[Commits] r16083 - in /fsf/trunk/libc: ChangeLog malloc/mcheck.h nis/nis_findserv.c nscd/aicache.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sun Dec  4 00:02:12 2011
New Revision: 16083

Log:
Import glibc-mainline for 2011-12-04

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/malloc/mcheck.h
    fsf/trunk/libc/nis/nis_findserv.c
    fsf/trunk/libc/nscd/aicache.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Dec  4 00:02:12 2011
@@ -1,3 +1,14 @@
+2011-12-03  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* malloc/mcheck.h: Fix use of incorrect encoding in comment.
+
+2011-12-02  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* nis/nis_findserv.c (__nis_findfastest_with_timeout): Avoid aliasing
+	problem.
+
+	* nscd/aicache.c (addhstaiX): Avoid unused variable warning.
+
 2011-11-29  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/sh/bits/atomic.h (rNOSP): Define

Modified: fsf/trunk/libc/malloc/mcheck.h
==============================================================================
--- fsf/trunk/libc/malloc/mcheck.h (original)
+++ fsf/trunk/libc/malloc/mcheck.h Sun Dec  4 00:02:12 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2011 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
@@ -41,7 +41,7 @@
    null, the standard function prints on stderr and then calls `abort'.  */
 extern int mcheck (void (*__abortfunc) (enum mcheck_status)) __THROW;
 
-/* Similar to `mcheck but performs checks for all block whenever one of
+/* Similar to `mcheck' but performs checks for all block whenever one of
    the memory handling functions is called.  This can be very slow.  */
 extern int mcheck_pedantic (void (*__abortfunc) (enum mcheck_status)) __THROW;
 

Modified: fsf/trunk/libc/nis/nis_findserv.c
==============================================================================
--- fsf/trunk/libc/nis/nis_findserv.c (original)
+++ fsf/trunk/libc/nis/nis_findserv.c Sun Dec  4 00:02:12 2011
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2001, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000, 2001, 2010, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@xxxxxxxxxxxxxxxxxxx>, 1997.
 
@@ -175,7 +175,9 @@
 			(xdrproc_t) xdr_void, (caddr_t) 0,
 			*timeout);
     if (RPC_SUCCESS == rc) {
-      fastest = *((u_int32_t *) (cu->cu_inbuf)) - xid_seed;
+      u_int32_t val;
+      memcpy (&val, cu->cu_inbuf, sizeof (u_int32_t));
+      fastest = val - xid_seed;
       if (fastest < pings_count) {
 	bind->server_used = pings[fastest].server_nr;
 	bind->current_ep = pings[fastest].server_ep;

Modified: fsf/trunk/libc/nscd/aicache.c
==============================================================================
--- fsf/trunk/libc/nscd/aicache.c (original)
+++ fsf/trunk/libc/nscd/aicache.c Sun Dec  4 00:02:12 2011
@@ -461,9 +461,12 @@
 		      <= (sizeof (struct database_pers_head)
 			  + db->head->module * sizeof (ref_t)
 			  + db->head->data_size));
+# ifndef __ASSUME_SENDFILE
 	      ssize_t written;
-	      written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp
-				     - (char *) db->head, dataset->head.recsize);
+	      written =
+# endif
+		sendfileall (fd, db->wr_fd, (char *) &dataset->resp
+			     - (char *) db->head, dataset->head.recsize);
 # ifndef __ASSUME_SENDFILE
 	      if (written == -1 && errno == ENOSYS)
 		goto use_write;

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits