[commits] r4805 - in /fsf/trunk/libc: ChangeLog libio/stdio.h nscd/connections.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jan  8 00:05:34 2008
New Revision: 4805

Log:
Import glibc-mainline for 2008-01-08

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/libio/stdio.h
    fsf/trunk/libc/nscd/connections.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Jan  8 00:05:34 2008
@@ -1,3 +1,12 @@
+2008-01-07  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* libio/stdio.h (vscanf): Fix definition for loser compilers.
+
+2008-01-05  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	[BZ #5112]
+	* nscd/connections.c (restart): Fix condition.
+
 2008-01-03  Jakub Jelinek  <jakub@xxxxxxxxxx>
 
 	* ctype/ctype.h (__ctype_b_loc, __ctype_tolower_loc,

Modified: fsf/trunk/libc/libio/stdio.h
==============================================================================
--- fsf/trunk/libc/libio/stdio.h (original)
+++ fsf/trunk/libc/libio/stdio.h Tue Jan  8 00:05:34 2008
@@ -1,5 +1,5 @@
 /* Define ISO C stdio on top of C++ iostreams.
-   Copyright (C) 1991,1994-2004,2005,2006,2007 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994-2007, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -492,7 +492,7 @@
 			     __const char *__restrict __format,
 			     _G_va_list __arg) __THROW;
 #   define vfscanf __isoc99_vfscanf
-#   define vscanf __isoc99_vsscanf
+#   define vscanf __isoc99_vscanf
 #   define vsscanf __isoc99_vsscanf
 #  endif
 # endif

Modified: fsf/trunk/libc/nscd/connections.c
==============================================================================
--- fsf/trunk/libc/nscd/connections.c (original)
+++ fsf/trunk/libc/nscd/connections.c Tue Jan  8 00:05:34 2008
@@ -1,5 +1,6 @@
 /* Inner loops of cache daemon.
-   Copyright (C) 1998-2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-2003, 2004, 2005, 2006, 2007, 2008
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
 
@@ -1297,7 +1298,7 @@
 
   /* Synchronize memory.  */
   for (int cnt = 0; cnt < lastdb; ++cnt)
-    if (!dbs[cnt].enabled)
+    if (dbs[cnt].enabled)
       {
 	/* Make sure nobody keeps using the database.  */
 	dbs[cnt].head->timestamp = 0;