commit b8be8265b6dc477efe591ccdb14fcd4b044dd241 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 15:40:15 2018 -0400

Rectify include paths after container split (automatic) --- src/common/address.c | 2 +- src/common/address.h | 2 +- src/common/address_set.c | 2 +- src/common/compat.c | 2 +- src/common/compat_time.c | 2 +- src/common/compat_winthreads.c | 2 +- src/common/confline.c | 2 +- src/common/confline.h | 2 +- src/common/log.c | 2 +- src/common/memarea.c | 2 +- src/common/sandbox.c | 2 +- src/common/storagedir.c | 2 +- src/common/util.c | 2 +- src/common/util_bug.c | 2 +- src/lib/container/container.c | 2 +- src/lib/crypt_ops/crypto.c | 2 +- src/lib/crypt_ops/crypto_curve25519.c | 2 +- src/lib/crypt_ops/crypto_digest.c | 2 +- src/lib/crypt_ops/crypto_digest.h | 2 +- src/lib/crypt_ops/crypto_format.c | 2 +- src/lib/crypt_ops/crypto_rand.c | 2 +- src/lib/tls/tortls.c | 2 +- src/or/hs_client.c | 2 +- src/or/hs_descriptor.h | 2 +- src/or/or.h | 2 +- src/or/parsecommon.h | 2 +- src/or/protover.h | 2 +- src/test/test_bridges.c | 2 +- src/test/test_dir_common.c | 2 +- src/test/test_guardfraction.c | 2 +- src/test/test_routerlist.c | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/common/address.c b/src/common/address.c index f135f1ffd..27f8c4efe 100644 --- 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 6986143f6..b8fccd81e 100644 --- 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 65c4cbf1e..d30343b1c 100644 --- 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 dece798bc..577ebe757 100644 --- 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 da323e55a..032c4e43a 100644 --- 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 95e70d06b..eeb0b9751 100644 --- 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 2ea2e9c3b..7343c5f52 100644 --- 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 4cc8286fc..10af34a0a 100644 --- 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 928a3fba8..8ea686a12 100644 --- 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 12ad9c511..ef6b78ecc 100644 --- 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 a33463f74..e67cedf0b 100644 --- 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 ee80bcc53..f3270ce7b 100644 --- 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 fbb2fed39..cd8ff93a3 100644 --- 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 524d48c68..3b249bdfc 100644 --- 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 a7810ba90..d31044fe2 100644 --- 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 b562578c5..de7e271d3 100644 --- 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 8302483d8..1e7a45625 100644 --- 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 44494337c..d746aaaca 100644 --- 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 96ac03850..129258245 100644 --- 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 07008eff2..246f28716 100644 --- 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 0bd7b078c..af258abea 100644 --- 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 ac45175c7..ea3a42054 100644 --- 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 90a3fb3dc..a977fa44f 100644 --- 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 5478edc89..640136f48 100644 --- 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 cb7e84e68..c70123934 100644 --- 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 93e62a559..c786bcc54 100644 --- 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 6236ed133..99502645c 100644 --- 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 c1de731b2..127b58762 100644 --- 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 6933800eb..5212810b7 100644 --- 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 fc451b162..12e64d0e7 100644 --- 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 e8f847833..5011e2285 100644 --- 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"