Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix casts when some variables are printed out.
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
ec39352
..
a103ff3
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-2,6
+2,7
@@
Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
Copyright (C) Paul Mackerras 1996
+ Copyright (C) 2001 by Martin Pool <mbp@samba.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-403,7
+404,6
@@
static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
extern int module_id;
extern int am_sender;
extern int read_batch; /* dw */
extern int module_id;
extern int am_sender;
extern int read_batch; /* dw */
- extern int write_batch; /* dw */
extern struct file_list *batch_flist; /* dw */
if (verbose > 2)
extern struct file_list *batch_flist; /* dw */
if (verbose > 2)
@@
-529,7
+529,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
}
if (pid != -1) {
if (verbose > 3)
}
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run waiting on %d\n",pid);
+ rprintf(FINFO,"client_run waiting on %d\n",
(int)
pid);
io_flush();
wait_process(pid, &status);
}
io_flush();
wait_process(pid, &status);
}
@@
-559,7
+559,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (pid != -1) {
if (verbose > 3)
if (pid != -1) {
if (verbose > 3)
- rprintf(FINFO,"client_run2 waiting on %d\n",pid);
+ rprintf(FINFO,"client_run2 waiting on %d\n",
(int)
pid);
io_flush();
wait_process(pid, &status);
}
io_flush();
wait_process(pid, &status);
}
@@
-743,7
+743,6
@@
int main(int argc,char *argv[])
extern int read_batch; /* dw */
extern int write_batch; /* dw */
extern char *batch_ext; /* dw */
extern int read_batch; /* dw */
extern int write_batch; /* dw */
extern char *batch_ext; /* dw */
- int i; /* dw */
int orig_argc; /* dw */
orig_argc = argc; /* dw */
int orig_argc; /* dw */
orig_argc = argc; /* dw */