[tor-commits] [tor/master] Rectify include paths (automated)

21 Jun 2018

diff --git a/src/common/address.h b/src/common/address.h
index 2c9c620c2..317c7f329 100644
--- a/src/common/address.h
+++ b/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"
diff --git a/src/common/address_set.h b/src/common/address_set.h
index f4986c9b0..cfee89cfb 100644
--- a/src/common/address_set.h
+++ b/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
diff --git a/src/common/buffers.c b/src/common/buffers.c
index fd029c26c..41f98ddf7 100644
--- a/src/common/buffers.c
+++ b/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>
diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5cd9d3ec6..5956e3484 100644
--- a/src/common/buffers.h
+++ b/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;
diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index c380369b5..0a57b9552 100644
--- a/src/common/buffers_tls.c
+++ b/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
diff --git a/src/common/compat.h b/src/common/compat.h
index da9bd8bcc..0cc257fc9 100644
--- a/src/common/compat.h
+++ b/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>
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h
index 5d3883043..ed0ece5ab 100644
--- a/src/common/compat_threads.h
+++ b/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)
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 57eb9c64c..8a8bb2b77 100644
--- a/src/common/crypto.c
+++ b/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"
diff --git a/src/common/crypto.h b/src/common/crypto.h
index e7d86eaf0..132446809 100644
--- a/src/common/crypto.h
+++ b/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"
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index 96d2e0e07..8a5b9b201 100644
--- a/src/common/crypto_curve25519.h
+++ b/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"
diff --git a/src/common/crypto_digest.h b/src/common/crypto_digest.h
index 25ca5ceda..96ac03850 100644
--- a/src/common/crypto_digest.h
+++ b/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
diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 20c04226e..981b0dce2 100644
--- a/src/common/crypto_ed25519.h
+++ b/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"
diff --git a/src/common/crypto_format.h b/src/common/crypto_format.h
index 325b1ef44..47f52b94b 100644
--- a/src/common/crypto_format.h
+++ b/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,
diff --git a/src/common/crypto_pwbox.h b/src/common/crypto_pwbox.h
index 2c73c700e..9ed35a150 100644
--- a/src/common/crypto_pwbox.h
+++ b/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
diff --git a/src/common/crypto_rand.h b/src/common/crypto_rand.h
index 2e05adc93..8309bb21c 100644
--- a/src/common/crypto_rand.h
+++ b/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 */
diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h
index c56eab319..a80c46bb9 100644
--- a/src/common/crypto_rsa.h
+++ b/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"
diff --git a/src/common/crypto_s2k.h b/src/common/crypto_s2k.h
index bc7224e8e..b270897b6 100644
--- a/src/common/crypto_s2k.h
+++ b/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. */
diff --git a/src/common/crypto_util.h b/src/common/crypto_util.h
index 53d9027fb..3ce34e6f2 100644
--- a/src/common/crypto_util.h
+++ b/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);
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 4fc132730..a33463f74 100644
--- a/src/common/sandbox.c
+++ b/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"
diff --git a/src/common/sandbox.h b/src/common/sandbox.h
index 945d57df7..f7c990e01 100644
--- a/src/common/sandbox.h
+++ b/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
diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index 645c90c62..fd6834f26 100644
--- a/src/common/token_bucket.h
+++ b/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. */
diff --git a/src/common/util.c b/src/common/util.c
index de46cc7c8..f9d64cfb9 100644
--- a/src/common/util.c
+++ b/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"
diff --git a/src/common/util.h b/src/common/util.h
index b3c17db24..cb8cefb12 100644
--- a/src/common/util.h
+++ b/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"
diff --git a/src/common/util_format.c b/src/common/util_format.c
index cab257234..420d8a1a8 100644
--- a/src/common/util_format.c
+++ b/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>
diff --git a/src/common/util_format.h b/src/common/util_format.h
index 7dd5ae5bd..e49efd05c 100644
--- a/src/common/util_format.h
+++ b/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
diff --git a/src/ext/OpenBSD_malloc_Linux.c b/src/ext/OpenBSD_malloc_Linux.c
index 157462b9a..9c30570c4 100644
--- a/src/ext/OpenBSD_malloc_Linux.c
+++ b/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"
diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c
index 36c3dee76..f82e10b10 100644
--- a/src/ext/csiphash.c
+++ b/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"
diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c
index d2d7fb434..45da7bf1e 100644
--- a/src/ext/curve25519_donna/curve25519-donna-c64.c
+++ b/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;
diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c
index 573e6e26a..d64b95c11 100644
--- a/src/ext/curve25519_donna/curve25519-donna.c
+++ b/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;
diff --git a/src/ext/ed25519/donna/ed25519_donna_tor.h b/src/ext/ed25519/donna/ed25519_donna_tor.h
index dfaefc865..20e9b5e99 100644
--- a/src/ext/ed25519/donna/ed25519_donna_tor.h
+++ b/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];
diff --git a/src/ext/ed25519/ref10/crypto_int32.h b/src/ext/ed25519/ref10/crypto_int32.h
index 59311a620..26271e917 100644
--- a/src/ext/ed25519/ref10/crypto_int32.h
+++ b/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
diff --git a/src/ext/ed25519/ref10/crypto_int64.h b/src/ext/ed25519/ref10/crypto_int64.h
index 6dda30f2e..3b066a9c0 100644
--- a/src/ext/ed25519/ref10/crypto_int64.h
+++ b/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
diff --git a/src/ext/ed25519/ref10/crypto_uint32.h b/src/ext/ed25519/ref10/crypto_uint32.h
index b12a595a1..a7a77723b 100644
--- a/src/ext/ed25519/ref10/crypto_uint32.h
+++ b/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
diff --git a/src/ext/ed25519/ref10/crypto_uint64.h b/src/ext/ed25519/ref10/crypto_uint64.h
index 73edfd1b5..adaaa0804 100644
--- a/src/ext/ed25519/ref10/crypto_uint64.h
+++ b/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
diff --git a/src/ext/ed25519/ref10/ed25519_ref10.h b/src/ext/ed25519/ref10/ed25519_ref10.h
index 15ac07e24..bb72af6c0 100644
--- a/src/ext/ed25519/ref10/ed25519_ref10.h
+++ b/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);
diff --git a/src/ext/keccak-tiny/keccak-tiny.h b/src/ext/keccak-tiny/keccak-tiny.h
index 58e1d4534..a9c8ed642 100644
--- a/src/ext/keccak-tiny/keccak-tiny.h
+++ b/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
diff --git a/src/ext/mulodi/mulodi4.c b/src/ext/mulodi/mulodi4.c
index ddd17cd1d..accce1ce0 100644
--- a/src/ext/mulodi/mulodi4.c
+++ b/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
diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 0d0c8112e..cb130b693 100644
--- a/src/lib/compress/compress.c
+++ b/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>
diff --git a/src/lib/ctime/di_ops.h b/src/lib/ctime/di_ops.h
index 8298bfa73..92af7ae27 100644
--- a/src/lib/ctime/di_ops.h
+++ b/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);
diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h
index 0a145fc92..7f7742843 100644
--- a/src/lib/err/backtrace.h
+++ b/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);
diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h
index 10d9f481c..d4bba6916 100644
--- a/src/lib/err/torerr.h
+++ b/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. */
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1af970040..9f64a1a20 100644
--- a/src/or/circuitlist.c
+++ b/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"
diff --git a/src/or/dir_server_st.h b/src/or/dir_server_st.h
index 8fdb04a7d..fe1f5c3d5 100644
--- a/src/or/dir_server_st.h
+++ b/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"
diff --git a/src/or/entry_port_cfg_st.h b/src/or/entry_port_cfg_st.h
index 45dd844c4..9b07ccb06 100644
--- a/src/or/entry_port_cfg_st.h
+++ b/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 {
diff --git a/src/or/keypin.c b/src/or/keypin.c
index 921a401a4..17b5010fa 100644
--- a/src/or/keypin.c
+++ b/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"
diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h
index 13a3298ac..0dd66f1e8 100644
--- a/src/or/onion_ntor.h
+++ b/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"
diff --git a/src/or/or.h b/src/or/or.h
index 66e69f3ca..53dc89607 100644
--- a/src/or/or.h
+++ b/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

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[tor-commits] [tor/master] Rectify include paths (automated)