X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcollectdmon.c;h=078b2eb1d2b1422acc50370406ebf48558677a18;hb=HEAD;hp=0295ad3d7813d8fe69611b0c8ba2dac6658b052e;hpb=06c85d5b5c1731eeaee5c99a66d8df9abe1c1e0d;p=collectd.git

diff --git a/src/collectdmon.c b/src/collectdmon.c
index 0295ad3d..078b2eb1 100644
--- a/src/collectdmon.c
+++ b/src/collectdmon.c
@@ -19,6 +19,10 @@
  *   Sebastian Harl <sh at tokkee.org>
  **/
 
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
 #include "config.h"
 
 #include <assert.h>
@@ -140,7 +144,7 @@ static int daemonize (void)
 	if (RLIM_INFINITY == rl.rlim_max)
 		rl.rlim_max = 1024;
 
-	for (i = 0; i < rl.rlim_max; ++i)
+	for (i = 0; i < (int)rl.rlim_max; ++i)
 		close (i);
 
 	errno = 0;
@@ -166,7 +170,7 @@ static int daemonize (void)
 	return 0;
 } /* daemonize */
 
-static int collectd_start (int argc, char **argv)
+static int collectd_start (char **argv)
 {
 	pid_t pid = 0;
 
@@ -197,13 +201,13 @@ static int collectd_stop (void)
 	return 0;
 } /* collectd_stop */
 
-static void sig_int_term_handler (int signo)
+static void sig_int_term_handler (int __attribute__((unused)) signo)
 {
 	++loop;
 	return;
 } /* sig_int_term_handler */
 
-static void sig_hup_handler (int signo)
+static void sig_hup_handler (int __attribute__((unused)) signo)
 {
 	++restart;
 	return;
@@ -331,16 +335,10 @@ int main (int argc, char **argv)
 		return 1;
 	}
 
-	sigaddset (&sa.sa_mask, SIGCHLD);
-	if (0 != sigprocmask (SIG_BLOCK, &sa.sa_mask, NULL)) {
-		syslog (LOG_ERR, "Error: sigprocmask() failed: %s", strerror (errno));
-		return 1;
-	}
-
 	while (0 == loop) {
 		int status = 0;
 
-		if (0 != collectd_start (collectd_argc, collectd_argv)) {
+		if (0 != collectd_start (collectd_argv)) {
 			syslog (LOG_ERR, "Error: failed to start collectd.");
 			break;
 		}