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

diff --git a/eloop.c b/eloop.c
index e3a748d79994dd9d1c950c9ffd875e38c7371327..13d79642f66a7a227b62958d1e037733d3bede1f 100644 (file)
--- 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;