aboutsummaryrefslogtreecommitdiff
path: root/src/lib/malloc
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/malloc
parent9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 (diff)
downloadtor-41640b65735ec6214aa5080c2143b0982a59bb93.tar.gz
tor-41640b65735ec6214aa5080c2143b0982a59bb93.zip
Rename util_malloc to malloc.
Diffstat (limited to 'src/lib/malloc')
-rw-r--r--src/lib/malloc/include.am4
-rw-r--r--src/lib/malloc/malloc.c (renamed from src/lib/malloc/util_malloc.c)4
-rw-r--r--src/lib/malloc/malloc.h (renamed from src/lib/malloc/util_malloc.h)2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am
index 50de9cb736..502cc1c6b7 100644
--- 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
index f3b0e50c70..271e84071a 100644
--- 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
index a1e9531176..26ee30742e 100644
--- 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
**/