X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Frealloc.c;h=df570aa631d51d5d126ed3383f2600721c09ddeb;hb=267a39bafd249d7eb9c37df06dc6defcf41cb343;hp=1f82e75aa9baa3ce7c4330c8d98c39234fcec53c;hpb=66d38967ea1995b22c06fbe3645b685b081355ce;p=gnulib.git

diff --git a/lib/realloc.c b/lib/realloc.c
index 1f82e75aa..df570aa63 100644
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -1,5 +1,5 @@
-/* Work around bug on some systems where realloc (NULL, n) fails.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+/* realloc() function that is glibc compatible.
+   Copyright (C) 1997, 2003, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* written by Jim Meyering */
 
@@ -22,20 +22,25 @@
 #endif
 #undef realloc
 
-#include <sys/types.h>
-
-char *malloc ();
-char *realloc ();
+#include <stdlib.h>
 
 /* Change the size of an allocated block of memory P to N bytes,
-   with error checking.  If P is NULL, use malloc.  */
+   with error checking.  If N is zero, change it to 1.  If P is NULL,
+   use malloc.  */
 
-char *
-rpl_realloc (p, n)
-     char *p;
-     size_t n;
+void *
+rpl_realloc (void *p, size_t n)
 {
-  if (p == 0)
+  if (n == 0)
+    {
+      n = 1;
+
+      /* In theory realloc might fail, so don't rely on it to free.  */
+      free (p);
+      p = NULL;
+    }
+
+  if (p == NULL)
     return malloc (n);
   return realloc (p, n);
 }