From: Willy Tarreau <w@1wt.eu>
Date: Thu, 11 Jun 2020 07:14:49 +0000 (+0200)
Subject: REORG: include: make list-t.h part of the base API
X-Git-Tag: v2.2-dev9~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5793916f00bf677382ef0ba3a4b163c20421937;p=thirdparty%2Fhaproxy.git

REORG: include: make list-t.h part of the base API

There are list definitions everywhere in the code, let's drop the need
for including list-t.h to declare them. The rest of the list manipulation
is huge however and not needed everywhere so using the list walking macros
still requires to include list.h.
---

diff --git a/include/haproxy/acl-t.h b/include/haproxy/acl-t.h
index a96aa428d9..e7de2a21d8 100644
--- a/include/haproxy/acl-t.h
+++ b/include/haproxy/acl-t.h
@@ -22,7 +22,6 @@
 #ifndef _HAPROXY_ACL_T_H
 #define _HAPROXY_ACL_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/sample-t.h>
 
diff --git a/include/haproxy/api-t.h b/include/haproxy/api-t.h
index e82f54b657..edb33a859d 100644
--- a/include/haproxy/api-t.h
+++ b/include/haproxy/api-t.h
@@ -35,5 +35,6 @@
 #include <haproxy/compat.h>
 #include <haproxy/compiler.h>
 #include <haproxy/defaults.h>
+#include <haproxy/list-t.h>
 
 #endif /* _HAPROXY_TYPES_H */
diff --git a/include/haproxy/arg-t.h b/include/haproxy/arg-t.h
index 04d2d9e4f7..55d7e443c0 100644
--- a/include/haproxy/arg-t.h
+++ b/include/haproxy/arg-t.h
@@ -26,7 +26,6 @@
 #include <netinet/in.h>
 
 #include <haproxy/buf-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/protobuf-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/vars-t.h>
diff --git a/include/haproxy/auth-t.h b/include/haproxy/auth-t.h
index 26716acdaf..fc8b6ec503 100644
--- a/include/haproxy/auth-t.h
+++ b/include/haproxy/auth-t.h
@@ -16,7 +16,6 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/auth-t.h>
-#include <haproxy/list-t.h>
 
 #define AU_O_INSECURE	0x00000001		/* insecure, unencrypted password */
 
diff --git a/include/haproxy/cfgparse.h b/include/haproxy/cfgparse.h
index 646384e318..15a46ec8a8 100644
--- a/include/haproxy/cfgparse.h
+++ b/include/haproxy/cfgparse.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
-#include <haproxy/list-t.h>
 #include <haproxy/proxy.h>
 
 /* configuration sections */
diff --git a/include/haproxy/check-t.h b/include/haproxy/check-t.h
index 901805dd4e..727f837bb8 100644
--- a/include/haproxy/check-t.h
+++ b/include/haproxy/check-t.h
@@ -20,7 +20,6 @@
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/vars-t.h>
 
diff --git a/include/haproxy/check.h b/include/haproxy/check.h
index 1d3340ad61..a1bdb012df 100644
--- a/include/haproxy/check.h
+++ b/include/haproxy/check.h
@@ -23,7 +23,6 @@
 #define _HAPROXY_CHECKS_H
 
 #include <haproxy/check-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 
diff --git a/include/haproxy/cli-t.h b/include/haproxy/cli-t.h
index bfa3a34a7e..8f12fee425 100644
--- a/include/haproxy/cli-t.h
+++ b/include/haproxy/cli-t.h
@@ -23,7 +23,6 @@
 #define _HAPROXY_CLI_T_H
 
 #include <haproxy/applet-t.h>
-#include <haproxy/list-t.h>
 
 /* Access level for a stats socket */
 #define ACCESS_LVL_NONE     0
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index 3755e83e49..ff0ba92e76 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -31,7 +31,6 @@
 #include <import/ist.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/port_range-t.h>
diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h
index 6816b0835a..9ba60012cf 100644
--- a/include/haproxy/dns-t.h
+++ b/include/haproxy/dns-t.h
@@ -25,7 +25,6 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/connection-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/proto_udp-t.h>
 #include <haproxy/task-t.h>
diff --git a/include/haproxy/dynbuf-t.h b/include/haproxy/dynbuf-t.h
index 451d58c538..b76b30bdce 100644
--- a/include/haproxy/dynbuf-t.h
+++ b/include/haproxy/dynbuf-t.h
@@ -22,7 +22,6 @@
 #ifndef _HAPROXY_DYNBUF_T_H
 #define _HAPROXY_DYNBUF_T_H
 
-#include <haproxy/list-t.h>
 
 /* an element of the <buffer_wq> list. It represents an object that need to
  * acquire a buffer to continue its process. */
diff --git a/include/haproxy/dynbuf.h b/include/haproxy/dynbuf.h
index 01a784d4f7..fb72b0a9b1 100644
--- a/include/haproxy/dynbuf.h
+++ b/include/haproxy/dynbuf.h
@@ -32,7 +32,6 @@
 #include <haproxy/buf.h>
 #include <haproxy/chunk.h>
 #include <haproxy/dynbuf-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/pool.h>
 
 extern struct pool_head *pool_head_buffer;
diff --git a/include/haproxy/fcgi-app-t.h b/include/haproxy/fcgi-app-t.h
index 3148260979..10cb1785f5 100644
--- a/include/haproxy/fcgi-app-t.h
+++ b/include/haproxy/fcgi-app-t.h
@@ -30,7 +30,6 @@
 #include <haproxy/arg-t.h>
 #include <haproxy/fcgi.h>
 #include <haproxy/filters-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
 
 #define FCGI_APP_FL_KEEP_CONN     0x00000001 /* Keep the connection alive */
diff --git a/include/haproxy/filters-t.h b/include/haproxy/filters-t.h
index f41fa10902..d2f8c73868 100644
--- a/include/haproxy/filters-t.h
+++ b/include/haproxy/filters-t.h
@@ -22,7 +22,6 @@
 #define _HAPROXY_FILTERS_T_H
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 
 /* Flags set on a filter config */
 #define FLT_CFG_FL_HTX    0x00000001  /* The filter can filter HTX streams */
diff --git a/include/haproxy/global-t.h b/include/haproxy/global-t.h
index 078889d78c..7db541209b 100644
--- a/include/haproxy/global-t.h
+++ b/include/haproxy/global-t.h
@@ -25,7 +25,6 @@
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/freq_ctr-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/vars-t.h>
 
 /* modes of operation (global.mode) */
diff --git a/include/haproxy/hlua-t.h b/include/haproxy/hlua-t.h
index 6764bfa57d..391310c103 100644
--- a/include/haproxy/hlua-t.h
+++ b/include/haproxy/hlua-t.h
@@ -29,7 +29,6 @@
 
 #include <import/ebpttree.h>
 
-#include <haproxy/list-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/server-t.h>
diff --git a/include/haproxy/http_htx-t.h b/include/haproxy/http_htx-t.h
index 9ca06a03e3..8051925e2e 100644
--- a/include/haproxy/http_htx-t.h
+++ b/include/haproxy/http_htx-t.h
@@ -29,7 +29,6 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/http-t.h>
 #include <haproxy/htx-t.h>
-#include <haproxy/list-t.h>
 
 /* Context used to find/remove an HTTP header. */
 struct http_hdr_ctx {
diff --git a/include/haproxy/list.h b/include/haproxy/list.h
index a35502c67a..2f2699f17c 100644
--- a/include/haproxy/list.h
+++ b/include/haproxy/list.h
@@ -23,7 +23,6 @@
 #define _HAPROXY_LIST_H
 
 #include <haproxy/api.h>
-#include <haproxy/list-t.h>
 #include <haproxy/thread.h>
 
 /* First undefine some macros which happen to also be defined on OpenBSD,
diff --git a/include/haproxy/listener-t.h b/include/haproxy/listener-t.h
index 4412cf7be0..224e32513c 100644
--- a/include/haproxy/listener-t.h
+++ b/include/haproxy/listener-t.h
@@ -28,7 +28,6 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/thread.h>
 
diff --git a/include/haproxy/log-t.h b/include/haproxy/log-t.h
index bee43283f7..2fcce43bd6 100644
--- a/include/haproxy/log-t.h
+++ b/include/haproxy/log-t.h
@@ -27,7 +27,6 @@
 #include <netinet/in.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/ring-t.h>
 #include <haproxy/thread-t.h>
 
diff --git a/include/haproxy/mailers-t.h b/include/haproxy/mailers-t.h
index 076a9f76d5..0fa3197a97 100644
--- a/include/haproxy/mailers-t.h
+++ b/include/haproxy/mailers-t.h
@@ -32,7 +32,6 @@
 #include <arpa/inet.h>
 
 #include <haproxy/check-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/tcpcheck-t.h>
 #include <haproxy/thread-t.h>
 
diff --git a/include/haproxy/pattern-t.h b/include/haproxy/pattern-t.h
index 63e4c7271c..c9a14a8252 100644
--- a/include/haproxy/pattern-t.h
+++ b/include/haproxy/pattern-t.h
@@ -25,7 +25,6 @@
 #include <import/ebmbtree.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/regex-t.h>
 #include <haproxy/sample_data-t.h>
 #include <haproxy/thread-t.h>
diff --git a/include/haproxy/peers-t.h b/include/haproxy/peers-t.h
index a681cff674..0f8db66cc3 100644
--- a/include/haproxy/peers-t.h
+++ b/include/haproxy/peers-t.h
@@ -31,7 +31,6 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/dict-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/thread-t.h>
 
 
diff --git a/include/haproxy/protocol-t.h b/include/haproxy/protocol-t.h
index cc762aefa6..83620db415 100644
--- a/include/haproxy/protocol-t.h
+++ b/include/haproxy/protocol-t.h
@@ -27,7 +27,6 @@
 
 #include <import/eb32tree.h>
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 
 /* some pointer types referenced below */
 struct listener;
diff --git a/include/haproxy/proxy-t.h b/include/haproxy/proxy-t.h
index 5cdba708f0..20cc3c9e16 100644
--- a/include/haproxy/proxy-t.h
+++ b/include/haproxy/proxy-t.h
@@ -35,7 +35,6 @@
 #include <haproxy/backend-t.h>
 #include <haproxy/counters-t.h>
 #include <haproxy/freq_ctr-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/tcpcheck-t.h>
diff --git a/include/haproxy/ring-t.h b/include/haproxy/ring-t.h
index e1f9468dc3..a379265cff 100644
--- a/include/haproxy/ring-t.h
+++ b/include/haproxy/ring-t.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/buf-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/thread.h>
 
 /* The code below handles circular buffers with single-producer and multiple
diff --git a/include/haproxy/sample-t.h b/include/haproxy/sample-t.h
index 2873037fb9..d11c411dde 100644
--- a/include/haproxy/sample-t.h
+++ b/include/haproxy/sample-t.h
@@ -24,7 +24,6 @@
 #define _HAPROXY_SAMPLE_T_H
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/sample_data-t.h>
 
 /* input and output sample types */
diff --git a/include/haproxy/server-t.h b/include/haproxy/server-t.h
index 1db69b461d..48ed176eb2 100644
--- a/include/haproxy/server-t.h
+++ b/include/haproxy/server-t.h
@@ -34,7 +34,6 @@
 #include <haproxy/counters-t.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/freq_ctr-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/openssl-compat.h>
diff --git a/include/haproxy/session-t.h b/include/haproxy/session-t.h
index b47760c6c8..3bb753acff 100644
--- a/include/haproxy/session-t.h
+++ b/include/haproxy/session-t.h
@@ -29,7 +29,6 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/task-t.h>
diff --git a/include/haproxy/signal-t.h b/include/haproxy/signal-t.h
index 3991f56ea3..85d4b3396d 100644
--- a/include/haproxy/signal-t.h
+++ b/include/haproxy/signal-t.h
@@ -16,7 +16,6 @@
 
 #include <signal.h>
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 
 /* flags for -> flags */
 #define SIG_F_ONE_SHOOT         0x0001  /* unregister handler before calling it */
diff --git a/include/haproxy/sink-t.h b/include/haproxy/sink-t.h
index a2464357c3..e3922d856f 100644
--- a/include/haproxy/sink-t.h
+++ b/include/haproxy/sink-t.h
@@ -24,7 +24,6 @@
 
 #include <import/ist.h>
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 
 /* A sink may be of 4 distinct types :
  *   - file descriptor (such as stdout)
diff --git a/include/haproxy/sink.h b/include/haproxy/sink.h
index 6b2ce613dd..025fa4185c 100644
--- a/include/haproxy/sink.h
+++ b/include/haproxy/sink.h
@@ -23,7 +23,6 @@
 #define _HAPROXY_SINK_H
 
 #include <sys/types.h>
-#include <haproxy/list-t.h>
 #include <haproxy/sink-t.h>
 #include <haproxy/thread.h>
 
diff --git a/include/haproxy/spoe-t.h b/include/haproxy/spoe-t.h
index bd9bdb2bcb..dbfe0cb476 100644
--- a/include/haproxy/spoe-t.h
+++ b/include/haproxy/spoe-t.h
@@ -28,7 +28,6 @@
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/freq_ctr-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/sample-t.h>
 #include <haproxy/stream-t.h>
diff --git a/include/haproxy/ssl_ckch-t.h b/include/haproxy/ssl_ckch-t.h
index d102887af7..a811ee30f5 100644
--- a/include/haproxy/ssl_ckch-t.h
+++ b/include/haproxy/ssl_ckch-t.h
@@ -35,7 +35,6 @@
 
 #include <import/ebmbtree.h>
 #include <haproxy/buf-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/openssl-compat.h>
 
 /* This is used to preload the certificate, private key
diff --git a/include/haproxy/ssl_crtlist-t.h b/include/haproxy/ssl_crtlist-t.h
index 6ca48b5d92..7ec8aa9f0b 100644
--- a/include/haproxy/ssl_crtlist-t.h
+++ b/include/haproxy/ssl_crtlist-t.h
@@ -26,7 +26,6 @@
 #include <import/ebmbtree.h>
 #include <import/ebpttree.h>
 
-#include <haproxy/list-t.h>
 
 /* forward declarations for structures below */
 struct bind_conf;
diff --git a/include/haproxy/ssl_sock-t.h b/include/haproxy/ssl_sock-t.h
index fbaa8f068e..d54469c9ea 100644
--- a/include/haproxy/ssl_sock-t.h
+++ b/include/haproxy/ssl_sock-t.h
@@ -29,7 +29,6 @@
 
 #include <haproxy/buf-t.h>
 #include <haproxy/connection-t.h> /* struct wait_event */
-#include <haproxy/list-t.h>
 #include <haproxy/listener-t.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ssl_ckch-t.h>
diff --git a/include/haproxy/stream-t.h b/include/haproxy/stream-t.h
index 525373c8b3..9640111979 100644
--- a/include/haproxy/stream-t.h
+++ b/include/haproxy/stream-t.h
@@ -32,7 +32,6 @@
 #include <haproxy/filters-t.h>
 #include <haproxy/hlua-t.h>
 #include <haproxy/http_ana-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/queue-t.h>
diff --git a/include/haproxy/task-t.h b/include/haproxy/task-t.h
index 872918815f..2ea2b3ca50 100644
--- a/include/haproxy/task-t.h
+++ b/include/haproxy/task-t.h
@@ -28,7 +28,6 @@
 #include <import/eb32tree.h>
 
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/thread-t.h>
 
 /* values for task->state */
diff --git a/include/haproxy/tcpcheck-t.h b/include/haproxy/tcpcheck-t.h
index d767d8e3f5..042f83375a 100644
--- a/include/haproxy/tcpcheck-t.h
+++ b/include/haproxy/tcpcheck-t.h
@@ -24,7 +24,6 @@
 #include <haproxy/buf-t.h>
 #include <haproxy/check-t.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/obj_type-t.h>
 #include <haproxy/vars-t.h>
 
diff --git a/include/haproxy/tcpcheck.h b/include/haproxy/tcpcheck.h
index 4583dbb1a5..8befe3bbcb 100644
--- a/include/haproxy/tcpcheck.h
+++ b/include/haproxy/tcpcheck.h
@@ -28,7 +28,6 @@
 
 #include <haproxy/action.h>
 #include <haproxy/check-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/proxy-t.h>
 #include <haproxy/tcpcheck-t.h>
diff --git a/include/haproxy/trace-t.h b/include/haproxy/trace-t.h
index 2ceddfb1ff..8bc7d0070c 100644
--- a/include/haproxy/trace-t.h
+++ b/include/haproxy/trace-t.h
@@ -24,7 +24,6 @@
 
 #include <import/ist.h>
 #include <haproxy/api-t.h>
-#include <haproxy/list-t.h>
 #include <haproxy/sink-t.h>
 
 /* the macros below define an optional type for each of the 4 args passed to
diff --git a/include/haproxy/uri_auth-t.h b/include/haproxy/uri_auth-t.h
index 250979155f..009adfdfe6 100644
--- a/include/haproxy/uri_auth-t.h
+++ b/include/haproxy/uri_auth-t.h
@@ -16,7 +16,6 @@
 
 #include <haproxy/acl-t.h>
 #include <haproxy/auth-t.h>
-#include <haproxy/list-t.h>
 
 /* This is a list of proxies we are allowed to see. Later, it should go in the
  * user list, but before this we need to support de/re-authentication.
diff --git a/include/haproxy/vars-t.h b/include/haproxy/vars-t.h
index 388d208120..e1e04524c7 100644
--- a/include/haproxy/vars-t.h
+++ b/include/haproxy/vars-t.h
@@ -22,7 +22,6 @@
 #ifndef _HAPROXY_VARS_T_H
 #define _HAPROXY_VARS_T_H
 
-#include <haproxy/list-t.h>
 #include <haproxy/sample_data-t.h>
 #include <haproxy/thread-t.h>