Rectify include paths after container split (automatic)

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

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

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"

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"
 

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

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

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,

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

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

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
 

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"

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"

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"

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;

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>

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"

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"

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"

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

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"

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"

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

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"

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

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"

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"
 

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

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"
 

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"

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"

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"