Fix paths for buffers.h; automated.

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

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

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"

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

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"

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"

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"

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"

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"

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"

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

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"
 

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

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"