projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log yesterday's merge from coreutils.
[gnulib.git]
/
lib
/
xmalloc.c
diff --git
a/lib/xmalloc.c
b/lib/xmalloc.c
index
e865827
..
ead5039
100644
(file)
--- a/
lib/xmalloc.c
+++ b/
lib/xmalloc.c
@@
-1,5
+1,7
@@
/* xmalloc.c -- malloc with out of memory checking
/* xmalloc.c -- malloc with out of memory checking
- Copyright (C) 1990-1997, 98, 99 Free Software Foundation, Inc.
+
+ Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000, 2002, 2003 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
@@
-30,47
+32,45
@@
void *realloc ();
void free ();
#endif
void free ();
#endif
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
#include "error.h"
#include "error.h"
+#include "exitfail.h"
#include "xalloc.h"
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
#include "xalloc.h"
#ifndef EXIT_FAILURE
# define EXIT_FAILURE 1
#endif
-#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-you must run the autoconf test for a properly working malloc -- see malloc.m4
-#endif
+/* The following tests require AC_PREREQ(2.54). */
-#ifndef HAVE_
DONE_WORKING_REALLOC_CHECK
-you must run the autoconf test for a properly working realloc -- see realloc.m4
+#ifndef HAVE_
MALLOC
+"you must run the autoconf test for a GNU libc compatible malloc"
#endif
#endif
-/* Exit value when the requested amount of memory is not available.
- The caller may set it to some other value. */
-int xalloc_exit_failure = EXIT_FAILURE;
+#ifndef HAVE_REALLOC
+"you must run the autoconf test for a GNU libc compatible realloc"
+#endif
/* If non NULL, call this function when memory is exhausted. */
/* If non NULL, call this function when memory is exhausted. */
-void (*xalloc_fail_func) () = 0;
+void (*xalloc_fail_func) (
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) ();
{
if (xalloc_fail_func)
(*xalloc_fail_func) ();
- error (xalloc_exit_failure, 0, "%s", xalloc_msg_memory_exhausted);
+ error (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
+82,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
+107,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;
}