commit 1697269ce7ab6a0ef74d442028df9df4b07d857c
author Simon Kelley <simon@thekelleys.org.uk> Mon Oct 16 20:04:18 2006 +0100
committer Simon Kelley <simon@thekelleys.org.uk> Thu Jan 05 17:31:12 2012 +0000
tree 06b2840ebfa694c2071fc206f665edd040d9026f
parent 208b65c5cf0b8277371a0e787005ad66ee3027a8

import of dnsmasq-2.34.tar.gz

src/dbus.c

diff --git a/src/dbus.c b/src/dbus.c
index 08200bd..9b3d247 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -282,8 +282,8 @@
 }
  
 
-int set_dbus_listeners(struct daemon *daemon, int maxfd,
-		       fd_set *rset, fd_set *wset, fd_set *eset)
+void set_dbus_listeners(struct daemon *daemon, int *maxfdp,
+			fd_set *rset, fd_set *wset, fd_set *eset)
 {
   struct watch *w;
   
@@ -293,8 +293,7 @@
 	unsigned int flags = dbus_watch_get_flags(w->watch);
 	int fd = dbus_watch_get_fd(w->watch);
 	
-	if (fd > maxfd)
-	  maxfd = fd;
+	bump_maxfd(fd, maxfdp);
 	
 	if (flags & DBUS_WATCH_READABLE)
 	  FD_SET(fd, rset);
@@ -304,7 +303,6 @@
 	
 	FD_SET(fd, eset);
       }
-  return maxfd;
 }
 
 void check_dbus_listeners(struct daemon *daemon,