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

No change was necessary, it was already properly split.

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

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>

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>
 

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>
 

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>

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,

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>
 

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>

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:

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>

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;

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>

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>

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>

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>
 

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>

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>

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>

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>

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>
 

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>

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>
 

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>

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>

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>

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>

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>

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

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>

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>

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>

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>