Rename log.h to torlog.h

This should make us conflict less with system files named "log.h".
Yes, we shouldn't have been conflicting with those anyway, but some
people's compilers act very oddly.

The actual change was done with one "git mv", by editing
Makefile.am, and running
   find . -name '*.[ch]' | xargs perl -i -pe 'if (/^#include.*\Wlog.h/) {s/log.h/torlog.h/; }'

diff --git a/changes/RemoveLogHeader b/changes/RemoveLogHeader
new file mode 100644 (file)
index 0000000..d93c9ff
--- /dev/null
+++ b/changes/RemoveLogHeader
@@ -0,0 +1,4 @@
+  o Code simplifications and refactoring:
+    - Rename the "log.h" header to "torlog.h" so as to conflict with fewer
+      system headers.
+

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index eecfeb83fe258232ef0e1aff246598a1ab0009a2..b1e03cd7101336b3ed028931761d9f1997d6d836 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -16,7 +16,7 @@ libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \
 libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c
 libor_event_a_SOURCES = compat_libevent.c
 
-noinst_HEADERS = address.h log.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h
+noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h
 
 common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS)
        if test "@SHA1SUM@" != none; then \

diff --git a/src/common/address.c b/src/common/address.c
index 4569373f3b926c83d6055ab357021c494cafe169..c35f04c18b3f72d47a18ba1c1593894ddfd05c33 100644 (file)
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -12,7 +12,7 @@
 #include "compat.h"
 #include "util.h"
 #include "address.h"
-#include "log.h"
+#include "torlog.h"
 
 #ifdef MS_WINDOWS
 #include <process.h>

diff --git a/src/common/aes.c b/src/common/aes.c
index 2b6f0234b7f0575922e3445568fb776fd223dde6..a17328317e05b3bf878807c4073121195e261189 100644 (file)
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -21,7 +21,7 @@
 #include "compat.h"
 #include "aes.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 
 /* We have 3 strategies for getting AES: Via OpenSSL's AES_encrypt function,
  * via OpenSSL's EVP_EncryptUpdate function, or via the built-in AES

diff --git a/src/common/compat.c b/src/common/compat.c
index 7b79c5cc3edce0014ba8e2289f36fb85c02bb8bc..ebe8c03e33ed2fdbd956577583ff7cf2875d70e7 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -88,7 +88,7 @@
 #include <sys/prctl.h>
 #endif
 
-#include "log.h"
+#include "torlog.h"
 #include "util.h"
 #include "container.h"
 #include "address.h"

diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 1532392279cca772515babf1866e09d729a5bc28..5cdd687cf0247469c4a9f8b6ce95b88002c2fe0c 100644 (file)
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -15,7 +15,7 @@
 #include "compat_libevent.h"
 
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
 #include <event2/event.h>

diff --git a/src/common/container.c b/src/common/container.c
index ab5a9b0325b8792432e2c8246dea5a696e0c7582..72f3470344caf7fba8e0911a40f08310b5585bbe 100644 (file)
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -13,7 +13,7 @@
 
 #include "compat.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 #include "crypto.h"
 

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 1d75555b2f0d422e4bc1028cf17bf4d16ce90ec5..bfb81d3ccdd644eb25542bc723a341f61008406f 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -50,7 +50,7 @@
 
 #define CRYPTO_PRIVATE
 #include "crypto.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 #include "aes.h"
 #include "../common/util.h"
 #include "container.h"

diff --git a/src/common/log.c b/src/common/log.c
index 6bf94721f8e6f1692d19d669718b7b9f5af9daff..b639e7a7814bb9921c748310dfb6141406b433df 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -33,7 +33,7 @@
 #include "compat.h"
 #include "util.h"
 #define LOG_PRIVATE
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 
 #define TRUNCATED_STR "[...truncated]"

diff --git a/src/common/memarea.c b/src/common/memarea.c
index 0402e5f2089878c02a93ca464f153530c6730c0d..77579e63be52023972ca1d4dc20094cd99f4caf1 100644 (file)
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -11,7 +11,7 @@
 #include "memarea.h"
 #include "util.h"
 #include "compat.h"
-#include "log.h"
+#include "torlog.h"
 
 /** If true, we try to detect any attempts to write beyond the length of a
  * memarea. */

diff --git a/src/common/mempool.c b/src/common/mempool.c
index 256388a9fdcae02be3c23b15f73efc4f7958112b..c795d83f0cbe3006afab928c309a0aa6161cbe25 100644 (file)
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -65,7 +65,7 @@
 #include "orconfig.h"
 #include "util.h"
 #include "compat.h"
-#include "log.h"
+#include "torlog.h"
 #define ALLOC(x) tor_malloc(x)
 #define FREE(x) tor_free(x)
 #define ASSERT(x) tor_assert(x)

diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 9ebddf07b70dcf7b7c24ab3633b0fd2f15865350..a247d6c1778a28a3f5e8ecc4f529f9c00d71bb48 100644 (file)
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -20,7 +20,7 @@
 
 #include "torint.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "torgzip.h"
 
 /* zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of

diff --git a/src/common/log.h b/src/common/torlog.h
similarity index 100%
rename from src/common/log.h
rename to src/common/torlog.h

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 6732d55b8aaaf00dbe1329168aadcfd4d047af5c..b3c91a6ca6a0a7e05b160a344176434c7150ba76 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -38,7 +38,7 @@
 #include "crypto.h"
 #include "tortls.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #include "container.h"
 #include "ht.h"
 #include <string.h>

diff --git a/src/common/util.c b/src/common/util.c
index 8531d12ebae7ccd360e60d99b2d7cff2d2f25922..6830ef3aa4492e51e679883919870970c41ca9ce 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -15,7 +15,7 @@
 
 #include "orconfig.h"
 #include "util.h"
-#include "log.h"
+#include "torlog.h"
 #undef log
 #include "crypto.h"
 #include "torint.h"

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 970c1888c1c40503e0abec6eedd11d9c61009003..c4ebc8135f2e10c86c90b29f8e2ad5202636ea4e 100644 (file)
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -13,7 +13,7 @@
 #define BUFFERS_PRIVATE
 #include "or.h"
 #include "../common/util.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/or/or.h b/src/or/or.h
index 60987698b49c3db0e8f5881732e8a4715791e65b..2124d457efc6c8471a1a634572f038857fc339cb 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -82,7 +82,7 @@
 
 #include "crypto.h"
 #include "tortls.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 #include "compat.h"
 #include "container.h"
 #include "util.h"

diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c
index a24412499140df1b37aca317e309e04f5a119c20..94c8cbd44cac6d22e0fe294510d35a7134cd10d4 100644 (file)
--- a/src/tools/tor-checkkey.c
+++ b/src/tools/tor-checkkey.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "crypto.h"
-#include "log.h"
+#include "torlog.h"
 #include "../common/util.h"
 #include "compat.h"
 #include <openssl/bn.h>

diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 13a640cb8b9d20f7621a6f727679e9f96c0f4089..bc99c24bd7d4c5e43c4d6e80dfc48b329b10701c 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -29,7 +29,7 @@
 
 #include "compat.h"
 #include "../common/util.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 #include "crypto.h"
 #include "address.h"
 

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 2639d9e5997123a3c7d9667d60e33ac6e5aca45f..f5b0becaff2c7e6ed7ef6be4b3641ba845c90d38 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -8,7 +8,7 @@
 #include "compat.h"
 #include "../common/util.h"
 #include "address.h"
-#include "../common/log.h"
+#include "../common/torlog.h"
 
 #include <stdio.h>
 #include <stdlib.h>