diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-02-23 15:03:49 +0100 |
|---|---|---|
| committer | Vito Caputo <vcaputo@pengaru.com> | 2024-02-23 18:35:12 +0100 |
| commit | db7136ec739fa48a7767d77b2b2cfa633267a62a (patch) | |
| tree | 566499311fb00de9b1a2e43c94996f88576d8821 /src/import | |
| parent | signal-util: use RET_NERRNO() + RET_GATHER() more (diff) | |
| download | systemd-db7136ec739fa48a7767d77b2b2cfa633267a62a.tar.xz systemd-db7136ec739fa48a7767d77b2b2cfa633267a62a.zip | |
signal-util: imply sentinel -1 in sigprocmask_many() + sigset_add_many() args list
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/export.c | 4 | ||||
| -rw-r--r-- | src/import/import-common.c | 2 | ||||
| -rw-r--r-- | src/import/importd.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/import/export.c b/src/import/export.c index 7e941a29af..cd67349a4e 100644 --- a/src/import/export.c +++ b/src/import/export.c @@ -105,7 +105,7 @@ static int export_tar(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to allocate event loop: %m"); - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT) >= 0); (void) sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); (void) sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); @@ -181,7 +181,7 @@ static int export_raw(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to allocate event loop: %m"); - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT) >= 0); (void) sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); (void) sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); diff --git a/src/import/import-common.c b/src/import/import-common.c index 319aa078a7..4a8a9a9c20 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -295,7 +295,7 @@ int import_allocate_event_with_signals(sd_event **ret) { if (r < 0) return log_error_errno(r, "Failed to allocate event loop: %m"); - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT) >= 0); (void) sd_event_add_signal(event, NULL, SIGTERM, interrupt_signal_handler, NULL); (void) sd_event_add_signal(event, NULL, SIGINT, interrupt_signal_handler, NULL); diff --git a/src/import/importd.c b/src/import/importd.c index d25c23c6dc..24b8e9f92e 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -1374,7 +1374,7 @@ static int run(int argc, char *argv[]) { umask(0022); - assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, SIGTERM, SIGINT, SIGRTMIN+18, -1) >= 0); + assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGCHLD, SIGTERM, SIGINT, SIGRTMIN+18) >= 0); r = manager_new(&m); if (r < 0) |