X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..342bfb5e23ebb372e0b1230f8124a4312f8a66d8:/sender.c

diff --git a/sender.c b/sender.c
index 6aa5aeb8..c8ef7ccd 100644
--- a/sender.c
+++ b/sender.c
@@ -69,9 +69,9 @@ static struct sum_struct *receive_sums(int f)
 
 	s->sums = NULL;
 
-	if (DEBUG_GTE(CHKSUM, 3)) {
-		rprintf(FINFO, "count=%.0f n=%ld rem=%ld\n",
-			(double)s->count, (long)s->blength, (long)s->remainder);
+	if (DEBUG_GTE(DELTASUM, 3)) {
+		rprintf(FINFO, "count=%s n=%ld rem=%ld\n",
+			big_num(s->count, 0), (long)s->blength, (long)s->remainder);
 	}
 
 	if (append_mode > 0) {
@@ -103,10 +103,10 @@ static struct sum_struct *receive_sums(int f)
 		if (allowed_lull && !(i % lull_mod))
 			maybe_send_keepalive();
 
-		if (DEBUG_GTE(CHKSUM, 3)) {
+		if (DEBUG_GTE(DELTASUM, 3)) {
 			rprintf(FINFO,
-				"chunk[%d] len=%d offset=%.0f sum1=%08x\n",
-				i, s->sums[i].len, (double)s->sums[i].offset,
+				"chunk[%d] len=%d offset=%s sum1=%08x\n",
+				i, s->sums[i].len, big_num(s->sums[i].offset, 0),
 				s->sums[i].sum1);
 		}
 	}
@@ -283,7 +283,7 @@ void send_files(int f_in, int f_out)
 
 		if (!(s = receive_sums(f_in))) {
 			io_error |= IOERR_GENERAL;
-			rprintf(FERROR, "receive_sums failed\n");
+			rprintf(FERROR_XFER, "receive_sums failed\n");
 			exit_cleanup(RERR_PROTOCOL);
 		}
 
@@ -311,7 +311,7 @@ void send_files(int f_in, int f_out)
 		/* map the local file */
 		if (do_fstat(fd, &st) != 0) {
 			io_error |= IOERR_GENERAL;
-			rsyserr(FERROR, errno, "fstat failed");
+			rsyserr(FERROR_XFER, errno, "fstat failed");
 			free_sums(s);
 			close(fd);
 			exit_cleanup(RERR_PROTOCOL);
@@ -323,16 +323,16 @@ void send_files(int f_in, int f_out)
 		} else
 			mbuf = NULL;
 
-		if (DEBUG_GTE(CHKSUM, 2)) {
-			rprintf(FINFO, "send_files mapped %s%s%s of size %.0f\n",
-				path,slash,fname, (double)st.st_size);
+		if (DEBUG_GTE(DELTASUM, 2)) {
+			rprintf(FINFO, "send_files mapped %s%s%s of size %s\n",
+				path,slash,fname, big_num(st.st_size, 0));
 		}
 
 		write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
 				    fnamecmp_type, xname, xlen);
 		write_sum_head(f_xfer, s);
 
-		if (DEBUG_GTE(CHKSUM, 2))
+		if (DEBUG_GTE(DELTASUM, 2))
 			rprintf(FINFO, "calling match_sums %s%s%s\n", path,slash,fname);
 
 		if (log_before_transfer)