projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stats plugin: Link with libm (-lm).
[collectd.git]
/
src
/
collectdmon.c
diff --git
a/src/collectdmon.c
b/src/collectdmon.c
index
0295ad3
..
078b2eb
100644
(file)
--- a/
src/collectdmon.c
+++ b/
src/collectdmon.c
@@
-19,6
+19,10
@@
* Sebastian Harl <sh at tokkee.org>
**/
* Sebastian Harl <sh at tokkee.org>
**/
+#if !defined(__GNUC__) || !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
#include "config.h"
#include <assert.h>
#include "config.h"
#include <assert.h>
@@
-140,7
+144,7
@@
static int daemonize (void)
if (RLIM_INFINITY == rl.rlim_max)
rl.rlim_max = 1024;
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;
close (i);
errno = 0;
@@
-166,7
+170,7
@@
static int daemonize (void)
return 0;
} /* daemonize */
return 0;
} /* daemonize */
-static int collectd_start (
int argc,
char **argv)
+static int collectd_start (char **argv)
{
pid_t pid = 0;
{
pid_t pid = 0;
@@
-197,13
+201,13
@@
static int collectd_stop (void)
return 0;
} /* collectd_stop */
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 */
{
++loop;
return;
} /* sig_int_term_handler */
-static void sig_hup_handler (int signo)
+static void sig_hup_handler (int
__attribute__((unused))
signo)
{
++restart;
return;
{
++restart;
return;
@@
-331,16
+335,10
@@
int main (int argc, char **argv)
return 1;
}
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;
while (0 == loop) {
int status = 0;
- if (0 != collectd_start (collectd_arg
c, collectd_arg
v)) {
+ if (0 != collectd_start (collectd_argv)) {
syslog (LOG_ERR, "Error: failed to start collectd.");
break;
}
syslog (LOG_ERR, "Error: failed to start collectd.");
break;
}