From: Roy Marples <roy@marples.name>
Date: Sun, 24 Apr 2016 19:55:22 +0000 (+0000)
Subject: CID 1358677: (Negative returns) tuck in poll_fd assignment in eloop_open(), thanks... 
X-Git-Tag: v6.11.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf1c6d2bcb227e2effcd0734f70564cdd2602da9;p=thirdparty%2Fdhcpcd.git

CID 1358677: (Negative returns) tuck in poll_fd assignment in eloop_open(), thanks to Christos.
---

diff --git a/eloop.c b/eloop.c
index e3a748d7..13d79642 100644
--- a/eloop.c
+++ b/eloop.c
@@ -611,12 +611,13 @@ eloop_open(struct eloop *eloop)
 	{
 		close(eloop->poll_fd);
 		eloop->poll_fd = -1;
-		return -1;
 	}
 
 	return eloop->poll_fd;
 #elif defined (HAVE_EPOLL)
 	return (eloop->poll_fd = epoll_create1(EPOLL_CLOEXEC));
+#else
+	return (eloop->poll_fd = -1);
 #endif
 }
 #endif
@@ -787,7 +788,6 @@ eloop_new(void)
 		TAILQ_INIT(&eloop->free_timeouts);
 		eloop->exitcode = EXIT_FAILURE;
 #if defined(HAVE_KQUEUE) || defined(HAVE_EPOLL)
-		eloop->poll_fd = -1;
 		if (eloop_open(eloop) == -1) {
 			eloop_free(eloop);
 			return NULL;