This is the mail archive of the libc-alpha@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]

Re: mallopt indentation bug?


On Sep  5, 2012, "Carlos O'Donell" <carlos_odonell@mentor.com> wrote:

>>> +++ b/malloc/malloc.c

> Merge copyright years.

This file had already had them merged.

Others I've just modified hadn't.  Fixed with the second patch below.

> Alexandre, Could you please also fix the indentation for M_MMAP_MAX?

I generally don't like to make gratuitous whitespace changes when not
touching the actual code; they just make merges harder.

Now, since I'm about to touch the code there with one of the proposed
probes, I'm checking this in, and adjusting the probe patch to match.

for ChangeLog
2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
 
	* malloc/malloc.c (__libc_mallopt) <M_MMAP_MAX>: Fix indentation.

Index: malloc/malloc.c
diff --git malloc/malloc.c malloc/malloc.c
index c69e281..13b19bb1 100644
--- malloc/malloc.c
+++ 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:
for ChangeLog
2012-09-05  Alexandre Oliva  <aoliva@redhat.com>
 
	* malloc/arena.c: Fold copyright years.
	* malloc/mcheck.c, malloc/memusage.c: Likewise.

Index: malloc/arena.c
diff --git malloc/arena.c malloc/arena.c
index 9e5e332..b893bae 100644
--- malloc/arena.c
+++ 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.
 
Index: malloc/mcheck.c
diff --git malloc/mcheck.c malloc/mcheck.c
index 430f871..c5addc5 100644
--- malloc/mcheck.c
+++ 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.
 
Index: malloc/memusage.c
diff --git malloc/memusage.c malloc/memusage.c
index 2f6b6b5..8e2b683 100644
--- malloc/memusage.c
+++ 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.
 

-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist      Red Hat Brazil Compiler Engineer

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