From 8538fdb3ec7c8899cbc5dbbce4a3fbfe7cf8c2a1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 8 Jul 2011 13:20:41 -0400 Subject: (memalign_check): No need to use checked_request2size. --- ChangeLog | 5 +++++ malloc/hooks.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d47995ba80..7480493229 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-07-08 Ulrich Drepper + + * malloc/hooks.c (memalign_check): Avoid using checked_request2size + if the result is not used. + 2011-07-05 Andreas Jaeger [BZ#9696] diff --git a/malloc/hooks.c b/malloc/hooks.c index 28845eeb49..4b1a996eb7 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -1,5 +1,5 @@ /* Malloc implementation for multiple threads without lock contention. - Copyright (C) 2001-2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Wolfram Gloger , 2001. @@ -398,7 +398,6 @@ memalign_check(alignment, bytes, caller) size_t alignment; size_t bytes; const Void_t *caller; #endif { - INTERNAL_SIZE_T nb; Void_t* mem; if (alignment <= MALLOC_ALIGNMENT) return malloc_check(bytes, NULL); @@ -408,7 +407,6 @@ memalign_check(alignment, bytes, caller) MALLOC_FAILURE_ACTION; return NULL; } - checked_request2size(bytes+1, nb); (void)mutex_lock(&main_arena.mutex); mem = (top_check() >= 0) ? _int_memalign(&main_arena, alignment, bytes+1) : NULL; -- cgit 1.4.1