GNU C Library master sources branch master updated. glibc-2.16-ports-merge-291-g24d4e01

[aoliva at sourceware dot org]

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  24d4e01b22c96a116c7878b701ea65aa5c7980c2 (commit)
       via  61d581741699e104f8af2871bb61ea797fc05912 (commit)
      from  20196a5e5e122851dc726bc7dc7a6289fc2e11c9 (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=24d4e01b22c96a116c7878b701ea65aa5c7980c2

commit 24d4e01b22c96a116c7878b701ea65aa5c7980c2
Author: Alexandre Oliva <aoliva@redhat.com>
Date:   Wed Sep 5 20:47:16 2012 -0300

    * malloc/arena.c: Fold copyright years.
    * malloc/mcheck.c, malloc/memusage.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index d8bec40..2bad2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
 
+	* malloc/arena.c: Fold copyright years.
+	* malloc/mcheck.c, malloc/memusage.c: Likewise.
+
+2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
+
 	* malloc/malloc.c (__libc_mallopt) <M_MMAP_MAX>: Fix indentation.
 
 2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
diff --git a/malloc/arena.c b/malloc/arena.c
index 9e5e332..b893bae 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -1,6 +1,5 @@
 /* Malloc implementation for multiple threads without lock contention.
-   Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2009,2010,2011,2012
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Wolfram Gloger <wg@malloc.de>, 2001.
 
diff --git a/malloc/mcheck.c b/malloc/mcheck.c
index 430f871..c5addc5 100644
--- a/malloc/mcheck.c
+++ b/malloc/mcheck.c
@@ -1,6 +1,5 @@
 /* Standard debugging hooks for `malloc'.
-   Copyright (C) 1990-1997,1999,2000-2002,2007,2010,2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written May 1989 by Mike Haertel.
 
diff --git a/malloc/memusage.c b/malloc/memusage.c
index 2f6b6b5..8e2b683 100644
--- a/malloc/memusage.c
+++ b/malloc/memusage.c
@@ -1,5 +1,5 @@
 /* Profile heap and stack memory usage of running program.
-   Copyright (C) 1998-2002, 2004-2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1998-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 

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

commit 61d581741699e104f8af2871bb61ea797fc05912
Author: Alexandre Oliva <aoliva@redhat.com>
Date:   Wed Sep 5 20:37:37 2012 -0300

    * malloc/malloc.c (__libc_mallopt) <M_MMAP_MAX>: Fix indentation.

diff --git a/ChangeLog b/ChangeLog
index ec83ce4..d8bec40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
 
+	* malloc/malloc.c (__libc_mallopt) <M_MMAP_MAX>: Fix indentation.
+
+2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
+
 	* manual/contrib.texi (Contributors): Fix typo.  Complete entry.
 
 2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
diff --git a/malloc/malloc.c b/malloc/malloc.c
index c69e281..13b19bb 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -4776,8 +4776,8 @@ int __libc_mallopt(int param_number, int value)
     break;
 
   case M_MMAP_MAX:
-      mp_.n_mmaps_max = value;
-      mp_.no_dyn_threshold = 1;
+    mp_.n_mmaps_max = value;
+    mp_.no_dyn_threshold = 1;
     break;
 
   case M_CHECK_ACTION:

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

Summary of changes:
 ChangeLog         |    9 +++++++++
 malloc/arena.c    |    3 +--
 malloc/malloc.c   |    4 ++--
 malloc/mcheck.c   |    3 +--
 malloc/memusage.c |    2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)


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