commit 469509b39eb23a269eb9f6c6505710945725b541
author Willy Tarreau <w@1wt.eu> Thu Jun 04 15:13:30 2020 +0200
committer Willy Tarreau <w@1wt.eu> Thu Jun 11 10:18:58 2020 +0200
tree fa3b54613009b06625c1fd57094891ecea6d88ae
parent 2cd5809f94eeb733d713072bdda95ee762157fd9

REORG: include: move payload.h to haproxy/payload.h

There's no type file, it only contains fetch_rdp_cookie_name() and
val_payload_lv() which probably ought to move somewhere else instead
of staying there.

include/haproxy/payload.h

diff --git a/include/proto/payload.h b/include/haproxy/payload.h
similarity index 89%
rename from include/proto/payload.h
rename to include/haproxy/payload.h
index 481b613..a99adf0 100644
--- a/include/proto/payload.h
+++ b/include/haproxy/payload.h
@@ -1,5 +1,5 @@
 /*
- * include/proto/payload.h
+ * include/haproxy/payload.h
  * Definitions for payload-based sample fetches and ACLs
  *
  * Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _PROTO_PROTO_PAYLOAD_H
-#define _PROTO_PROTO_PAYLOAD_H
+#ifndef _HAPROXY_PAYLOAD_H
+#define _HAPROXY_PAYLOAD_H
 
 #include <haproxy/api.h>
 #include <types/sample.h>
@@ -29,7 +29,7 @@
 int fetch_rdp_cookie_name(struct stream *s, struct sample *smp, const char *cname, int clen);
 int val_payload_lv(struct arg *arg, char **err_msg);
 
-#endif /* _PROTO_PROTO_PAYLOAD_H */
+#endif /* _HAPROXY_PAYLOAD_H */
 
 /*
  * Local variables:

src/backend.c

diff --git a/src/backend.c b/src/backend.c
index 0d18e15..6c6c26d 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -30,6 +30,7 @@
 #include <haproxy/lb_fwlc.h>
 #include <haproxy/lb_fwrr.h>
 #include <haproxy/obj_type.h>
+#include <haproxy/payload.h>
 #include <haproxy/ticks.h>
 #include <haproxy/time.h>
 #include <haproxy/namespace.h>
@@ -43,7 +44,6 @@
 #include <proto/checks.h>
 #include <proto/lb_map.h>
 #include <proto/log.h>
-#include <proto/payload.h>
 #include <haproxy/protocol.h>
 #include <proto/http_ana.h>
 #include <proto/proto_tcp.h>

src/hlua.c

diff --git a/src/hlua.c b/src/hlua.c
index a2743f9..69d84bd 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -36,6 +36,7 @@
 #include <haproxy/map.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pattern.h>
+#include <haproxy/payload.h>
 #include <haproxy/tools.h>
 
 #include <types/cli.h>
@@ -50,7 +51,6 @@
 #include <proto/stats.h>
 #include <proto/http_fetch.h>
 #include <proto/queue.h>
-#include <proto/payload.h>
 #include <proto/http_ana.h>
 #include <proto/sample.h>
 #include <proto/server.h>

src/payload.c

diff --git a/src/payload.c b/src/payload.c
index eaf8f06..3d176d6 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -15,13 +15,13 @@
 
 #include <haproxy/api.h>
 #include <haproxy/net_helper.h>
+#include <haproxy/payload.h>
 #include <haproxy/pattern.h>
 #include <haproxy/htx.h>
 #include <proto/acl.h>
 #include <haproxy/arg.h>
 #include <proto/channel.h>
 #include <proto/connection.h>
-#include <proto/payload.h>
 #include <proto/sample.h>
 #include <proto/http_ana.h>