mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-12-11 10:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

(xalloc_fail): Renamed from fixup_null_alloc.

Browse Source 
(xcalloc): #ifdef-out unused function.
(xrealloc): Remove code to work around deficient versions of realloc.
Now we have an autoconf-enabled replacement version.
(xmalloc): Remove code to work around deficient versions of malloc.
Now we have an autoconf-enabled replacement version.
This commit is contained in:
Jim Meyering 1997-11-03 05:25:44 +00:00
parent c417b4e790
commit aafe49ef49
1 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
lib/xmalloc.c
View File

@ -71,22 +71,12 @@ void error (int, int, const char *, ...);
void error ();
#endif
static void *
fixup_null_alloc (n)
size_t n;
static void
xalloc_fail ()
{
void *p;
p = 0;
if (n == 0)
p = malloc ((size_t) 1);
if (p == 0)
{
if (xalloc_fail_func)
(*xalloc_fail_func) ();
error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted);
}
return p;
if (xalloc_fail_func)
(*xalloc_fail_func) ();
error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted);
}
/* Allocate N bytes of memory dynamically, with error checking. */
@ -99,10 +89,27 @@ xmalloc (n)
p = malloc (n);
if (p == 0)
p = fixup_null_alloc (n);
xalloc_fail ();
return p;
}
/* Change the size of an allocated block of memory P to N bytes,
with error checking.
If P is NULL, run xmalloc. */
void *
xrealloc (p, n)
void *p;
size_t n;
{
p = realloc (p, n);
if (p == 0)
xalloc_fail ();
return p;
}
#ifdef NOT_USED
/* Allocate memory for N elements of S bytes, with error checking. */
void *
@ -117,19 +124,4 @@ xcalloc (n, s)
return p;
}
/* Change the size of an allocated block of memory P to N bytes,
with error checking.
If P is NULL, run xmalloc. */
void *
xrealloc (p, n)
void *p;
size_t n;
{
if (p == 0)
return xmalloc (n);
p = realloc (p, n);
if (p == 0)
p = fixup_null_alloc (n);
return p;
}
#endif /* NOT_USED */