X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..56ac812359d7dda201fa5a3399bb60bc4bfbbbc2:/generator.c

diff --git a/generator.c b/generator.c
index 22f2851e..a0a95d9f 100644
--- a/generator.c
+++ b/generator.c
@@ -805,9 +805,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 
 	if (sum->count && DEBUG_GTE(CHKSUM, 2)) {
 		rprintf(FINFO,
-			"count=%.0f rem=%ld blength=%ld s2length=%d flength=%.0f\n",
-			(double)sum->count, (long)sum->remainder, (long)sum->blength,
-			sum->s2length, (double)sum->flength);
+			"count=%s rem=%ld blength=%ld s2length=%d flength=%s\n",
+			big_num(sum->count, 0), (long)sum->remainder, (long)sum->blength,
+			sum->s2length, big_num(sum->flength, 0));
 	}
 }
 
@@ -857,8 +857,8 @@ static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 
 		if (DEBUG_GTE(CHKSUM, 3)) {
 			rprintf(FINFO,
-				"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
-				(double)i, (double)offset - n1, (long)n1,
+				"chunk[%s] offset=%s len=%ld sum1=%08lx\n",
+				big_num(i, 0), big_num(offset - n1, 0), (long)n1,
 				(unsigned long)sum1);
 		}
 		write_int(f_out, sum1);
@@ -1198,7 +1198,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 static void list_file_entry(struct file_struct *f)
 {
 	char permbuf[PERMSTRING_SIZE];
-	double len;
+	int64 len;
 
 	if (!F_IS_ACTIVE(f)) {
 		/* this can happen if duplicate names were removed */
@@ -1212,14 +1212,14 @@ static void list_file_entry(struct file_struct *f)
 
 #ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(f->mode)) {
-		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-			permbuf, len, timestring(f->modtime),
+		rprintf(FINFO, "%s %11s %s %s -> %s\n",
+			permbuf, big_num(len, 0), timestring(f->modtime),
 			f_name(f, NULL), F_SYMLINK(f));
 	} else
 #endif
 	{
-		rprintf(FINFO, "%s %11.0f %s %s\n",
-			permbuf, len, timestring(f->modtime),
+		rprintf(FINFO, "%s %11s %s %s\n",
+			permbuf, big_num(len, 0), timestring(f->modtime),
 			f_name(f, NULL));
 	}
 }
@@ -1904,8 +1904,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (DEBUG_GTE(CHKSUM, 3)) {
-		rprintf(FINFO, "gen mapped %s of size %.0f\n",
-			fnamecmp, (double)sx.st.st_size);
+		rprintf(FINFO, "gen mapped %s of size %s\n",
+			fnamecmp, big_num(sx.st.st_size, 0));
 	}
 
 	if (DEBUG_GTE(CHKSUM, 2))