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

The file was split into two since it contains a variable declaration.

diff --git a/include/haproxy/capture-t.h b/include/haproxy/capture-t.h
new file mode 100644 (file)
index 0000000..ebc7fe8
--- /dev/null
+++ b/include/haproxy/capture-t.h
@@ -0,0 +1,43 @@
+/*
+ * include/haproxy/capture-t.h
+ * This file defines types for captures.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _HAPROXY_CAPTURE_T_H
+#define _HAPROXY_CAPTURE_T_H
+
+#include <haproxy/pool-t.h>
+
+struct cap_hdr {
+    struct cap_hdr *next;
+    char *name;                                /* header name, case insensitive, NULL if not header */
+    int namelen;                       /* length of the header name, to speed-up lookups, 0 if !name */
+    int len;                           /* capture length, not including terminal zero */
+    int index;                         /* index in the output array */
+    struct pool_head *pool;            /* pool of pre-allocated memory area of (len+1) bytes */
+};
+
+#endif /* _HAPROXY_CAPTURE_T_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */

diff --git a/include/haproxy/capture.h b/include/haproxy/capture.h
new file mode 100644 (file)
index 0000000..ba0a6c0
--- /dev/null
+++ b/include/haproxy/capture.h
@@ -0,0 +1,37 @@
+/*
+ * include/haproxy/capture.h
+ * This file defines prototypes for captures.
+ *
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, version 2.1
+ * exclusively.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef _HAPROXY_CAPTURE_H
+#define _HAPROXY_CAPTURE_H
+
+#include <haproxy/capture-t.h>
+#include <haproxy/pool-t.h>
+
+extern struct pool_head *pool_head_capture;
+
+#endif /* _HAPROXY_CAPTURE_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */

diff --git a/include/types/capture.h b/include/types/capture.h
deleted file mode 100644 (file)
index 7849cdd..0000000
--- a/include/types/capture.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  include/types/capture.h
-  This file defines everything related to captures.
-
-  Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
-  
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation, version 2.1
-  exclusively.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#ifndef _TYPES_CAPTURE_H
-#define _TYPES_CAPTURE_H
-
-#include <haproxy/api-t.h>
-#include <haproxy/pool-t.h>
-
-struct cap_hdr {
-    struct cap_hdr *next;
-    char *name;                                /* header name, case insensitive, NULL if not header */
-    int namelen;                       /* length of the header name, to speed-up lookups, 0 if !name */
-    int len;                           /* capture length, not including terminal zero */
-    int index;                         /* index in the output array */
-    struct pool_head *pool;            /* pool of pre-allocated memory area of (len+1) bytes */
-};
-
-extern struct pool_head *pool_head_capture;
-
-#endif /* _TYPES_CAPTURE_H */
-
-/*
- * Local variables:
- *  c-indent-level: 8
- *  c-basic-offset: 8
- * End:
- */

diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c
index 0fdf5dbc680b1a5ba11744b67446591bb4e6c1e7..d72d83af9a8a1cf04e1dac57f7e392a729fe837b 100644 (file)
--- a/src/cfgparse-listen.c
+++ b/src/cfgparse-listen.c
@@ -14,7 +14,7 @@
 #include <common/cfgparse.h>
 #include <common/uri_auth.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <haproxy/compression-t.h>
 #include <haproxy/http_htx.h>
 #include <types/stats.h>

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 011977a0a90f4076cadbc5e563b4675f98bbf799..bf2373bf4e7378d0ddbeca4b79e87548acc00d30 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -36,6 +36,7 @@
 #include <haproxy/action-t.h>
 #include <haproxy/auth.h>
 #include <haproxy/api.h>
+#include <haproxy/capture.h>
 #include <common/cfgparse.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dns.h>
@@ -48,7 +49,6 @@
 #include <haproxy/namespace.h>
 #include <haproxy/thread.h>
 
-#include <types/capture.h>
 #include <types/filters.h>
 #include <types/global.h>
 #include <types/obj_type.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 95c35de7534864d02a81b3378c1198957ebfdcb5..37e1176599adc7dc3d8073a4aec59653f889370d 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -101,7 +101,7 @@
 #include <haproxy/version.h>
 #include <haproxy/thread.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/global.h>

diff --git a/src/http_act.c b/src/http_act.c
index 9355fa01338c41715d692417c444b47e7922f242..51bb1a34859ef035d20e64aac53dd9d1ef1f9cde 100644 (file)
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -28,7 +28,7 @@
 #include <common/uri_auth.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <proto/acl.h>

diff --git a/src/http_ana.c b/src/http_ana.c
index 3ad3bcca9e6be8eb323eabfbe46c71f47d1c56b0..da160980be6e3e52a2a383e6f46ac6806c72b61e 100644 (file)
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -20,7 +20,7 @@
 #include <haproxy/regex.h>
 #include <common/uri_auth.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 
 #include <proto/acl.h>
 #include <proto/channel.h>

diff --git a/src/http_conv.c b/src/http_conv.c
index e3e9517707829b2221ba44e416dac17845f63c72..da7d53f9347066a0bf7a84fd9d36f608f8236dab 100644 (file)
--- a/src/http_conv.c
+++ b/src/http_conv.c
@@ -23,7 +23,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <haproxy/arg.h>

diff --git a/src/http_rules.c b/src/http_rules.c
index c6bc54005fcd413fe6651d09762887f665f8495b..758e6192ac01ba20bc840e8ded64ce7ff4b0e07b 100644 (file)
--- a/src/http_rules.c
+++ b/src/http_rules.c
@@ -25,7 +25,7 @@
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/global.h>
 
 #include <proto/acl.h>

diff --git a/src/proxy.c b/src/proxy.c
index 45750b723b928c8702a2c4b1fa00e49ddfee6744..3f889c264c4964d1dfbcd6a28f376a8dab601e74 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -26,7 +26,7 @@
 #include <import/eb32tree.h>
 #include <import/ebistree.h>
 
-#include <types/capture.h>
+#include <haproxy/capture-t.h>
 #include <types/cli.h>
 #include <types/global.h>
 #include <types/obj_type.h>

diff --git a/src/stream.c b/src/stream.c
index b2c71d6ea26d301599f56f31a5b76ba4c4df3262..4bd8d517ba57610eb0bcc379dd6babdcd3ce0cfb 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -16,6 +16,7 @@
 
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/capture.h>
 #include <common/cfgparse.h>
 #include <haproxy/dict.h>
 #include <haproxy/dns.h>
@@ -27,7 +28,6 @@
 #include <haproxy/pool.h>
 
 #include <types/applet.h>
-#include <types/capture.h>
 #include <types/cli.h>
 #include <types/filters.h>
 #include <types/global.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 262224d9b2dd0c96da4559f8c011da308df28c7a..6cd87efa07ab10197a73f07f08c339bb5ed6de08 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -11,6 +11,7 @@
  */
 #include <haproxy/action.h>
 #include <haproxy/api.h>
+#include <haproxy/capture-t.h>
 #include <common/cfgparse.h>
 #include <haproxy/list.h>
 #include <haproxy/tools.h>
@@ -18,7 +19,6 @@
 #include <haproxy/time.h>
 
 #include <haproxy/arg-t.h>
-#include <types/capture.h>
 #include <types/connection.h>
 #include <types/global.h>