From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 15 May 2018 10:43:45 +0000 (+0200)
Subject: Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ced4663d20fba65f3966fd2dfbe23a53fc16df37;hp=ea2983299710c1a3b7886ab6aa460818e091076f;p=collectd.git

Merge pull request #2774 from takahashi-tsc/bugfix-collectdmon-loop

Fix collecdmon not start collectd
---

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 43ff6af2..0e2b0214 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) {
@@ -276,9 +276,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 +323,7 @@ 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);