[commits] r13032 - in /fsf/trunk/libc: ChangeLog libio/fmemopen.c setjmp/bits/setjmp2.h sysdeps/sparc/sparc64/multiarch/memset.S

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Mar  4 00:02:53 2011
New Revision: 13032

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

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/libio/fmemopen.c
    fsf/trunk/libc/setjmp/bits/setjmp2.h
    fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Mar  4 00:02:53 2011
@@ -1,3 +1,20 @@
+2011-03-04  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	* libio/fmemopen.c (fmemopen): Optimize a bit.
+
+2011-03-03  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* libio/fmemopen.c (fmemopen): Don't read past end of buffer.
+
+2011-03-03  Roland McGrath  <roland@xxxxxxxxxx>
+
+	* setjmp/bits/setjmp2.h: Canonicalize comment formatting.
+
+2011-02-28  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	* sysdeps/sparc/sparc64/multiarch/memset.S(__bzero): call
+	__bzero_ultra1 instead of __memset_ultra1.
+
 2011-02-23  Andreas Schwab  <schwab@xxxxxxxxxx>
 	    Ulrich Drepper  <drepper@xxxxxxxxx>
 

Modified: fsf/trunk/libc/libio/fmemopen.c
==============================================================================
--- fsf/trunk/libc/libio/fmemopen.c (original)
+++ fsf/trunk/libc/libio/fmemopen.c Fri Mar  4 00:02:53 2011
@@ -1,5 +1,5 @@
 /* Fmemopen implementation.
-   Copyright (C) 2000, 2002, 2005, 2006, 2008, 2009
+   Copyright (C) 2000, 2002, 2005, 2006, 2008, 2009, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Hanno Mueller, kontakt@xxxxxxxx, 2000.
@@ -226,6 +226,7 @@
 	  return NULL;
 	}
       c->buffer[0] = '\0';
+      c->maxpos = 0;
     }
   else
     {
@@ -236,14 +237,14 @@
 	}
 
       c->buffer = buf;
+
+      if (mode[0] == 'w')
+	c->buffer[0] = '\0';
+
+      c->maxpos = strnlen (c->buffer, len);
     }
 
   c->size = len;
-
-  if (mode[0] == 'w')
-    c->buffer[0] = '\0';
-
-  c->maxpos = strlen (c->buffer);
 
   if (mode[0] == 'a')
     c->pos = c->maxpos;

Modified: fsf/trunk/libc/setjmp/bits/setjmp2.h
==============================================================================
--- fsf/trunk/libc/setjmp/bits/setjmp2.h (original)
+++ fsf/trunk/libc/setjmp/bits/setjmp2.h Fri Mar  4 00:02:53 2011
@@ -1,21 +1,21 @@
 /* Checking macros for setjmp functions.
- * Copyright (C) 2009 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
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * The GNU C Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the GNU C Library; if not, write to the Free
- * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.  */
+   Copyright (C) 2009 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _SETJMP_H
 # error "Never include <bits/setjmp2.h> directly; use <setjmp.h> instead."

Modified: fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S
==============================================================================
--- fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S (original)
+++ fsf/trunk/libc/sysdeps/sparc/sparc64/multiarch/memset.S Fri Mar  4 00:02:53 2011
@@ -114,8 +114,8 @@
 	 nop
 9:
 # ifdef SHARED
-	sethi	%gdop_hix22(__memset_ultra1), %o1
-	xor	%o1, %gdop_lox10(__memset_ultra1), %o1
+	sethi	%gdop_hix22(__bzero_ultra1), %o1
+	xor	%o1, %gdop_lox10(__bzero_ultra1), %o1
 # else
 	set	__bzero_ultra1, %o1
 # endif