aboutsummaryrefslogtreecommitdiffstats
path: root/receiver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-05-09 18:31:06 +0000
committerWayne Davison <wayned@samba.org>2006-05-09 18:31:06 +0000
commitecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d (patch)
treef9603599ed59db41ce98fb0668fc68f634a1794d /receiver.c
parent87c0f9d6b4899729313154ac5752dd86c745ed07 (diff)
downloadandroid_external_rsync-ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d.tar.gz
android_external_rsync-ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d.tar.bz2
android_external_rsync-ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d.zip
Some demon_log_* variables changed into logfile_* variables that are
also used by the new --log-file option.
Diffstat (limited to 'receiver.c')
-rw-r--r--receiver.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/receiver.c b/receiver.c
index b6215fb3..94b6fb40 100644
--- a/receiver.c
+++ b/receiver.c
@@ -24,12 +24,11 @@
extern int verbose;
extern int do_xfers;
-extern int am_daemon;
extern int am_server;
extern int do_progress;
extern int log_before_transfer;
extern int log_format_has_i;
-extern int daemon_log_format_has_i;
+extern int logfile_format_has_i;
extern int csum_length;
extern int read_batch;
extern int write_batch;
@@ -343,8 +342,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
struct file_struct *file;
struct stats initial_stats;
int save_make_backups = make_backups;
- int itemizing = am_daemon ? daemon_log_format_has_i
- : !am_server && log_format_has_i;
+ int itemizing = am_server ? logfile_format_has_i : log_format_has_i;
int max_phase = protocol_version >= 29 ? 2 : 1;
int i, recv_ok;