From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 9 Aug 2005 06:16:47 +0000 (+0000)
Subject: * nscd/connections.c (main_loop_epoll): Pass NULL as event
X-Git-Tag: upstream/2.30~16490
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=908c9e87c3b639c8d1660a5c1a22c962634c6332;p=external%2Fglibc.git

* nscd/connections.c (main_loop_epoll): Pass NULL as event

	argument for epoll_ctl(EPOLL_CTL_DEL) calls.
---

diff --git a/ChangeLog b/ChangeLog
index 35d1b17..51c2036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-08-08  Ulrich Drepper  <drepper@redhat.com>
 
+	* nscd/connections.c (main_loop_epoll): Pass NULL as event
+	argument for epoll_ctl(EPOLL_CTL_DEL) calls.
+
 	* nscd/nscd_stat.c (receive_print_stats): Really print values of
 	thread number, paranoia, and restart interval the server is using.
 
diff --git a/nscd/connections.c b/nscd/connections.c
index 7ead3fd..14e490b 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1459,7 +1459,7 @@ fd_ready (int fd)
 	{
 	  /* We got another thread.  */
 	  ++nthreads;
-	  /* The new thread might new a kick.  */
+	  /* The new thread might need a kick.  */
 	  do_signal = true;
 	}
 
@@ -1644,8 +1644,7 @@ main_loop_epoll (int efd)
 	else
 	  {
 	    /* Remove the descriptor from the epoll descriptor.  */
-	    struct epoll_event ev = { 0, };
-	    (void) epoll_ctl (efd, EPOLL_CTL_DEL, revs[cnt].data.fd, &ev);
+	    (void) epoll_ctl (efd, EPOLL_CTL_DEL, revs[cnt].data.fd, NULL);
 
 	    /* Get a worked to handle the request.  */
 	    fd_ready (revs[cnt].data.fd);
@@ -1667,8 +1666,7 @@ main_loop_epoll (int efd)
 	if (cnt != sock && starttime[cnt] != 0 && starttime[cnt] < laststart)
 	  {
 	    /* We are waiting for this one for too long.  Close it.  */
-	    struct epoll_event ev = {0, };
-	    (void) epoll_ctl (efd, EPOLL_CTL_DEL, cnt, &ev);
+	    (void) epoll_ctl (efd, EPOLL_CTL_DEL, cnt, NULL);
 
 	    (void) close (cnt);