From 72c0a2c255b172ebbb2a2b7dab7c9aec4c9582d9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Jun 2015 20:13:23 +0200 Subject: 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. --- src/libsystemd-terminal/evcat.c | 2 +- src/libsystemd-terminal/modeset.c | 2 +- src/libsystemd-terminal/subterm.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsystemd-terminal') 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; -- cgit v1.2.3-54-g00ecf