diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-07-10 15:20:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-07-10 15:20:30 -0400 |
commit | e7f5f48d68553206b95cbb4f610702c887500124 (patch) | |
tree | 75cbf04d94e08c92d48f3518d506ec1166e862df /src/lib/log | |
parent | 41640b65735ec6214aa5080c2143b0982a59bb93 (diff) | |
download | tor-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/log')
-rw-r--r-- | src/lib/log/include.am | 4 | ||||
-rw-r--r-- | src/lib/log/log.c (renamed from src/lib/log/torlog.c) | 4 | ||||
-rw-r--r-- | src/lib/log/log.h (renamed from src/lib/log/torlog.h) | 2 | ||||
-rw-r--r-- | src/lib/log/util_bug.c | 2 | ||||
-rw-r--r-- | src/lib/log/util_bug.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/log/include.am b/src/lib/log/include.am index f0491b3863..b5a1c5ca26 100644 --- a/src/lib/log/include.am +++ b/src/lib/log/include.am @@ -8,7 +8,7 @@ endif src_lib_libtor_log_a_SOURCES = \ src/lib/log/escape.c \ src/lib/log/ratelim.c \ - src/lib/log/torlog.c \ + src/lib/log/log.c \ src/lib/log/util_bug.c if WIN32 @@ -26,6 +26,6 @@ src/lib/log/torlog.$(OBJEXT) \ noinst_HEADERS += \ src/lib/log/escape.h \ src/lib/log/ratelim.h \ - src/lib/log/torlog.h \ + src/lib/log/log.h \ src/lib/log/util_bug.h \ src/lib/log/win32err.h diff --git a/src/lib/log/torlog.c b/src/lib/log/log.c index 46d1217554..b89747d844 100644 --- a/src/lib/log/torlog.c +++ b/src/lib/log/log.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file torlog.c + * \file log.c * \brief Functions to send messages to log files or the console. **/ @@ -31,7 +31,7 @@ #endif #define LOG_PRIVATE -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/log/ratelim.h" #include "lib/lock/compat_mutex.h" #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/log/torlog.h b/src/lib/log/log.h index c24b638191..493409756f 100644 --- a/src/lib/log/torlog.h +++ b/src/lib/log/log.h @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */ /** - * \file torlog.h + * \file log.h * * \brief Headers for log.c **/ diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index e3c8df0d64..42b3670a71 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -9,7 +9,7 @@ #include "orconfig.h" #include "lib/log/util_bug.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/err/backtrace.h" #ifdef TOR_UNIT_TESTS #include "lib/smartlist_core/smartlist_core.h" diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index a0753c807b..61ee60f729 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -38,7 +38,7 @@ #include "orconfig.h" #include "lib/cc/compat_compiler.h" -#include "lib/log/torlog.h" +#include "lib/log/log.h" #include "lib/testsupport/testsupport.h" /* Replace assert() with a variant that sends failures to the log before |