projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
realloc.c
diff --git
a/lib/realloc.c
b/lib/realloc.c
index
1f82e75
..
c1fe9e5
100644
(file)
--- a/
lib/realloc.c
+++ b/
lib/realloc.c
@@
-1,5
+1,6
@@
-/* 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, 2006 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
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,29
+14,32
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#undef realloc
#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,
/* 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);
}
return malloc (n);
return realloc (p, n);
}