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.15-516-gfb289bd


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  fb289bde9a171c5f7fbcd1230018562dc0bd8ded (commit)
       via  05f3d1f6c6ae403180259b84a5af0061a62ffb98 (commit)
      from  86ae07a8c9e8e26806f7b8dedf57e7b14a308c69 (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=fb289bde9a171c5f7fbcd1230018562dc0bd8ded

commit fb289bde9a171c5f7fbcd1230018562dc0bd8ded
Merge: 05f3d1f 86ae07a
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Mar 28 13:06:05 2012 -0400

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

diff --cc ChangeLog
index 94d5126,ba7b2cd..03b7795
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,10 +1,14 @@@
 +2012-03-28  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* malloc/mallocbug.c: Avoid warnings about unused variables.
 +
+ 2012-02-22  Siddhesh Poyarekar  <siddhesh@redhat.com>
+ 
+ 	[BZ #13760]
+ 	* resolv/nss_dns/dns-host.c (gaih_getanswer): Look for errno
+ 	in the right place. Discard and retry query if response is
+ 	larger than input buffer size.
+ 
  2012-03-28  Joseph Myers  <joseph@codesourcery.com>
  
  	[BZ #369]

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

commit 05f3d1f6c6ae403180259b84a5af0061a62ffb98
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Mar 28 13:05:11 2012 -0400

    Avoid warnings in test malloc program

diff --git a/ChangeLog b/ChangeLog
index f75e121..94d5126 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-28  Ulrich Drepper  <drepper@gmail.com>
+
+	* malloc/mallocbug.c: Avoid warnings about unused variables.
+
 2012-03-28  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #369]
@@ -388,9 +392,9 @@
 
 2012-03-21  Thomas Schwinge  <thomas@codesourcery.com>
 
-        * conform/conformtest.pl: Handle --tmpdir argument, defaulting to /tmp.
-        * conform/run-conformtest.sh: Pass --tmpdir argument when invoking
-        conformtest.pl
+	* conform/conformtest.pl: Handle --tmpdir argument, defaulting to /tmp.
+	* conform/run-conformtest.sh: Pass --tmpdir argument when invoking
+	conformtest.pl
 
 2012-03-21  Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/malloc/mallocbug.c b/malloc/mallocbug.c
index 84a6387..fc607ae 100644
--- a/malloc/mallocbug.c
+++ b/malloc/mallocbug.c
@@ -5,12 +5,15 @@
 
 #define size_t unsigned int
 
+/* Defined as global variables to avoid warnings about unused variables.  */
+char *dummy0;
+char *dummy1;
+char *fill_info_table1;
+
+
 int
 main (int argc, char *argv[])
 {
-  char *dummy0;
-  char *dummy1;
-  char *fill_info_table1;
   char *over_top;
   size_t over_top_size = 0x3000;
   char *over_top_dup;
@@ -19,11 +22,11 @@ main (int argc, char *argv[])
   size_t i;
 
   /* Here's what memory is supposed to look like (hex):
-        size  contents
-        3000  original_info_table, later fill_info_table1
+	size  contents
+	3000  original_info_table, later fill_info_table1
       3fa000  dummy0
       3fa000  dummy1
-        6000  info_table_2
+	6000  info_table_2
 	3000  over_top
 
 	*/

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

Summary of changes:
 ChangeLog          |   10 +++++++---
 malloc/mallocbug.c |   15 +++++++++------
 2 files changed, 16 insertions(+), 9 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]