REORG: include: move arg.h to haproxy/arg{,-t}.h

Almost no change was needed; chunk.h was replaced with buf-t.h.
It dpeends on types/vars.h and types/protocol_buffers.h.

contrib/modsecurity/modsec_wrapper.c

@@ -22,7 +22,7 @@
 #include <types/global.h>
 #include <types/stream.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/spoe.h>
 

include/haproxy/arg-t.h

@@ -1,5 +1,5 @@
 /*
- * include/types/arg.h
+ * include/haproxy/arg-t.h
  * This file contains structure declarations for generaic argument parsing.
  *
  * Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _TYPES_ARG_H
-#define _TYPES_ARG_H
+#ifndef _HAPROXY_ARG_T_H
+#define _HAPROXY_ARG_T_H
 
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include <haproxy/chunk.h>
+#include <haproxy/buf-t.h>
 #include <haproxy/list-t.h>
 
 #include <types/vars.h>
@@ -133,7 +133,7 @@ struct arg_list {
 	int line;                 /* line number where the args are referenced */
 };
 
-#endif /* _TYPES_ARG_H */
+#endif /* _HAPROXY_ARG_T_H */
 
 /*
  * Local variables:

include/haproxy/arg.h

@@ -1,5 +1,5 @@
 /*
- * include/proto/arg.h
+ * include/haproxy/arg.h
  * This file contains functions and macros declarations for generic argument parsing.
  *
  * Copyright 2012 Willy Tarreau <w@1wt.eu>
@@ -19,10 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _PROTO_ARG_H
-#define _PROTO_ARG_H
+#ifndef _HAPROXY_ARG_H
+#define _HAPROXY_ARG_H
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 
 /* Some macros used to build some arg list. We can declare various argument
  * combinations from 0 to 7 args using a single 32-bit integer. The first
@@ -83,7 +83,7 @@ int make_arg_list(const char *in, int len, uint64_t mask, struct arg **argp,
                   char **err_msg, const char **end_ptr, int *err_arg,
                   struct arg_list *al);
 
-#endif /* _PROTO_ARG_H */
+#endif /* _HAPROXY_ARG_H */
 
 /*
  * Local variables:

include/proto/http_fetch.h

@@ -24,7 +24,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/htx.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/channel.h>
 #include <types/checks.h>
 #include <types/sample.h>

include/proto/protocol_buffers.h

@@ -23,7 +23,7 @@
 #define _PROTO_PROTOCOL_BUFFERS_H
 
 #include <inttypes.h>
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/protocol_buffers.h>
 #include <proto/sample.h>
 

include/types/acl.h

@@ -25,7 +25,7 @@
 #include <haproxy/api-t.h>
 #include <haproxy/list-t.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/auth.h>
 #include <types/pattern.h>
 #include <types/proxy.h>

src/51d.c

@@ -8,7 +8,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/thread.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>

src/acl.c

@@ -22,7 +22,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/channel.h>
 #include <proto/log.h>

src/arg.c

@@ -17,7 +17,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/chunk.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 
 const char *arg_type_names[ARGT_NBTYPES] = {
 	[ARGT_STOP] = "end of arguments",

src/backend.c

@@ -31,7 +31,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>

src/checks.c

@@ -49,7 +49,7 @@
 #include <types/dns.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/checks.h>
 #include <proto/stats.h>

src/da.c

@@ -6,7 +6,7 @@
 #include <haproxy/http.h>
 #include <haproxy/http_htx.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>

src/flt_spoe.c

@@ -19,12 +19,12 @@
 #include <haproxy/pool.h>
 #include <haproxy/time.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/global.h>
 #include <types/spoe.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/filters.h>
 #include <haproxy/freq_ctr.h>

src/frontend.c

@@ -30,7 +30,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <haproxy/fd.h>
 #include <proto/frontend.h>

src/haproxy.c

@@ -108,7 +108,7 @@
 
 #include <proto/acl.h>
 #include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/backend.h>
 #include <proto/channel.h>

src/hlua.c

@@ -38,7 +38,7 @@
 #include <types/proxy.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/cli.h>

src/http_acl.c

@@ -26,7 +26,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/pattern.h>
 

src/http_act.c

@@ -32,7 +32,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>

src/http_conv.c

@@ -26,7 +26,7 @@
 #include <types/capture.h>
 #include <types/global.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/sample.h>
 #include <proto/stream.h>
 

src/http_fetch.c

@@ -30,7 +30,7 @@
 
 #include <types/global.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/channel.h>
 #include <proto/connection.h>

src/http_htx.c

@@ -24,7 +24,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/htx.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_fetch.h>
 #include <proto/sample.h>
 

src/http_rules.c

@@ -29,7 +29,7 @@
 #include <types/global.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>

src/map.c

@@ -24,7 +24,7 @@
 #include <types/stats.h>
 
 #include <proto/applet.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <proto/map.h>

src/payload.c

@@ -17,7 +17,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/htx.h>
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/pattern.h>

src/proto_tcp.c

@@ -41,7 +41,7 @@
 #include <types/global.h>
 #include <types/stream.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <haproxy/fd.h>

src/sample.c

@@ -29,7 +29,7 @@
 #include <common/uri_auth.h>
 #include <haproxy/base64.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/auth.h>
 #include <proto/log.h>
 #include <proto/proxy.h>

src/ssl_sample.c

@@ -29,7 +29,7 @@
 #include <types/ssl_sock.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/obj_type.h>
 #include <proto/ssl_sock.h>
 #include <proto/ssl_utils.h>

src/ssl_sock.c

@@ -64,7 +64,7 @@
 #include <types/stats.h>
 
 #include <proto/acl.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
 #include <proto/cli.h>

src/stick_table.c

@@ -29,7 +29,7 @@
 #include <types/global.h>
 #include <types/stats.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/cli.h>
 #include <proto/http_rules.h>
 #include <proto/log.h>

src/stream.c

@@ -34,7 +34,7 @@
 
 #include <proto/acl.h>
 #include <haproxy/activity.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/backend.h>
 #include <proto/channel.h>
 #include <proto/checks.h>

src/tcp_rules.c

@@ -17,7 +17,7 @@
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 
-#include <types/arg.h>
+#include <haproxy/arg-t.h>
 #include <types/capture.h>
 #include <types/connection.h>
 #include <types/global.h>

src/vars.c

@@ -7,7 +7,7 @@
 
 #include <types/vars.h>
 
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/http_rules.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>

src/wurfl.c

@@ -8,7 +8,7 @@
 #include <haproxy/errors.h>
 #include <haproxy/http_htx.h>
 #include <types/global.h>
-#include <proto/arg.h>
+#include <haproxy/arg.h>
 #include <proto/log.h>
 #include <proto/http_ana.h>
 #include <proto/http_fetch.h>