]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Fix signal handling
authorRoy Marples <roy@marples.name>
Wed, 4 Mar 2015 20:03:22 +0000 (20:03 +0000)
committerRoy Marples <roy@marples.name>
Wed, 4 Mar 2015 20:03:22 +0000 (20:03 +0000)
eloop.c
script.c

diff --git a/eloop.c b/eloop.c
index 0aaf4689afc9ca3f637fcfd2a80a3234b07682e9..f9cfdfad6a663e7477b7f5e2ce860e3a490e2264 100644 (file)
--- a/eloop.c
+++ b/eloop.c
@@ -383,7 +383,7 @@ eloop_requeue(struct eloop_ctx *ctx)
                return -1;
 
        i = 0;
-       while ((int)i < dhcpcd_handlesigs[i])
+       while (dhcpcd_handlesigs[i])
                i++;
        TAILQ_FOREACH(e, &ctx->events, next) {
                i++;
@@ -394,7 +394,7 @@ eloop_requeue(struct eloop_ctx *ctx)
        if ((ke = malloc(sizeof(*ke) * i)) == NULL)
                return -1;
 
-       for (i = 0; (int)i < dhcpcd_handlesigs[i]; i++)
+       for (i = 0; dhcpcd_handlesigs[i]; i++)
                EV_SET(&ke[i], dhcpcd_handlesigs[i],
                    EVFILT_SIGNAL, EV_ADD, 0, 0, UPTR(NULL));
 
index 22bd4dc04efbe8d906999aa600d3a5bd30a49bf5..7634c9395337c3505a28d96dd60358e139e107a4 100644 (file)
--- a/script.c
+++ b/script.c
@@ -112,7 +112,7 @@ exec_script(U const struct dhcpcd_ctx *ctx, char *const *argv, char *const *env)
        flags = POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF;
        posix_spawnattr_setflags(&attr, flags);
        sigemptyset(&defsigs);
-       for (i = 0; i < dhcpcd_handlesigs[i]; i++)
+       for (i = 0; dhcpcd_handlesigs[i]; i++)
                sigaddset(&defsigs, dhcpcd_handlesigs[i]);
        posix_spawnattr_setsigdefault(&attr, &defsigs);
        posix_spawnattr_setsigmask(&attr, &ctx->sigset);