commit da4ae8a6b6bc45f301c1493bb55b09e2f1209ac2 parent 97b15a1d7c51764888d2172711e3f3a71fb01916 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 22 Jun 2018 10:32:10 -0400 Automated fixup of include paths after torlog.h movement. Diffstat:
54 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/src/common/address.c b/src/common/address.c @@ -39,7 +39,7 @@ #include "common/util.h" #include "common/util_format.h" #include "common/address.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/container/smartlist.h" #include "common/sandbox.h" #include "siphash.h" diff --git a/src/common/buffers.c b/src/common/buffers.c @@ -26,7 +26,7 @@ #include "lib/compress/compress.h" #include "common/util.h" #include "lib/cc/torint.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/common/compat.c b/src/common/compat.c @@ -124,7 +124,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) #include <sys/file.h> #endif -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "lib/container/smartlist.h" #include "common/address.h" diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include <event2/event.h> #include <event2/thread.h> diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c @@ -16,7 +16,7 @@ #include <time.h> #include "common/compat.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" /** Wraps a void (*)(void*) function and its argument so we can diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c @@ -17,7 +17,7 @@ #include "common/compat_threads.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #ifdef HAVE_SYS_EVENTFD_H #include <sys/eventfd.h> diff --git a/src/common/compat_time.c b/src/common/compat_time.c @@ -35,7 +35,7 @@ #endif #include "lib/err/torerr.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #ifdef _WIN32 diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c @@ -16,7 +16,7 @@ #include <windows.h> #include <process.h> #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" /* This value is more or less total cargo-cult */ #define SPIN_COUNT 2000 diff --git a/src/common/confline.c b/src/common/confline.c @@ -6,7 +6,7 @@ #include "common/compat.h" #include "common/confline.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "lib/container/smartlist.h" diff --git a/src/common/memarea.c b/src/common/memarea.c @@ -12,7 +12,7 @@ #include "common/memarea.h" #include "common/util.h" #include "common/compat.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #ifndef DISABLE_MEMORY_SENTINELS diff --git a/src/common/procmon.h b/src/common/procmon.h @@ -12,7 +12,7 @@ #include "common/compat.h" #include "common/compat_libevent.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" typedef struct tor_process_monitor_t tor_process_monitor_t; diff --git a/src/common/sandbox.c b/src/common/sandbox.c @@ -35,7 +35,7 @@ #include "common/sandbox.h" #include "lib/container/map.h" #include "lib/err/torerr.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/cc/torint.h" #include "common/util.h" #include "tor_queue.h" diff --git a/src/common/storagedir.c b/src/common/storagedir.c @@ -7,7 +7,7 @@ #include "common/memarea.h" #include "common/sandbox.h" #include "common/storagedir.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #ifdef HAVE_SYS_TYPES_H diff --git a/src/common/timers.c b/src/common/timers.c @@ -34,7 +34,7 @@ #include "common/compat.h" #include "common/compat_libevent.h" #include "common/timers.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" struct timeout_cb { diff --git a/src/common/util.c b/src/common/util.c @@ -15,7 +15,7 @@ #endif #define UTIL_PRIVATE #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/cc/torint.h" #include "lib/container/smartlist.h" diff --git a/src/common/util_bug.c b/src/common/util_bug.c @@ -9,7 +9,7 @@ #include "orconfig.h" #include "common/util_bug.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/err/backtrace.h" #ifdef TOR_UNIT_TESTS #include "lib/container/smartlist.h" diff --git a/src/common/util_format.c b/src/common/util_format.c @@ -13,7 +13,7 @@ #include "orconfig.h" #include <stddef.h> -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/util_format.h" #include "lib/cc/torint.h" diff --git a/src/common/util_process.c b/src/common/util_process.c @@ -21,7 +21,7 @@ #include "common/compat.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util_process.h" #include "ht.h" diff --git a/src/common/workqueue.c b/src/common/workqueue.c @@ -31,7 +31,7 @@ #include "common/util.h" #include "common/workqueue.h" #include "tor_queue.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include <event2/event.h> diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c @@ -20,7 +20,7 @@ #endif #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/compress/compress.h" #include "lib/compress/compress_lzma.h" #include "lib/compress/compress_none.h" diff --git a/src/lib/compress/compress_lzma.c b/src/lib/compress/compress_lzma.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/compress/compress.h" #include "lib/compress/compress_lzma.h" diff --git a/src/lib/compress/compress_none.c b/src/lib/compress/compress_none.c @@ -17,7 +17,7 @@ #include "orconfig.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/compress/compress.h" #include "lib/compress/compress_none.h" diff --git a/src/lib/compress/compress_zlib.c b/src/lib/compress/compress_zlib.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/compress/compress.h" #include "lib/compress/compress_zlib.h" diff --git a/src/lib/compress/compress_zstd.c b/src/lib/compress/compress_zstd.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/compress/compress.h" #include "lib/compress/compress_zstd.h" diff --git a/src/lib/crypt_ops/aes.c b/src/lib/crypt_ops/aes.c @@ -38,7 +38,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include "common/compat.h" #include "lib/crypt_ops/aes.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/ctime/di_ops.h" #ifdef ANDROID diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c @@ -62,7 +62,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include <unistd.h> #endif -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/cc/torint.h" #include "lib/crypt_ops/aes.h" #include "common/util.h" diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "ed25519/donna/ed25519_donna_tor.h" diff --git a/src/lib/crypt_ops/crypto_dh.c b/src/lib/crypt_ops/crypto_dh.c @@ -23,7 +23,7 @@ ENABLE_GCC_WARNING(redundant-decls) #include <openssl/bn.h> -#include "common/torlog.h" +#include "lib/log/torlog.h" /** A structure to hold the first half (x, g^x) of a Diffie-Hellman handshake * while we're waiting for the second.*/ diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c @@ -14,7 +14,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_openssl_mgt.h" #include "lib/crypt_ops/crypto_util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "keccak-tiny/keccak-tiny.h" diff --git a/src/lib/crypt_ops/crypto_ed25519.c b/src/lib/crypt_ops/crypto_ed25519.c @@ -27,7 +27,7 @@ #include "lib/crypt_ops/crypto_format.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c @@ -23,7 +23,7 @@ #include "lib/string/util_string.h" #include "common/util.h" #include "common/util_format.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" /** Write the <b>datalen</b> bytes from <b>data</b> to the file named * <b>fname</b> in the tagged-data format. This format contains a diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c @@ -27,7 +27,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "common/sandbox.h" #include "lib/testsupport/testsupport.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_rsa.c b/src/lib/crypt_ops/crypto_rsa.c @@ -33,7 +33,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/lib/crypt_ops/crypto_rsa.h b/src/lib/crypt_ops/crypto_rsa.h @@ -21,7 +21,7 @@ #include "lib/testsupport/testsupport.h" #include "common/compat.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" /** Length of our public keys. */ #define PK_BYTES (1024/8) diff --git a/src/lib/crypt_ops/crypto_util.c b/src/lib/crypt_ops/crypto_util.c @@ -32,7 +32,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) -#include "common/torlog.h" +#include "lib/log/torlog.h" /** * Destroy the <b>sz</b> bytes of data stored at <b>mem</b>, setting them to diff --git a/src/lib/log/torlog.c b/src/lib/log/torlog.c @@ -31,7 +31,7 @@ #endif #define LOG_PRIVATE -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/container/smartlist.h" #include "lib/err/torerr.h" #include "lib/intmath/bits.h" diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c @@ -12,7 +12,7 @@ #include "common/compat.h" #include "common/util.h" #include "lib/cc/torint.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/tls/tortls.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c @@ -54,7 +54,7 @@ ENABLE_GCC_WARNING(redundant-decls) #define TORTLS_PRIVATE #include "lib/tls/tortls.h" #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/container/smartlist.h" #include <string.h> diff --git a/src/lib/trace/debug.h b/src/lib/trace/debug.h @@ -4,7 +4,7 @@ #ifndef TOR_TRACE_LOG_DEBUG_H #define TOR_TRACE_LOG_DEBUG_H -#include "common/torlog.h" +#include "lib/log/torlog.h" /* Stringify pre-processor trick. */ #define XSTR(d) STR(d) diff --git a/src/or/keypin.c b/src/or/keypin.c @@ -19,7 +19,7 @@ #include "or/keypin.h" #include "siphash.h" #include "lib/cc/torint.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/util_format.h" diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c @@ -26,7 +26,7 @@ #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_util.h" #include "or/onion_ntor.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" /** Free storage held in an ntor handshake state. */ diff --git a/src/or/or.h b/src/or/or.h @@ -68,7 +68,7 @@ #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_hkdf.h" #include "lib/tls/tortls.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/container/smartlist.h" #include "lib/container/map.h" #include "lib/compress/compress.h" diff --git a/src/or/parsecommon.c b/src/or/parsecommon.c @@ -7,7 +7,7 @@ **/ #include "or/parsecommon.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util_format.h" #include "lib/container/smartlist.h" diff --git a/src/or/torcert.c b/src/or/torcert.c @@ -30,7 +30,7 @@ #include "lib/crypt_ops/crypto_util.h" #include "or/torcert.h" #include "trunnel/ed25519_cert.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/util.h" #include "common/compat.h" #include "trunnel/link_handshake.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c @@ -12,7 +12,7 @@ #include "or/config.h" #include "or/connection.h" #include "or/directory.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "or/dir_connection_st.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c @@ -13,7 +13,7 @@ #include "or/connection.h" #include "or/connection_edge.h" #include "or/proto_socks.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "or/entry_connection_st.h" #include "or/socks_request_st.h" diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c @@ -1,7 +1,7 @@ /* Copyright (c) 2015-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ #define LOG_PRIVATE -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "test/log_test_helpers.h" /** diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c @@ -10,7 +10,7 @@ #include "or/or.h" #include "common/util.h" #include "lib/err/backtrace.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" /* -1: no crash. * 0: crash with a segmentation fault. diff --git a/src/test/test_logging.c b/src/test/test_logging.c @@ -4,7 +4,7 @@ #include "orconfig.h" #include "or/or.h" #include "lib/err/torerr.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "test/test.h" static void diff --git a/src/test/test_status.c b/src/test/test_status.c @@ -12,7 +12,7 @@ #include <math.h> #include "or/or.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "tor_queue.h" #include "or/status.h" #include "or/circuitlist.h" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c @@ -31,7 +31,7 @@ DISABLE_GCC_WARNING(redundant-decls) ENABLE_GCC_WARNING(redundant-decls) #include "or/or.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "or/config.h" #include "lib/tls/tortls.h" diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c @@ -8,7 +8,7 @@ #include "common/util.h" #include "common/util_process.h" #include "lib/crypt_ops/crypto.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "test/test.h" #ifndef BUILDDIR diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c @@ -36,7 +36,7 @@ ENABLE_GCC_WARNING(redundant-decls) #endif #include "common/util.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_rand.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c @@ -7,7 +7,7 @@ #include "common/compat.h" #include "common/util.h" #include "common/address.h" -#include "common/torlog.h" +#include "lib/log/torlog.h" #include "common/sandbox.h" #include <stdio.h>