From c13ed53b1272ee3c6a9866bdd1c8fffba8838b30 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Tue, 2 Jun 2020 10:22:45 +0200
Subject: [PATCH] REORG: include: move common/chunk.h to haproxy/chunk.h

No change was necessary, it was already properly split.
---
 contrib/hpack/decode.c              | 2 +-
 contrib/mod_defender/defender.c     | 2 +-
 contrib/mod_defender/spoa.c         | 2 +-
 contrib/modsecurity/spoa.c          | 2 +-
 include/common/buffer.h             | 2 +-
 include/common/hpack-dec.h          | 2 +-
 include/common/htx.h                | 2 +-
 include/common/standard.h           | 2 +-
 include/{common => haproxy}/chunk.h | 8 ++++----
 include/proto/channel.h             | 2 +-
 include/types/applet.h              | 2 +-
 include/types/arg.h                 | 2 +-
 include/types/proxy.h               | 2 +-
 src/51d.c                           | 2 +-
 src/arg.c                           | 2 +-
 src/cfgparse.c                      | 2 +-
 src/checks.c                        | 2 +-
 src/chunk.c                         | 2 +-
 src/fcgi-app.c                      | 2 +-
 src/frontend.c                      | 2 +-
 src/haproxy.c                       | 2 +-
 src/hpack-dec.c                     | 2 +-
 src/http_acl.c                      | 2 +-
 src/http_act.c                      | 2 +-
 src/http_conv.c                     | 2 +-
 src/http_fetch.c                    | 2 +-
 src/http_rules.c                    | 2 +-
 src/htx.c                           | 2 +-
 src/sample.c                        | 2 +-
 src/ssl_sock.c                      | 2 +-
 src/standard.c                      | 2 +-
 src/wurfl.c                         | 2 +-
 32 files changed, 35 insertions(+), 35 deletions(-)
 rename include/{common => haproxy}/chunk.h (98%)

diff --git a/contrib/hpack/decode.c b/contrib/hpack/decode.c
index 8dbb6f1f41..bc38f92f7d 100644
--- 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 f3b9055118..fdf80d8862 100644
--- 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 530b42d069..b4c990b4a6 100644
--- 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 ded8a6fa99..b9d61ed4be 100644
--- 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 e9aae25851..a42fc25ab3 100644
--- 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 f538332be9..1926574c5a 100644
--- 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 e73b69939a..664aaca9ed 100644
--- 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 7a2ba2e4aa..d2231d8032 100644
--- 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 279b80224b..8bb9372f1b 100644
--- 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 eaaa36bcce..a36b63a61f 100644
--- 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 1f16543821..ac7f38d714 100644
--- 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 366c09e09d..6cd739f171 100644
--- 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 aeec0ed92a..4e095efc0f 100644
--- 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 6d3e86f106..c53d68138f 100644
--- 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 adaff1293b..5adffe3a0f 100644
--- 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 373a32194f..205f4fbee4 100644
--- 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 6744e2d3c4..0a1d0e2e0d 100644
--- 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 2ec6a7d796..917a4f93e0 100644
--- 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 5b116803d5..f0889001af 100644
--- 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 b111e6ad51..4a66c49c2d 100644
--- 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 917b14fc08..40d31d7610 100644
--- 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 50293d8505..aa73f9b210 100644
--- 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 c55c720992..368a4b113c 100644
--- 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 8e394cce9b..c2e3857371 100644
--- 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 b82883a48a..8937fa0b8c 100644
--- 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 c253c8de93..8fe22b8cc5 100644
--- 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 01a820ebd9..96508e9a84 100644
--- 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 82c788b5ac..d1679a280c 100644
--- 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 0715e14689..23cd3ab8e7 100644
--- 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 f5e34055ea..fe194b7a74 100644
--- 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 fe174af3a9..2b32429eb2 100644
--- 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 8869461f49..65a591732d 100644
--- 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>
-- 
2.47.2