X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxmalloc.c;h=01ac54824815daf95d989a2b0ff3bfed5c6302bf;hb=ac5e11c593de9d8a862193b328a2def30e6d3447;hp=204469f240ab7a67a48f92bdbe3e2ed92aafec61;hpb=267a59868922aac05ec514a3ed7c1795c3d8d822;p=gnulib.git

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 204469f24..01ac54824 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -1,5 +1,5 @@
 /* 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-1997, 98 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
@@ -46,13 +46,6 @@ void free ();
 # define EXIT_FAILURE 1
 #endif
 
-/* Prototypes for functions defined here.  */
-#if defined (__STDC__) && __STDC__
-void *xmalloc (size_t n);
-void *xcalloc (size_t n, size_t s);
-void *xrealloc (void *p, size_t n);
-#endif
-
 #ifndef HAVE_DONE_WORKING_MALLOC_CHECK
 you must run the autoconf test for a properly working malloc -- see malloc.m4
 #endif
@@ -65,20 +58,15 @@ you must run the autoconf test for a properly working realloc -- see realloc.m4
    The caller may set it to some other value.  */
 int xalloc_exit_failure = EXIT_FAILURE;
 
-/* FIXME: describe */
-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
-
-/* FIXME: describe */
+/* If non NULL, call this function when memory is exhausted. */
 void (*xalloc_fail_func) () = 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
-xalloc_fail ()
+xalloc_fail (void)
 {
   if (xalloc_fail_func)
     (*xalloc_fail_func) ();
@@ -88,8 +76,7 @@ xalloc_fail ()
 /* Allocate N bytes of memory dynamically, with error checking.  */
 
 void *
-xmalloc (n)
-     size_t n;
+xmalloc (size_t n)
 {
   void *p;
 
@@ -104,9 +91,7 @@ xmalloc (n)
    If P is NULL, run xmalloc.  */
 
 void *
-xrealloc (p, n)
-     void *p;
-     size_t n;
+xrealloc (void *p, size_t n)
 {
   p = realloc (p, n);
   if (p == 0)
@@ -114,13 +99,10 @@ xrealloc (p, n)
   return p;
 }
 
-#ifdef NOT_USED
-
 /* Allocate memory for N elements of S bytes, with error checking.  */
 
 void *
-xcalloc (n, s)
-     size_t n, s;
+xcalloc (size_t n, size_t s)
 {
   void *p;
 
@@ -129,5 +111,3 @@ xcalloc (n, s)
     xalloc_fail ();
   return p;
 }
-
-#endif /* NOT_USED */