X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmalloc.c;h=08c30fb8a3b7cdcfa0fa903df1bd55417bae5395;hb=1062e7a84e38a0e708fa3a7de81bba8ad45a2d45;hp=8217c992d7ac7ab6365cd3dff8a1bc66aff38aff;hpb=8bc2863c9a53466fda8f50603df297df9233c285;p=gnulib.git
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 8217c992d..08c30fb8a 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,10 +1,11 @@
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990, 91, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990-2000, 2002-2006, 2008-2011 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,118 +13,112 @@
GNU General Public License for more details.
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. */
+ along with this program. If not, see . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
-#if __STDC__
-# define VOID void
-#else
-# define VOID char
+#if ! HAVE_INLINE
+# define static_inline
#endif
+#include "xalloc.h"
+#undef static_inline
-#include
-
-#if STDC_HEADERS
-# include
-#else
-VOID *calloc ();
-VOID *malloc ();
-VOID *realloc ();
-void free ();
-#endif
+#include
+#include
-#if ENABLE_NLS
-# include
-# define _(Text) gettext (Text)
+/* 1 if calloc is known to be compatible with GNU calloc. This
+ matters if we are not also using the calloc module, which defines
+ HAVE_CALLOC_GNU and supports the GNU API even on non-GNU platforms. */
+#if defined HAVE_CALLOC_GNU || (defined __GLIBC__ && !defined __UCLIBC__)
+enum { HAVE_GNU_CALLOC = 1 };
#else
-# define textdomain(Domain)
-# define _(Text) Text
+enum { HAVE_GNU_CALLOC = 0 };
#endif
-#include "error.h"
+/* Allocate N bytes of memory dynamically, with error checking. */
-#ifndef EXIT_FAILURE
-# define EXIT_FAILURE 1
-#endif
+void *
+xmalloc (size_t n)
+{
+ void *p = malloc (n);
+ if (!p && n != 0)
+ xalloc_die ();
+ return p;
+}
-/* Prototypes for functions defined here. */
-#if defined (__STDC__) && __STDC__
-static VOID *fixup_null_alloc (size_t n);
-VOID *xmalloc (size_t n);
-VOID *xcalloc (size_t n, size_t s);
-VOID *xrealloc (VOID *p, size_t n);
-#endif
+/* Change the size of an allocated block of memory P to N bytes,
+ with error checking. */
+void *
+xrealloc (void *p, size_t n)
+{
+ if (!n && p)
+ {
+ /* The GNU and C99 realloc behaviors disagree here. Act like
+ GNU, even if the underlying realloc is C99. */
+ free (p);
+ return NULL;
+ }
-/* Exit value when the requested amount of memory is not available.
- The caller may set it to some other value. */
-int xmalloc_exit_failure = EXIT_FAILURE;
+ p = realloc (p, n);
+ if (!p && n)
+ xalloc_die ();
+ return p;
+}
-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
-void error (int, int, const char *, ...);
-#else
-void error ();
-#endif
+/* If P is null, allocate a block of at least *PN bytes; otherwise,
+ reallocate P so that it contains more than *PN bytes. *PN must be
+ nonzero unless P is null. Set *PN to the new block's size, and
+ return the pointer to the new block. *PN is never set to zero, and
+ the returned pointer is never null. */
-static VOID *
-fixup_null_alloc (n)
- size_t n;
+void *
+x2realloc (void *p, size_t *pn)
{
- VOID *p;
-
- p = 0;
- if (n == 0)
- p = malloc ((size_t) 1);
- if (p == 0)
- error (xmalloc_exit_failure, 0, _("Memory exhausted"));
- return p;
+ return x2nrealloc (p, pn, 1);
}
-/* Allocate N bytes of memory dynamically, with error checking. */
+/* Allocate S bytes of zeroed memory dynamically, with error checking.
+ There's no need for xnzalloc (N, S), since it would be equivalent
+ to xcalloc (N, S). */
-VOID *
-xmalloc (n)
- size_t n;
+void *
+xzalloc (size_t s)
{
- VOID *p;
+ return memset (xmalloc (s), 0, s);
+}
- p = malloc (n);
- if (p == 0)
- p = fixup_null_alloc (n);
+/* Allocate zeroed memory for N elements of S bytes, with error
+ checking. S must be nonzero. */
+
+void *
+xcalloc (size_t n, size_t s)
+{
+ void *p;
+ /* Test for overflow, since some calloc implementations don't have
+ proper overflow checks. But omit overflow and size-zero tests if
+ HAVE_GNU_CALLOC, since GNU calloc catches overflow and never
+ returns NULL if successful. */
+ if ((! HAVE_GNU_CALLOC && xalloc_oversized (n, s))
+ || (! (p = calloc (n, s)) && (HAVE_GNU_CALLOC || n != 0)))
+ xalloc_die ();
return p;
}
-/* Allocate memory for N elements of S bytes, with error checking. */
+/* Clone an object P of size S, with error checking. There's no need
+ for xnmemdup (P, N, S), since xmemdup (P, N * S) works without any
+ need for an arithmetic overflow check. */
-VOID *
-xcalloc (n, s)
- size_t n, s;
+void *
+xmemdup (void const *p, size_t s)
{
- VOID *p;
-
- p = calloc (n, s);
- if (p == 0)
- p = fixup_null_alloc (n);
- return p;
+ return memcpy (xmalloc (s), p, s);
}
-/* Change the size of an allocated block of memory P to N bytes,
- with error checking.
- If P is NULL, run xmalloc. */
+/* Clone STRING. */
-VOID *
-xrealloc (p, n)
- VOID *p;
- size_t n;
+char *
+xstrdup (char const *string)
{
- if (p == 0)
- return xmalloc (n);
- p = realloc (p, n);
- if (p == 0)
- p = fixup_null_alloc (n);
- return p;
+ return xmemdup (string, strlen (string) + 1);
}