diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:35:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:35:18 +0200 |
| commit | 86b85cf440324c4be2d49472e40dbb6ec0faa330 (patch) | |
| tree | d3f0da63487dd124e490aef54aa710dbab6032dc /src/journal | |
| parent | 78ed65ac8dd05041f08ba8b089e1e87445a0905f (diff) | |
| parent | 72c0a2c255b172ebbb2a2b7dab7c9aec4c9582d9 (diff) | |
Merge pull request #214 from poettering/signal-rework-2
everywhere: port everything to sigprocmask_many() and friends
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index d0d670f36e..f7402984af 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1264,14 +1264,11 @@ static int dispatch_sigterm(sd_event_source *es, const struct signalfd_siginfo * } static int setup_signals(Server *s) { - sigset_t mask; int r; assert(s); - assert_se(sigemptyset(&mask) == 0); - sigset_add_many(&mask, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, -1); - assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); + assert(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, SIGUSR1, SIGUSR2, -1) >= 0); r = sd_event_add_signal(s->event, &s->sigusr1_event_source, SIGUSR1, dispatch_sigusr1, s); if (r < 0) |