]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REORG: include: move arg.h to haproxy/arg{,-t}.h
authorWilly Tarreau <w@1wt.eu>
Thu, 4 Jun 2020 08:19:23 +0000 (10:19 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 11 Jun 2020 08:18:57 +0000 (10:18 +0200)
Almost no change was needed; chunk.h was replaced with buf-t.h.
It dpeends on types/vars.h and types/protocol_buffers.h.

33 files changed:
contrib/modsecurity/modsec_wrapper.c
include/haproxy/arg-t.h [moved from include/types/arg.h with 97% similarity]
include/haproxy/arg.h [moved from include/proto/arg.h with 96% similarity]
include/proto/http_fetch.h
include/proto/protocol_buffers.h
include/types/acl.h
src/51d.c
src/acl.c
src/arg.c
src/backend.c
src/checks.c
src/da.c
src/flt_spoe.c
src/frontend.c
src/haproxy.c
src/hlua.c
src/http_acl.c
src/http_act.c
src/http_conv.c
src/http_fetch.c
src/http_htx.c
src/http_rules.c
src/map.c
src/payload.c
src/proto_tcp.c
src/sample.c
src/ssl_sample.c
src/ssl_sock.c
src/stick_table.c
src/stream.c
src/tcp_rules.c
src/vars.c
src/wurfl.c

index 6306b0b94388bf392280173a932ed05156a7de94..8b9d998dda56e3a565197add74aaa21faf8410ec 100644 (file)
@@ -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>
 
similarity index 97%
rename from include/types/arg.h
rename to include/haproxy/arg-t.h
index 6cd739f1712974ffc6a57dd803a9689ef5c98bb8..1a4208d4e940ff601f6d05a7069a272766fca258 100644 (file)
@@ -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>
  * 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:
similarity index 96%
rename from include/proto/arg.h
rename to include/haproxy/arg.h
index 884e5bbf230f40d7883b68d5531f2df5f252f782..1817daef7ca9cd648b95dd4810db05296497b970 100644 (file)
@@ -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>
  * 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:
index 8df991c208b6539b851f7734107a0f32d0a06f0c..e631bc03a9b11949c3c4d5bac4ae970608f2df6e 100644 (file)
@@ -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>
index 0426d83d2cc94ab5147c537e77f14479db7b76e3..3e1571a308b71d7e5272613b8b608f12330a12d2 100644 (file)
@@ -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>
 
index 7afa3d8707e57c540d4c5c5b7442d65add3bf842..89c3c93c8f95189b9b474d1cd3889e27232171a3 100644 (file)
@@ -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>
index d6033f34a5f772ff1accde6d0fecbe6610bce5a9..ceff8283ee5a012f5573087647a3c6d0e5daf4a3 100644 (file)
--- a/src/51d.c
+++ b/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>
index 16e775314670e0429c1eee297fe669638ab28b41..5b5fd1d3b99fe0e7ca6436c223f6828e86c158a1 100644 (file)
--- a/src/acl.c
+++ b/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>
index 9c4fa44f864fa4271c5d90e19ec9dffae4fc49e0..467929b52cadcad35725c41e785698ae2cd1c296 100644 (file)
--- a/src/arg.c
+++ b/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",
index 22f8603c8e260daa7a0d68ca47eba7049fbab0cd..7169058110e42b28aea18900ed3205046919bcde 100644 (file)
@@ -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>
index 279e8af01b65cd4c26c819ea48a2cca949eb5e7f..81ca77b7ab55199a4ae2ec976cf7c78458956247 100644 (file)
@@ -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>
index a9bc696aa855b8fed45df2d3b94b0cffec3b477b..8ff5bfac44e29a28dae6893b7e7f9d18efb1480e 100644 (file)
--- a/src/da.c
+++ b/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>
index 4bb259e6e6bef679009feeef985bf4112f6f825f..91915233bf544baaa872298a1e4bf693113af2f4 100644 (file)
 #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>
index 82067090c480a2042108aabba29d10f5f947f1e1..a71dc091d2510233d23f6b71f9efcf17ef6a3306 100644 (file)
@@ -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>
index 1ec9d83135a078cd3d63139bd2cbf09fb94c515b..94a37c3f6977037e1119850d598e51a070c67587 100644 (file)
 
 #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>
index 284c17359813c04dcc510388f99eef73f3b7f9ce..d0d6282de6dfcf87d4ccdcb4bd73efb32c31336a 100644 (file)
@@ -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>
index 8ff4ab3e4acdf2ca8dc6e16235d82b07f67740a1..2fe7e85e1f4e090d4862a8cf6cfa52624d19a909 100644 (file)
@@ -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>
 
index 8bb98775b90d64c8c4a460cae09f30a14a13ed8f..9355fa01338c41715d692417c444b47e7922f242 100644 (file)
@@ -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>
index e321dbb0519be6ecdd0aebd958ac6ce57d6aa178..e3e9517707829b2221ba44e416dac17845f63c72 100644 (file)
@@ -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>
 
index 42ba8c2f7ee8a0ad5f0f12200be7406e3f847ec1..31a69e768058f8824c96cd6114ba114263201a5e 100644 (file)
@@ -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>
index af4dd5cec032b7d63de0b1ec7282df990cd30d3a..8524d8af502bf633ff80c1673c7a2fd574a10899 100644 (file)
@@ -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>
 
index ba19e878e558153e48f68b4e8fc947fa124f5958..c6bc54005fcd413fe6651d09762887f665f8495b 100644 (file)
@@ -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>
index 8dc1b51962ad251ecd5d38f2f3f83f40a13c174d..df24ed2f03e6431731e9b63b1e69900e0d2d0d00 100644 (file)
--- a/src/map.c
+++ b/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>
index 7d7cb36564cf75aba7d7d69e464bf1c4a5cdacbb..f52f9873c200ea17ad82c512053d81074b534d39 100644 (file)
@@ -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>
index c21d1c91a7e2c0b8ca14decbae37d556db0e94bb..5a475b8714144136e5a30b3d583499d9986ee175 100644 (file)
@@ -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>
index 2dec9edb9661bd83da9d295aab88ac15ce46c379..c1a4bb9bb600e24d2e79ada19d54045a424ae5fb 100644 (file)
@@ -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>
index 5f8cbd798a3fa4ce66f3a201a09fc95f0247c9c1..8eb958b8e2d2c6db9e90287ae166d90647bc428d 100644 (file)
@@ -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>
index 357828d29301dbf6d67e0cbfd06f6685382b9e9e..45981cf383a632cf479e321dc84d977a9e52bd4f 100644 (file)
@@ -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>
index 8ceafa3c668ec320d96f682bc1d8f63dfd6c41ae..c2e1e852bf03347e8cd0206dd94aa15e4a2be2bf 100644 (file)
@@ -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>
index 530be55c4758a3a7fdd28341c7eba0da6412b7a9..151dbf037dd22e0069e6bea5b021f6bca296bc6a 100644 (file)
@@ -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>
index d6c1eb3fb6d335ab22b7064a54c537cf6f237d10..262224d9b2dd0c96da4559f8c011da308df28c7a 100644 (file)
@@ -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>
index edcf1af1c0b666fcf858455e7c5ea1bcc76e466c..de55f148ba73e54fa53617d08f49901b148a6a1a 100644 (file)
@@ -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>
index 9f374fa65e271423871b553824a8e078f76f9a25..78288bee6ba1637c2f9098504bb76597533b3abb 100644 (file)
@@ -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>