REORG: include: move common/chunk.h to haproxy/chunk.h

No change was necessary, it was already properly split.

diff --git a/contrib/hpack/decode.c b/contrib/hpack/decode.c
index 8dbb6f1f416fd0a916645f002a6791202b5f530f..bc38f92f7d0c596ded65e8351c5950962e5bc260 100644 (file)
--- a/contrib/hpack/decode.c
+++ b/contrib/hpack/decode.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/hpack-dec.h>
 
 #define MAX_RQ_SIZE 65536

diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index f3b9055118c158bff6b4f39416801c7c55d607bd..fdf80d8862abe7a3493b322272c50cdd0d8c1a85 100644 (file)
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -20,7 +20,7 @@
 
 #include <haproxy/api.h>
 #include <common/standard.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/time.h>
 
 #include <proto/spoe.h>

diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 530b42d069f01ec0c57d3161d5064c90ef8d3837..b4c990b4a646e8f91fab040a541b10d445dc4076 100644 (file)
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -32,7 +32,7 @@
 #include <event2/thread.h>
 
 #include <haproxy/list.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 
 #include <proto/spoe.h>
 

diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index ded8a6fa99f4296a2de392ece20c3fa5e57bdeff..b9d61ed4be6dc9f93d4fd65017cae7bc2e5009b2 100644 (file)
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -37,7 +37,7 @@
 #include <event2/thread.h>
 
 #include <haproxy/list.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 
 #include <proto/spoe.h>
 

diff --git a/include/common/buffer.h b/include/common/buffer.h
index e9aae2585160f0dc4bee0c1217489b1c32b2ae01..a42fc25ab39de81f5f8febbc6b2c10f4faf75465 100644 (file)
--- a/include/common/buffer.h
+++ b/include/common/buffer.h
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <import/ist.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/pool.h>

diff --git a/include/common/hpack-dec.h b/include/common/hpack-dec.h
index f538332be9a5cfeef1f0238ea070c4395c132610..1926574c5a7bed2b91fcc0f638265203f994e1e2 100644 (file)
--- a/include/common/hpack-dec.h
+++ b/include/common/hpack-dec.h
@@ -29,7 +29,7 @@
 #define _COMMON_HPACK_DEC_H
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/hpack-tbl.h>
 
 int hpack_decode_frame(struct hpack_dht *dht, const uint8_t *raw, uint32_t len,

diff --git a/include/common/htx.h b/include/common/htx.h
index e73b69939a73dfe2c0e18206269482e8f1a63fac..664aaca9ed0cec311b91daa19baa23f1b94bad56 100644 (file)
--- a/include/common/htx.h
+++ b/include/common/htx.h
@@ -26,7 +26,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <import/ist.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <common/http-hdr.h>
 

diff --git a/include/common/standard.h b/include/common/standard.h
index 7a2ba2e4aab63f180ae8ee35c02e620e9cea27c6..d2231d803255d2a2ee65ba56d9efe7251de7f4c5 100644 (file)
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -39,7 +39,7 @@
 #include <arpa/inet.h>
 #include <haproxy/api.h>
 #include <haproxy/intops.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/namespace.h>
 #include <import/eb32tree.h>
 #include <import/eb32sctree.h>

diff --git a/include/common/chunk.h b/include/haproxy/chunk.h
similarity index 98%
rename from include/common/chunk.h
rename to include/haproxy/chunk.h
index 279b80224b74a824162561878538b25f455b84a2..8bb9372f1b13388af57397b5bb6911dc5571c321 100644 (file)
--- a/include/common/chunk.h
+++ b/include/haproxy/chunk.h
@@ -1,5 +1,5 @@
 /*
- * include/common/chunk.h
+ * include/haproxy/chunk.h
  * Chunk management definitions, macros and inline functions.
  *
  * Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _TYPES_CHUNK_H
-#define _TYPES_CHUNK_H
+#ifndef _HAPROXY_CHUNK_H
+#define _HAPROXY_CHUNK_H
 
 #include <stdlib.h>
 #include <string.h>
@@ -298,7 +298,7 @@ static inline char *chunk_dup(struct buffer *dst, const struct buffer *src)
        return dst->area;
 }
 
-#endif /* _TYPES_CHUNK_H */
+#endif /* _HAPROXY_CHUNK_H */
 
 /*
  * Local variables:

diff --git a/include/proto/channel.h b/include/proto/channel.h
index eaaa36bcce0d359e15c87831d7cd62dd96cd15b6..a36b63a61f7feb742b08a4ab7331f0e01f474e1f 100644 (file)
--- a/include/proto/channel.h
+++ b/include/proto/channel.h
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/htx.h>
 #include <common/ticks.h>
 #include <haproxy/time.h>

diff --git a/include/types/applet.h b/include/types/applet.h
index 1f16543821e5a2c06f9ab93cad5afc5c09285e13..ac7f38d714febab785b619d2da926feb4429301e 100644 (file)
--- a/include/types/applet.h
+++ b/include/types/applet.h
@@ -29,7 +29,7 @@
 #include <types/proxy.h>
 #include <types/stream.h>
 #include <common/buffer.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/xref.h>
 
 struct appctx;

diff --git a/include/types/arg.h b/include/types/arg.h
index 366c09e09dc74444b7ac26b95c504ee26cd7fac1..6cd739f1712974ffc6a57dd803a9689ef5c98bb8 100644 (file)
--- a/include/types/arg.h
+++ b/include/types/arg.h
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/list-t.h>
 
 #include <types/vars.h>

diff --git a/include/types/proxy.h b/include/types/proxy.h
index aeec0ed92aac2e572701bd4dcc21588983acdb72..4e095efc0f4eed2d8eeefea268f98c00958df9d5 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -28,7 +28,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/list-t.h>
 #include <common/regex.h>

diff --git a/src/51d.c b/src/51d.c
index 6d3e86f106727021c30d56679ea9c0c226d0ca25..c53d68138fb1193583a4a2f190ab4026dcd5b6b7 100644 (file)
--- a/src/51d.c
+++ b/src/51d.c
@@ -2,7 +2,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/buffer.h>
 #include <haproxy/errors.h>
 #include <haproxy/thread.h>

diff --git a/src/arg.c b/src/arg.c
index adaff1293bcaf467fcb75b756ec5e90613aa6602..5adffe3a0f26135d009530d2ee97435efb12cf28 100644 (file)
--- a/src/arg.c
+++ b/src/arg.c
@@ -15,7 +15,7 @@
 #include <arpa/inet.h>
 
 #include <common/standard.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <types/global.h>
 #include <proto/arg.h>
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 373a32194fac3d3af1e860f31dc1713423753532..205f4fbee4d80d697d975a12091304dd4f42eabe 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -35,7 +35,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>

diff --git a/src/checks.c b/src/checks.c
index 6744e2d3c40bdd6477aa60a497b10d892c4e4be1..0a1d0e2e0db16d4b1c5a98538038a77cee32e91a 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -32,7 +32,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/list.h>
 #include <common/standard.h>
 #include <haproxy/time.h>

diff --git a/src/chunk.c b/src/chunk.c
index 2ec6a7d796b1ab6fe3db4ee191fd197f5a8b6027..917a4f93e022f859460361463710e4e0bad4cbbd 100644 (file)
--- a/src/chunk.c
+++ b/src/chunk.c
@@ -16,7 +16,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/standard.h>
 
 #include <types/global.h>

diff --git a/src/fcgi-app.c b/src/fcgi-app.c
index 5b116803d5deaf5c7b0e300cbf7de7af8317e68b..f0889001af79e6782dc579cc3cd9ab970994a650 100644 (file)
--- a/src/fcgi-app.c
+++ b/src/fcgi-app.c
@@ -11,7 +11,7 @@
  */
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
 #include <common/standard.h>

diff --git a/src/frontend.c b/src/frontend.c
index b111e6ad51f1e3efbc5f01549a85a683ca3d5d02..4a66c49c2d9aa09a08f7606da81f2af72dd481f8 100644 (file)
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -23,7 +23,7 @@
 #include <netinet/tcp.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/standard.h>
 #include <haproxy/time.h>
 

diff --git a/src/haproxy.c b/src/haproxy.c
index 917b14fc0857562839b3f1cb9c557f3a7c5cedc2..40d31d761055efa70e1a56acfafd44c16bf74401 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -83,7 +83,7 @@
 
 #include <haproxy/base64.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/pool.h>
 #include <haproxy/list.h>

diff --git a/src/hpack-dec.c b/src/hpack-dec.c
index 50293d85052b1c7a674fb1220f25e11b517f4741..aa73f9b210853bbecec5a940da77aa92a8a6c6ab 100644 (file)
--- a/src/hpack-dec.c
+++ b/src/hpack-dec.c
@@ -34,7 +34,7 @@
 #include <common/hpack-dec.h>
 #include <common/hpack-huff.h>
 #include <common/hpack-tbl.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/h2.h>
 #include <import/ist.h>
 

diff --git a/src/http_acl.c b/src/http_acl.c
index c55c720992181278ee57fe5cde44aef38c90f91e..368a4b113c57ce9120702bc0720400aefcda4ade 100644 (file)
--- a/src/http_acl.c
+++ b/src/http_acl.c
@@ -17,7 +17,7 @@
 #include <time.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>

diff --git a/src/http_act.c b/src/http_act.c
index 8e394cce9b14635ab25c7e5a1de39586304c1b54..c2e3857371dbfc23dfbf6fc686b8af582cdfd2ea 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -18,7 +18,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index b82883a48a23fe328afa5e5fc9333e8005e13b1b..8937fa0b8cb7f6876e6223b0ee45f9fd3fdf8b8c 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -17,7 +17,7 @@
 #include <time.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>

diff --git a/src/http_fetch.c b/src/http_fetch.c
index c253c8de93b6d0d60876db77e598a5201bece6dd..8fe22b8cc509006a921d8fc61f2abe56891319d3 100644 (file)
--- a/src/http_fetch.c
+++ b/src/http_fetch.c
@@ -18,7 +18,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/base64.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/h1.h>
 #include <common/http.h>
 #include <common/htx.h>

diff --git a/src/http_rules.c b/src/http_rules.c
index 01a820ebd918b81cd1252e550038a8c6b9657efd..96508e9a8446134354a9dae0e0e2d1f6fdf2e8a3 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -18,7 +18,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/http.h>
 #include <haproxy/pool.h>
 #include <common/standard.h>

diff --git a/src/htx.c b/src/htx.c
index 82c788b5ac63a54921353a0217a9e8752ab39898..d1679a280c90238a56018d6cf6abadffe4cee780 100644 (file)
--- a/src/htx.c
+++ b/src/htx.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/htx.h>
 
 struct htx htx_empty = { .size = 0, .data = 0, .head  = -1, .tail = -1, .first = -1 };

diff --git a/src/sample.c b/src/sample.c
index 0715e146898c103111f963df7a994a7d6ef667c9..23cd3ab8e74326320de6ebfd524f98b1d9d44108 100644 (file)
--- a/src/sample.c
+++ b/src/sample.c
@@ -19,7 +19,7 @@
 #include <haproxy/api.h>
 #include <types/global.h>
 
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/hash.h>
 #include <common/http.h>
 #include <common/net_helper.h>

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index f5e34055ea2cb8a91c8429a4fb8a4d04b026a706..fe194b7a743178eef708c867b0b7f362b32fedb4 100644 (file)
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -45,7 +45,7 @@
 #include <import/xxhash.h>
 
 #include <common/buffer.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <haproxy/errors.h>
 #include <haproxy/openssl-compat.h>
 #include <common/standard.h>

diff --git a/src/standard.c b/src/standard.c
index fe174af3a977f79a3a9f6ba5e16d46aa875e4257..2b32429eb276fef036f89552aa42f86701ca5091 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -37,7 +37,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/standard.h>
 #include <types/global.h>
 #include <proto/applet.h>

diff --git a/src/wurfl.c b/src/wurfl.c
index 8869461f49284c87b361c80bfe31a677852143a6..65a591732d2f1ccface3c2b10990da26c6233411 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/chunk.h>
+#include <haproxy/chunk.h>
 #include <common/buffer.h>
 #include <haproxy/errors.h>
 #include <types/global.h>