changeset 1956:b04912653d02

(xalloc_die): Rename from xalloc_fail and update callers. Use explicit exit to help avoid warnings.
author Jim Meyering <jim@meyering.net>
date Sun, 26 Sep 1999 19:05:39 +0000
parents 6921aa7028ba
children ff7525910d7b
files lib/xmalloc.c
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -65,12 +65,16 @@
    before exiting when memory is exhausted.  Goes through gettext. */
 char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
 
-static void
-xalloc_fail (void)
+void
+xalloc_die (void)
 {
   if (xalloc_fail_func)
     (*xalloc_fail_func) ();
   error (xalloc_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.  */
@@ -82,7 +86,7 @@
 
   p = malloc (n);
   if (p == 0)
-    xalloc_fail ();
+    xalloc_die ();
   return p;
 }
 
@@ -95,7 +99,7 @@
 {
   p = realloc (p, n);
   if (p == 0)
-    xalloc_fail ();
+    xalloc_die ();
   return p;
 }
 
@@ -108,6 +112,6 @@
 
   p = calloc (n, s);
   if (p == 0)
-    xalloc_fail ();
+    xalloc_die ();
   return p;
 }