Rectify include paths (automated)

src/common/address.h

@@ -13,7 +13,7 @@
 
 //#include <sys/sockio.h>
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/container.h"
 

src/common/address_set.h

@@ -14,7 +14,7 @@
 #define TOR_ADDRESS_SET_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /**
  * An address_set_t represents a set of tor_addr_t values. The implementation

src/common/buffers.c

@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

src/common/buffers.h

@@ -13,7 +13,7 @@
 #define TOR_BUFFERS_H
 
 #include "common/compat.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 typedef struct buf_t buf_t;

src/common/buffers_tls.c

@@ -12,7 +12,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/tortls.h"
 #ifdef HAVE_UNISTD_H

src/common/compat.h

@@ -14,7 +14,7 @@
 #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
 #endif
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <netinet6/in6.h>
 #endif
 
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 #include "common/compat_time.h"
 
 #include <stdio.h>

src/common/compat_threads.h

@@ -7,7 +7,7 @@
 #define TOR_COMPAT_THREADS_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)

src/common/crypto.c

@@ -63,7 +63,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #endif
 
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/aes.h"
 #include "common/util.h"
 #include "common/container.h"

src/common/crypto.h

@@ -16,7 +16,7 @@
 #include "orconfig.h"
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/util.h"
 #include "common/crypto_rsa.h"

src/common/crypto_curve25519.h

@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_CURVE25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_digest.h"
 #include "common/crypto_openssl_mgt.h"
 

src/common/crypto_digest.h

@@ -16,7 +16,7 @@
 #include <stdio.h>
 
 #include "common/container.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of the output of our message digest. */
 #define DIGEST_LEN 20

src/common/crypto_ed25519.h

@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_ED25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_curve25519.h"
 #include "common/util.h"
 

src/common/crypto_format.h

@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_ed25519.h"
 
 int crypto_write_tagged_contents_to_file(const char *fname,

src/common/crypto_pwbox.h

@@ -4,7 +4,7 @@
 #ifndef CRYPTO_PWBOX_H_INCLUDED_
 #define CRYPTO_PWBOX_H_INCLUDED_
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #define UNPWBOX_OKAY 0
 #define UNPWBOX_BAD_SECRET -1

src/common/crypto_rand.h

@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_RAND_H
 #define TOR_CRYPTO_RAND_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 
 /* random numbers */

src/common/crypto_rsa.h

@@ -17,7 +17,7 @@
 
 #include "common/crypto_digest.h"
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #include "common/compat.h"
 #include "common/util.h"

src/common/crypto_s2k.h

@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_S2K_H_INCLUDED
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of RFC2440-style S2K specifier: the first 8 bytes are a salt, the
  * 9th describes how much iteration to do. */

src/common/crypto_util.h

@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_UTIL_H
 #define TOR_CRYPTO_UTIL_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** OpenSSL-based utility functions. */
 void memwipe(void *mem, uint8_t byte, size_t sz);

src/common/sandbox.c

@@ -36,7 +36,7 @@
 #include "common/container.h"
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 #include "tor_queue.h"
 

src/common/sandbox.h

@@ -13,7 +13,7 @@
 #define SANDBOX_H_
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #ifndef SYS_SECCOMP
 

src/common/token_bucket.h

@@ -9,7 +9,7 @@
 #ifndef TOR_TOKEN_BUCKET_H
 #define TOR_TOKEN_BUCKET_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */

src/common/util.c

@@ -17,7 +17,7 @@
 #include "common/util.h"
 #include "common/torlog.h"
 #include "common/crypto_digest.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"

src/common/util.h

@@ -12,7 +12,7 @@
 #define TOR_UTIL_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
 #include "common/testsupport.h"

src/common/util_format.c

@@ -15,7 +15,7 @@
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #include <stddef.h>
 #include <string.h>

src/common/util_format.h

@@ -8,7 +8,7 @@
 #define TOR_UTIL_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** @{ */
 /** These macros don't check for overflow.  Use them only for constant inputs

src/ext/OpenBSD_malloc_Linux.c

@@ -59,7 +59,7 @@
 #include <errno.h>
 #include <err.h>
 /* For SIZE_MAX */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 //#include "thread_private.h"
 

src/ext/csiphash.c

@@ -29,7 +29,7 @@
     Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
 */
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "siphash.h"
 /* for tor_assert */
 #include "common/util.h"

src/ext/curve25519_donna/curve25519-donna-c64.c

@@ -25,7 +25,7 @@
 #include "orconfig.h"
 
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef uint8_t u8;
 typedef uint64_t limb;

src/ext/curve25519_donna/curve25519-donna.c

@@ -48,7 +48,7 @@
 #include "orconfig.h"
 
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef uint8_t u8;
 typedef int32_t s32;

src/ext/ed25519/donna/ed25519_donna_tor.h

@@ -1,7 +1,7 @@
 /* Added for Tor. */
 #ifndef SRC_EXT_ED25519_DONNA_H_INCLUDED_
 #define SRC_EXT_ED25519_DONNA_H_INCLUDED_
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef unsigned char curved25519_key[32];
 

src/ext/ed25519/ref10/crypto_int32.h

@@ -3,7 +3,7 @@
 #ifndef CRYPTO_INT32_H
 #define CRYPTO_INT32_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_int32 int32_t
 #define crypto_uint32 uint32_t
 

src/ext/ed25519/ref10/crypto_int64.h

@@ -3,7 +3,7 @@
 #ifndef CRYPTO_INT64_H
 #define CRYPTO_INT64_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_int64 int64_t
 #define crypto_uint64 uint64_t
 

src/ext/ed25519/ref10/crypto_uint32.h

@@ -1,3 +1,3 @@
 /* Added for Tor. */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_uint32 uint32_t

src/ext/ed25519/ref10/crypto_uint64.h

@@ -1,3 +1,3 @@
 /* Added for Tor. */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_uint64 uint64_t

src/ext/ed25519/ref10/ed25519_ref10.h

@@ -1,7 +1,7 @@
 /* Added for Tor */
 #ifndef SRC_EXT_ED25519_REF10_H_INCLUDED_
 #define SRC_EXT_ED25519_REF10_H_INCLUDED_
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 int ed25519_ref10_seckey(unsigned char *sk);
 int ed25519_ref10_seckey_expand(unsigned char *sk, const unsigned char *sk_seed);

src/ext/keccak-tiny/keccak-tiny.h

@@ -2,7 +2,7 @@
 #define KECCAK_FIPS202_H
 
 #include <stddef.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #define KECCAK_MAX_RATE 200
 

src/ext/mulodi/mulodi4.c

@@ -18,7 +18,7 @@
 #define COMPILER_RT_ABI
 #define di_int int64_t
 #define di_uint uint64_t
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 di_int __mulodi4(di_int a, di_int b, int* overflow);
 #endif

src/lib/compress/compress.c

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

src/lib/ctime/di_ops.h

@@ -12,7 +12,7 @@
 #define TOR_DI_OPS_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 int tor_memcmp(const void *a, const void *b, size_t sz);
 int tor_memeq(const void *a, const void *b, size_t sz);

src/lib/err/backtrace.h

@@ -5,7 +5,7 @@
 #define TOR_BACKTRACE_H
 
 #include "orconfig.h"
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 
 typedef void (*tor_log_fn)(int, unsigned, const char *fmt, ...)
   CHECK_PRINTF(3,4);

src/lib/err/torerr.h

@@ -13,7 +13,7 @@
 #ifndef TOR_TORERR_H
 #define TOR_TORERR_H
 
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 
 /* The raw_assert...() variants are for use within code that can't call
  * tor_assertion_failed_() because of call circularity issues. */

src/or/circuitlist.c

@@ -51,7 +51,7 @@
  * logic, which was originally circuit-focused.
  **/
 #define CIRCUITLIST_PRIVATE
-#include "common/torint.h"  /* TOR_PRIuSZ */
+#include "lib/cc/torint.h"  /* TOR_PRIuSZ */
 
 #include "or/or.h"
 #include "or/channel.h"

src/or/dir_server_st.h

@@ -7,7 +7,7 @@
 #ifndef DIR_SERVER_ST_H
 #define DIR_SERVER_ST_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "or/or.h"
 #include "or/routerstatus_st.h"
 

src/or/entry_port_cfg_st.h

@@ -7,7 +7,7 @@
 #ifndef ENTRY_PORT_CFG_ST_H
 #define ENTRY_PORT_CFG_ST_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "or/or.h"
 
 struct entry_port_cfg_t {

src/or/keypin.c

@@ -18,7 +18,7 @@
 #include "ht.h"
 #include "or/keypin.h"
 #include "siphash.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"

src/or/onion_ntor.h

@@ -4,7 +4,7 @@
 #ifndef TOR_ONION_NTOR_H
 #define TOR_ONION_NTOR_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_curve25519.h"
 #include "lib/ctime/di_ops.h"
 

src/or/or.h

@@ -26,7 +26,7 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h> /* FreeBSD needs this to know what version it is */
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif