diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-01-18 10:48:36 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-01-18 14:56:03 +0100 |
| commit | 11be2acce8384212388dd442c7f4eaa7b4a5f1a1 (patch) | |
| tree | daab5c3c35637b402dc6e19d50a7d45569f0042e /malloc | |
| parent | a6be5cf5459eeb8359e5fa192e9dc397c02102bf (diff) | |
| parent | 6392473fe970b0cdace62f31000a83ba0fcf6161 (diff) | |
| download | glibc-11be2acce8384212388dd442c7f4eaa7b4a5f1a1.tar.xz glibc-11be2acce8384212388dd442c7f4eaa7b4a5f1a1.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/malloc.c | 2 | ||||
| -rwxr-xr-x | malloc/memusage.sh | 4 | ||||
| -rw-r--r-- | malloc/mtrace.pl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index f7770a394c..3e06b8755b 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2831,7 +2831,7 @@ static void do_check_malloc_state(mstate av) max_fast_bin = fastbin_index(get_max_fast ()); for (i = 0; i < NFASTBINS; ++i) { - p = av->fastbins[i]; + p = fastbin (av, i); /* The following test can only be performed for the main arena. While mallopt calls malloc_consolidate to get rid of all fast diff --git a/malloc/memusage.sh b/malloc/memusage.sh index ec34486b55..757629241f 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -1,5 +1,5 @@ #! @BASH@ -# Copyright (C) 1999-2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1999-2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@gnu.org>, 1999. @@ -73,7 +73,7 @@ do_version() { printf $"Copyright (C) %s Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -" "2010" +" "2011" printf $"Written by %s. " "Ulrich Drepper" exit 0 diff --git a/malloc/mtrace.pl b/malloc/mtrace.pl index 82318dca58..c30bb96806 100644 --- a/malloc/mtrace.pl +++ b/malloc/mtrace.pl @@ -1,7 +1,7 @@ #! @PERL@ eval "exec @PERL@ -S $0 $@" if 0; -# Copyright (C) 1997-2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright (C) 1997-2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper <drepper@gnu.org>, 1997. # Based on the mtrace.awk script. @@ -45,7 +45,7 @@ arglist: while (@ARGV) { $ARGV[0] eq "--vers" || $ARGV[0] eq "--versi" || $ARGV[0] eq "--versio" || $ARGV[0] eq "--version") { print "mtrace (GNU $PACKAGE) $VERSION\n"; - print "Copyright (C) 2010 Free Software Foundation, Inc.\n"; + print "Copyright (C) 2011 Free Software Foundation, Inc.\n"; print "This is free software; see the source for copying conditions. There is NO\n"; print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; print "Written by Ulrich Drepper <drepper\@gnu.org>\n"; |