changeset 2985:0302782e1082 draft

Fix signal handling
author Roy Marples <roy@marples.name>
date Wed, 04 Mar 2015 20:03:22 +0000
parents f1073cedc828
children 00521ee7fdd2
files eloop.c script.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/eloop.c	Wed Mar 04 19:29:17 2015 +0000
+++ b/eloop.c	Wed Mar 04 20:03:22 2015 +0000
@@ -383,7 +383,7 @@
 		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 @@
 	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));
 
--- a/script.c	Wed Mar 04 19:29:17 2015 +0000
+++ b/script.c	Wed Mar 04 20:03:22 2015 +0000
@@ -112,7 +112,7 @@
 	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);