From d654808ff33c54f587c5fee79be84ac20794db55 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 10 Jun 2014 00:00:08 +0200 Subject: [PATCH 1/1] move signal_setup() to main.c Signed-off-by: Felix Fietkau --- main.c | 10 +++++++++- util.c | 14 -------------- util.h | 1 - 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/main.c b/main.c index 115bd2a..8275c48 100644 --- a/main.c +++ b/main.c @@ -40,6 +40,12 @@ static char *iface_name = "eth0"; +static void +signal_shutdown(int signal) +{ + uloop_end(); +} + int main(int argc, char **argv) { @@ -73,7 +79,9 @@ main(int argc, char **argv) return -1; } - signal_setup(); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, signal_shutdown); + signal(SIGKILL, signal_shutdown); if (cache_init()) return -1; diff --git a/util.c b/util.c index 05f02b2..e68e9c9 100644 --- a/util.c +++ b/util.c @@ -39,20 +39,6 @@ int debug = 0; char mdns_hostname[HOSTNAME_LEN]; char mdns_hostname_local[HOSTNAME_LEN + 6]; -static void -signal_shutdown(int signal) -{ - uloop_end(); -} - -void -signal_setup(void) -{ - signal(SIGPIPE, SIG_IGN); - signal(SIGTERM, signal_shutdown); - signal(SIGKILL, signal_shutdown); -} - uint32_t rand_time_delta(uint32_t t) { diff --git a/util.h b/util.h index ab38b7a..aaa2bd1 100644 --- a/util.h +++ b/util.h @@ -31,7 +31,6 @@ extern char mdns_hostname_local[HOSTNAME_LEN + 6]; void *memdup(const void *d, int l); -extern void signal_setup(void); extern void get_hostname(void); extern uint32_t rand_time_delta(uint32_t t); -- 2.11.0