Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3e6ddb3
)
The global allowed_lull is now already set, so just set lull_mod.
author
Wayne Davison
<wayned@samba.org>
Thu, 19 May 2005 08:52:22 +0000
(08:52 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 19 May 2005 08:52:22 +0000
(08:52 +0000)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
e46da84
..
7636784
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-59,8
+59,8
@@
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
extern int ignore_times;
extern int size_only;
extern OFF_T max_size;
-extern int io_timeout;
extern int io_error;
extern int io_error;
+extern int allowed_lull;
extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
extern int sock_f_out;
extern int ignore_timeout;
extern int protocol_version;
@@
-89,8
+89,6
@@
extern int backup_suffix_len;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-int allowed_lull = 0;
-
static int deletion_count = 0; /* used to implement --max-delete */
static int deletion_count = 0; /* used to implement --max-delete */
@@
-1145,10
+1143,11
@@
notify_others:
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
void generate_files(int f_out, struct file_list *flist, char *local_name)
{
- int i
, lull_mod
;
+ int i;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
enum logcode code;
char fbuf[MAXPATHLEN];
int itemizing, maybe_PERMS_REPORT;
enum logcode code;
+ int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
@@
-1156,9
+1155,6
@@
void generate_files(int f_out, struct file_list *flist, char *local_name)
int save_do_progress = do_progress;
int save_make_backups = make_backups;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
- allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
- lull_mod = allowed_lull * 5;
-
if (protocol_version >= 29) {
itemizing = 1;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
if (protocol_version >= 29) {
itemizing = 1;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;