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
Use the latest F_*() accessors.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
b0c6570
..
eee2a02
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-143,8
+143,8
@@
void successful_send(int ndx)
}
}
}
}
-
static
void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-
uchar fnamecmp_type, char *buf, int len)
+void write_ndx_and_attrs(int f_out, int ndx, int iflags,
+ uchar fnamecmp_type, char *buf, int len)
{
write_int(f_out, ndx);
if (protocol_version < 29)
{
write_int(f_out, ndx);
if (protocol_version < 29)
@@
-182,13
+182,13
@@
void send_files(struct file_list *flist, int f_out, int f_in)
unsigned int offset;
i = read_int(f_in);
unsigned int offset;
i = read_int(f_in);
- if (i ==
-1
) {
+ if (i ==
NDX_DONE
) {
if (++phase > max_phase)
break;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
if (++phase > max_phase)
break;
csum_length = SUM_LENGTH;
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
- write_int(f_out,
-1
);
+ write_int(f_out,
NDX_DONE
);
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
/* For inplace: redo phase turns off the backup
* flag so that we do a regular inplace send. */
make_backups = 0;
@@
-230,7
+230,7
@@
void send_files(struct file_list *flist, int f_out, int f_in)
stats.current_file_index = i;
stats.num_transferred_files++;
stats.current_file_index = i;
stats.num_transferred_files++;
- stats.total_transferred_size +=
file->length
;
+ stats.total_transferred_size +=
F_LENGTH(file)
;
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
@@
-332,5
+332,5
@@
void send_files(struct file_list *flist, int f_out, int f_in)
match_report();
match_report();
- write_int(f_out,
-1
);
+ write_int(f_out,
NDX_DONE
);
}
}