Rename util_malloc to malloc.

src/core/or/or.h

@@ -47,7 +47,7 @@
 #include "lib/log/escape.h"
 #include "lib/log/ratelim.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
 #include "lib/net/socket.h"

src/lib/compress/compress.c

@@ -32,7 +32,7 @@
 #include "lib/compress/compress_zlib.h"
 #include "lib/compress/compress_zstd.h"
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 /** Total number of bytes allocated for compression state overhead. */

src/lib/compress/compress_lzma.c

@@ -17,7 +17,7 @@
 #include "lib/compress/compress_lzma.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/thread/threads.h"
 
 #ifdef HAVE_LZMA

src/lib/container/bitarray.h

@@ -15,7 +15,7 @@
 #include "orconfig.h"
 #include <string.h>
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if SIZEOF_INT == 4
 #define BITARRAY_SHIFT 5

src/lib/container/bloomfilt.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/container/bloomfilt.h"
 #include "lib/intmath/bits.h"
 #include "lib/log/util_bug.h"

src/lib/container/buffers.c

@@ -30,7 +30,7 @@
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/ctime/di_ops.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/time/compat_time.h"
 

src/lib/container/handles.h

@@ -52,7 +52,7 @@
 #include "orconfig.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #define HANDLE_ENTRY(name, structname)         \
   struct name ## _handle_head_t *handle_head

src/lib/container/map.c

@@ -14,7 +14,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/string/util_string.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include "lib/log/util_bug.h"
 

src/lib/container/smartlist.c

@@ -17,7 +17,7 @@
 
 #include "lib/container/smartlist.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/string/compat_ctype.h"

src/lib/crypt_ops/aes.h

@@ -14,7 +14,7 @@
  */
 
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 typedef struct aes_cnt_cipher aes_cnt_cipher_t;
 

src/lib/crypt_ops/crypto_digest.h

@@ -15,7 +15,7 @@
 
 #include "lib/cc/torint.h"
 #include "lib/defs/digest_sizes.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Length of a sha1 message digest when encoded in base32 with trailing =
  * signs removed. */

src/lib/crypt_ops/crypto_rand.c

@@ -28,7 +28,7 @@
 #include "lib/intmath/weakrng.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"

src/lib/ctime/di_ops.c

@@ -9,7 +9,7 @@
 #include "orconfig.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 

src/lib/encoding/binascii.c

@@ -19,7 +19,7 @@
 #include "lib/cc/torint.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/intmath/muldiv.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stddef.h>
 #include <string.h>

src/lib/encoding/confline.c

@@ -19,7 +19,7 @@
 #include "lib/encoding/cstring.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/util_string.h"

src/lib/encoding/cstring.c

@@ -13,7 +13,7 @@
 #include "lib/encoding/cstring.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/compat_ctype.h"
 
 #include <string.h>

src/lib/encoding/time_fmt.c

@@ -18,7 +18,7 @@
 #include "lib/log/torlog.h"
 #include "lib/log/escape.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/scanf.h"
 #include "lib/wallclock/tm_cvt.h"

src/lib/evloop/compat_libevent.h

@@ -11,7 +11,7 @@
 
 #include "orconfig.h"
 #include "lib/testsupport/testsupport.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 void configure_libevent_logging(void);
 void suppress_libevent_log_msg(const char *msg);

src/lib/evloop/procmon.c

@@ -11,7 +11,7 @@
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 
 #ifdef HAVE_SIGNAL_H

src/lib/evloop/timers.c

@@ -36,7 +36,7 @@
 #include "lib/intmath/muldiv.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/time/compat_time.h"
 
 #ifdef _WIN32

src/lib/fs/conffile.c

@@ -18,7 +18,7 @@
 #include "lib/fs/files.h"
 #include "lib/fs/path.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 static smartlist_t *config_get_file_list(const char *path,

src/lib/fs/dir.c

@@ -19,7 +19,7 @@
 #include "lib/log/win32err.h"
 #include "lib/container/smartlist.h"
 #include "lib/sandbox/sandbox.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 #include "lib/string/compat_string.h"
 

src/lib/fs/files.c

@@ -20,7 +20,7 @@
 #include "lib/log/util_bug.h"
 #include "lib/log/escape.h"
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"

src/lib/fs/lockfile.c

@@ -15,7 +15,7 @@
 #include "lib/fs/lockfile.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>

src/lib/fs/mmap.c

@@ -15,7 +15,7 @@
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
 #include "lib/string/compat_string.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_MMAP
 #include <sys/mman.h>

src/lib/fs/path.c

@@ -10,7 +10,7 @@
  **/
 
 #include "lib/fs/path.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/string/printf.h"

src/lib/fs/storagedir.c

@@ -22,7 +22,7 @@
 #include "lib/log/escape.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/memarea/memarea.h"
 #include "lib/sandbox/sandbox.h"
 #include "lib/string/printf.h"

src/lib/fs/userdb.c

@@ -12,7 +12,7 @@
 #include "lib/fs/userdb.h"
 
 #ifndef _WIN32
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 

src/lib/lock/compat_mutex.c

@@ -10,7 +10,7 @@
  **/
 
 #include "lib/lock/compat_mutex.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Return a newly allocated, ready-for-use mutex. */
 tor_mutex_t *

src/lib/lock/compat_mutex.h

@@ -14,7 +14,7 @@
 
 #include "orconfig.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)
 #include <pthread.h>

src/lib/log/escape.c

@@ -12,7 +12,7 @@
 #include "lib/log/util_bug.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 /** Allocate and return a new string representing the contents of <b>s</b>,
  * surrounded by quotes and using standard C escapes.

src/lib/log/ratelim.c

@@ -9,7 +9,7 @@
  **/
 
 #include "lib/log/ratelim.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 /** If the rate-limiter <b>lim</b> is ready at <b>now</b>, return the number

src/lib/log/torlog.c

@@ -41,7 +41,7 @@
 #include "lib/intmath/bits.h"
 #include "lib/string/compat_string.h"
 #include "lib/string/printf.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/util_string.h"
 #include "lib/wallclock/tor_gettimeofday.h"
 #include "lib/wallclock/approx_time.h"

src/lib/log/util_bug.c

@@ -15,7 +15,7 @@
 #include "lib/smartlist_core/smartlist_core.h"
 #include "lib/smartlist_core/smartlist_foreach.h"
 #endif
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/printf.h"
 
 #include <string.h>

src/lib/log/win32err.c

@@ -11,7 +11,7 @@
 #ifdef _WIN32
 #include "orconfig.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <tchar.h>
 #include <windows.h>

src/lib/malloc/include.am

@@ -6,7 +6,7 @@ noinst_LIBRARIES += src/lib/libtor-malloc-testing.a
 endif
 
 src_lib_libtor_malloc_a_SOURCES =			\
-	src/lib/malloc/util_malloc.c
+	src/lib/malloc/malloc.c
 
 if USE_OPENBSD_MALLOC
 src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c
@@ -18,4 +18,4 @@ src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_lib_libtor_malloc_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=					\
-	src/lib/malloc/util_malloc.h
+	src/lib/malloc/malloc.h

src/lib/malloc/util_malloc.c → src/lib/malloc/malloc.c

@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.c
+ * \file malloc.c
  * \brief Wrappers for C malloc code, and replacements for items that
  *   may be missing.
  **/
@@ -16,7 +16,7 @@
 
 #include "lib/testsupport/testsupport.h"
 #define UTIL_MALLOC_PRIVATE
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/cc/torint.h"
 #include "lib/err/torerr.h"
 

src/lib/malloc/util_malloc.h → src/lib/malloc/malloc.h

@@ -4,7 +4,7 @@
 /* See LICENSE for licensing information */
 
 /**
- * \file util_malloc.h
+ * \file malloc.h
  * \brief Headers for util_malloc.c
  **/
 

src/lib/memarea/memarea.c

@@ -19,7 +19,7 @@
 #include "lib/container/smartlist.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifndef DISABLE_MEMORY_SENTINELS
 

src/lib/meminfo/meminfo.c

@@ -16,7 +16,7 @@
 #include "lib/cc/torint.h"
 #include "lib/fs/files.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>

src/lib/net/address.c

@@ -44,7 +44,7 @@
 #include "lib/ctime/di_ops.h"
 #include "lib/log/torlog.h"
 #include "lib/log/escape.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/inaddr.h"
 #include "lib/string/compat_ctype.h"
 #include "lib/string/compat_string.h"

src/lib/net/resolve.c

@@ -12,7 +12,7 @@
 
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/parse_int.h"
 #include "lib/string/util_string.h"
 

src/lib/process/env.c

@@ -11,12 +11,12 @@
 #include "orconfig.h"
 #include "lib/process/env.h"
 
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/ctime/di_ops.h"
 #include "lib/container/smartlist.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

src/lib/process/setuid.c

@@ -19,7 +19,7 @@
 #include "lib/fs/userdb.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

src/lib/process/subprocess.c

@@ -16,7 +16,7 @@
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
 #include "lib/log/win32err.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/process/env.h"
 #include "lib/process/waitpid.h"
 #include "lib/string/compat_ctype.h"

src/lib/process/waitpid.c

@@ -15,7 +15,7 @@
 #include "lib/process/waitpid.h"
 #include "lib/log/torlog.h"
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "ht.h"
 
 #ifdef HAVE_SYS_WAIT_H

src/lib/sandbox/sandbox.c

@@ -39,7 +39,7 @@
 #include "lib/log/torlog.h"
 #include "lib/cc/torint.h"
 #include "lib/net/resolve.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
 #include "tor_queue.h"

src/lib/smartlist_core/smartlist_core.c

@@ -11,7 +11,7 @@
  **/
 
 #include "lib/err/torerr.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/smartlist_core/smartlist_core.h"
 
 #include <stdlib.h>

src/lib/smartlist_core/smartlist_split.c

@@ -14,7 +14,7 @@
 #include "lib/err/torerr.h"
 #include "lib/string/util_string.h"
 #include "lib/string/compat_ctype.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 

src/lib/string/printf.c

@@ -11,7 +11,7 @@
 #include "lib/string/printf.h"
 #include "lib/err/torerr.h"
 #include "lib/cc/torint.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/lib/term/getpass.c

@@ -11,7 +11,7 @@
 #include "lib/term/getpass.h"
 
 #include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #ifdef _WIN32
 #include <windows.h>

src/test/test-memwipe.c

@@ -5,7 +5,7 @@
 #include "lib/crypt_ops/crypto_util.h"
 
 #include "lib/intmath/cmp.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 
 #include <string.h>
 #include <stdio.h>

src/test/test_crypto_openssl.c

@@ -10,7 +10,7 @@
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/encoding/binascii.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "test/test.h"
 
 #include <openssl/evp.h>

src/tools/tor-gencert.c

@@ -39,7 +39,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/encoding/time_fmt.h"
 #include "lib/fs/files.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/inaddr.h"
 #include "lib/net/resolve.h"

src/tools/tor-resolve.c

@@ -7,7 +7,7 @@
 
 #include "lib/arch/bytes.h"
 #include "lib/log/torlog.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/net/address.h"
 #include "lib/net/resolve.h"
 #include "lib/net/socket.h"

src/trunnel/trunnel-local.h

@@ -3,7 +3,7 @@
 #define TRUNNEL_LOCAL_H_INCLUDED
 
 #include "lib/crypt_ops/crypto_util.h"
-#include "lib/malloc/util_malloc.h"
+#include "lib/malloc/malloc.h"
 #include "lib/log/util_bug.h"
 
 #define trunnel_malloc tor_malloc