From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 13 Oct 2006 16:28:21 +0000 (+0000)
Subject: * elf/dl-minimal.c (realloc): Optimize last patch.
X-Git-Tag: upstream/2.20~8317
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff8d96be3075b59499046dc2c49c89a871f1cfd9;p=platform%2Fupstream%2Flinaro-glibc.git

* elf/dl-minimal.c (realloc): Optimize last patch.
---

diff --git a/ChangeLog b/ChangeLog
index ffb3296..adef0d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
+2006-10-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/dl-minimal.c (realloc): Optimize last patch.
+
 2006-10-12  Richard Sandiford  <richard@codesourcery.com>
 
 	[BZ #3352]
 	* elf/dl-minimal.c (realloc): Let malloc() return a new pointer,
 	and use memcpy() if it does.
-		
+
 2006-11-12  Andreas Jaeger  <aj@suse.de>
 
 	[BZ #2510]
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
index 44b8c37..8e78709 100644
--- a/elf/dl-minimal.c
+++ b/elf/dl-minimal.c
@@ -1,5 +1,6 @@
 /* Minimal replacements for basic facilities used in the dynamic linker.
-   Copyright (C) 1995-1998,2000-2002,2004,2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998,2000-2002,2004,2005,2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -134,9 +135,7 @@ realloc (void *ptr, size_t n)
   size_t old_size = alloc_ptr - alloc_last_block;
   alloc_ptr = alloc_last_block;
   void *new = malloc (n);
-  if (new != ptr)
-    memcpy (new, ptr, old_size);
-  return new;
+  return new != ptr ? memcpy (new, ptr, old_size) : new;
 }
 
 /* Avoid signal frobnication in setjmp/longjmp.  Keeps things smaller.  */