diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lib/ChangeLog | 7 | ||||
| -rw-r--r-- | lib/xmalloc.c | 16 | ||||
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/xalloc.m4 | 4 | ||||
| -rw-r--r-- | modules/hash | 2 | ||||
| -rw-r--r-- | modules/xalloc | 2 |
7 files changed, 20 insertions, 19 deletions
@@ -1,5 +1,8 @@ 2004-05-30 Paul Eggert <eggert@cs.ucla.edu> + * modules/hash (Depends-on): Remove malloc, realloc. + * modules/xalloc (Depends-on): Likewise. + * README: Mention that the 'free' module works around the problem with 'free (0)'. Mention LIA-1 and C99. diff --git a/lib/ChangeLog b/lib/ChangeLog index a894cc13c4..9752f1e763 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2004-05-30 Paul Eggert <eggert@cs.ucla.edu> + + * xmalloc.c (HAVE_MALLOC, HAVE_REALLOC): Do not require these + macros to be defined. + (xnmalloc_inline, xnrealloc_inline, xcalloc): Do not die if + the allocator returns NULL because the requested size is zero. + 2004-05-20 Paul Eggert <eggert@cs.ucla.edu> * malloc/obstack.c (_obstack) [defined _LIBC]: Bring back this diff --git a/lib/xmalloc.c b/lib/xmalloc.c index 181006b43d..cc7501974d 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -1,7 +1,7 @@ /* xmalloc.c -- malloc with out of memory checking Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003, - 1999, 2000, 2002, 2003 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003, 2004 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 @@ -37,14 +37,6 @@ # define SIZE_MAX ((size_t) -1) #endif -#ifndef HAVE_MALLOC -"you must run the autoconf test for a GNU libc compatible malloc" -#endif - -#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. */ void (*xalloc_fail_func) (void) = 0; @@ -71,7 +63,7 @@ static inline void * xnmalloc_inline (size_t n, size_t s) { void *p; - if (xalloc_oversized (n, s) || ! (p = malloc (n * s))) + if (xalloc_oversized (n, s) || (! (p = malloc (n * s)) && n != 0)) xalloc_die (); return p; } @@ -96,7 +88,7 @@ xmalloc (size_t n) static inline void * xnrealloc_inline (void *p, size_t n, size_t s) { - if (xalloc_oversized (n, s) || ! (p = realloc (p, n * s))) + if (xalloc_oversized (n, s) || (! (p = realloc (p, n * s)) && n != 0)) xalloc_die (); return p; } @@ -239,7 +231,7 @@ xcalloc (size_t n, size_t s) void *p; /* Test for overflow, since some calloc implementations don't have proper overflow checks. */ - if (xalloc_oversized (n, s) || ! (p = calloc (n, s))) + if (xalloc_oversized (n, s) || (! (p = calloc (n, s)) && n != 0)) xalloc_die (); return p; } diff --git a/m4/ChangeLog b/m4/ChangeLog index 02d81a2765..909ba98990 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2004-05-30 Paul Eggert <eggert@cs.ucla.edu> + + * xalloc.m4 (gl_PREREQ_XMALLOC): Do not require AC_FUNC_MALLOC + or AC_FUNC_REALLOC. + 2004-05-20 Andreas Schwab <schwab@suse.de> * free.m4: Replace free if it not known to work, not the other diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index f3d3790074..4d9383509f 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,4 +1,4 @@ -# xalloc.m4 serial 8 +# xalloc.m4 serial 9 dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -21,8 +21,6 @@ AC_DEFUN([gl_PREREQ_XALLOC], [ # Prerequisites of lib/xmalloc.c. AC_DEFUN([gl_PREREQ_XMALLOC], [ AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([AC_FUNC_MALLOC]) - AC_REQUIRE([AC_FUNC_REALLOC]) : ]) diff --git a/modules/hash b/modules/hash index 6f353dc230..6081004530 100644 --- a/modules/hash +++ b/modules/hash @@ -7,8 +7,6 @@ lib/hash.c m4/hash.m4 Depends-on: -malloc -realloc stdbool configure.ac: diff --git a/modules/xalloc b/modules/xalloc index e92d5332fc..5d93aa3988 100644 --- a/modules/xalloc +++ b/modules/xalloc @@ -8,8 +8,6 @@ lib/xstrdup.c m4/xalloc.m4 Depends-on: -malloc -realloc error gettext exitfail |