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 (parent:
5562deb
)
Merged a couple more f != -1 if sections.
author
Wayne Davison
<wayned@samba.org>
Tue, 13 Jan 2004 06:27:30 +0000
(06:27 +0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 13 Jan 2004 06:27:30 +0000
(06:27 +0000)
flist.c
patch
|
blob
|
blame
|
history
diff --git
a/flist.c
b/flist.c
index
06310cf
..
55107a7
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1135,12
+1135,11
@@
struct file_list *send_file_list(int f, int argc, char *argv[])
clean_flist(flist, 0, 0);
clean_flist(flist, 0, 0);
- /* now send the uid/gid list. This was introduced in protocol
- * version 15 */
- if (f != -1)
+ if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
send_uid_list(f);
send_uid_list(f);
- if (f != -1) {
/* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
/* send the io_error flag */
write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
@@
-1212,16
+1211,18
@@
struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
clean_flist(flist, relative_paths, 1);
- /* now recv the uid/gid list. This was introduced in protocol version 15 */
- if (f != -1)
+ if (f != -1) {
+ /* Now send the uid/gid list. This was introduced in
+ * protocol version 15 */
recv_uid_list(f, flist);
recv_uid_list(f, flist);
- /* recv the io_error flag */
- if (f != -1 && !read_batch) { /* dw-added readbatch */
- if (lp_ignore_errors(module_id) || ignore_errors)
- read_int(f);
- else
- io_error |= read_int(f);
+ if (!read_batch) {
+ /* Recv the io_error flag */
+ if (lp_ignore_errors(module_id) || ignore_errors)
+ read_int(f);
+ else
+ io_error |= read_int(f);
+ }
}
if (list_only) {
}
if (list_only) {
@@
-1230,7
+1231,6
@@
struct file_list *recv_file_list(int f)
list_file_entry(flist->files[i]);
}
list_file_entry(flist->files[i]);
}
-
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");
if (verbose > 2)
rprintf(FINFO, "recv_file_list done\n");