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
d2996a0
..
e865827
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
, 91, 92, 93, 94, 95, 96, 97
Free Software Foundation, Inc.
+ Copyright (C) 1990
-1997, 98, 99
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
@@
-46,14
+46,6
@@
void free ();
# define EXIT_FAILURE 1
#endif
# 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
-
#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
you must run the autoconf test for a properly working malloc -- see malloc.m4
#endif
#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
you must run the autoconf test for a properly working malloc -- see malloc.m4
#endif
@@
-66,31
+58,25
@@
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;
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;
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
static void
-xalloc_fail ()
+xalloc_fail (
void
)
{
if (xalloc_fail_func)
(*xalloc_fail_func) ();
{
if (xalloc_fail_func)
(*xalloc_fail_func) ();
- error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted);
+ error (xalloc_exit_failure, 0,
"%s",
xalloc_msg_memory_exhausted);
}
/* Allocate N bytes of memory dynamically, with error checking. */
void *
}
/* Allocate N bytes of memory dynamically, with error checking. */
void *
-xmalloc (n)
- size_t n;
+xmalloc (size_t n)
{
void *p;
{
void *p;
@@
-105,9
+91,7
@@
xmalloc (n)
If P is NULL, run xmalloc. */
void *
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)
{
p = realloc (p, n);
if (p == 0)
@@
-115,20
+99,15
@@
xrealloc (p, n)
return p;
}
return p;
}
-#ifdef NOT_USED
-
/* Allocate memory for N elements of S bytes, with error checking. */
void *
/* 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;
p = calloc (n, s);
if (p == 0)
{
void *p;
p = calloc (n, s);
if (p == 0)
-
p = fixup_null_alloc (n
);
+
xalloc_fail (
);
return p;
}
return p;
}
-
-#endif /* NOT_USED */