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/libsystemd-terminal | |
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/libsystemd-terminal')
-rw-r--r-- | src/libsystemd-terminal/evcat.c | 2 | ||||
-rw-r--r-- | src/libsystemd-terminal/modeset.c | 2 | ||||
-rw-r--r-- | src/libsystemd-terminal/subterm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd-terminal/evcat.c b/src/libsystemd-terminal/evcat.c index bfa166c489..2aeefc2e16 100644 --- a/src/libsystemd-terminal/evcat.c +++ b/src/libsystemd-terminal/evcat.c @@ -154,7 +154,7 @@ static int evcat_new(Evcat **out) { if (r < 0) return r; - r = sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1); + r = sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1); if (r < 0) return r; diff --git a/src/libsystemd-terminal/modeset.c b/src/libsystemd-terminal/modeset.c index f3a60e1fb0..790a244772 100644 --- a/src/libsystemd-terminal/modeset.c +++ b/src/libsystemd-terminal/modeset.c @@ -170,7 +170,7 @@ static int modeset_new(Modeset **out) { if (r < 0) return r; - r = sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1); + r = sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1); if (r < 0) return r; diff --git a/src/libsystemd-terminal/subterm.c b/src/libsystemd-terminal/subterm.c index d10e2f549f..5f12540111 100644 --- a/src/libsystemd-terminal/subterm.c +++ b/src/libsystemd-terminal/subterm.c @@ -856,7 +856,7 @@ static int terminal_new(Terminal **out, int in_fd, int out_fd) { goto error; } - r = sigprocmask_many(SIG_BLOCK, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1); + r = sigprocmask_many(SIG_BLOCK, NULL, SIGINT, SIGQUIT, SIGTERM, SIGWINCH, SIGCHLD, -1); if (r < 0) { log_error_errno(r, "error: sigprocmask_many() (%d): %m", r); goto error; |