From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Date: Fri, 30 Oct 2020 09:27:55 +0000 (+0100)
Subject: signal-util: make sigaction_many_ap a little more concise
X-Git-Tag: v247-rc2~31^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd8e699c27fbc52dd7a2c232722ba59222d3d47d;p=thirdparty%2Fsystemd.git

signal-util: make sigaction_many_ap a little more concise

There's no reason to duplicate the stop condition sig < 0, nor the sigaction()
call.
---

diff --git a/src/basic/signal-util.c b/src/basic/signal-util.c
index cb59f6ca0f2..e976205d868 100644
--- a/src/basic/signal-util.c
+++ b/src/basic/signal-util.c
@@ -49,16 +49,7 @@ static int sigaction_many_ap(const struct sigaction *sa, int sig, va_list ap) {
         int r = 0;
 
         /* negative signal ends the list. 0 signal is skipped. */
-
-        if (sig < 0)
-                return 0;
-
-        if (sig > 0) {
-                if (sigaction(sig, sa, NULL) < 0)
-                        r = -errno;
-        }
-
-        while ((sig = va_arg(ap, int)) >= 0) {
+        for (; sig >= 0; sig = va_arg(ap, int)) {
 
                 if (sig == 0)
                         continue;