REORG: include: split mini-clist into haproxy/list and list-t.h

Half of the users of this include only need the type definitions and
not the manipulation macros nor the inline functions. Moves the various
types into mini-clist-t.h makes the files cleaner. The other one had all
its includes grouped at the top. A few files continued to reference it
without using it and were cleaned.

In addition it was about time that we'd rename that file, it's not
"mini" anymore and contains a bit more than just circular lists.

diff --git a/contrib/hpack/decode.c b/contrib/hpack/decode.c
index ce3b484918705cb6539f4f947084d0d041e971a5..8dbb6f1f416fd0a916645f002a6791202b5f530f 100644 (file)
--- a/contrib/hpack/decode.c
+++ b/contrib/hpack/decode.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <common/chunk.h>
 #include <common/hpack-dec.h>
-#include <common/mini-clist.h>
 
 #define MAX_RQ_SIZE 65536
 #define MAX_HDR_NUM 1000

diff --git a/contrib/mod_defender/spoa.c b/contrib/mod_defender/spoa.c
index 079e880cb091d5784093a1a14bc06ac1459c34e1..530b42d069f01ec0c57d3161d5064c90ef8d3837 100644 (file)
--- a/contrib/mod_defender/spoa.c
+++ b/contrib/mod_defender/spoa.c
@@ -31,7 +31,7 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/chunk.h>
 
 #include <proto/spoe.h>

diff --git a/contrib/modsecurity/spoa.c b/contrib/modsecurity/spoa.c
index 20916fdf3c4f3212a8470d55885e5180f6eea4d3..ded8a6fa99f4296a2de392ece20c3fa5e57bdeff 100644 (file)
--- a/contrib/modsecurity/spoa.c
+++ b/contrib/modsecurity/spoa.c
@@ -36,7 +36,7 @@
 #include <event2/event_struct.h>
 #include <event2/thread.h>
 
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/chunk.h>
 
 #include <proto/spoe.h>

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index a31aa153ce04e2cbb204db5da847884936f83c51..6afa43feb50f37f340f0ba3a28047d058ddf25ac 100644 (file)
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -18,7 +18,7 @@
 #include <common/buffer.h>
 #include <common/htx.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 
 #include <types/global.h>
 

diff --git a/include/common/cfgparse.h b/include/common/cfgparse.h
index 8ecb7714a21e38384cf1ddb8c99e80b8987da24e..86f87bf42bb17ec68a37fa482aa268181a3e1b3b 100644 (file)
--- a/include/common/cfgparse.h
+++ b/include/common/cfgparse.h
@@ -23,7 +23,7 @@
 #define _COMMON_CFGPARSE_H
 
 #include <haproxy/api.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <proto/log.h>
 #include <proto/proxy.h>

diff --git a/include/common/memory.h b/include/common/memory.h
index 8b03daf8e1ba619f96c9a54c73b8cb15fc260462..d80b4868cb79421f5eedee93d1e52317d92546f3 100644 (file)
--- a/include/common/memory.h
+++ b/include/common/memory.h
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include <haproxy/api.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/hathreads.h>
 
 /* On architectures supporting threads and double-word CAS, we can implement

diff --git a/include/haproxy/list-t.h b/include/haproxy/list-t.h
new file mode 100644 (file)
index 0000000..dd8493e
--- /dev/null
+++ b/include/haproxy/list-t.h
@@ -0,0 +1,73 @@
+/*
+ * include/haproxy/list-t.h
+ * Circular list manipulation types definitions
+ *
+ * Copyright (C) 2002-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_LIST_T_H
+#define _HAPROXY_LIST_T_H
+
+
+/* these are circular or bidirectionnal lists only. Each list pointer points to
+ * another list pointer in a structure, and not the structure itself. The
+ * pointer to the next element MUST be the first one so that the list is easily
+ * cast as a single linked list or pointer.
+ */
+struct list {
+    struct list *n;    /* next */
+    struct list *p;    /* prev */
+};
+
+/* This is similar to struct list, but we want to be sure the compiler will
+ * yell at you if you use macroes for one when you're using the other. You have
+ * to expicitely cast if that's really what you want to do.
+ */
+struct mt_list {
+    struct mt_list *next;
+    struct mt_list *prev;
+};
+
+
+/* a back-ref is a pointer to a target list entry. It is used to detect when an
+ * element being deleted is currently being tracked by another user. The best
+ * example is a user dumping the session table. The table does not fit in the
+ * output buffer so we have to set a mark on a session and go on later. But if
+ * that marked session gets deleted, we don't want the user's pointer to go in
+ * the wild. So we can simply link this user's request to the list of this
+ * session's users, and put a pointer to the list element in ref, that will be
+ * used as the mark for next iteration.
+ */
+struct bref {
+       struct list users;
+       struct list *ref; /* pointer to the target's list entry */
+};
+
+/* a word list is a generic list with a pointer to a string in each element. */
+struct wordlist {
+       struct list list;
+       char *s;
+};
+
+/* this is the same as above with an additional pointer to a condition. */
+struct cond_wordlist {
+       struct list list;
+       void *cond;
+       char *s;
+};
+
+#endif /* _HAPROXY_LIST_T_H */

diff --git a/include/common/mini-clist.h b/include/haproxy/list.h
similarity index 94%
rename from include/common/mini-clist.h
rename to include/haproxy/list.h
index 188d118ac890e140267288466395ad8d535869dd..0281aa1a4f2b1223fcfcef701e8aab4575c62930 100644 (file)
--- a/include/common/mini-clist.h
+++ b/include/haproxy/list.h
@@ -1,8 +1,8 @@
 /*
- * include/common/mini-clist.h
- * Circular list manipulation macros and structures.
+ * include/haproxy/list.h
+ * Circular list manipulation macros and functions.
  *
- * Copyright (C) 2002-2014 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2002-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
@@ -19,56 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _COMMON_MINI_CLIST_H
-#define _COMMON_MINI_CLIST_H
+#ifndef _HAPROXY_LIST_H
+#define _HAPROXY_LIST_H
 
-
-/* these are circular or bidirectionnal lists only. Each list pointer points to
- * another list pointer in a structure, and not the structure itself. The
- * pointer to the next element MUST be the first one so that the list is easily
- * cast as a single linked list or pointer.
- */
-struct list {
-    struct list *n;    /* next */
-    struct list *p;    /* prev */
-};
-
-/* This is similar to struct list, but we want to be sure the compiler will
- * yell at you if you use macroes for one when you're using the other. You have
- * to expicitely cast if that's really what you want to do.
- */
-struct mt_list {
-    struct mt_list *next;
-    struct mt_list *prev;
-};
-
-
-/* a back-ref is a pointer to a target list entry. It is used to detect when an
- * element being deleted is currently being tracked by another user. The best
- * example is a user dumping the session table. The table does not fit in the
- * output buffer so we have to set a mark on a session and go on later. But if
- * that marked session gets deleted, we don't want the user's pointer to go in
- * the wild. So we can simply link this user's request to the list of this
- * session's users, and put a pointer to the list element in ref, that will be
- * used as the mark for next iteration.
- */
-struct bref {
-       struct list users;
-       struct list *ref; /* pointer to the target's list entry */
-};
-
-/* a word list is a generic list with a pointer to a string in each element. */
-struct wordlist {
-       struct list list;
-       char *s;
-};
-
-/* this is the same as above with an additional pointer to a condition. */
-struct cond_wordlist {
-       struct list list;
-       void *cond;
-       char *s;
-};
+#include <haproxy/api.h>
+#include <haproxy/list-t.h>
+#include <common/hathreads.h>
 
 /* First undefine some macros which happen to also be defined on OpenBSD,
  * in sys/queue.h, used by sys/event.h
@@ -257,15 +213,13 @@ struct cond_wordlist {
             &item->member != (list_head);                               \
             item = back, back = LIST_ELEM(back->member.p, typeof(back), member))
 
-#include <haproxy/api.h>
-#include <common/hathreads.h>
-#define MT_LIST_BUSY ((struct mt_list *)1)
 
 /*
  * Locked version of list manipulation macros.
  * It is OK to use those concurrently from multiple threads, as long as the
  * list is only used with the locked variants.
  */
+#define MT_LIST_BUSY ((struct mt_list *)1)
 
 /*
  * Add an item at the beginning of a list.
@@ -733,4 +687,4 @@ static __inline struct mt_list *list_to_mt_list(struct list *list)
 
 }
 
-#endif /* _COMMON_MINI_CLIST_H */
+#endif /* _HAPROXY_LIST_H */

diff --git a/include/proto/applet.h b/include/proto/applet.h
index ea8bc0baf40998e4669e365157fc1fa4815094aa..aaa49038bc2289bd19fabb7480eb518e0185726e 100644 (file)
--- a/include/proto/applet.h
+++ b/include/proto/applet.h
@@ -26,7 +26,7 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <types/applet.h>
 #include <proto/task.h>
 

diff --git a/include/proto/http_rules.h b/include/proto/http_rules.h
index 27c4b6a8fdd9c564fd48b97f3d71168f1a1a6bfb..84f302dce02c7f6f06e68d3f9985884ddedf4233 100644 (file)
--- a/include/proto/http_rules.h
+++ b/include/proto/http_rules.h
@@ -23,7 +23,7 @@
 #define _PROTO_HTTP_RULES_H
 
 #include <haproxy/api.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <types/action.h>
 #include <types/proxy.h>
 

diff --git a/include/proto/queue.h b/include/proto/queue.h
index 8ef9179e696c8eefff63035c1d390938e6be620a..9bec9b42bd0c001b87d4a81288a237b69e8efd5f 100644 (file)
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -24,7 +24,6 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
 
 #include <types/proxy.h>
 #include <types/queue.h>

diff --git a/include/proto/shctx.h b/include/proto/shctx.h
index 25bf377f23c50631c791adbec681029ab32fbc7e..76f498f53692889e13d9d481a091100ecddbd8c2 100644 (file)
--- a/include/proto/shctx.h
+++ b/include/proto/shctx.h
@@ -14,7 +14,7 @@
 #ifndef SHCTX_H
 #define SHCTX_H
 
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <types/shctx.h>
 
 #include <inttypes.h>

diff --git a/include/proto/sink.h b/include/proto/sink.h
index d30f30a742791ed8aca034ac69e0542282bf5f51..c0c75c30f89c3997934d94485954fe6f0f7d6ae8 100644 (file)
--- a/include/proto/sink.h
+++ b/include/proto/sink.h
@@ -22,7 +22,7 @@
 #ifndef _PROTO_SINK_H
 #define _PROTO_SINK_H
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <types/sink.h>
 
 extern struct list sink_list;

diff --git a/include/proto/task.h b/include/proto/task.h
index a42431a1715205d79c67177c7bcd26fd9a9c1bdd..944ada50a4808342aa878153b7d0a3c71180053a 100644 (file)
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -27,7 +27,7 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/hathreads.h>

diff --git a/include/proto/trace.h b/include/proto/trace.h
index f43faf5a9a7f2326f1384214ee8d1d9adea0e23f..144794057355314dd94c1ab880656609fd1e7fd8 100644 (file)
--- a/include/proto/trace.h
+++ b/include/proto/trace.h
@@ -25,7 +25,7 @@
 #include <haproxy/api.h>
 #include <common/buffer.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <types/log.h>
 #include <types/sink.h>
 #include <types/trace.h>

diff --git a/include/types/acl.h b/include/types/acl.h
index 748f3611b8f4f9dc1f4fd5fafe14082d5fbfd08d..7afa3d8707e57c540d4c5c5b7442d65add3bf842 100644 (file)
--- a/include/types/acl.h
+++ b/include/types/acl.h
@@ -23,7 +23,7 @@
 #define _TYPES_ACL_H
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <types/arg.h>
 #include <types/auth.h>

diff --git a/include/types/arg.h b/include/types/arg.h
index 60fd007e51f3f6d258c9881811ba0cc454c15684..366c09e09dc74444b7ac26b95c504ee26cd7fac1 100644 (file)
--- a/include/types/arg.h
+++ b/include/types/arg.h
@@ -26,7 +26,7 @@
 #include <netinet/in.h>
 
 #include <common/chunk.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <types/vars.h>
 #include <types/protocol_buffers.h>

diff --git a/include/types/auth.h b/include/types/auth.h
index c10aced5b6b6a024b2be6a682161fe79d5ee4989..f9b56f1ad2778f5e80aa5a1c7e3cd7f51ca9a1d3 100644 (file)
--- a/include/types/auth.h
+++ b/include/types/auth.h
@@ -14,7 +14,7 @@
 #define _TYPES_AUTH_H
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <types/auth.h>
 

diff --git a/include/types/checks.h b/include/types/checks.h
index 6d07c9a55d271cbd8542d5240890af8834bda976..3ea4a06384ecdcdced5d2c98035f44bc5be53bfb 100644 (file)
--- a/include/types/checks.h
+++ b/include/types/checks.h
@@ -18,7 +18,7 @@
 
 #include <common/standard.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/regex.h>
 #include <haproxy/buf-t.h>
 

diff --git a/include/types/cli.h b/include/types/cli.h
index 8a44124151e501d1417d94023179785662585d4d..41753c52267452def1289b26094689c473626b3d 100644 (file)
--- a/include/types/cli.h
+++ b/include/types/cli.h
@@ -20,7 +20,7 @@
 #ifndef _TYPES_CLI_H
 #define _TYPES_CLI_H
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <types/applet.h>
 
 /* Access level for a stats socket */

diff --git a/include/types/dns.h b/include/types/dns.h
index 06afda8b8c62d79e80b2ff74b99c01d67ca3b076..84a82190a6889a59e529578d4adb37215f692ce8 100644 (file)
--- a/include/types/dns.h
+++ b/include/types/dns.h
@@ -24,7 +24,7 @@
 
 #include <import/eb32tree.h>
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/hathreads.h>
 
 #include <types/connection.h>

diff --git a/include/types/fcgi-app.h b/include/types/fcgi-app.h
index 7fb20ee6f7efb89dc80bce8c2e03ad5c8430cf11..c88dda3d0b1154ca584fd76d84782e311782ddb7 100644 (file)
--- a/include/types/fcgi-app.h
+++ b/include/types/fcgi-app.h
@@ -25,7 +25,7 @@
 #include <haproxy/api-t.h>
 #include <import/ist.h>
 #include <common/fcgi.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/regex.h>
 
 #include <import/ebistree.h>

diff --git a/include/types/filters.h b/include/types/filters.h
index 5de4eee6e640fb78aa3308aecea0307fe8e83588..2e06b83163f5f6da360ba37ae9b677afcbce2042 100644 (file)
--- a/include/types/filters.h
+++ b/include/types/filters.h
@@ -22,7 +22,7 @@
 #define _TYPES_FILTERS_H
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 struct http_msg;
 struct proxy;

diff --git a/include/types/listener.h b/include/types/listener.h
index 7374dc8f8d8c8a8a5f7d63213937bb5c64b2286d..431420940342c265e680eaffa41f80c6dfbde145 100644 (file)
--- a/include/types/listener.h
+++ b/include/types/listener.h
@@ -30,7 +30,7 @@
 #include <haproxy/openssl-compat.h>
 #endif
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/hathreads.h>
 
 #include <types/obj_type.h>

diff --git a/include/types/log.h b/include/types/log.h
index 2c2ac0298a2823187580c36707ce6306344ded99..301c2bf3329d01d4f9c582ed5c9b742a99b94a63 100644 (file)
--- a/include/types/log.h
+++ b/include/types/log.h
@@ -27,7 +27,7 @@
 #include <netinet/in.h>
 #include <haproxy/api-t.h>
 #include <common/hathreads.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <types/ring.h>
 
 #define NB_LOG_FACILITIES       24

diff --git a/include/types/pattern.h b/include/types/pattern.h
index f1468b3e2a67dd65050abcaa6c06e8fa586ba761..1a3e0766f4095995e9a62053c5b7aa2be014e2e0 100644 (file)
--- a/include/types/pattern.h
+++ b/include/types/pattern.h
@@ -23,7 +23,7 @@
 #define _TYPES_PATTERN_H
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/regex.h>
 
 #include <types/sample.h>

diff --git a/include/types/peers.h b/include/types/peers.h
index 74613472a85b88f2b7f4e5a5216c7eeda49f6f9f..b3e1e4429398a353cd482af6809586095d3ce6e1 100644 (file)
--- a/include/types/peers.h
+++ b/include/types/peers.h
@@ -28,7 +28,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/regex.h>
 #include <import/eb32tree.h>
 

diff --git a/include/types/protocol.h b/include/types/protocol.h
index edda61c0180783c6e679b935f9afa58e96f59d5e..0c490682acfb1613de4134da6c363df25fe4d8bf 100644 (file)
--- a/include/types/protocol.h
+++ b/include/types/protocol.h
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <import/eb32tree.h>
 
 /* some pointer types referenced below */

diff --git a/include/types/proxy.h b/include/types/proxy.h
index c75f0b6795c8e55041b949a94f15b3517c0ef44b..f7bdd30ff43421260c4d321be13d00a7126bc117 100644 (file)
--- a/include/types/proxy.h
+++ b/include/types/proxy.h
@@ -30,7 +30,7 @@
 #include <haproxy/api-t.h>
 #include <common/chunk.h>
 #include <common/http.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/regex.h>
 #include <common/hathreads.h>
 

diff --git a/include/types/queue.h b/include/types/queue.h
index b0800f30f741039b275c2551ccd1d33e1c4df2ea..9333468949519e67ed54161ef9fc55fcd23333dc 100644 (file)
--- a/include/types/queue.h
+++ b/include/types/queue.h
@@ -23,7 +23,7 @@
 #define _TYPES_QUEUE_H
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/hathreads.h>
 
 #include <types/server.h>

diff --git a/include/types/sample.h b/include/types/sample.h
index bb6b0928bca2ded2d5f5fe3cb408845fd4ec7b98..618be08bf2edf573d2de51c1b2c547ee65ee363e 100644 (file)
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -28,7 +28,7 @@
 
 #include <haproxy/buf-t.h>
 #include <common/http.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 struct arg;
 

diff --git a/include/types/server.h b/include/types/server.h
index c8e5bb69bcdc96d9a285e8f29a3a2f6cf17d95da..1737f80698a441b43e9bdd0393fca13128d6f6a9 100644 (file)
--- a/include/types/server.h
+++ b/include/types/server.h
@@ -26,7 +26,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/api.h>
 #include <common/hathreads.h>
 #include <haproxy/openssl-compat.h>
 

diff --git a/include/types/session.h b/include/types/session.h
index fb6b6212b5f3f863909011837c1daad9f6448cd0..57ee52ab8436c66cdac1c658ad0783e070556627 100644 (file)
--- a/include/types/session.h
+++ b/include/types/session.h
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <types/obj_type.h>
 #include <types/proxy.h>

diff --git a/include/types/signal.h b/include/types/signal.h
index 661347a0a4a0d5fc1549fcd87ff338209839087a..838aefd655b1a3003b75d88e175c48a470c78160 100644 (file)
--- a/include/types/signal.h
+++ b/include/types/signal.h
@@ -17,7 +17,7 @@
 
 #include <signal.h>
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/standard.h>
 
 /* flags for -> flags */

diff --git a/include/types/spoe.h b/include/types/spoe.h
index eaa0ef05c3fc23a2ace7602908dc8b45c0b3ea53..85f8b430d2dc3e004fcd2fee71fee41ace93e38c 100644 (file)
--- a/include/types/spoe.h
+++ b/include/types/spoe.h
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #include <common/buffer.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/hathreads.h>
 
 #include <types/filters.h>

diff --git a/include/types/ssl_ckch.h b/include/types/ssl_ckch.h
index a63ec1d1eff733df1ea0871dce31949279bdc08b..a4108104b5ea33e18d4ca42b19397d1b4352210c 100644 (file)
--- a/include/types/ssl_ckch.h
+++ b/include/types/ssl_ckch.h
@@ -33,7 +33,7 @@
 #define _TYPES_SSL_CKCH_H
 #ifdef USE_OPENSSL
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <haproxy/openssl-compat.h>
 
 /* This is used to preload the certificate, private key

diff --git a/include/types/ssl_crtlist.h b/include/types/ssl_crtlist.h
index 2879d745c3d89f36634118668fe3e1bd54eb4c2f..ed8c135aec628a337ace9d95a98590daf69c069e 100644 (file)
--- a/include/types/ssl_crtlist.h
+++ b/include/types/ssl_crtlist.h
@@ -25,7 +25,7 @@
 
 #include <import/ebmbtree.h>
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 /* forward declarations for structures below */
 struct bind_conf;

diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index be58aa8c27b370c6ab3d26762e32eb90517400b2..d62e4ddf9d957b106250e389d7e9156f1684d631 100644 (file)
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -33,7 +33,7 @@
 
 #include <common/buffer.h>
 #include <common/hathreads.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <haproxy/openssl-compat.h>
 
 /* ***** READ THIS before adding code here! *****

diff --git a/include/types/stream.h b/include/types/stream.h
index e450c6340e1a21c8d1b354dd15bd8f0a111ab159..37bdb96c56009d7a65496ecf8673165df83ae4a8 100644 (file)
--- a/include/types/stream.h
+++ b/include/types/stream.h
@@ -29,7 +29,7 @@
 #include <arpa/inet.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 
 #include <types/channel.h>
 #include <types/filters.h>

diff --git a/include/types/task.h b/include/types/task.h
index 01756ead854d308a9cd4113cc9b7dca46efa686a..fe945df273ef83771fb7ce906282c60a37701541 100644 (file)
--- a/include/types/task.h
+++ b/include/types/task.h
@@ -25,7 +25,7 @@
 #include <sys/time.h>
 
 #include <haproxy/api-t.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <import/eb32sctree.h>
 #include <import/eb32tree.h>
 

diff --git a/include/types/trace.h b/include/types/trace.h
index ad9d7b6a02a0d854b62998b447c53d63503537a1..c119ab33f0dc080a4a1535788c4f6ee942017501 100644 (file)
--- a/include/types/trace.h
+++ b/include/types/trace.h
@@ -25,7 +25,7 @@
 #include <haproxy/api-t.h>
 #include <common/buffer.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <types/sink.h>
 
 /* the macros below define an optional type for each of the 4 args passed to

diff --git a/include/types/vars.h b/include/types/vars.h
index a72469fd133ab49c200d0fc7d4d80a8e9102fbf4..91fcf07279fcb3d55f8c52d5275a2997ca798a05 100644 (file)
--- a/include/types/vars.h
+++ b/include/types/vars.h
@@ -1,7 +1,7 @@
 #ifndef _TYPES_VARS_H
 #define _TYPES_VARS_H
 
-#include <common/mini-clist.h>
+#include <haproxy/list-t.h>
 #include <common/hathreads.h>
 
 #include <types/sample.h>

diff --git a/src/acl.c b/src/acl.c
index 5b25fce5ad90ea321a19483a6d7b3287972aec3c..14a0e0ba6c9b42d3a9323bcfadb9c4e465e44f38 100644 (file)
--- a/src/acl.c
+++ b/src/acl.c
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include <haproxy/api.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/uri_auth.h>
 

diff --git a/src/action.c b/src/action.c
index 0854208132c8f6fa7f900c46c4c6aff81b0f846c..cb897b66a299d75707590bd3bd6be06ab7d85202 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -12,7 +12,7 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 
 #include <proto/action.h>

diff --git a/src/applet.c b/src/applet.c
index 5f06d6ac1ec10f3a52c9a1312928b8781592e742..88be4474eb60a0635f775a306be6f3d8db5e2c7f 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 
 #include <haproxy/api.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <proto/applet.h>
 #include <proto/channel.h>
 #include <proto/stream.h>

diff --git a/src/checks.c b/src/checks.c
index de182db42e61d165c5315c02180ab3cd3f5be769..5dbbecae49ff043ec72ffc582398ff8c926c2a70 100644 (file)
--- a/src/checks.c
+++ b/src/checks.c
@@ -33,7 +33,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/chunk.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <common/hathreads.h>

diff --git a/src/cli.c b/src/cli.c
index a0118dc2b761b56f69f39a53c873ea1fbe5bcdd1..4b9c31f97587e7d537732d478e87ad82f3b01383 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -29,7 +29,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index abec6b3bff6d7d5b7ddfb1b2ccf37080cae8e322..9ca51e538c5bec10dece202ce5e087d3dd3f7d71 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -14,7 +14,7 @@
 #include <common/buffer.h>
 #include <common/cfgparse.h>
 #include <common/htx.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 
 #include <types/compression.h>

diff --git a/src/haproxy.c b/src/haproxy.c
index 79a28acb62bf849505d1b5b503d1fabed44496e0..a1dff0c38e1bd9ac93f07b5e3c8ca5d17e96f1fa 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -86,7 +86,7 @@
 #include <common/chunk.h>
 #include <haproxy/errors.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/namespace.h>
 #include <common/net_helper.h>
 #include <haproxy/openssl-compat.h>

diff --git a/src/listener.c b/src/listener.c
index a1b6ae455d724d77d6b2da1c2a4ca585c315a5c3..c035ed84198d84509d1e575df548e4d4391b4933 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -21,7 +21,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <haproxy/errors.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/time.h>
 

diff --git a/src/memory.c b/src/memory.c
index 961a292c233d67d84025014b236918e251fb426c..2caf13d9c14e2fbc323aa3d129ad763f770046f4 100644 (file)
--- a/src/memory.c
+++ b/src/memory.c
@@ -20,7 +20,7 @@
 #include <common/cfgparse.h>
 #include <common/hathreads.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 
 #include <types/activity.h>

diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 7ff39328c7ae9418f0c576ac8bf7831a3e342d56..87c84fb1adc554dc6f7c5f6ec379213affa3e4f3 100644 (file)
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -16,7 +16,7 @@
 #include <common/h1.h>
 #include <common/htx.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/net_helper.h>
 
 #include <types/proxy.h>

diff --git a/src/mworker.c b/src/mworker.c
index 95c06bba1a6717dfb94364eb1d89765afead386b..4b2a7afafd70ab8d7918a553c2e3ffcf36a2f3f4 100644 (file)
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -19,7 +19,7 @@
 
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <haproxy/version.h>
 
 #include <types/cli.h>

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index c95d5d46f974df7fd4dc61fe67b8cd4d5eb79bd1..b6277247f4e908b1ec5993aa7f9de0db8bf0c69b 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <haproxy/version.h>

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 9233288fd7c241da85d0ef4f672ec6b65db80d7d..9d875153773620d596592d4dd0e33d99e62b1b5c 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -32,7 +32,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/namespace.h>
 

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 648f3a32f9ba93679c88f3cd60b0245b70933936..ae68a8d1d9fbf94398d18dbb9ca524abd9fbc9eb 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -28,7 +28,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <haproxy/version.h>

diff --git a/src/protocol.c b/src/protocol.c
index 3a11bddf6c897bf7cfd945fe5502bd08faf7a739..4909ee14a3ba990fde36f33ab6507c75bcf93887 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -15,7 +15,7 @@
 
 #include <haproxy/api.h>
 #include <haproxy/errors.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 
 #include <proto/protocol.h>

diff --git a/src/shctx.c b/src/shctx.c
index bfca085bb9693e696574076d879d0c8da8ce86e0..113828adb5e75a8d923db140f11b3ce3155f43f6 100644 (file)
--- a/src/shctx.c
+++ b/src/shctx.c
@@ -15,7 +15,7 @@
 #include <arpa/inet.h>
 #include <import/ebmbtree.h>
 #include <types/global.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include "proto/shctx.h"
 
 #if !defined (USE_PRIVATE_CACHE)

diff --git a/src/sink.c b/src/sink.c
index 7eb283fc6796ab32b372d03919a209177891ad0d..9ed75aca9b610e09db348516a79d984ad1876545 100644 (file)
--- a/src/sink.c
+++ b/src/sink.c
@@ -21,7 +21,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/time.h>
 #include <proto/cli.h>
 #include <proto/log.h>

diff --git a/src/stats.c b/src/stats.c
index 05dc223fb0df0a3e3c5e3548aaae19232ef439ab..e7a1e76f64987a41f54e2e6a8cb1e28e733fdfae 100644 (file)
--- a/src/stats.c
+++ b/src/stats.c
@@ -30,7 +30,7 @@
 #include <common/http.h>
 #include <common/htx.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/stick_table.c b/src/stick_table.c
index 37131f6a98ebea1a701fcef78a5093ccae2bbca9..dc2ef4f82f2184a9a57e72bbc04a69c057c519f8 100644 (file)
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -17,7 +17,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/net_helper.h>
 #include <common/standard.h>
 #include <common/time.h>

diff --git a/src/task.c b/src/task.c
index a116b2e80f7f0ec4d9489ba479363d4699204064..fc0978787758691bcf37a85e898352f6ab7c0ca8 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -14,7 +14,7 @@
 
 #include <haproxy/api.h>
 #include <common/memory.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/time.h>
 #include <import/eb32sctree.h>

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 0be4ecdf2275f56d80d11b7f33470d27bed58a33..194301874f02c35c123aec3578fa0752decffa5d 100644 (file)
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -11,7 +11,7 @@
  */
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <common/standard.h>
 #include <common/ticks.h>
 #include <common/time.h>

diff --git a/src/trace.c b/src/trace.c
index 3f6ff0543ded92e7edee3daac63250a0b9ea0f20..a0b9648844a9207373a160e90890c3ccf2204b98 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -21,7 +21,7 @@
 #include <haproxy/api.h>
 #include <common/buffer.h>
 #include <import/ist.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 #include <proto/cli.h>
 #include <proto/log.h>
 #include <proto/sink.h>

diff --git a/src/vars.c b/src/vars.c
index a213657b8d8d394da1c2ca75834d48ea5bf4c6ce..227c94b9f4536cfeba97c81342a37b3501cdb3e8 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -3,7 +3,7 @@
 #include <haproxy/api.h>
 #include <common/cfgparse.h>
 #include <common/http.h>
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 
 #include <types/vars.h>
 

diff --git a/tests/test-list.c b/tests/test-list.c
index d95800e5155d984b2976e7e55db124033375e41d..5e54f6034f6acc004c6fd28c1dd8ca28113495d8 100644 (file)
--- a/tests/test-list.c
+++ b/tests/test-list.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #define USE_THREAD
-#include <common/mini-clist.h>
+#include <haproxy/list.h>
 
 /* Stress test the mt_lists.
  * Compile from the haproxy directory with :