commit 275aff6917260209dc53e553d895ec886f6c8c52 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 09:54:04 2018 -0400
Rectify include paths (automated) --- src/common/compat_time.c | 2 +- src/common/log.c | 2 +- src/common/sandbox.c | 4 ++-- src/common/util.c | 2 +- src/common/util.h | 2 +- src/common/util_bug.c | 2 +- src/lib/err/backtrace.c | 6 +++--- src/lib/err/torerr.c | 4 ++-- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- src/or/directory.c | 2 +- src/or/main.c | 2 +- src/or/relay.c | 2 +- src/or/routerlist.c | 2 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/fuzz/fuzzing_common.c | 2 +- src/test/test.c | 2 +- src/test/test_bt_cl.c | 2 +- src/test/test_logging.c | 2 +- src/test/testing_common.c | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 913fa666e..da323e55a 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -34,7 +34,7 @@ #include <mach/mach_time.h> #endif
-#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "common/util.h" #include "common/container.h" diff --git a/src/common/log.c b/src/common/log.c index 6dba5bf4b..928a3fba8 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -34,7 +34,7 @@ #define LOG_PRIVATE #include "common/torlog.h" #include "common/container.h" -#include "common/torerr.h" +#include "lib/err/torerr.h"
#ifdef HAVE_ANDROID_LOG_H #include <android/log.h> diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 3679037f8..4fc132730 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -34,7 +34,7 @@
#include "common/sandbox.h" #include "common/container.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "common/torint.h" #include "common/util.h" @@ -80,7 +80,7 @@ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) #define USE_BACKTRACE #define EXPOSE_CLEAN_BACKTRACE -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */
#ifdef USE_BACKTRACE diff --git a/src/common/util.c b/src/common/util.c index 664ab34d2..de46cc7c8 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -21,7 +21,7 @@ #include "common/container.h" #include "common/address.h" #include "common/sandbox.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/util_process.h" #include "common/util_format.h"
diff --git a/src/common/util.h b/src/common/util.h index a5e6c4d46..8761e455f 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -22,7 +22,7 @@ /* for the correct alias to struct stat */ #include <sys/stat.h> #endif -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/util_bug.h"
#ifndef O_BINARY diff --git a/src/common/util_bug.c b/src/common/util_bug.c index da34201c1..5cfd00649 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -10,7 +10,7 @@ #include "orconfig.h" #include "common/util_bug.h" #include "common/torlog.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/container.h"
#ifdef __COVERITY__ diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index d83cbba0e..cded6459f 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -14,7 +14,7 @@ */
#include "orconfig.h" -#include "common/torerr.h" +#include "lib/err/torerr.h"
#ifdef HAVE_EXECINFO_H #include <execinfo.h> @@ -45,8 +45,8 @@ #endif
#define EXPOSE_CLEAN_BACKTRACE -#include "common/backtrace.h" -#include "common/torerr.h" +#include "lib/err/backtrace.h" +#include "lib/err/torerr.h"
#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index 0e0c4db35..81f360596 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -28,8 +28,8 @@ #include <sys/types.h> #endif
-#include "common/torerr.h" -#include "common/backtrace.h" +#include "lib/err/torerr.h" +#include "lib/err/backtrace.h"
/** Array of fds to log crash-style warnings to. */ static int sigsafe_log_fds[TOR_SIGSAFE_LOG_MAX_FDS] = { STDERR_FILENO }; diff --git a/src/or/connection.c b/src/or/connection.c index 267719881..450903d6d 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -65,7 +65,7 @@ */ #define TOR_CHANNEL_INTERNAL_ #define CONNECTION_PRIVATE -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/circuitbuild.h" diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 125709786..6d6279c83 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -57,7 +57,7 @@
#include "or/or.h"
-#include "common/backtrace.h" +#include "lib/err/backtrace.h"
#include "or/addressmap.h" #include "common/buffers.h" diff --git a/src/or/directory.c b/src/or/directory.c index e008ac7f7..9918433f5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -6,7 +6,7 @@ #define DIRECTORY_PRIVATE
#include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/buffers.h" #include "or/circuitbuild.h" diff --git a/src/or/main.c b/src/or/main.c index b2856d3f8..4ca180af2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -49,7 +49,7 @@ #define MAIN_PRIVATE #include "or/or.h" #include "or/addressmap.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/buffers.h" #include "common/buffers_tls.h" diff --git a/src/or/relay.c b/src/or/relay.c index af03cd474..8a97d72f9 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -48,7 +48,7 @@ #define RELAY_PRIVATE #include "or/or.h" #include "or/addressmap.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9ab01f4b3..9a6cf8c25 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -92,7 +92,7 @@
#define ROUTERLIST_PRIVATE #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/bridges.h" #include "common/crypto_ed25519.h" #include "or/circuitstats.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index a5be26df4..564edbb55 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -7,7 +7,7 @@ #define DIRECTORY_PRIVATE
#include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 664007502..1cde742f2 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -7,7 +7,7 @@ #define CONNECTION_EDGE_PRIVATE
#include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index b2fc85a49..12ebd97bd 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -3,7 +3,7 @@ #define CRYPTO_ED25519_PRIVATE #include "orconfig.h" #include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "or/config.h" #include "test/fuzz/fuzzing.h" #include "common/crypto.h" diff --git a/src/test/test.c b/src/test/test.c index 98f554b31..8bdeb60bd 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -40,7 +40,7 @@ long int lround(double x); double fabs(double x);
#include "or/or.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/buffers.h" #include "or/circuitlist.h" #include "or/circuitstats.h" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index d2d167ac3..66dd931e5 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -9,7 +9,7 @@ #undef TOR_COVERAGE #include "or/or.h" #include "common/util.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "common/torlog.h"
/* -1: no crash. diff --git a/src/test/test_logging.c b/src/test/test_logging.c index eaad7ed13..d31c70437 100644 --- a/src/test/test_logging.c +++ b/src/test/test_logging.c @@ -3,7 +3,7 @@
#include "orconfig.h" #include "or/or.h" -#include "common/torerr.h" +#include "lib/err/torerr.h" #include "common/torlog.h" #include "test/test.h"
diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 8b83265d8..f9e60001d 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -15,7 +15,7 @@ #include "or/config.h" #include "common/crypto_rand.h" #include "or/rephist.h" -#include "common/backtrace.h" +#include "lib/err/backtrace.h" #include "test/test.h" #include "or/channelpadding.h" #include "or/main.h"