X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=server.c;h=93de8cc35d26c4e9f0e2277a236f47de905d5a6a;hb=b46dd218f90646441998f975c9b5515a5521c9d5;hp=80cc8f46e36a6e70be2ed13da7bfcce6f5d5a27d;hpb=d2e164526bed7f523043b7e4ec5bd282d5bc6f19;p=paraslash.git diff --git a/server.c b/server.c index 80cc8f46..93de8cc3 100644 --- a/server.c +++ b/server.c @@ -166,7 +166,7 @@ void para_log(int ll, const char* fmt,...) fprintf(outfd, "%i: ", ll); mypid = getpid(); if (conf.loglevel_arg <= INFO) - fprintf(outfd, "(%d) ", mypid); + fprintf(outfd, "(%d) ", (int)mypid); va_start(argp, fmt); vfprintf(outfd, fmt, argp); va_end(argp); @@ -292,9 +292,9 @@ static void setup_signal_handling(void) ret += para_install_sighandler(SIGTERM); ret += para_install_sighandler(SIGHUP); ret += para_install_sighandler(SIGCHLD); - ret += para_install_sighandler(SIGUSR1); signal(SIGPIPE, SIG_IGN); - if (ret != 5) { + signal(SIGUSR1, SIG_IGN); + if (ret != 4) { PARA_EMERG_LOG("%s", "could not install signal handlers\n"); exit(EXIT_FAILURE); }