]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-event: make use of new signal_is_blocked() helper
authorLennart Poettering <lennart@poettering.net>
Wed, 30 Oct 2019 16:37:12 +0000 (17:37 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 4 Dec 2019 09:35:16 +0000 (10:35 +0100)
src/libsystemd/sd-event/sd-event.c

index 4693049f4c556a385762dd3e75c60da23e78122a..bb3c542b7cf40f6421179aecb20baeecd4793603 100644 (file)
@@ -1165,7 +1165,6 @@ _public_ int sd_event_add_signal(
 
         _cleanup_(source_freep) sd_event_source *s = NULL;
         struct signal_data *d;
-        sigset_t ss;
         int r;
 
         assert_return(e, -EINVAL);
@@ -1177,11 +1176,10 @@ _public_ int sd_event_add_signal(
         if (!callback)
                 callback = signal_exit_callback;
 
-        r = pthread_sigmask(SIG_SETMASK, NULL, &ss);
-        if (r != 0)
-                return -r;
-
-        if (!sigismember(&ss, sig))
+        r = signal_is_blocked(sig);
+        if (r < 0)
+                return r;
+        if (r == 0)
                 return -EBUSY;
 
         if (!e->signal_sources) {