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/basic | |
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/basic')
-rw-r--r-- | src/basic/signal-util.c | 4 | ||||
-rw-r--r-- | src/basic/signal-util.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c index 84cf42b285..d24730d439 100644 --- a/src/basic/signal-util.c +++ b/src/basic/signal-util.c @@ -159,7 +159,7 @@ int sigset_add_many(sigset_t *ss, ...) { return r; } -int sigprocmask_many(int how, ...) { +int sigprocmask_many(int how, sigset_t *old, ...) { va_list ap; sigset_t ss; int r; @@ -174,7 +174,7 @@ int sigprocmask_many(int how, ...) { if (r < 0) return r; - if (sigprocmask(how, &ss, NULL) < 0) + if (sigprocmask(how, &ss, old) < 0) return -errno; return 0; diff --git a/src/basic/signal-util.h b/src/basic/signal-util.h index 9dc8a28726..5e6eb50b07 100644 --- a/src/basic/signal-util.h +++ b/src/basic/signal-util.h @@ -33,7 +33,7 @@ int default_signals(int sig, ...); int sigaction_many(const struct sigaction *sa, ...); int sigset_add_many(sigset_t *ss, ...); -int sigprocmask_many(int how, ...); +int sigprocmask_many(int how, sigset_t *old, ...); const char *signal_to_string(int i) _const_; int signal_from_string(const char *s) _pure_; |