moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Improved fatal error message.

Browse Source
This commit is contained in:
hniksic 2003-10-31 18:51:47 -08:00
parent 3dc9f336e8
commit 9d9e242e5d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xmalloc.c
View File

@ -56,19 +56,20 @@ extern int errno;
The second reason why these are useful is that, if DEBUG_MALLOC is The second reason why these are useful is that, if DEBUG_MALLOC is
defined, they also provide a handy (if crude) malloc debugging defined, they also provide a handy (if crude) malloc debugging
interface that checks memory leaks. */ interface that checks for memory leaks. */
/* Croak the fatal memory error and bail out with non-zero exit /* Croak the fatal memory error and bail out with non-zero exit
status. */ status. */
static void static void
memfatal (const char *context, long size) memfatal (const char *context, long attempted_size)
{ {
/* Make sure we don't try to store part of the log line, and thus /* Make sure we don't try to store part of the log line, and thus
call malloc. */ call malloc. */
log_set_save_context (0); log_set_save_context (0);
logprintf (LOG_ALWAYS, _("%s: %s: Cannot allocate %ld bytes.\n"), logprintf (LOG_ALWAYS,
exec_name, context, size); _("%s: %s: Failed to allocate %ld bytes; memory exhausted.\n"),
exec_name, context, attempted_size);
exit (1); exit (1);
} }
@ -76,7 +77,7 @@ memfatal (const char *context, long size)
distinguished from the debugging functions, and from the macros. distinguished from the debugging functions, and from the macros.
Explanation follows: Explanation follows:
If memory debugging is not turned on, wget.h defines these: If memory debugging is not turned on, xmalloc.h defines these:
#define xmalloc xmalloc_real #define xmalloc xmalloc_real
#define xmalloc0 xmalloc0_real #define xmalloc0 xmalloc0_real
@ -162,6 +163,9 @@ xstrdup_real (const char *s)
return copy; return copy;
} }
/* xfree_real is unnecessary because free doesn't require any special
functionality. */
#ifdef DEBUG_MALLOC #ifdef DEBUG_MALLOC
/* Crude home-grown routines for debugging some malloc-related /* Crude home-grown routines for debugging some malloc-related