From 20f90d5e8a58fa8992993b444897d435af4a7896 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Mon, 29 May 2006 22:56:55 +0000
Subject: [PATCH] Use the renamed stdout_format_has_i variable.

---
 hlink.c | 6 +++---
 rsync.c | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hlink.c b/hlink.c
index c5547eb4..65ddd158 100644
--- a/hlink.c
+++ b/hlink.c
@@ -26,7 +26,7 @@
 extern int verbose;
 extern int link_dest;
 extern int make_backups;
-extern int log_format_has_i;
+extern int stdout_format_has_i;
 extern char *basis_dir[];
 extern struct file_list *the_file_list;
 
@@ -183,7 +183,7 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		head = hlink_list[file->F_HLINDEX];
 	if (ndx != head) {
 		struct file_struct *head_file = FPTR(head);
-		if (!log_format_has_i && verbose > 1) {
+		if (!stdout_format_has_i && verbose > 1) {
 			rprintf(FINFO, "\"%s\" is a hard link\n",
 				f_name(file, NULL));
 		}
@@ -208,7 +208,7 @@ int hard_link_check(struct file_struct *file, int ndx, char *fname,
 							continue;
 						statret = 1;
 						st = &st3;
-						if (verbose < 2 || !log_format_has_i)
+						if (verbose < 2 || !stdout_format_has_i)
 							itemizing = code = 0;
 						break;
 					}
diff --git a/rsync.c b/rsync.c
index 818f26b4..fec27c1c 100644
--- a/rsync.c
+++ b/rsync.c
@@ -218,8 +218,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
 #endif
 
 	if (verbose > 1 && flags & ATTRS_REPORT) {
-		enum logcode code = logfile_format_has_i || dry_run
-				  ? FCLIENT : FINFO;
+		enum logcode code = logfile_format_has_i || dry_run ? FCLIENT : FINFO;
 		if (updated)
 			rprintf(code, "%s\n", fname);
 		else
-- 
2.34.1