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:
c2a608d
)
Some minor format tweaks.
author
Wayne Davison
<wayned@samba.org>
Thu, 7 Dec 2006 03:31:44 +0000
(
03:31
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 7 Dec 2006 03:31:44 +0000
(
03:31
+0000)
main.c
patch
|
blob
|
blame
|
history
diff --git
a/main.c
b/main.c
index
e2d6aa7
..
24c7544
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-630,7
+630,6
@@
static void read_final_goodbye(int f_in, int f_out)
}
}
}
}
-
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
{
struct file_list *flist;
@@
-671,9
+670,8
@@
static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
}
flist = send_file_list(f_out,argc,argv);
}
flist = send_file_list(f_out,argc,argv);
- if (!flist || flist->count == 0)
{
+ if (!flist || flist->count == 0)
exit_cleanup(0);
exit_cleanup(0);
- }
the_file_list = flist;
io_start_buffering_in();
the_file_list = flist;
io_start_buffering_in();
@@
-784,7
+782,6
@@
static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
return exit_code;
}
return exit_code;
}
-
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
{
int exit_code;
@@
-905,12
+902,10
@@
void start_server(int f_in, int f_out, int argc, char *argv[])
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in();
keep_dirlinks = 0; /* Must be disabled on the sender. */
if (need_messages_from_generator)
io_start_multiplex_in();
-
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
recv_filter_list(f_in);
do_server_sender(f_in, f_out, argc, argv);
- } else
{
+ } else
do_server_recv(f_in, f_out, argc, argv);
do_server_recv(f_in, f_out, argc, argv);
- }
exit_cleanup(0);
}
exit_cleanup(0);
}
@@
-1023,7
+1018,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
return MAX(exit_code, exit_code2);
}
return MAX(exit_code, exit_code2);
}
-static int copy_argv
(char *argv[])
+static int copy_argv(char *argv[])
{
int i;
{
int i;