X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=6affd3c7b9c2e0b3eab1e71a26ac75b75539292c;hb=a503c54a95d139f117650a0e6d80e6edfe81e8bf;hp=59bebf005061ab37798cc1ff65b45d69537b4209;hpb=14d5571cccff7d32a75956cec5a2805e8249dfad;p=collectd.git diff --git a/src/collectdmon.c b/src/collectdmon.c index 59bebf00..6affd3c7 100644 --- a/src/collectdmon.c +++ b/src/collectdmon.c @@ -135,7 +135,7 @@ static int daemonize(void) { } pid_t pid = fork(); - if (pid < 0) { + if (pid < 0) { fprintf(stderr, "Error: fork() failed: %s\n", strerror(errno)); return -1; } else if (pid != 0) { @@ -255,11 +255,12 @@ static void check_respawn(void) { if (counter >= 10) { unsigned int time_left = 300; - syslog(LOG_ERR, "Error: collectd is respawning too fast - " - "disabled for %i seconds", + syslog(LOG_ERR, + "Error: collectd is respawning too fast - " + "disabled for %i seconds", time_left); - while (((time_left = sleep(time_left)) >= 0) && loop == 0) + while (((time_left = sleep(time_left)) > 0) && loop == 0) ; } return; @@ -276,9 +277,10 @@ int main(int argc, char **argv) { while (42) { int c = getopt(argc, argv, "hc:P:"); - switch (c) { - case -1: + if (c == -1) break; + + switch (c) { case 'c': collectd = optarg; break; @@ -322,8 +324,8 @@ int main(int argc, char **argv) { } struct sigaction sa = { - .sa_handler = sig_int_term_handler, - .sa_flags = 0, + .sa_handler = sig_int_term_handler, + .sa_flags = 0, }; sigemptyset(&sa.sa_mask);