summaryrefslogtreecommitdiffstats
path: root/src/run.c
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-15 14:00:14 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-15 14:00:14 +0000
commit82290b2b0bd2ebb5539b61b98e993ae807c2e8d7 (patch)
tree6f5cddfcc4c64a6a1cf3af96144271727be8e2f6 /src/run.c
parenta1728b3d5fd0b417941b7114de2fa9384ece5a35 (diff)
Max Kellermann <max@duempel.org>:
Fix tons of gcc warnings
Diffstat (limited to 'src/run.c')
-rw-r--r--src/run.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/run.c b/src/run.c
index 7fbeaf5..3fd98cd 100644
--- a/src/run.c
+++ b/src/run.c
@@ -20,12 +20,19 @@
#include "conntrackd.h"
#include "netlink.h"
+#include "ignore.h"
+#include "log.h"
+#include "alarm.h"
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
#include <errno.h>
#include "us-conntrack.h"
#include <signal.h>
#include <stdlib.h>
#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <time.h>
void killer(int foo)
{
@@ -84,7 +91,8 @@ void local_handler(int fd, void *data)
dlog(STATE(log), LOG_WARNING, "unknown local request %d", type);
}
-int init(void)
+int
+init(void)
{
if (CONFIG(flags) & CTD_STATS_MODE)
STATE(mode) = &stats_mode;
@@ -164,11 +172,11 @@ static int __run(struct timeval *next_alarm)
if (ret == -1) {
/* interrupted syscall, retry */
if (errno == EINTR)
- return;
+ return 0;
dlog(STATE(log), LOG_WARNING,
"select failed: %s", strerror(errno));
- return;
+ return 0;
}
/* timeout expired, run the alarm list */
@@ -223,7 +231,8 @@ static int __run(struct timeval *next_alarm)
return 0;
}
-void run(void)
+void __attribute__((noreturn))
+run(void)
{
struct timeval next_alarm;
struct timeval *next = &next_alarm;