Rename util_malloc to malloc.

diff --git a/src/core/or/or.h b/src/core/or/or.h
index 2e419eefd5e006a457d80e4b9ea445d2a243c57c..9aca030c744c686b44ef02e1c9d327c477cdf2b4 100644 (file)
--- a/src/core/or/or.h
+++ b/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"

diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index e87e788f14e141c1ee7c2211cd05ac026b6b798a..ff1aea47a46212b8b41016cbf8e9c9546f0f6735 100644 (file)
--- a/src/lib/compress/compress.c
+++ b/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. */

diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c
index 3b6f91b84b68c234e384cfe399748d8927f07ea9..9091832ed3e59f1008cb2db4b41ae72844e41875 100644 (file)
--- a/src/lib/compress/compress_lzma.c
+++ b/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

diff --git a/src/lib/container/bitarray.h b/src/lib/container/bitarray.h
index 172d56cc0652a3022896f95e90f1e30c3f44eacf..ae82a4ab4d8aa9802f3ba83ff09920d47f23a684 100644 (file)
--- a/src/lib/container/bitarray.h
+++ b/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

diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c
index 1cab817e1838f11f01a9ff86b83fd16ec5fce8ce..ea2d2917c77c2187cb7914fd698022ea38a4768a 100644 (file)
--- a/src/lib/container/bloomfilt.c
+++ b/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"

diff --git a/src/lib/container/buffers.c b/src/lib/container/buffers.c
index 5849704e3550f87f5a4fafc2b5580751d85ead01..525747a4c9ffef870e5475fce3c6f2a815c7870a 100644 (file)
--- a/src/lib/container/buffers.c
+++ b/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"
 

diff --git a/src/lib/container/handles.h b/src/lib/container/handles.h
index 21ec0dfeecfe439079f75ab4855fd990b43354e6..7144e1720df26b770c62b686182e6afb2ed21afa 100644 (file)
--- a/src/lib/container/handles.h
+++ b/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

diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index 0602eac89101952e9de0c49a75d0e2ea22edabca..85e074e10a20b6a25da8ff4e78d8dd6f07ef3774 100644 (file)
--- a/src/lib/container/map.c
+++ b/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"
 

diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c
index c3abbff513007e296a0916dbd2f4bb9aad891c14..dc283e5f509ecdcf396bdf2c34289abaf0e02663 100644 (file)
--- a/src/lib/container/smartlist.c
+++ b/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"

diff --git a/src/lib/crypt_ops/aes.h b/src/lib/crypt_ops/aes.h
index a57654159a4df33fe1f97f6033fd57da27004d24..578a1a65a2f761e48d3019ae0ed99a2e7ace68ba 100644 (file)
--- a/src/lib/crypt_ops/aes.h
+++ b/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;
 

diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h
index 15bc5ad5b9dd91db7b0b2acdd6a23be9fad808a3..9facf3b9810a80fe8fae915398a603bcf6e08405 100644 (file)
--- a/src/lib/crypt_ops/crypto_digest.h
+++ b/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. */

diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 6f479b013b509b43b158eedff8d264034ec32327..e2d72a77c0bc585ebc5001c1a5e847e4171e97c5 100644 (file)
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/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"

diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c
index 287ff6080a5dc9f5e35fc159f5fa902faeb16cdc..011baf2654c85dcfb1420c638875d410ea0eba58 100644 (file)
--- a/src/lib/ctime/di_ops.c
+++ b/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>
 

diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c
index df9bb4a8134e80edda91ad2b1ef0ae208ed80c1b..7499d64720f0dbe2bc7462548d60adb30cddd5c8 100644 (file)
--- a/src/lib/encoding/binascii.c
+++ b/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>

diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c
index 3486b6a82ba43b265718f2e3322608234dec6dfa..9b17629537b6fa04610708ef10c263f4b0887e4c 100644 (file)
--- a/src/lib/encoding/confline.c
+++ b/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"

diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c
index 994a52e70cd02c9de44cf28944527c78205b5172..3e0db712f922bf0199dcd24fec140a94b932953d 100644 (file)
--- a/src/lib/encoding/cstring.c
+++ b/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>

diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index c2ff34a91afa90faa09262cdbadb6f179e841cdc..8ce15e7477f540d32dcbcc71595f2e21fd425b87 100644 (file)
--- a/src/lib/encoding/time_fmt.c
+++ b/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"

diff --git a/src/lib/evloop/compat_libevent.h b/src/lib/evloop/compat_libevent.h
index 7a5469047cdb27891ce74097c8964169498079c3..5fda49f7417d1add218afd99f8254f12af0357d3 100644 (file)
--- a/src/lib/evloop/compat_libevent.h
+++ b/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);

diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c
index a923fbad7472a731001b4fb0b5db22dd243234b8..53c458f159b1d95a8e433681e462e2bc7217e106 100644 (file)
--- a/src/lib/evloop/procmon.c
+++ b/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

diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index c07bd2e72681ca953ff57c6744980e5e280d4177..4580b89e3c61d3e1b5e9d7783b3a01a5dadf6b8a 100644 (file)
--- a/src/lib/evloop/timers.c
+++ b/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

diff --git a/src/lib/fs/conffile.c b/src/lib/fs/conffile.c
index 600c7f6b703e993d2e473547dda22f9452e89983..3a4d95f4508c8e724b425b1eb2f4023acde9d1f7 100644 (file)
--- a/src/lib/fs/conffile.c
+++ b/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,

diff --git a/src/lib/fs/dir.c b/src/lib/fs/dir.c
index cc339f747e19a8b4b75f77b33d2f94cf9d9afe29..0f2a5e2359a27b6a6b3420f8dba626b7b627eb2c 100644 (file)
--- a/src/lib/fs/dir.c
+++ b/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"
 

diff --git a/src/lib/fs/files.c b/src/lib/fs/files.c
index 4e0a398baa993a1dd0f8025847d0303fdd14e488..9012fd64f2e7272ffbd62eebbe1a4b6bed1ee365 100644 (file)
--- a/src/lib/fs/files.c
+++ b/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"

diff --git a/src/lib/fs/lockfile.c b/src/lib/fs/lockfile.c
index 972fd5658d422d459c4763014c9eb5586d272c05..a4e3c427dbc10897e57fef94e347a20bbc5787ea 100644 (file)
--- a/src/lib/fs/lockfile.c
+++ b/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>

diff --git a/src/lib/fs/mmap.c b/src/lib/fs/mmap.c
index 2d758c1b5f942b671852c9f2f3af2295561c7698..7d91945bb9d25a7fbc44b64821a03c692633770b 100644 (file)
--- a/src/lib/fs/mmap.c
+++ b/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>

diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 708ff0505a7af0c58a6c04a29b91a39885c70f7f..9b32b2ebd3d9a6f0dd2dc7961af6d19f76f3e3fb 100644 (file)
--- a/src/lib/fs/path.c
+++ b/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"

diff --git a/src/lib/fs/storagedir.c b/src/lib/fs/storagedir.c
index 1cda2374d8526255bc2375b2c007bae4ce7b8919..4db56b02f86d286c4456a7d58cebc5bb77ab150c 100644 (file)
--- a/src/lib/fs/storagedir.c
+++ b/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"

diff --git a/src/lib/fs/userdb.c b/src/lib/fs/userdb.c
index 3d7a9da59d9ca4f1eada928961465bf426a58371..1e772b8fbd2c4c921a75eb4949309b7c29248b5b 100644 (file)
--- a/src/lib/fs/userdb.c
+++ b/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"
 

diff --git a/src/lib/lock/compat_mutex.c b/src/lib/lock/compat_mutex.c
index bfab6dd29b91f3d549c5d5aee3f013a759dec34f..b53676cf4921f6afc16ce6d20e25a89337d138fb 100644 (file)
--- a/src/lib/lock/compat_mutex.c
+++ b/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 *

diff --git a/src/lib/lock/compat_mutex.h b/src/lib/lock/compat_mutex.h
index f467aa5dba1f043a1a0873fbb085dfb71e21052c..f8689422b1b549197d26f423b027ab77a2d9d164 100644 (file)
--- a/src/lib/lock/compat_mutex.h
+++ b/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>

diff --git a/src/lib/log/escape.c b/src/lib/log/escape.c
index b6b20183bacdcd9b2019a33083a4599b1b35fa91..37d7e0fdc488be782cefe9a383064300402252e0 100644 (file)
--- a/src/lib/log/escape.c
+++ b/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.

diff --git a/src/lib/log/ratelim.c b/src/lib/log/ratelim.c
index fba702d7f0104f733ad6ec452b0ce557c37690ca..2d0e8b17ca185fe87eae4d1b3dd5066b3473bfde 100644 (file)
--- a/src/lib/log/ratelim.c
+++ b/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

diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c
index 1c9f33790d983a2033d3774aae1823aeafb66e24..46d121755408030a03bafb588fbe0c0f06b45dfa 100644 (file)
--- a/src/lib/log/torlog.c
+++ b/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"

diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c
index 78af08f0226accc33255a04542f09d037723f03b..e3c8df0d6474cd3cfc7a4cc84a49b5565d105db9 100644 (file)
--- a/src/lib/log/util_bug.c
+++ b/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>

diff --git a/src/lib/log/win32err.c b/src/lib/log/win32err.c
index 6603ed4648fdb7eb31551373bffadbf06cf89878..41f563bfa551264cf85825ef0899318448423291 100644 (file)
--- a/src/lib/log/win32err.c
+++ b/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>

diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am
index 50de9cb736bcca0126e54401c4a70198a7a4021e..502cc1c6b708b7bab5918ebf229b1d107b939eae 100644 (file)
--- a/src/lib/malloc/include.am
+++ b/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

diff --git a/src/lib/malloc/util_malloc.c b/src/lib/malloc/malloc.c
similarity index 99%
rename from src/lib/malloc/util_malloc.c
rename to src/lib/malloc/malloc.c
index f3b0e50c70b0ce2a30e54f92f8896633cec47f10..271e84071a5ef1518e04ae5800a25136d0ebd178 100644 (file)
--- a/src/lib/malloc/util_malloc.c
+++ b/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"
 

diff --git a/src/lib/malloc/util_malloc.h b/src/lib/malloc/malloc.h
similarity index 99%
rename from src/lib/malloc/util_malloc.h
rename to src/lib/malloc/malloc.h
index a1e953117653a01109dfe547a1d83218c88b05d6..26ee30742e6e15330cfb41106453899a341bcec9 100644 (file)
--- a/src/lib/malloc/util_malloc.h
+++ b/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
  **/
 

diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index 9d494ab2d40484501328f341b9ca57611923894d..3a93d89ee27c133a4d42e1d2c600c2050889b2bb 100644 (file)
--- a/src/lib/memarea/memarea.c
+++ b/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
 

diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c
index b5a74ce6246f517e3de3f4dba810b83f9b31c7a9..01080367fa35120d28fcdbd6cf9858ffb70521ae 100644 (file)
--- a/src/lib/meminfo/meminfo.c
+++ b/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>

diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index 3b624da096a69f2c25831693f1ac7648112a0306..ca0c2a46c4e218c1621e56e5fbc022c83c0e358e 100644 (file)
--- a/src/lib/net/address.c
+++ b/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"

diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c
index ff9c93989aa7a4eb8e120c4910b3d3ed71e4e2dd..7c8df3e3077e39802c02e1f108e4149dd4312cbd 100644 (file)
--- a/src/lib/net/resolve.c
+++ b/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"
 

diff --git a/src/lib/process/env.c b/src/lib/process/env.c
index 244cd4a4eb3e9de2ea420b4d4b0fa1d79bb1429a..5b959d05f8d84815bd888d8f7ea8978f2cfefb3b 100644 (file)
--- a/src/lib/process/env.c
+++ b/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>

diff --git a/src/lib/process/setuid.c b/src/lib/process/setuid.c
index 5423259a66638487ba295cb5f8e68b10a5b9f4f1..13b352dad0a67c291aca2c0dd7b46b14f03f51ca 100644 (file)
--- a/src/lib/process/setuid.c
+++ b/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>

diff --git a/src/lib/process/subprocess.c b/src/lib/process/subprocess.c
index 9a12f5e76ea8a9a79c3c513860e6a3344fbffa59..d2bbb61c343f551ebef1556174626eb92894cc62 100644 (file)
--- a/src/lib/process/subprocess.c
+++ b/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"

diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c
index 27f69b08f0a4766f6d015543e7f6b2dcb1cb8840..b829cb1b094287bf92aad1273e6b9f1e890b9628 100644 (file)
--- a/src/lib/process/waitpid.c
+++ b/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

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 25dd6d1c26f18ea312d4b9e9ee6347488b4d4783..7768bee06e218daddb4c9fd4aec8aaab55a4e54f 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/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"

diff --git a/src/lib/smartlist_core/smartlist_core.c b/src/lib/smartlist_core/smartlist_core.c
index b9c5f728ce12e78c5b64e903180f67887315d526..8364a8180ba4cd84a7bbb7b0e55243938445e279 100644 (file)
--- a/src/lib/smartlist_core/smartlist_core.c
+++ b/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>

diff --git a/src/lib/smartlist_core/smartlist_split.c b/src/lib/smartlist_core/smartlist_split.c
index 9c8368f665fa28de08e6d156f69fbaacf512930d..f63894869cefa8a3a7402244e1bd3b3f1020da09 100644 (file)
--- a/src/lib/smartlist_core/smartlist_split.c
+++ b/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>
 

diff --git a/src/lib/string/printf.c b/src/lib/string/printf.c
index f8be3b4704c5bb091a3dd67e79dfc84be97f4538..82d38242dd525debd7eb34371591a0571fa7b5e4 100644 (file)
--- a/src/lib/string/printf.c
+++ b/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>

diff --git a/src/lib/term/getpass.c b/src/lib/term/getpass.c
index 590411b715796c3861712f2955209c833aaad0de..27a27179b6656000ae2d0bd0ee2395a1c6254a25 100644 (file)
--- a/src/lib/term/getpass.c
+++ b/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>

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 8a4610e9047e4fce3835982fc869c7afee98dc57..c879013ed650fd7c338a2ce551dd63b8c0d73cf2 100644 (file)
--- a/src/test/test-memwipe.c
+++ b/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>

diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c
index b1a5613eaff6fe0a18244fba108151ca30053ad6..92f9cbab2f8eb8c05bd6cbf97701c7ec15799268 100644 (file)
--- a/src/test/test_crypto_openssl.c
+++ b/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>

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index efae621d09e96a144e7af49ec6b09ae3ac1495da..0e3ab240838c9135d2155c13b01b0d6ff0d6ffbd 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/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"

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 9358cc8a6e1d4f334956d6fa49e87f9eef740960..a4d5184b4ab9f8761ef24bd378d3aedf5b7b8fc1 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/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"

diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index e81396aeea597e0f2bf26cec8d4764e8956df121..c4118fce4c3535dcf32782fbe8ccca77c1c6a128 100644 (file)
--- a/src/trunnel/trunnel-local.h
+++ b/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