[NeoStats-Devel] [Commits] r2465 - trunk/lib/adns

Author: Mark
Date: Thu Apr  7 07:23:17 2005
New Revision: 2465

Modified:
   trunk/lib/adns/event.c
Log:
adns tidy

Modified: trunk/lib/adns/event.c
==============================================================================
--- trunk/lib/adns/event.c	(original)
+++ trunk/lib/adns/event.c	Thu Apr  7 07:23:17 2005
@@ -725,9 +725,6 @@
 			inter_immed(tv_mod, tv_tobuf);
 			adns__consistency(ads, 0, cc_entex);
 			return;
-#if 0
-			goto xit;
-#endif
 		}
 		adns__timeouts(ads, 0, tv_mod, tv_tobuf, *now);
 	}
@@ -742,9 +739,6 @@
     if (pollfds[i].events & POLLPRI) FD_SET(fd,exceptfds_io);
 	}
 	*maxfd_io = maxfd;
-#if 0
-      xit:
-#endif
 	adns__consistency(ads, 0, cc_entex);
 }
 
@@ -758,17 +752,17 @@
 
 	adns__consistency(ads, 0, cc_entex);
 	adns__must_gettimeofday(ads, &now, &tv_buf);
-	if (!now)
-		goto xit;
-	adns_processtimeouts(ads, now);
-
-	npollfds = adns__pollfds(ads, pollfds);
-	for (i = 0; i < npollfds; i++)
-		pollfds[i].revents = POLLIN | POLLOUT | POLLPRI;
-	adns__fdevents(ads,
-		       pollfds, npollfds,
-		       maxfd, readfds, writefds, exceptfds, *now, 0);
-      xit:
+	if (now)
+	{
+		adns_processtimeouts(ads, now);
+
+		npollfds = adns__pollfds(ads, pollfds);
+		for (i = 0; i < npollfds; i++)
+			pollfds[i].revents = POLLIN | POLLOUT | POLLPRI;
+		adns__fdevents(ads,
+				pollfds, npollfds,
+				maxfd, readfds, writefds, exceptfds, *now, 0);
+	}
 	adns__consistency(ads, 0, cc_entex);
 }