[src/trunk]: src/external/bsd/dhcpcd/dist CID 1358677: (Negative returns) tuc...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7237a5b0d5f
branches:  trunk
changeset: 344860:f7237a5b0d5f
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Apr 24 18:20:40 2016 +0000

description:
CID 1358677: (Negative returns) tuck in poll_fd assignment in eloop_open()

diffstat:

 external/bsd/dhcpcd/dist/eloop.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 32c6f731445e -r f7237a5b0d5f external/bsd/dhcpcd/dist/eloop.c
--- a/external/bsd/dhcpcd/dist/eloop.c  Sun Apr 24 18:16:05 2016 +0000
+++ b/external/bsd/dhcpcd/dist/eloop.c  Sun Apr 24 18:20:40 2016 +0000
@@ -1,5 +1,5 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: eloop.c,v 1.12 2016/04/10 21:00:53 roy Exp $");
+ __RCSID("$NetBSD: eloop.c,v 1.13 2016/04/24 18:20:40 christos Exp $");
 
 /*
  * eloop - portable event based main loop.
@@ -620,6 +620,8 @@
        return eloop->poll_fd;
 #elif defined (HAVE_EPOLL)
        return (eloop->poll_fd = epoll_create1(EPOLL_CLOEXEC));
+#else
+       return eloop->poll_fd = -1;
 #endif
 }
 #endif
@@ -790,7 +792,6 @@
                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;