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
Cast various s->blength references inside of MIN() macros to OFF_T
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
79929d6
..
810576f
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-877,17
+877,20
@@
static int start_client(int argc, char *argv[])
}
}
-static RETSIGTYPE sigusr1_handler(int UNUSED(val)) {
+static RETSIGTYPE sigusr1_handler(UNUSED(int val))
+{
exit_cleanup(RERR_SIGNAL);
}
exit_cleanup(RERR_SIGNAL);
}
-static RETSIGTYPE sigusr2_handler(int UNUSED(val)) {
+static RETSIGTYPE sigusr2_handler(UNUSED(int val))
+{
extern int log_got_error;
if (log_got_error) _exit(RERR_PARTIAL);
_exit(0);
}
extern int log_got_error;
if (log_got_error) _exit(RERR_PARTIAL);
_exit(0);
}
-static RETSIGTYPE sigchld_handler(int UNUSED(val)) {
+static RETSIGTYPE sigchld_handler(UNUSED(int val))
+{
#ifdef WNOHANG
int cnt, status;
pid_t pid;
#ifdef WNOHANG
int cnt, status;
pid_t pid;
@@
-945,7
+948,7
@@
const char *get_panic_action(void)
* should just look at the environment variable, but I'm a bit leery
* of a signal sending us into a busy loop.
**/
* should just look at the environment variable, but I'm a bit leery
* of a signal sending us into a busy loop.
**/
-static RETSIGTYPE rsync_panic_handler(
int UNUSED(
whatsig))
+static RETSIGTYPE rsync_panic_handler(
UNUSED(int
whatsig))
{
char cmd_buf[300];
int ret;
{
char cmd_buf[300];
int ret;
@@
-1056,6
+1059,5
@@
int main(int argc,char *argv[])
else
exit_cleanup(ret);
else
exit_cleanup(ret);
- exit(ret);
- /* NOTREACHED */
+ return ret;
}
}