summaryrefslogtreecommitdiff
path: root/src/lib/encoding
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/encoding
parent9ec80909ec7be3d9eea863dfc3f320bfe9072ae8 (diff)
downloadtor-41640b65735ec6214aa5080c2143b0982a59bb93.tar.gz
tor-41640b65735ec6214aa5080c2143b0982a59bb93.zip
Rename util_malloc to malloc.
Diffstat (limited to 'src/lib/encoding')
-rw-r--r--src/lib/encoding/binascii.c2
-rw-r--r--src/lib/encoding/confline.c2
-rw-r--r--src/lib/encoding/cstring.c2
-rw-r--r--src/lib/encoding/time_fmt.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c
index df9bb4a813..7499d64720 100644
--- 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 3486b6a82b..9b17629537 100644
--- 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 994a52e70c..3e0db712f9 100644
--- 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 c2ff34a91a..8ce15e7477 100644
--- 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"