From a0d3a0b3fae05bfaa5af14dedc5dc4f11e47d6cf Mon Sep 17 00:00:00 2001 From: Denny Page Date: Tue, 15 Dec 2015 07:38:57 -0800 Subject: [PATCH] Fix typos Move signal handler up --- dpinger.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dpinger.c b/dpinger.c index 4b769a3..fa81871 100644 --- a/dpinger.c +++ b/dpinger.c @@ -1096,7 +1096,7 @@ main( if (strlen(usocket_name) >= sizeof(uaddr.sun_path)) { - fatal("Unix socket name too large\n"); + fatal("socket name too large\n"); } usocket_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); @@ -1171,6 +1171,12 @@ main( (void) setsid(); } + // Termination handler + memset(&act, 0, sizeof(act)); + act.sa_handler = (void (*)(int)) term_handler; + sigaction(SIGTERM, &act, NULL); + sigaction(SIGINT, &act, NULL); + // Write pid file if (pidfile_name) { @@ -1184,12 +1190,6 @@ main( } } - // Termination handler - memset(&act, 0, sizeof(act)); - act.sa_handler = (void (*)(int)) term_handler; - sigaction(SIGTERM, &act, NULL); - sigaction(SIGINT, &act, NULL); - // Create the array array_size = time_period / send_interval; array = calloc(array_size, sizeof(*array)); @@ -1279,7 +1279,7 @@ main( if (r != 0) { perror("pthread_create"); - fatal("cannot create send thread\n"); + fatal("cannot create report thread\n"); } } @@ -1301,7 +1301,7 @@ main( if (r != 0) { perror("pthread_create"); - fatal("cannot create unix socket thread\n"); + fatal("cannot create usocket thread\n"); } }