From 189d5bac5c45a6a735489541e285dec8bfc1d38d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 23 Sep 2015 01:32:44 +0200 Subject: util: unify implementation of NOP signal handler This is highly complex code after all, we really should make sure to only keep one implementation of this extremely difficult function around. --- src/nspawn/nspawn.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nspawn/nspawn.c') diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index cb4e87fd74..6b5d5d5b75 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -2282,8 +2282,6 @@ static int wait_for_container(pid_t pid, ContainerStatus *container) { return r; } -static void nop_handler(int sig) {} - static int on_orderly_shutdown(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) { pid_t pid; @@ -3241,7 +3239,7 @@ int main(int argc, char *argv[]) { ContainerStatus container_status; _cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL; static const struct sigaction sa = { - .sa_handler = nop_handler, + .sa_handler = nop_signal_handler, .sa_flags = SA_NOCLDSTOP, }; int ifi = 0; -- cgit v1.2.3-54-g00ecf