[svn] Use bool type for boolean variables and values.

[wget] / src / xmalloc.c

diff --git a/src/xmalloc.c b/src/xmalloc.c
index cf3ad267dc76eb185d3d2fcf71b7dfe430e2d64a..268aa748d5e15b78d6539b897cf7cc4b92ae15c7 100644 (file)
--- a/src/xmalloc.c
+++ b/src/xmalloc.c
@@ -31,12 +31,7 @@ so, delete this exception statement from your version.  */
 
 #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>
 
@@ -44,10 +39,6 @@ so, delete this exception statement from your version.  */
 #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
@@ -67,7 +58,7 @@ memfatal (const char *context, long attempted_size)
 {
   /* 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);
@@ -261,15 +252,15 @@ register_ptr (const void *ptr, const char *file, int line)
   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. */
@@ -288,7 +279,7 @@ unregister_ptr (void *ptr)
     cont_outer:
       ;
     }
-  return 1;
+  return true;
 }
 
 /* Print the malloc debug stats gathered from the above information.