From: Willy Tarreau <w@1wt.eu>
Date: Wed, 6 Oct 2021 14:18:40 +0000 (+0200)
Subject: CLEANUP: tree-wide: remove unneeded include time.h in ~20 files
X-Git-Tag: v2.5-dev9~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9310f481ce7c33bfc511d865144678dad368c596;p=thirdparty%2Fhaproxy.git

CLEANUP: tree-wide: remove unneeded include time.h in ~20 files

20 files used to have haproxy/time.h included only for now_ms, and two
were missing it for other things but used to inherit from it via other
files.
---

diff --git a/include/haproxy/channel.h b/include/haproxy/channel.h
index f263b88c12..0f6e9e0fd6 100644
--- a/include/haproxy/channel.h
+++ b/include/haproxy/channel.h
@@ -31,7 +31,6 @@
 #include <haproxy/stream_interface-t.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools-t.h>
 
 
diff --git a/include/haproxy/freq_ctr.h b/include/haproxy/freq_ctr.h
index b2da7adb5a..e0f50809dd 100644
--- a/include/haproxy/freq_ctr.h
+++ b/include/haproxy/freq_ctr.h
@@ -26,7 +26,6 @@
 #include <haproxy/freq_ctr-t.h>
 #include <haproxy/intops.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 /* exported functions from freq_ctr.c */
 ullong freq_ctr_total(const struct freq_ctr *ctr, uint period, int pend);
diff --git a/include/haproxy/peers.h b/include/haproxy/peers.h
index d5e5765b29..c5918690d6 100644
--- a/include/haproxy/peers.h
+++ b/include/haproxy/peers.h
@@ -29,7 +29,6 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/stream-t.h>
-#include <haproxy/time.h>
 
 
 extern struct peers *cfg_peers;
diff --git a/include/haproxy/proxy.h b/include/haproxy/proxy.h
index c7bc2c5335..e47a577fed 100644
--- a/include/haproxy/proxy.h
+++ b/include/haproxy/proxy.h
@@ -30,7 +30,6 @@
 #include <haproxy/proxy-t.h>
 #include <haproxy/server-t.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 extern struct proxy *proxies_list;
 extern struct eb_root used_proxy_id;	/* list of proxy IDs in use */
diff --git a/include/haproxy/quic_loss.h b/include/haproxy/quic_loss.h
index ca7a026103..441d478cb9 100644
--- a/include/haproxy/quic_loss.h
+++ b/include/haproxy/quic_loss.h
@@ -27,7 +27,6 @@
 #endif
 
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/xprt_quic-t.h>
 
 #include <haproxy/trace.h>
diff --git a/include/haproxy/stick_table.h b/include/haproxy/stick_table.h
index ff172f4584..d5a56d11bf 100644
--- a/include/haproxy/stick_table.h
+++ b/include/haproxy/stick_table.h
@@ -30,7 +30,6 @@
 #include <haproxy/sample-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 extern struct stktable *stktables_list;
 extern struct stktable_type stktable_types[];
diff --git a/include/haproxy/task.h b/include/haproxy/task.h
index 6adba48458..e82c1db697 100644
--- a/include/haproxy/task.h
+++ b/include/haproxy/task.h
@@ -37,6 +37,7 @@
 #include <haproxy/task-t.h>
 #include <haproxy/thread.h>
 #include <haproxy/ticks.h>
+#include <haproxy/time.h>
 
 
 /* Principle of the wait queue.
diff --git a/include/haproxy/xprt_quic.h b/include/haproxy/xprt_quic.h
index aa0331f7b1..bd20d46f28 100644
--- a/include/haproxy/xprt_quic.h
+++ b/include/haproxy/xprt_quic.h
@@ -33,7 +33,6 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 #include <haproxy/listener.h>
 #include <haproxy/quic_cc.h>
diff --git a/src/extcheck.c b/src/extcheck.c
index e621918a8d..5b0d3e9675 100644
--- a/src/extcheck.c
+++ b/src/extcheck.c
@@ -39,7 +39,6 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/freq_ctr.c b/src/freq_ctr.c
index edea699a75..54aa78f02a 100644
--- a/src/freq_ctr.c
+++ b/src/freq_ctr.c
@@ -12,7 +12,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/freq_ctr.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 /* Returns the total number of events over the current + last period, including
diff --git a/src/frontend.c b/src/frontend.c
index a8ed2c4884..6aa1027013 100644
--- a/src/frontend.c
+++ b/src/frontend.c
@@ -37,7 +37,7 @@
 #include <haproxy/stream.h>
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/listener.c b/src/listener.c
index be467ea5d8..0ba2ce6e54 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -35,7 +35,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 0357552baa..216700b40d 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -38,7 +38,6 @@
 #include <haproxy/protocol.h>
 #include <haproxy/proto_sockpair.h>
 #include <haproxy/sock.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index dfc52b137e..47a9992435 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -36,7 +36,6 @@
 #include <haproxy/proto_uxst.h>
 #include <haproxy/sock.h>
 #include <haproxy/sock_unix.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
 
diff --git a/src/raw_sock.c b/src/raw_sock.c
index a078f2d11a..7ee5f9bc7f 100644
--- a/src/raw_sock.c
+++ b/src/raw_sock.c
@@ -30,8 +30,6 @@
 #include <haproxy/global.h>
 #include <haproxy/pipe.h>
 #include <haproxy/stream_interface.h>
-#include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/sample.c b/src/sample.c
index 8fcacb1283..bda590875c 100644
--- a/src/sample.c
+++ b/src/sample.c
@@ -39,6 +39,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sink.h>
 #include <haproxy/stick_table.h>
+#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/vars.h>
diff --git a/src/stick_table.c b/src/stick_table.c
index f5d76322c4..4bc1a217df 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -40,7 +40,7 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/stream_interface.c b/src/stream_interface.c
index 2406261749..b55515901c 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -33,7 +33,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index f525895360..9af3005c44 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -27,7 +27,6 @@
 #include <haproxy/stream_interface.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace.h>
 
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index ba8a82aba4..6109f5afe3 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -57,7 +57,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
-#include <haproxy/time.h>
+#include <haproxy/ticks.h>
 #include <haproxy/tools.h>
 #include <haproxy/trace.h>
 #include <haproxy/vars.h>
diff --git a/src/wdt.c b/src/wdt.c
index 3c0b3d19e9..c42c4f7a07 100644
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -18,6 +18,7 @@
 #include <haproxy/global.h>
 #include <haproxy/signal-t.h>
 #include <haproxy/thread.h>
+#include <haproxy/time.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 32b8fced2d..802e5702b4 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -28,7 +28,6 @@
 #include <haproxy/debug.h>
 #include <haproxy/tools.h>
 #include <haproxy/ticks.h>
-#include <haproxy/time.h>
 
 #include <haproxy/connection.h>
 #include <haproxy/fd.h>