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/login/logind.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/login/logind.c')
-rw-r--r-- | src/login/logind.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/login/logind.c b/src/login/logind.c index 00f8dbdab2..01f7cd9ee0 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -787,13 +787,8 @@ static int manager_connect_console(Manager *m) { return -EINVAL; } - r = ignore_signals(SIGRTMIN + 1, -1); - if (r < 0) - return log_error_errno(r, "Cannot ignore SIGRTMIN + 1: %m"); - - r = sigprocmask_many(SIG_BLOCK, SIGRTMIN, -1); - if (r < 0) - return log_error_errno(r, "Cannot block SIGRTMIN: %m"); + assert_se(ignore_signals(SIGRTMIN + 1, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGRTMIN, -1) >= 0); r = sd_event_add_signal(m->event, NULL, SIGRTMIN, manager_vt_switch, m); if (r < 0) |