Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed human_num() to big_num() with an extra arg so that it can
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
2ba1ab9
..
05ac184
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-179,8
+179,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
int32 read_size = MAX(sum.blength * 2, 16*1024);
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (DEBUG_GTE(CHKSUM, 2)) {
int32 read_size = MAX(sum.blength * 2, 16*1024);
mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
if (DEBUG_GTE(CHKSUM, 2)) {
- rprintf(FINFO, "recv mapped %s of size %
.0f
\n",
- fname_r,
(double)size_r
);
+ rprintf(FINFO, "recv mapped %s of size %
s
\n",
+ fname_r,
big_num(size_r, 0)
);
}
} else
mapbuf = NULL;
}
} else
mapbuf = NULL;
@@
-209,8
+209,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
}
offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
}
offset = sum.flength;
if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
- rsyserr(FERROR_XFER, errno, "lseek of %s returned %
.0f, not %.0f
",
- full_fname(fname),
(double)j, (double)offset
);
+ rsyserr(FERROR_XFER, errno, "lseek of %s returned %
s, not %s
",
+ full_fname(fname),
big_num(j, 0), big_num(offset, 0)
);
exit_cleanup(RERR_FILEIO);
}
}
exit_cleanup(RERR_FILEIO);
}
}
@@
-221,8
+221,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
if (i > 0) {
if (DEBUG_GTE(CHKSUM, 3)) {
if (i > 0) {
if (DEBUG_GTE(CHKSUM, 3)) {
- rprintf(FINFO,"data recv %d at %
.0f
\n",
- i,
(double)offset
);
+ rprintf(FINFO,"data recv %d at %
s
\n",
+ i,
big_num(offset, 0)
);
}
stats.literal_data += i;
}
stats.literal_data += i;
@@
-246,8
+246,8
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
if (DEBUG_GTE(CHKSUM, 3)) {
rprintf(FINFO,
if (DEBUG_GTE(CHKSUM, 3)) {
rprintf(FINFO,
- "chunk[%d] of size %ld at %
.0f offset=%.0f
\n",
- i, (long)len,
(double)offset2, (double)offset
);
+ "chunk[%d] of size %ld at %
s offset=%s
\n",
+ i, (long)len,
big_num(offset2, 0), big_num(offset, 0)
);
}
if (mapbuf) {
}
if (mapbuf) {
@@
-265,9
+265,9
@@
static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
offset += len;
if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
rsyserr(FERROR_XFER, errno,
offset += len;
if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
rsyserr(FERROR_XFER, errno,
- "lseek of %s returned %
.0f, not %.0f
",
+ "lseek of %s returned %
s, not %s
",
full_fname(fname),
full_fname(fname),
-
(double)pos, (double)offset
);
+
big_num(pos, 0), big_num(offset, 0)
);
exit_cleanup(RERR_FILEIO);
}
continue;
exit_cleanup(RERR_FILEIO);
}
continue;