[commits] r6392 - in /fsf/trunk/libc: ChangeLog nscd/connections.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Jun 19 00:03:41 2008
New Revision: 6392

Log:
Import glibc-mainline for 2008-06-19

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/connections.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Thu Jun 19 00:03:41 2008
@@ -1,3 +1,8 @@
+2008-06-18  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* nscd/connections.c (main_loop_poll): Fix test for read error.
+	(main_loop_epoll): Likewise.
+
 2008-06-13  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/posix/getaddrinfo.c: Move _res_hconf_init call to a

Modified: fsf/trunk/libc/nscd/connections.c
==============================================================================
--- fsf/trunk/libc/nscd/connections.c (original)
+++ fsf/trunk/libc/nscd/connections.c Thu Jun 19 00:03:41 2008
@@ -1819,7 +1819,7 @@
 
 		  while (TEMP_FAILURE_RETRY (read (inotify_fd, &inev,
 						   sizeof (inev)))
-			 >= sizeof (struct inotify_event))
+			 >= (ssize_t) sizeof (struct inotify_event))
 		    {
 		      /* Check which of the files changed.  */
 		      for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt)
@@ -1974,7 +1974,7 @@
 
 	    while (TEMP_FAILURE_RETRY (read (inotify_fd, &inev,
 					     sizeof (inev)))
-		   >= sizeof (struct inotify_event))
+		   >= (ssize_t) sizeof (struct inotify_event))
 	      {
 		/* Check which of the files changed.  */
 		for (size_t dbcnt = 0; dbcnt < lastdb; ++dbcnt)