commit 935ba025653567f1700d2590b3ccd008460dbf6e Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 28 16:29:35 2018 -0400
Fix paths for buffers.h; automated. --- src/or/connection.c | 2 +- src/or/connection.h | 2 +- src/or/connection_edge.c | 2 +- src/or/connection_or.c | 2 +- src/or/control.c | 2 +- src/or/directory.c | 2 +- src/or/dirserv.c | 2 +- src/or/geoip.c | 2 +- src/or/main.c | 2 +- src/or/proto_cell.c | 2 +- src/or/proto_control0.c | 2 +- src/or/proto_ext_or.c | 2 +- src/or/proto_http.c | 2 +- src/or/proto_socks.c | 2 +- src/or/relay.c | 2 +- src/or/scheduler.c | 2 +- src/or/scheduler_kist.c | 2 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/test.c | 2 +- src/test/test_buffers.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_oom.c | 2 +- src/test/test_proto_http.c | 2 +- src/test/test_proto_misc.c | 2 +- src/test/test_socks.c | 2 +- src/test/test_util.c | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/or/connection.c b/src/or/connection.c index 974281331..e3e9c313a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -57,7 +57,7 @@ #define CONNECTION_PRIVATE #include "or/or.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" /* * Define this so we get channel internal functions, since we're implementing diff --git a/src/or/connection.h b/src/or/connection.h index 7fcf71021..1bbe17bff 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -15,7 +15,7 @@ listener_connection_t *TO_LISTENER_CONN(connection_t *);
/* XXXX For buf_datalen in inline function */ -#include "common/buffers.h" +#include "lib/container/buffers.h"
const char *conn_type_to_string(int type); const char *conn_state_to_string(int type, int state); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5bb85255b..e8185a5fa 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -60,7 +60,7 @@ #include "lib/err/backtrace.h"
#include "or/addressmap.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" #include "or/circuitlist.h" diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7badcd370..9692e5d67 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -22,7 +22,7 @@ **/ #include "or/or.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" /* * Define this so we get channel internal functions, since we're implementing * part of a subclass (channel_tls_t). diff --git a/src/or/control.c b/src/or/control.c index 13814804a..7063b4cb3 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -38,7 +38,7 @@ #include "or/or.h" #include "or/addressmap.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/circuitbuild.h" diff --git a/src/or/directory.c b/src/or/directory.c index 2d3f7fe9a..4e34af305 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -8,7 +8,7 @@ #include "or/or.h" #include "lib/err/backtrace.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitbuild.h" #include "or/config.h" #include "or/connection.h" diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 693160e80..62d4e7322 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -5,7 +5,7 @@
#define DIRSERV_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/confparse.h" #include "or/channel.h" diff --git a/src/or/geoip.c b/src/or/geoip.c index 4a55e3f8d..fac35d398 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -30,7 +30,7 @@ #define GEOIP_PRIVATE #include "or/or.h" #include "ht.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/control.h" #include "or/dnsserv.h" diff --git a/src/or/main.c b/src/or/main.c index 67ebc980c..856e988cd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -51,7 +51,7 @@ #include "or/addressmap.h" #include "lib/err/backtrace.h" #include "or/bridges.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "or/channel.h" #include "or/channeltls.h" diff --git a/src/or/proto_cell.c b/src/or/proto_cell.c index af0862a97..41554bd1b 100644 --- a/src/or/proto_cell.c +++ b/src/or/proto_cell.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */
#include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_cell.h"
#include "or/connection_or.h" diff --git a/src/or/proto_control0.c b/src/or/proto_control0.c index 5d83b11cb..34e7ddb8d 100644 --- a/src/or/proto_control0.c +++ b/src/or/proto_control0.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */
#include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_control0.h"
/** Return 1 iff buf looks more like it has an (obsolete) v0 controller diff --git a/src/or/proto_ext_or.c b/src/or/proto_ext_or.c index 495b489bc..f30d87623 100644 --- a/src/or/proto_ext_or.c +++ b/src/or/proto_ext_or.c @@ -5,7 +5,7 @@ /* See LICENSE for licensing information */
#include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/ext_orport.h" #include "or/proto_ext_or.h"
diff --git a/src/or/proto_http.c b/src/or/proto_http.c index 45f763b2a..ecc669e3a 100644 --- a/src/or/proto_http.c +++ b/src/or/proto_http.c @@ -6,7 +6,7 @@
#define PROTO_HTTP_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_http.h"
/** Return true if <b>cmd</b> looks like a HTTP (proxy) request. */ diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index 46439d66b..94603c260 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -6,7 +6,7 @@
#include "or/or.h" #include "or/addressmap.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/control.h" #include "or/config.h" #include "lib/crypt_ops/crypto_util.h" diff --git a/src/or/relay.c b/src/or/relay.c index 9ff3d96c1..e8e1762b4 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -49,7 +49,7 @@ #include "or/or.h" #include "or/addressmap.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/circpathbias.h" #include "or/circuitbuild.h" diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 519010026..960972de8 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -9,7 +9,7 @@ #define SCHEDULER_KIST_PRIVATE #include "or/scheduler.h" #include "or/main.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #define TOR_CHANNEL_INTERNAL_ #include "or/channeltls.h"
diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index b62281d58..3059952b9 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -4,7 +4,7 @@ #define SCHEDULER_KIST_PRIVATE
#include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/networkstatus.h" diff --git a/src/test/fuzz/fuzz_http.c b/src/test/fuzz/fuzz_http.c index c82c658d9..772f2099b 100644 --- a/src/test/fuzz/fuzz_http.c +++ b/src/test/fuzz/fuzz_http.c @@ -8,7 +8,7 @@
#include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/directory.h" diff --git a/src/test/fuzz/fuzz_http_connect.c b/src/test/fuzz/fuzz_http_connect.c index 32bd26135..bf0a9deba 100644 --- a/src/test/fuzz/fuzz_http_connect.c +++ b/src/test/fuzz/fuzz_http_connect.c @@ -8,7 +8,7 @@
#include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/connection.h" #include "or/connection_edge.h" diff --git a/src/test/test.c b/src/test/test.c index 8ce756492..e3121293c 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -41,7 +41,7 @@ double fabs(double x);
#include "or/or.h" #include "lib/err/backtrace.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitlist.h" #include "or/circuitstats.h" #include "lib/compress/compress.h" diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 080325538..66ee99722 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -6,7 +6,7 @@ #define BUFFERS_PRIVATE #define PROTO_HTTP_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "lib/tls/buffers_tls.h" #include "lib/crypt_ops/crypto_rand.h" #include "or/proto_http.h" diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c index bd1182677..aed766fc0 100644 --- a/src/test/test_channeltls.c +++ b/src/test/test_channeltls.c @@ -8,7 +8,7 @@ #define TOR_CHANNEL_INTERNAL_ #include "or/or.h" #include "lib/net/address.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/channel.h" #include "or/channeltls.h" #include "or/connection_or.h" diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 3e99961ce..0032ef5b7 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -5,7 +5,7 @@ #define EXT_ORPORT_PRIVATE #define MAIN_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/connection.h" #include "or/connection_or.h" #include "or/config.h" diff --git a/src/test/test_helpers.c b/src/test/test_helpers.c index 2b1c33aa6..ba279c790 100644 --- a/src/test/test_helpers.c +++ b/src/test/test_helpers.c @@ -14,7 +14,7 @@ #include "orconfig.h" #include "or/or.h"
-#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/confparse.h" #include "or/connection.h" diff --git a/src/test/test_oom.c b/src/test/test_oom.c index c78ec4099..2e5989c0d 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -8,7 +8,7 @@ #define CIRCUITLIST_PRIVATE #define CONNECTION_PRIVATE #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/circuitlist.h" #include "common/compat_libevent.h" #include "or/connection.h" diff --git a/src/test/test_proto_http.c b/src/test/test_proto_http.c index b98ee83ae..57bfe2463 100644 --- a/src/test/test_proto_http.c +++ b/src/test/test_proto_http.c @@ -8,7 +8,7 @@
#include "or/or.h" #include "test/test.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/proto_http.h" #include "test/log_test_helpers.h"
diff --git a/src/test/test_proto_misc.c b/src/test/test_proto_misc.c index 979fc72f1..7f066e14a 100644 --- a/src/test/test_proto_misc.c +++ b/src/test/test_proto_misc.c @@ -8,7 +8,7 @@
#include "or/or.h" #include "test/test.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/connection_or.h" #include "or/ext_orport.h" #include "or/proto_cell.h" diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 04c028058..1d2c0cf2b 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -4,7 +4,7 @@ /* See LICENSE for licensing information */
#include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/proto_socks.h" #include "test/test.h" diff --git a/src/test/test_util.c b/src/test/test_util.c index 77196028d..539782e93 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -13,7 +13,7 @@ #define SUBPROCESS_PRIVATE #include "lib/testsupport/testsupport.h" #include "or/or.h" -#include "common/buffers.h" +#include "lib/container/buffers.h" #include "or/config.h" #include "or/control.h" #include "or/transports.h"
tor-commits@lists.torproject.org
-
nickm＠torproject.org