/* Wrappers around malloc and memory debugging support.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2003-2006 Free Software Foundation, Inc.
This file is part of GNU Wget.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget; if not, write to the Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
In addition, as a special exception, the Free Software Foundation
gives permission to link the code of its release of Wget with the
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else /* not HAVE_STRING_H */
-# include <strings.h>
-#endif /* not HAVE_STRING_H */
-#include <sys/types.h>
+#include <string.h>
#include <errno.h>
#include <assert.h>
#include "xmalloc.h"
#include "hash.h" /* for hash_pointer */
-#ifndef errno
-extern int errno;
-#endif
-
/* This file implements several wrappers around the basic allocation
routines. This is done for two reasons: first, so that the callers
of these functions need not check for errors, which is easy to
{
/* Make sure we don't try to store part of the log line, and thus
call malloc. */
- log_set_save_context (0);
+ log_set_save_context (false);
logprintf (LOG_ALWAYS,
_("%s: %s: Failed to allocate %ld bytes; memory exhausted.\n"),
exec_name, context, attempted_size);
malloc_table[i].line = line;
}
-/* Unregister PTR from malloc_table. Return 0 if PTR is not present
- in malloc_table. */
+/* Unregister PTR from malloc_table. Return false if PTR is not
+ present in malloc_table. */
-static int
+static bool
unregister_ptr (void *ptr)
{
int i = ptr_position (ptr);
if (malloc_table[i].ptr == NULL)
- return 0;
+ return false;
malloc_table[i].ptr = NULL;
/* Relocate malloc_table entries immediately following PTR. */
cont_outer:
;
}
- return 1;
+ return true;
}
/* Print the malloc debug stats gathered from the above information.
}
if (!unregister_ptr (ptr))
{
- fprintf (stderr, "%s: bad xfree(%0*lx) at %s:%d\n",
+ fprintf (stderr, "%s: bad xfree(0x%0*lx) at %s:%d\n",
exec_name, PTR_FORMAT (ptr), source_file, source_line);
abort ();
}