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/network | |
| 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/network')
| -rw-r--r-- | src/network/networkd-wait-online.c | 2 | ||||
| -rw-r--r-- | src/network/networkd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c index 6a96f1de55..32c31fdf3d 100644 --- a/src/network/networkd-wait-online.c +++ b/src/network/networkd-wait-online.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) { if (arg_quiet) log_set_max_level(LOG_WARNING); - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); r = manager_new(&m, arg_interfaces, arg_ignore, arg_timeout); if (r < 0) { diff --git a/src/network/networkd.c b/src/network/networkd.c index 41ec7cf904..9fe8a5fa15 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) { if (r < 0) goto out; - assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); r = manager_new(&m); if (r < 0) { |