aboutsummaryrefslogtreecommitdiff
path: root/src/lib/encoding
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-10 15:20:28 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-10 15:20:30 -0400
commite7f5f48d68553206b95cbb4f610702c887500124 (patch)
tree75cbf04d94e08c92d48f3518d506ec1166e862df /src/lib/encoding
parent41640b65735ec6214aa5080c2143b0982a59bb93 (diff)
downloadtor-e7f5f48d68553206b95cbb4f610702c887500124.tar.gz
tor-e7f5f48d68553206b95cbb4f610702c887500124.zip
Rename torlog.[ch] to log.[ch]
Fun fact: these files used to be called log.[ch] until we ran into conflicts with systems having a log.h file. But now that we always include "lib/log/log.h", we should be fine.
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/keyval.c2
-rw-r--r--src/lib/encoding/time_fmt.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/encoding/binascii.c b/src/lib/encoding/binascii.c
index 7499d64720..e9140d9432 100644
--- a/src/lib/encoding/binascii.c
+++ b/src/lib/encoding/binascii.c
@@ -14,7 +14,7 @@
#include "orconfig.h"
#include "lib/encoding/binascii.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/cc/torint.h"
#include "lib/string/compat_ctype.h"
diff --git a/src/lib/encoding/confline.c b/src/lib/encoding/confline.c
index 9b17629537..dd5193d3a7 100644
--- a/src/lib/encoding/confline.c
+++ b/src/lib/encoding/confline.c
@@ -17,7 +17,7 @@
#include "lib/encoding/confline.h"
#include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"
#include "lib/string/compat_ctype.h"
diff --git a/src/lib/encoding/cstring.c b/src/lib/encoding/cstring.c
index 3e0db712f9..69aa7f3da5 100644
--- a/src/lib/encoding/cstring.c
+++ b/src/lib/encoding/cstring.c
@@ -11,7 +11,7 @@
**/
#include "lib/encoding/cstring.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"
#include "lib/string/compat_ctype.h"
diff --git a/src/lib/encoding/keyval.c b/src/lib/encoding/keyval.c
index 53ee776fe7..d5e4e4e438 100644
--- a/src/lib/encoding/keyval.c
+++ b/src/lib/encoding/keyval.c
@@ -12,7 +12,7 @@
#include "orconfig.h"
#include "lib/encoding/keyval.h"
#include "lib/log/escape.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/util_bug.h"
#include <stdlib.h>
diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index 8ce15e7477..42b1cc646b 100644
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -15,7 +15,7 @@
**/
#include "lib/encoding/time_fmt.h"
-#include "lib/log/torlog.h"
+#include "lib/log/log.h"
#include "lib/log/escape.h"
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"