This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-276-ge4899e7


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  e4899e7b9adbf74145f6530f6f57517f773e330c (commit)
       via  f22e10748fbabbf07161eb7a5540b8c0e18553c4 (commit)
      from  0a2349f929e937fb335ba53e217c05f5aa5d66d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e4899e7b9adbf74145f6530f6f57517f773e330c

commit e4899e7b9adbf74145f6530f6f57517f773e330c
Merge: f22e107 0a2349f
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Fri Sep 9 18:21:39 2011 -0400

    Merge branch 'master' of ssh://sourceware.org/git/glibc
    
    Conflicts:
    	ChangeLog

diff --cc ChangeLog
index f1b1c0d,98661dc..01d8905
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,14 @@@
 +2011-09-09  Ulrich Drepper  <drepper@gmail.com>
 +
 +	[BZ #12847]
 +	* libio/genops.c (INTDEF): For string streams the _lock pointer can
 +	be NULL.  Don't lock in this case.
 +
+ 2011-09-09  Roland McGrath  <roland@hack.frob.com>
+ 
+ 	* elf/elf.h (ELFOSABI_GNU): New macro.
+ 	(ELFOSABI_LINUX): Define to that.
+ 
  2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
  
  	* string/strncat.c (strncat): Undef the symbol in case it has been
diff --cc stdio-common/vfscanf.c
index 7356eeb,7356eeb..9d312d5
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@@ -1,4 -1,4 +1,4 @@@
--/* Copyright (C) 1991-2006, 2007, 2010 Free Software Foundation, Inc.
++/* Copyright (C) 1991-2006, 2007, 2010, 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
@@@ -48,7 -48,7 +48,7 @@@
  #if INT_MAX == LONG_MAX
  # define need_long	0
  #else
--# define need_long 	1
++# define need_long	1
  #endif
  
  /* Those are flags in the conversion format. */
@@@ -102,9 -102,9 +102,9 @@@
  # define __strtof_internal	__wcstof_internal
  
  # define L_(Str)	L##Str
--# define CHAR_T	  	wchar_t
++# define CHAR_T		wchar_t
  # define UCHAR_T	unsigned int
--# define WINT_T	  	wint_t
++# define WINT_T		wint_t
  # undef EOF
  # define EOF		WEOF
  #else
@@@ -128,7 -128,7 +128,7 @@@
  			    return EOF
  
  # define L_(Str)	Str
--# define CHAR_T	  	char
++# define CHAR_T		char
  # define UCHAR_T	unsigned char
  # define WINT_T		int
  #endif

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f22e10748fbabbf07161eb7a5540b8c0e18553c4

commit f22e10748fbabbf07161eb7a5540b8c0e18553c4
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Fri Sep 9 16:15:25 2011 -0400

    Don't lock string streams in stream cleanup code

diff --git a/ChangeLog b/ChangeLog
index 007b61c..f1b1c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-09  Ulrich Drepper  <drepper@gmail.com>
+
+	[BZ #12847]
+	* libio/genops.c (INTDEF): For string streams the _lock pointer can
+	be NULL.  Don't lock in this case.
+
 2011-07-29  Denis Zaitceff  <zaitceff@gmail.com>
 
 	* string/strncat.c (strncat): Undef the symbol in case it has been
diff --git a/NEWS b/NEWS
index e42adbc..9fa55ca 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,8 @@ Version 2.15
 
 * The following bugs are resolved with this release:
 
-  9696, 12403, 12868, 12852, 12874, 12885, 12907, 12922, 12935, 13007,
-  13021, 13068, 13092, 13114, 13118, 13123, 13134, 13150
+  9696, 12403, 12847, 12868, 12852, 12874, 12885, 12907, 12922, 12935,
+  13007, 13021, 13068, 13092, 13114, 13118, 13123, 13134, 13150
 
 * New program pldd to list loaded object of a process
   Implemented by Ulrich Drepper.
diff --git a/libio/genops.c b/libio/genops.c
index 481fbc5..5d21c42 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2002, 2003, 2004, 2006, 2007
+/* Copyright (C) 1993,1995,1997-2002, 2003, 2004, 2006, 2007, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -471,7 +471,7 @@ _IO_default_xsputn (f, data, n)
 	      f->_IO_write_ptr += count;
 #endif
 	      s += count;
-            }
+	    }
 	  else if (count)
 	    {
 	      char *p = f->_IO_write_ptr;
@@ -479,9 +479,9 @@ _IO_default_xsputn (f, data, n)
 	      for (i = count; --i >= 0; )
 		*p++ = *s++;
 	      f->_IO_write_ptr = p;
-            }
+	    }
 	  more -= count;
-        }
+	}
       if (more == 0 || _IO_OVERFLOW (f, (unsigned char) *s++) == EOF)
 	break;
       more--;
@@ -534,9 +534,9 @@ _IO_default_xsgetn (fp, data, n)
 	      while (--i >= 0)
 		*s++ = *p++;
 	      fp->_IO_read_ptr = p;
-            }
-            more -= count;
-        }
+	    }
+	    more -= count;
+	}
       if (more == 0 || __underflow (fp) == EOF)
 	break;
     }
@@ -959,7 +959,7 @@ _IO_unbuffer_write (void)
 	  int cnt;
 #define MAXTRIES 2
 	  for (cnt = 0; cnt < MAXTRIES; ++cnt)
-	    if (_IO_lock_trylock (*fp->_lock) == 0)
+	    if (fp->_lock == NULL || _IO_lock_trylock (*fp->_lock) == 0)
 	      break;
 	    else
 	      /* Give the other thread time to finish up its use of the
@@ -978,7 +978,7 @@ _IO_unbuffer_write (void)
 
 	  _IO_SETBUF (fp, NULL, 0);
 
-	  if (cnt < MAXTRIES)
+	  if (cnt < MAXTRIES && fp->_lock != NULL)
 	    _IO_lock_unlock (*fp->_lock);
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    6 ++++++
 NEWS                   |    4 ++--
 libio/genops.c         |   18 +++++++++---------
 stdio-common/vfscanf.c |   10 +++++-----
 4 files changed, 22 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]