summaryrefslogtreecommitdiff
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-12-03 06:44:16 +0000
committerWayne Davison <wayned@samba.org>2006-12-03 06:44:16 +0000
commit82ad07c4182f744c07b96a15df4572e559ed7dc8 (patch)
tree1f6dd4c5f7f72d77dde613a08c1d0e3a8905cc46 /receiver.c
parentd144e43bb3ea77bdc9d1dd68a648166970822dd6 (diff)
downloadrsync-82ad07c4182f744c07b96a15df4572e559ed7dc8.tar.gz
rsync-82ad07c4182f744c07b96a15df4572e559ed7dc8.tar.bz2
rsync-82ad07c4182f744c07b96a15df4572e559ed7dc8.zip
- Typical tranfers now save 12-20 bytes per file because several vars
were moved out of file_struct into an optional member-var setup. - Renamed and reorganized the FLAG_* defines. - Use NDX_DONE instead of a literal -1 when sending/checking the end-of-phase index value.
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/receiver.c b/receiver.c
index 28eec5fb..b9931b8f 100644
--- a/receiver.c
+++ b/receiver.c
@@ -39,6 +39,7 @@ extern int preserve_hard_links;
extern int preserve_perms;
extern int basis_dir_cnt;
extern int make_backups;
+extern int flist_extra_ndx;
extern int cleanup_got_literal;
extern int remove_source_files;
extern int append_mode;
@@ -300,8 +301,7 @@ static void handle_delayed_updates(struct file_list *flist, char *local_name)
full_fname(fname), partialptr);
} else {
if (remove_source_files
- || (preserve_hard_links
- && file->link_u.links)) {
+ || (preserve_hard_links && IS_HLINKED(file))) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS,numbuf,4);
}
@@ -369,7 +369,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
cleanup_disable();
i = read_int(f_in);
- if (i == -1) {
+ if (i == NDX_DONE) {
if (read_batch) {
get_next_gen_i(batch_gen_fd, next_gen_i,
flist->count);
@@ -655,7 +655,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
if (recv_ok > 0) {
if (remove_source_files
- || (preserve_hard_links && file->link_u.links)) {
+ || (preserve_hard_links && IS_HLINKED(file))) {
SIVAL(numbuf, 0, i);
send_msg(MSG_SUCCESS, numbuf, 4);
}