Rectify include paths (automated)

diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 913fa666e1421666a6d0cd8601a05b6e21f4dfd4..da323e55acc8f5000dcfcd14d52138050dbba469 100644 (file)
--- 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 6dba5bf4b0938a46bd7c7aacda0834ebd520ac2e..928a3fba8a1d27b7d47900b0858582b4380b8e9a 100644 (file)
--- 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 3679037f8d4e635b553ebb86e4815ebc5b9fff99..4fc13273078030f691b05943b12f3d94250887bc 100644 (file)
--- 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 664ab34d2a1167a6977fbd739c8f54a7e7de961f..de46cc7c87b51c5320742975f34adff000ca3a0e 100644 (file)
--- 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 a5e6c4d462738cd1d76858f0e310e27c191bf5d3..8761e455fdef447d863d2c5e118492016ccb61b5 100644 (file)
--- 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 da34201c1eb1fb3fb5cd1b5944bb228ed6324086..5cfd00649f0409783d18ea09c79f60cbb8963ffe 100644 (file)
--- 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 d83cbba0e860c09c0ff7513081f2a12ca89d31db..cded6459f7a9174fd448db8e05afacdff72db562 100644 (file)
--- 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 0e0c4db3559b587102586cd1111fc72e3e62fc11..81f36059649f08e8b1227a39822e81c369058f29 100644 (file)
--- 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 267719881f934632ab6eeddc2a5e33b6efb6acb7..450903d6d1bcc4d9eb81a4f4a74487d2ebc303fb 100644 (file)
--- 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 125709786d7e648af120ad800898a3d5b48db927..6d6279c83174e86ada81640be0109c7df5c02359 100644 (file)
--- 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 e008ac7f7e751ae84e1f73b2e5ded30adcc5d7a9..9918433f5efd97eace3ef4928c85d8ceb72dfc83 100644 (file)
--- 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 b2856d3f8dc8adb3e9e702d868f84794640977e3..4ca180af2cc5bacbbb2bcd793ea5be962a88f1be 100644 (file)
--- 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 af03cd4748437182e65a93cd52e4a14f35bae03d..8a97d72f952971b3377690691e7689625e07c670 100644 (file)
--- 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 9ab01f4b3909735cbaf8c726ef8d35b8b6d6e1c2..9a6cf8c25e6ec9fc4649342b288dc42fa7e654ed 100644 (file)
--- 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 a5be26df4fdd5a2892954ee576798dc8de532584..564edbb55eeed903704d5924fe5f2e1f1463d23b 100644 (file)
--- 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 664007502394b9be5b28d3881165047c8875fd77..1cde742f27e8403cc3853cc02d9c4644c9a82718 100644 (file)
--- 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 b2fc85a497dd2942a2cc04658c64d83ebf2294ab..12ebd97bd6ef63b368ff8f4969f31ff12d97abf2 100644 (file)
--- 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 98f554b3192a4479add49a5b8a6a5363d560da62..8bdeb60bd93ea532f41587261361c7f23e3232c9 100644 (file)
--- 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 d2d167ac330edfb4cfc719d207e97b7d476f5d95..66dd931e548c987c23ad13109da9361360ae4463 100644 (file)
--- 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 eaad7ed1350d02eec79cec6eb69ece754dd4a09b..d31c70437e1928e6dace9a3508bfca5afdaf584d 100644 (file)
--- 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 8b83265d8fae85cc06f1386f3561622a56e2655f..f9e60001da4f7ef35c243a94cd0cc7ab6d0c0ae2 100644 (file)
--- 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"