X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmalloc.c;h=ead50393d3485a251c8bb509987d894e7192f98f;hb=8f39c46374411f6da086c40cdf2e0ee8d39a5d59;hp=3d417f9274506d2e89ace8db8e94a88afb79f6e9;hpb=373d33b1085ae0f71c70f94ebd97ff6cfc6e025c;p=gnulib.git

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 3d417f927..ead50393d 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,5 +1,7 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 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
@@ -30,106 +32,81 @@ void *realloc ();
 void free ();
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
 
 #include "error.h"
+#include "exitfail.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
 # define EXIT_FAILURE 1
 #endif
 
-/* 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
+/* The following tests require AC_PREREQ(2.54).  */
 
+#ifndef HAVE_MALLOC
+"you must run the autoconf test for a GNU libc compatible malloc"
+#endif
 
-/* Exit value when the requested amount of memory is not available.
-   The caller may set it to some other value.  */
-int xalloc_exit_failure = EXIT_FAILURE;
+#ifndef HAVE_REALLOC
+"you must run the autoconf test for a GNU libc compatible realloc"
+#endif
 
-/* FIXME: describe */
-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
+/* If non NULL, call this function when memory is exhausted. */
+void (*xalloc_fail_func) (void) = 0;
 
-/* FIXME: describe */
-void (*xalloc_fail_func) () = 0;
+/* 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");
 
-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
-void error (int, int, const char *, ...);
-#else
-void error ();
-#endif
-
-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)
-    {
-      if (xalloc_fail_func)
-	(*xalloc_fail_func) ();
-      error (xalloc_exit_failure, 0, xalloc_msg_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.  */
 
 void *
-xmalloc (n)
-     size_t n;
+xmalloc (size_t n)
 {
   void *p;
 
   p = malloc (n);
   if (p == 0)
-    p = fixup_null_alloc (n);
+    xalloc_die ();
   return p;
 }
 
-/* Allocate memory for N elements of S bytes, with error checking.  */
+/* Change the size of an allocated block of memory P to N bytes,
+   with error checking.  */
 
 void *
-xcalloc (n, s)
-     size_t n, s;
+xrealloc (void *p, size_t n)
 {
-  void *p;
-
-  p = calloc (n, s);
+  p = realloc (p, 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,
-   with error checking.
-   If P is NULL, run xmalloc.  */
+/* Allocate memory for N elements of S bytes, with error checking.  */
 
 void *
-xrealloc (p, n)
-     void *p;
-     size_t n;
+xcalloc (size_t n, size_t s)
 {
+  void *p;
+
+  p = calloc (n, s);
   if (p == 0)
-    return xmalloc (n);
-  p = realloc (p, n);
-  if (p == 0)
-    p = fixup_null_alloc (n);
+    xalloc_die ();
   return p;
 }