summaryrefslogtreecommitdiff
path: root/lib/xmalloc.c
diff options
context:
space:
mode:
authorJeff Bailey <jbailey@gnu.org>2000-04-19 19:38:55 +0000
committerJeff Bailey <jbailey@gnu.org>2000-04-19 19:38:55 +0000
commit9409178c04f8e3b631a5f623fbc12751944d99bf (patch)
treebafcecb7ba55c94cc7816e946ce8a8aaa40c7c13 /lib/xmalloc.c
parentdf58081a1bc39eabe4241e13e08c7deb62c9db43 (diff)
downloadmailutils-9409178c04f8e3b631a5f623fbc12751944d99bf.tar.gz
mailutils-9409178c04f8e3b631a5f623fbc12751944d99bf.tar.bz2
Portability fixes
Diffstat (limited to 'lib/xmalloc.c')
-rw-r--r--lib/xmalloc.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index 696cf3c9a..8206a9473 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -59,18 +59,22 @@ you must run the autoconf test for a properly working realloc -- see realloc.m4
int xalloc_exit_failure = EXIT_FAILURE;
/* If non NULL, call this function when memory is exhausted. */
-void (*xalloc_fail_func) () = 0;
+void (*xalloc_fail_func) PARAMS ((void)) = 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");
-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 @@ xmalloc (size_t n)
p = malloc (n);
if (p == 0)
- xalloc_fail ();
+ xalloc_die ();
return p;
}
@@ -95,7 +99,7 @@ xrealloc (void *p, size_t n)
{
p = realloc (p, n);
if (p == 0)
- xalloc_fail ();
+ xalloc_die ();
return p;
}
@@ -108,6 +112,6 @@ xcalloc (size_t n, size_t s)
p = calloc (n, s);
if (p == 0)
- xalloc_fail ();
+ xalloc_die ();
return p;
}

Return to:

Send suggestions and report system problems to the System administrator.