X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..45c37e737f2a2f753d06b57605e66782aa93a114:/io.c

diff --git a/io.c b/io.c
index b21dff42..60685757 100644
--- a/io.c
+++ b/io.c
@@ -36,7 +36,6 @@
 extern int bwlimit;
 extern size_t bwlimit_writemax;
 extern int io_timeout;
-extern int allowed_lull;
 extern int am_server;
 extern int am_daemon;
 extern int am_sender;
@@ -47,7 +46,6 @@ extern int eol_nulls;
 extern int flist_eof;
 extern int list_only;
 extern int read_batch;
-extern int csum_length;
 extern int protect_args;
 extern int checksum_seed;
 extern int protocol_version;
@@ -60,7 +58,8 @@ extern int filesfrom_convert;
 extern iconv_t ic_send, ic_recv;
 #endif
 
-const char phase_unknown[] = "unknown";
+int csum_length = SHORT_SUM_LENGTH; /* initial value */
+int allowed_lull = 0;
 int ignore_timeout = 0;
 int batch_fd = -1;
 int msgdone_cnt = 0;
@@ -512,7 +511,7 @@ static void mplex_write(int fd, enum msgcode code, const char *buf, size_t len,
 		xbuf outbuf, inbuf;
 
 		INIT_XBUF(outbuf, buffer + 4, 0, sizeof buffer - 4);
-		INIT_XBUF(inbuf, (char*)buf, len, -1);
+		INIT_XBUF(inbuf, (char*)buf, len, (size_t)-1);
 
 		iconvbufs(ic_send, &inbuf, &outbuf,
 			  ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE);
@@ -629,8 +628,8 @@ static void whine_about_eof(int fd)
 	}
 
 	rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed "
-		"(%.0f bytes received so far) [%s]\n",
-		(double)stats.total_read, who_am_i());
+		"(%s bytes received so far) [%s]\n",
+		big_num(stats.total_read, 0), who_am_i());
 
 	exit_cleanup(RERR_STREAMIO);
 }
@@ -1092,10 +1091,9 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 				xbuf outbuf, inbuf;
 				char ibuf[512];
 				int add_null = 0;
-				int pos = 0;
 
 				INIT_CONST_XBUF(outbuf, line);
-				INIT_XBUF(inbuf, ibuf, 0, -1);
+				INIT_XBUF(inbuf, ibuf, 0, (size_t)-1);
 
 				while (msg_bytes) {
 					inbuf.len = msg_bytes > sizeof ibuf
@@ -1107,7 +1105,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 					if (iconvbufs(ic_send, &inbuf, &outbuf,
 					    ICB_INCLUDE_BAD | ICB_INCLUDE_INCOMPLETE) < 0)
 						goto overflow;
-					pos = -1;
 				}
 				if (add_null) {
 					if (outbuf.len == outbuf.size)