fixed some logcode warnings

diff --git a/io.c b/io.c
index aefd3ef481d57aeee562a60e9653e2d8e4c6a16a..c01296da6f8aa998c4a7f39256ce81a59b93687a 100644 (file)
--- a/io.c
+++ b/io.c
@@ -429,7 +429,7 @@ void io_flush(void)
        if (!io_buffer_count || no_flush) return;
 
        if (io_multiplexing_out) {
-               mplex_write(fd, 0, io_buffer, io_buffer_count);
+               mplex_write(fd, FNONE, io_buffer, io_buffer_count);
        } else {
                writefd_unbuffered(fd, io_buffer, io_buffer_count);
        }

diff --git a/log.c b/log.c
index 8619e4d6823148e011432e2a5d4d5fc21c829628..f0ee10e03810e560cf007dca888f4a3a9ccadb5b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -194,7 +194,7 @@ void rflush(enum logcode code)
 
 /* a generic logging routine for send/recv, with parameter
    substitiution */
-static void log_formatted(int fd,
+static void log_formatted(enum logcode code,
                          char *format, char *op, struct file_struct *file,
                          struct stats *initial_stats)
 {
@@ -284,7 +284,7 @@ static void log_formatted(int fd,
                s = p+l;
        }
 
-       rprintf(fd,"%s\n", buf);
+       rprintf(code,"%s\n", buf);
 }
 
 /* log the outgoing transfer of a file */

diff --git a/options.c b/options.c
index 00cfc0bea6498ec167e81fcb3464d1127bd82dc3..ca849d5135aaf5edeaea54ba228826caff712fb9 100644 (file)
--- a/options.c
+++ b/options.c
@@ -84,7 +84,7 @@ int list_only = 0;
 
 struct in_addr socket_address = {INADDR_ANY};
 
-void usage(int F)
+void usage(enum logcode F)
 {
   rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
          VERSION);

diff --git a/rsync.h b/rsync.h
index 3c5b7dc72066246e25ed7d870ed96871ee91c12b..2673c79f955b5bfba6f079a7c38fde820d95ae81 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -63,7 +63,7 @@
 
 #define MPLEX_BASE 7
 
-enum logcode {FERROR=1, FINFO=2, FLOG=3};
+enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3};
 
 #include "errcode.h"