X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0b7894460092b8b3939f2d89ba9ebde15843d6ab..5dd14f0c3388f69932d521915e039e32b9e6d970:/io.c

diff --git a/io.c b/io.c
index cc2561fe..ed556b15 100644
--- a/io.c
+++ b/io.c
@@ -29,6 +29,7 @@
 
 #include "rsync.h"
 #include "ifuncs.h"
+#include "inums.h"
 
 /** If no timeout is specified then use a 60 second select timeout */
 #define SELECT_TIMEOUT 60
@@ -63,7 +64,6 @@ int allowed_lull = 0;
 int ignore_timeout = 0;
 int batch_fd = -1;
 int msgdone_cnt = 0;
-int check_for_io_err = 0;
 
 /* Ignore an EOF error if non-zero. See whine_about_eof(). */
 int kluge_around_eof = 0;
@@ -377,8 +377,6 @@ static void read_msg_fd(void)
 	len = tag & 0xFFFFFF;
 	tag = (tag >> 24) - MPLEX_BASE;
 
-	check_for_io_err = 0;
-
 	switch (tag) {
 	case MSG_DONE:
 		if (len < 0 || len > 1 || !am_generator) {
@@ -413,9 +411,6 @@ static void read_msg_fd(void)
 		}
 		flist = recv_file_list(fd);
 		flist->parent_ndx = IVAL(buf,0);
-		/* If the sender is going to send us an MSG_IO_ERROR value, it
-		 * will always be the very next message following MSG_FLIST. */
-		check_for_io_err = 1;
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links)
 			match_hard_links(flist);
@@ -632,7 +627,7 @@ static void whine_about_eof(int fd)
 
 	rprintf(FERROR, RSYNC_NAME ": connection unexpectedly closed "
 		"(%s bytes received so far) [%s]\n",
-		big_num(stats.total_read, 0), who_am_i());
+		big_num(stats.total_read), who_am_i());
 
 	exit_cleanup(RERR_STREAMIO);
 }
@@ -1063,8 +1058,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 		msg_bytes = tag & 0xFFFFFF;
 		tag = (tag >> 24) - MPLEX_BASE;
 
-		check_for_io_err = 0;
-
 		switch (tag) {
 		case MSG_DATA:
 			if (msg_bytes > iobuf_in_siz) {