Rectify include paths after container split (automatic)

diff --git a/src/common/address.c b/src/common/address.c
index f135f1ffd194e90e8a1562be73687045623dd023..27f8c4efe22b09c46b7df658e34dcb1979da76b8 100644 (file)
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -40,7 +40,7 @@
 #include "common/util_format.h"
 #include "common/address.h"
 #include "common/torlog.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/sandbox.h"
 
 #ifdef HAVE_SYS_TIME_H

diff --git a/src/common/address.h b/src/common/address.h
index 6986143f6e265e25fb86e443908991de09737d7b..b8fccd81ec9c8b39f92f9decf4cb2e29ed508340 100644 (file)
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -15,7 +15,7 @@
 #include "orconfig.h"
 #include "lib/cc/torint.h"
 #include "common/compat.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/util_bug.h"
 
 #ifdef ADDRESS_PRIVATE

diff --git a/src/common/address_set.c b/src/common/address_set.c
index 65c4cbf1e1ce534410602f387903cb13f63a225d..d30343b1cc36591818c048ffbdd052e995dcf146 100644 (file)
--- a/src/common/address_set.c
+++ b/src/common/address_set.c
@@ -14,7 +14,7 @@
 #include "common/address_set.h"
 #include "common/address.h"
 #include "common/compat.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "common/util.h"
 #include "siphash.h"

diff --git a/src/common/compat.c b/src/common/compat.c
index dece798bcd646920bc649b1e9e8aa1ef523b34ab..577ebe7574a69bb6e25fa0159a3a79185207a2c4 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -126,7 +126,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
 
 #include "common/torlog.h"
 #include "common/util.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
 

diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index da323e55acc8f5000dcfcd14d52138050dbba469..032c4e43a1e485ad9c82b93a06be36effe1d05ee 100644 (file)
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -37,7 +37,7 @@
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "common/util.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 
 #ifndef HAVE_GETTIMEOFDAY
 #ifdef HAVE_FTIME

diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index 95e70d06bf15b8ab41b1b81a247b8e9bbd3d2e07..eeb0b9751020ef6c27a403c77de3b02cdd003c09 100644 (file)
--- 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/container.h"
+#include "lib/container/container.h"
 #include "common/torlog.h"
 
 /* This value is more or less total cargo-cult */

diff --git a/src/common/confline.c b/src/common/confline.c
index 2ea2e9c3b8a4e7581dd9240eccc1ffe62c08cd89..7343c5f5285ea3c9ca6fe45e80ad4f4398b1f7fe 100644 (file)
--- a/src/common/confline.c
+++ b/src/common/confline.c
@@ -8,7 +8,7 @@
 #include "common/confline.h"
 #include "common/torlog.h"
 #include "common/util.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 
 static int config_get_lines_aux(const char *string, config_line_t **result,
                                 int extended, int allow_include,

diff --git a/src/common/confline.h b/src/common/confline.h
index 4cc8286fc30672fef7a5b0ff8a054ba312fc6a2c..10af34a0a63121c6f686a0b79ade4475655def70 100644 (file)
--- a/src/common/confline.h
+++ b/src/common/confline.h
@@ -7,7 +7,7 @@
 #ifndef TOR_CONFLINE_H
 #define TOR_CONFLINE_H
 
-#include "common/container.h"
+#include "lib/container/container.h"
 
 /** Ordinary configuration line. */
 #define CONFIG_LINE_NORMAL 0

diff --git a/src/common/log.c b/src/common/log.c
index 928a3fba8a1d27b7d47900b0858582b4380b8e9a..8ea686a12e0596bb34903cc5c965f1e4e88e81af 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -33,7 +33,7 @@
 #include "common/util.h"
 #define LOG_PRIVATE
 #include "common/torlog.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/err/torerr.h"
 
 #ifdef HAVE_ANDROID_LOG_H

diff --git a/src/common/memarea.c b/src/common/memarea.c
index 12ad9c511c1eb97029c80ad8d13c6b33997749c9..ef6b78ecc59291f5d935de739d18ba433a902d60 100644 (file)
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -13,7 +13,7 @@
 #include "common/util.h"
 #include "common/compat.h"
 #include "common/torlog.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 
 #ifndef DISABLE_MEMORY_SENTINELS
 

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index a33463f74bdef1e97195184beb1378c7c0f86086..e67cedf0b7dd7d1a73dbec305413af6c2d126790 100644 (file)
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 
 #include "common/sandbox.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
 #include "lib/cc/torint.h"

diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index ee80bcc530357be2cd4d09b9f0106d5df3ead238..f3270ce7b81b85d131a35f602ee14b8f1aeeda20 100644 (file)
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2017-2018, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/compat.h"
 #include "common/confline.h"
 #include "common/memarea.h"

diff --git a/src/common/util.c b/src/common/util.c
index fbb2fed39546f21d858b19bb7a416ab673f91596..cd8ff93a3d9754a965ba4e66046649edb30bb754 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -18,7 +18,7 @@
 #include "common/torlog.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/cc/torint.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"
 #include "lib/err/backtrace.h"

diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index 524d48c68a6c158b7d933d0a626ea452f4b350a8..3b249bdfc1cded09f12ebb96bc72a89cb9b3723e 100644 (file)
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -11,7 +11,7 @@
 #include "common/util_bug.h"
 #include "common/torlog.h"
 #include "lib/err/backtrace.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 
 #ifdef __COVERITY__
 int bug_macro_deadcode_dummy__ = 0;

diff --git a/src/lib/container/container.c b/src/lib/container/container.c
index a7810ba90befeed326d78e1509d71906022dba64..d31044fe27a4fc486d63663ee7bc08afca3c0efb 100644 (file)
--- a/src/lib/container/container.c
+++ b/src/lib/container/container.c
@@ -12,7 +12,7 @@
  **/
 
 #include "common/util.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_digest.h"
 
 #include <stdlib.h>

diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index b562578c596428d20f0d4592ff16948832c9b175..de7e271d39586913c6928b08390af47238e5a33f 100644 (file)
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -66,7 +66,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/cc/torint.h"
 #include "lib/crypt_ops/aes.h"
 #include "common/util.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/compat.h"
 #include "common/sandbox.h"
 #include "common/util_format.h"

diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 8302483d87a5693c02ba48453cd601bc6b2ec3a4..1e7a456255e695d9e85c5d86286a8c6d8ae9b375 100644 (file)
--- a/src/lib/crypt_ops/crypto_curve25519.c
+++ b/src/lib/crypt_ops/crypto_curve25519.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_format.h"

diff --git a/src/lib/crypt_ops/crypto_digest.c b/src/lib/crypt_ops/crypto_digest.c
index 44494337c4c583ad2dbd8dac3524f75cccf8357f..d746aaaca51138338dc8a7565de22c1ed98ae053 100644 (file)
--- a/src/lib/crypt_ops/crypto_digest.c
+++ b/src/lib/crypt_ops/crypto_digest.c
@@ -10,7 +10,7 @@
  * operations.
  **/
 
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_openssl_mgt.h"
 #include "lib/crypt_ops/crypto_util.h"

diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h
index 96ac0385073a327a693782477af80bcd1d509221..129258245ebeeac6b51c32cdae4526999e56e951 100644 (file)
--- a/src/lib/crypt_ops/crypto_digest.h
+++ b/src/lib/crypt_ops/crypto_digest.h
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/cc/torint.h"
 
 /** Length of the output of our message digest. */

diff --git a/src/lib/crypt_ops/crypto_format.c b/src/lib/crypt_ops/crypto_format.c
index 07008eff2ebdd33fb6225654db3ff7514dca6f6e..246f28716acddde36277ed1b52b783ca40b25081 100644 (file)
--- a/src/lib/crypt_ops/crypto_format.c
+++ b/src/lib/crypt_ops/crypto_format.c
@@ -14,7 +14,7 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "lib/crypt_ops/crypto_digest.h"
 #include "lib/crypt_ops/crypto_ed25519.h"

diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c
index 0bd7b078c5789a27eedf6e7ddab5c3e5bf5c5152..af258abea429c42568644c7b6be9c099a7f841c0 100644 (file)
--- a/src/lib/crypt_ops/crypto_rand.c
+++ b/src/lib/crypt_ops/crypto_rand.c
@@ -21,7 +21,7 @@
 #include <wincrypt.h>
 #endif /* defined(_WIN32) */
 
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "common/compat.h"
 #include "lib/crypt_ops/compat_openssl.h"
 #include "lib/crypt_ops/crypto_util.h"

diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c
index ac45175c7d73e302722c0ef7228b17e45552ca70..ea3a4205412e9364f3f764c62edbb6fb78af1aad 100644 (file)
--- a/src/lib/tls/tortls.c
+++ b/src/lib/tls/tortls.c
@@ -55,7 +55,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/tls/tortls.h"
 #include "common/util.h"
 #include "common/torlog.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include <string.h>
 
 #ifdef OPENSSL_1_1_API

diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 90a3fb3dcbed9b379ab6faaf93daa2fcd4783723..a977fa44f27d326fd6adc105c1f8e107f94367d0 100644 (file)
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -16,7 +16,7 @@
 #include "or/config.h"
 #include "or/connection.h"
 #include "or/connection_edge.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/crypt_ops/crypto_util.h"
 #include "or/directory.h"

diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index 5478edc89bc5c1ccce9fe9ce1aa8a5136232f213..640136f4871d6103266674481b8dcb5942180706 100644 (file)
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -13,7 +13,7 @@
 
 #include "or/or.h"
 #include "common/address.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_ed25519.h"
 #include "trunnel/ed25519_cert.h" /* needed for trunnel */

diff --git a/src/or/or.h b/src/or/or.h
index cb7e84e68bf7abe2bb1163e627a4aaafce49a77c..c7012393455b46cccc7a678b9874dedc09dba693 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -69,7 +69,7 @@
 #include "lib/crypt_ops/crypto_hkdf.h"
 #include "lib/tls/tortls.h"
 #include "common/torlog.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/compress/compress.h"
 #include "common/address.h"
 #include "common/compat_libevent.h"

diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h
index 93e62a559dd2c20bf5dd8fe0887d33082ade23cc..c786bcc5480bac22d73d54c3e80316ac44e8a92c 100644 (file)
--- a/src/or/parsecommon.h
+++ b/src/or/parsecommon.h
@@ -9,7 +9,7 @@
 #ifndef TOR_PARSECOMMON_H
 #define TOR_PARSECOMMON_H
 
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "lib/crypt_ops/crypto.h"
 #include "common/memarea.h"
 

diff --git a/src/or/protover.h b/src/or/protover.h
index 6236ed133c8e7c244804e705b7f8800751be838a..99502645caaa61ffb1b2c4794eadbd857ea35537 100644 (file)
--- a/src/or/protover.h
+++ b/src/or/protover.h
@@ -9,7 +9,7 @@
 #ifndef TOR_PROTOVER_H
 #define TOR_PROTOVER_H
 
-#include "common/container.h"
+#include "lib/container/container.h"
 
 /** The first version of Tor that included "proto" entries in its
  * descriptors.  Authorities should use this to decide whether to

diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index c1de731b2d5276da857aeac7491143a79ee2e56a..127b58762d40217f5af9b9878635ad1cefcd61b3 100644 (file)
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -15,7 +15,7 @@
 #include "common/address.h"
 #include "or/bridges.h"
 #include "or/config.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "or/transports.h"
 #include "common/util.h"
 

diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 6933800eb8525b130bc2e8b463d2c2e43e0de527..5212810b74d15829b10d4d0cb281afc150c21861 100644 (file)
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -6,7 +6,7 @@
 #include "orconfig.h"
 #define DIRVOTE_PRIVATE
 #include "test/test.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "or/or.h"
 #include "or/dirauth/dirvote.h"
 #include "or/nodelist.h"

diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index fc451b162978d9344c6f976f74a0696567d22509..12e64d0e786e41808b70d88719f548f712fe4768 100644 (file)
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -9,7 +9,7 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/dirserv.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "or/entrynodes.h"
 #include "common/util.h"
 #include "or/routerparse.h"

diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index e8f847833000bd8b0c952dfde70cdb1b326f0d15..5011e2285f32d90e28fba84063a40b578678ad6c 100644 (file)
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -16,7 +16,7 @@
 #include "or/or.h"
 #include "or/config.h"
 #include "or/connection.h"
-#include "common/container.h"
+#include "lib/container/container.h"
 #include "or/control.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "or/directory.h"