From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Wed, 30 Mar 2016 14:21:32 +0000 (+0200)
Subject: IO/Poll: fix mistaken variable merge
X-Git-Tag: v1.6.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0a8be2ff5afb8385a69cc0df70984e0fd3a570;p=thirdparty%2Fbird.git

IO/Poll: fix mistaken variable merge

The events variable is used in the short loop decision. The reasons are
not much clear, keeping this to keep the former behaviour.
---

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index eb1c1cadc..112ebe918 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -2045,7 +2045,7 @@ io_loop(void)
 {
   int poll_tout;
   time_t tout;
-  int nfds, events;
+  int nfds, events, pout;
   sock *s;
   node *n;
   int fdmax = 256;
@@ -2125,16 +2125,16 @@ io_loop(void)
 
       /* And finally enter poll() to find active sockets */
       watchdog_stop();
-      events = poll(pfd, nfds, poll_tout);
+      pout = poll(pfd, nfds, poll_tout);
       watchdog_start();
 
-      if (events < 0)
+      if (pout < 0)
 	{
 	  if (errno == EINTR || errno == EAGAIN)
 	    continue;
 	  die("poll: %m");
 	}
-      if (events)
+      if (pout)
 	{
 	  /* guaranteed to be non-empty */
 	  current_sock = SKIP_BACK(sock, n, HEAD(sock_list));