diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:13:23 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:13:23 +0200 |
| commit | 72c0a2c255b172ebbb2a2b7dab7c9aec4c9582d9 (patch) | |
| tree | 09bd6f8db366a0a611de79dc08d88902d10f6a75 /src/journal-remote/journal-upload.c | |
| parent | a4c8a5995102144225439c0077bbda5325761986 (diff) | |
everywhere: port everything to sigprocmask_many() and friends
This ports a lot of manual code over to sigprocmask_many() and friends.
Also, we now consistly check for sigprocmask() failures with
assert_se(), since the call cannot realistically fail unless there's a
programming error.
Also encloses a few sd_event_add_signal() calls with (void) when we
ignore the return values for it knowingly.
Diffstat (limited to 'src/journal-remote/journal-upload.c')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index ddb1ef0396..5d23639ee8 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -396,14 +396,11 @@ static int dispatch_sigterm(sd_event_source *event, } static int setup_signals(Uploader *u) { - sigset_t mask; int r; assert(u); - assert_se(sigemptyset(&mask) == 0); - sigset_add_many(&mask, SIGINT, SIGTERM, -1); - assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); + assert_se(sigprocmask_many(SIG_SETMASK, NULL, SIGINT, SIGTERM, -1) >= 0); r = sd_event_add_signal(u->events, &u->sigterm_event, SIGTERM, dispatch_sigterm, u); if (r < 0) |