From: Wayne Davison <wayned@samba.org>
Date: Thu, 1 Jun 2006 08:04:50 +0000 (+0000)
Subject: Got rid of the FNAME logcode enum.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/85909931857090541511e7ab9a085225e0db0407

Got rid of the FNAME logcode enum.
---

diff --git a/receiver.c b/receiver.c
index 2ae46205..07fe3f4d 100644
--- a/receiver.c
+++ b/receiver.c
@@ -421,7 +421,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 		}
 
 		if (!do_xfers) { /* log the transfer */
-			log_item(FNAME, file, &stats, iflags, NULL);
+			log_item(FCLIENT, file, &stats, iflags, NULL);
 			if (read_batch)
 				discard_receive_data(f_in, file->length);
 			continue;
@@ -596,7 +596,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 
 		/* log the transfer */
 		if (log_before_transfer)
-			log_item(FNAME, file, &initial_stats, iflags, NULL);
+			log_item(FCLIENT, file, &initial_stats, iflags, NULL);
 		else if (!am_server && verbose && do_progress)
 			rprintf(FINFO, "%s\n", fname);
 
diff --git a/rsync.h b/rsync.h
index 5b1343b5..935360ef 100644
--- a/rsync.h
+++ b/rsync.h
@@ -159,9 +159,8 @@
 
 /* Log-message categories.  Only FERROR and FINFO get sent over the socket,
  * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
- * FLOG only goes to the log file, not to the client; FCLIENT is the opposite.
- * FNAME is a client-side message when outputting a filename on its own. */
-enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FNAME=5, FSOCKERR=6 };
+ * FLOG only goes to the log file, not the client; FCLIENT is the opposite. */
+enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 };
 
 /* Messages types that are sent over the message channel.  The logcode
  * values must all be present here with identical numbers. */
diff --git a/sender.c b/sender.c
index baecd5b7..9608ec96 100644
--- a/sender.c
+++ b/sender.c
@@ -281,7 +281,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 		stats.total_transferred_size += file->length;
 
 		if (!do_xfers) { /* log the transfer */
-			log_item(FNAME, file, &stats, iflags, NULL);
+			log_item(FCLIENT, file, &stats, iflags, NULL);
 			write_ndx_and_attrs(f_out, i, iflags, fnamecmp_type,
 					    xname, xlen);
 			continue;
@@ -342,9 +342,9 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 			rprintf(FINFO, "calling match_sums %s\n", fname);
 
 		if (log_before_transfer)
-			log_item(FNAME, file, &initial_stats, iflags, NULL);
+			log_item(FCLIENT, file, &initial_stats, iflags, NULL);
 		else if (!am_server && verbose && do_progress)
-			rprintf(FNAME, "%s\n", fname2);
+			rprintf(FCLIENT, "%s\n", fname2);
 
 		set_compression(fname);