aboutsummaryrefslogtreecommitdiff
path: root/src/lib/log
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/log
parent9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 (diff)
downloadtor-41640b65735ec6214aa5080c2143b0982a59bb93.tar.gz
tor-41640b65735ec6214aa5080c2143b0982a59bb93.zip
Rename util_malloc to malloc.
Diffstat (limited to 'src/lib/log')
-rw-r--r--src/lib/log/escape.c2
-rw-r--r--src/lib/log/ratelim.c2
-rw-r--r--src/lib/log/torlog.c2
-rw-r--r--src/lib/log/util_bug.c2
-rw-r--r--src/lib/log/win32err.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/log/escape.c b/src/lib/log/escape.c
index b6b20183ba..37d7e0fdc4 100644
--- 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 fba702d7f0..2d0e8b17ca 100644
--- 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 1c9f33790d..46d1217554 100644
--- 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 78af08f022..e3c8df0d64 100644
--- 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 6603ed4648..41f563bfa5 100644
--- 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>