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/; }'
This commit is contained in:
Nick Mathewson 2010-07-09 21:52:20 -04:00
parent c3febf8660
commit 14bc4dcc22
20 changed files with 22 additions and 18 deletions

4
changes/RemoveLogHeader Normal file
View File

@ -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.

View File

@ -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 \

View File

@ -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>

View File

@ -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

View File

@ -88,7 +88,7 @@
#include <sys/prctl.h>
#endif
#include "log.h"
#include "torlog.h"
#include "util.h"
#include "container.h"
#include "address.h"

View File

@ -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>

View File

@ -13,7 +13,7 @@
#include "compat.h"
#include "util.h"
#include "log.h"
#include "torlog.h"
#include "container.h"
#include "crypto.h"

View File

@ -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"

View File

@ -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]"

View File

@ -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. */

View File

@ -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)

View File

@ -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

View File

@ -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>

View File

@ -15,7 +15,7 @@
#include "orconfig.h"
#include "util.h"
#include "log.h"
#include "torlog.h"
#undef log
#include "crypto.h"
#include "torint.h"

View File

@ -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

View File

@ -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"

View File

@ -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>

View File

@ -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"

View File

@ -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>