summaryrefslogtreecommitdiff
path: root/src/lib/container
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:16:57 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:16:57 -0400
commit41640b65735ec6214aa5080c2143b0982a59bb93 (patch)
treeb65163e29bd3960342b4977bde86dec4f9ef6b72 /src/lib/container
parent9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 (diff)
downloadtor-41640b65735ec6214aa5080c2143b0982a59bb93.tar.gz
tor-41640b65735ec6214aa5080c2143b0982a59bb93.zip
Rename util_malloc to malloc.
Diffstat (limited to 'src/lib/container')
-rw-r--r--src/lib/container/bitarray.h2
-rw-r--r--src/lib/container/bloomfilt.c2
-rw-r--r--src/lib/container/buffers.c2
-rw-r--r--src/lib/container/handles.h2
-rw-r--r--src/lib/container/map.c2
-rw-r--r--src/lib/container/smartlist.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/container/bitarray.h b/src/lib/container/bitarray.h
index 172d56cc06..ae82a4ab4d 100644
--- 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 1cab817e18..ea2d2917c7 100644
--- 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 5849704e35..525747a4c9 100644
--- 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 21ec0dfeec..7144e1720d 100644
--- 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 0602eac891..85e074e10a 100644
--- 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 c3abbff513..dc283e5f50 100644
--- 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"