projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'free' module.
[gnulib.git]
/
lib
/
xmalloc.c
diff --git
a/lib/xmalloc.c
b/lib/xmalloc.c
index
a9f1975
..
3adf5dd
100644
(file)
--- a/
lib/xmalloc.c
+++ b/
lib/xmalloc.c
@@
-1,5
+1,7
@@
/* xmalloc.c -- malloc with out of memory checking
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2002, 2003 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
@@
-15,89
+17,85
@@
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, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#if __STDC__
-#define VOID void
-#else
-#define VOID char
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
#endif
-#include
<sys/types.h>
+#include
"xalloc.h"
-#if STDC_HEADERS
#include <stdlib.h>
#include <stdlib.h>
-#else
-VOID *malloc ();
-VOID *realloc ();
-void free ();
-#endif
-/* This is for other GNU distributions with internationalized messages.
- The GNU C Library itself does not yet support such messages. */
-#if HAVE_LIBINTL_H
-# include <libintl.h>
-#else
-# define gettext(msgid) (msgid)
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+#include "error.h"
+#include "exit.h"
+#include "exitfail.h"
+
+/* The following tests require AC_PREREQ(2.54). */
+
+#ifndef HAVE_MALLOC
+"you must run the autoconf test for a GNU libc compatible malloc"
#endif
#endif
-#ifndef
EXIT_FAILURE
-#define EXIT_FAILURE 1
+#ifndef
HAVE_REALLOC
+"you must run the autoconf test for a GNU libc compatible realloc"
#endif
#endif
-/* 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;
+/* If non NULL, call this function when memory is exhausted. */
+void (*xalloc_fail_func) (void) = 0;
-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
-void error (int, int, const char *, ...);
-#else
-void error ();
-#endif
+/* If XALLOC_FAIL_FUNC is NULL, or does return, display this message
+ before exiting when memory is exhausted. Goes through gettext. */
+char const xalloc_msg_memory_exhausted[] = N_("memory exhausted");
-static VOID *
-fixup_null_alloc (n)
- size_t n;
+void
+xalloc_die (void)
{
{
- VOID *p;
-
- p = 0;
- if (n == 0)
- p = malloc ((size_t) 1);
- if (p == 0)
- error (xmalloc_exit_failure, 0, gettext ("Memory exhausted"));
- return p;
+ if (xalloc_fail_func)
+ (*xalloc_fail_func) ();
+ error (exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted));
+ /* The `noreturn' cannot be given to error, since it may return if
+ its first argument is 0. To help compilers understand the
+ xalloc_die does terminate, call exit. */
+ exit (EXIT_FAILURE);
}
/* Allocate N bytes of memory dynamically, with error checking. */
}
/* Allocate N bytes of memory dynamically, with error checking. */
-VOID *
-xmalloc (n)
- size_t n;
+void *
+xmalloc (size_t n)
{
{
-
VOID
*p;
+
void
*p;
p = malloc (n);
if (p == 0)
p = malloc (n);
if (p == 0)
-
p = fixup_null_alloc (n
);
+
xalloc_die (
);
return p;
}
/* Change the size of an allocated block of memory P to N bytes,
return p;
}
/* Change the size of an allocated block of memory P to N bytes,
- with error checking.
- If P is NULL, run xmalloc. */
+ with error checking. */
-VOID *
-xrealloc (p, n)
- VOID *p;
- size_t n;
+void *
+xrealloc (void *p, size_t n)
{
{
- if (p == 0)
- return xmalloc (n);
p = realloc (p, n);
if (p == 0)
p = realloc (p, n);
if (p == 0)
- p = fixup_null_alloc (n);
+ xalloc_die ();
+ return p;
+}
+
+/* Allocate memory for N elements of S bytes, with error checking. */
+
+void *
+xcalloc (size_t n, size_t s)
+{
+ void *p;
+
+ p = calloc (n, s);
+ if (p == 0)
+ xalloc_die ();
return p;
}
return p;
}