From: Wayne Davison <wayned@samba.org>
Date: Sat, 3 Nov 2007 07:20:09 +0000 (+0000)
Subject: Avoid verbose output during the forwarding of flist data (for now,
X-Git-Tag: v3.0.0pre5~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7386d23d46ea8ed1fe85dc6ec4d11d85f345a16;p=thirdparty%2Frsync.git

Avoid verbose output during the forwarding of flist data (for now,
at least).
---

diff --git a/rsync.c b/rsync.c
index 7f8d65cb..fea0c1fb 100644
--- a/rsync.c
+++ b/rsync.c
@@ -211,7 +211,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
 	int len, iflags = 0;
 	struct file_list *flist;
 	uchar fnamecmp_type = FNAMECMP_FNAME;
-	int ndx;
+	int ndx, save_verbose = verbose;
 
   read_loop:
 	while (1) {
@@ -239,15 +239,17 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
 		}
 
 		/* Send everything read from f_in to msg_fd_out. */
-		send_msg_int(MSG_FLIST, ndx);
-		start_flist_forward(f_in);
 		if (verbose > 3) {
 			rprintf(FINFO, "[%s] receiving flist for dir %d\n",
 				who_am_i(), ndx);
 		}
+		verbose = 0;
+		send_msg_int(MSG_FLIST, ndx);
+		start_flist_forward(f_in);
 		flist = recv_file_list(f_in);
 		flist->parent_ndx = ndx;
 		stop_flist_forward();
+		verbose = save_verbose;
 	}
 
 	iflags = protocol_version >= 29 ? read_shortint(f_in)