projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
xmalloc.c
diff --git
a/lib/xmalloc.c
b/lib/xmalloc.c
index
696cf3c
..
2f103d6
100644
(file)
--- a/
lib/xmalloc.c
+++ b/
lib/xmalloc.c
@@
-1,5
+1,5
@@
/* xmalloc.c -- malloc with out of memory checking
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990-199
7, 98, 99
Free Software Foundation, Inc.
+ Copyright (C) 1990-199
9, 2000
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
@@
-47,11
+47,11
@@
void free ();
#endif
#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
#endif
#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
+"you must run the autoconf test for a properly working malloc -- see malloc.m4"
#endif
#ifndef HAVE_DONE_WORKING_REALLOC_CHECK
#endif
#ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+"you must run the autoconf test for a properly working realloc --see realloc.m4"
#endif
/* Exit value when the requested amount of memory is not available.
#endif
/* Exit value when the requested amount of memory is not available.
@@
-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. */
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. */
/* 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_("M
emory exhausted");
+char
const xalloc_msg_memory_exhausted[] = N_("m
emory 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));
{
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. */
}
/* Allocate N bytes of memory dynamically, with error checking. */
@@
-82,20
+86,19
@@
xmalloc (size_t n)
p = malloc (n);
if (p == 0)
p = malloc (n);
if (p == 0)
- xalloc_
fail
();
+ 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 (void *p, size_t n)
{
p = realloc (p, n);
if (p == 0)
void *
xrealloc (void *p, size_t n)
{
p = realloc (p, n);
if (p == 0)
- xalloc_
fail
();
+ xalloc_
die
();
return p;
}
return p;
}
@@
-108,6
+111,6
@@
xcalloc (size_t n, size_t s)
p = calloc (n, s);
if (p == 0)
p = calloc (n, s);
if (p == 0)
- xalloc_
fail
();
+ xalloc_
die
();
return p;
}
return p;
}