diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-06-15 20:13:23 +0200 |
---|---|---|
committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:03:02 +0100 |
commit | d896ac2d2fbce41a0b11a0618a685adeaf18b8fe (patch) | |
tree | cc90162919ed5f2359055ec5ab725c629cd070cd /src/login | |
parent | 75f28e3cd94d18d7fc437714de032ac087b46d6b (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')
-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 6db99fc5e..a83d9443d 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) |