X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/30e8c8e1e48088477f0befdd08922caa6919bc51..87cc45e136333407acc6463f6415df4979289f30:/log.c

diff --git a/log.c b/log.c
index ade21ebd..34ff6d3d 100644
--- a/log.c
+++ b/log.c
@@ -184,7 +184,7 @@ void log_init(void)
 #endif
 }
 
-void log_open()
+void log_open(void)
 {
 	if (logfname && !logfile) {
 		extern int orig_umask;
@@ -194,7 +194,7 @@ void log_open()
 	}
 }
 
-void log_close()
+void log_close(void)
 {
 	if (logfile) {
 		fclose(logfile);
@@ -238,9 +238,9 @@ void rwrite(enum logcode code, char *buf, int len)
 		return;
 	}
 
-	/* next, if we are a server but not in daemon mode, and multiplexing
-	 *  is enabled, pass it to the other side.  */
-	if (am_server && !am_daemon && io_multiplex_write(code, buf, len)) {
+	/* next, if we are a server and multiplexing is enabled, 
+	 * pass it to the other side.  */
+	if (am_server && io_multiplex_write(code, buf, len)) {
 		return;
 	}
 
@@ -250,7 +250,9 @@ void rwrite(enum logcode code, char *buf, int len)
 	 *  side because we don't want the client to see most errors for
 	 *  security reasons.  We do want early messages when running daemon
 	 *  mode over a remote shell to go to the remote side; those will
-	 *  fall through to the next case. */
+	 *  fall through to the next case.
+	 * Note that this is only for the time before multiplexing is enabled.
+	 */
 	if (am_daemon && (!am_server || log_initialised)) {
 		static int depth;
 		int priority = LOG_INFO;
@@ -570,17 +572,3 @@ void log_exit(int code, const char *file, int line)
 			name, code, file, line);
 	}
 }
-
-/*
- * Log the incoming transfer of a file for interactive use,
- * this will be called at the end where the client was run.
- * Called when a file starts to be transferred.
- */
-void log_transfer(struct file_struct *file, const char *fname)
-{
-	extern int verbose;
-
-	if (!verbose) return;
-
-	rprintf(FINFO, "%s\n", fname);
-}