Rectify include paths (automated)

This commit is contained in:
Nick Mathewson 2018-06-21 12:20:52 -04:00
parent cd8f919553
commit fa5fda5bbf
47 changed files with 48 additions and 48 deletions

View File

@ -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"

View File

@ -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

View File

@ -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>

View File

@ -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;

View File

@ -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

View File

@ -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>

View File

@ -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)

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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"

View File

@ -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,

View File

@ -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

View File

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

View File

@ -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"

View File

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

View File

@ -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);

View File

@ -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"

View File

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

View File

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

View File

@ -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"

View File

@ -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"

View File

@ -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>

View File

@ -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

View File

@ -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"

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -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];

View File

@ -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

View File

@ -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

View File

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

View File

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

View File

@ -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);

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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);

View File

@ -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);

View File

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

View File

@ -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"

View File

@ -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"

View File

@ -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 {

View File

@ -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"

View File

@ -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"

View File

@ -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