lib: drop unused or duplicate `curlx/timeval.h` includes

Note: This patch doesn't aim to add `timeval.h` includes missing from
local headers using `curltime` type. They remain relying on `urldata.h`
being included first. This patch also doesn't delete existing, used
includes already present in local headers (as internal users may rely
on them).

Ref: #20106
Closes #20126

diff --git a/lib/altsvc.c b/lib/altsvc.c
index b4bb875438f9a286c2548794db8e9aafebfd92dd..3b99c145908262e292fac789ed06b28d1b675524 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -36,7 +36,6 @@
 #include "curl_trc.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "connect.h"
 
 #define MAX_ALTSVC_LINE    4095

diff --git a/lib/cshutdn.h b/lib/cshutdn.h
index ad2d009673f3ead6b1887cb212dc909a2e74254e..0a15d39f1cbd67f0f98c306f645fd2eda18e33c6 100644 (file)
--- a/lib/cshutdn.h
+++ b/lib/cshutdn.h
@@ -24,8 +24,6 @@
  * SPDX-License-Identifier: curl
  *
  ***************************************************************************/
-#include "curlx/timeval.h"
-
 struct connectdata;
 struct Curl_easy;
 struct curl_pollfds;

diff --git a/lib/file.c b/lib/file.c
index 8d171374a5616707d988b779c837297888e758f4..982f254b2d94594410a39c24aea67d5ffd05d429 100644 (file)
--- a/lib/file.c
+++ b/lib/file.c
@@ -64,7 +64,6 @@
 #include "url.h"
 #include "parsedate.h" /* for the week day and month names */
 #include "curlx/fopen.h"
-#include "curlx/timeval.h"
 #include "curl_range.h"
 
 #if defined(_WIN32) || defined(MSDOS)

diff --git a/lib/ftp.c b/lib/ftp.c
index 27e4c8aadd6303576943b4098e0eaeebd2692066..12b8d4a6379e9ee8812ada0d37834ef68bcab52b 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -67,7 +67,6 @@
 #include "strdup.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 
 #ifndef NI_MAXHOST
 #define NI_MAXHOST 1025

diff --git a/lib/hostip.h b/lib/hostip.h
index 6f8e98218edead60eab894788e1f107af98ab2cb..a40e24b88e982a965fb287576762087113feaa63 100644 (file)
--- a/lib/hostip.h
+++ b/lib/hostip.h
@@ -27,7 +27,7 @@
 
 #include "hash.h"
 #include "curl_addrinfo.h"
-#include "curlx/timeval.h" /* for timediff_t */
+#include "curlx/timeval.h" /* for curltime, timediff_t */
 #include "asyn.h"
 #include "httpsrr.h"
 

diff --git a/lib/hsts.c b/lib/hsts.c
index a4e233e61e9fb33eedf2fc7fd76d05687c2ae662..de6c5731cd5b63bab77dda84b167ad18dac97895 100644 (file)
--- a/lib/hsts.c
+++ b/lib/hsts.c
@@ -36,7 +36,6 @@
 #include "parsedate.h"
 #include "curl_share.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "curlx/strcopy.h"
 
 #define MAX_HSTS_LINE    4095

diff --git a/lib/http.c b/lib/http.c
index 3e52efa8d192ca2d7baa7e79be56ffb9d8b3323f..a78e2f666bfb5744216a86dca651b3c3ee1456e8 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -84,7 +84,6 @@
 #include "ws.h"
 #include "bufref.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 
 /*
  * Forward declarations.

diff --git a/lib/http_aws_sigv4.c b/lib/http_aws_sigv4.c
index a01b72202dea0c88ce070c79f2b2da329ec6a0f6..598d8cbe5fcbfc51191e6525a741d8c322b51806 100644 (file)
--- a/lib/http_aws_sigv4.c
+++ b/lib/http_aws_sigv4.c
@@ -34,7 +34,6 @@
 #include "curl_trc.h"
 #include "escape.h"
 #include "curlx/strparse.h"
-#include "curlx/timeval.h"
 #include "slist.h"
 
 #include <time.h>

diff --git a/lib/multi.c b/lib/multi.c
index aec0739c39c4de97fcaac155ebef0a63bad5c45a..b65be603614d7cbd6a9cfc5f67f842aea8952b25 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -35,7 +35,6 @@
 #include "multi_ev.h"
 #include "sendf.h"
 #include "curl_trc.h"
-#include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"
 #include "curlx/wait.h"

diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index deebb970f34d54fa202c4c44114282cfeb3306b5..0c89721f358ba8c0268163a9f0b69e52cda38274 100644 (file)
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -28,7 +28,6 @@
 #include "cfilters.h"
 #include "curl_trc.h"
 #include "multiif.h"
-#include "curlx/timeval.h"
 #include "multi_ev.h"
 #include "select.h"
 #include "uint-bset.h"

diff --git a/lib/progress.c b/lib/progress.c
index 6493f748ebc06c1de5146e4397e8c3df066c3726..9fbe1f7a34580be7c3a2c3c5d1cfb52cea3a93fc 100644 (file)
--- a/lib/progress.c
+++ b/lib/progress.c
@@ -28,7 +28,6 @@
 #include "multiif.h"
 #include "progress.h"
 #include "transfer.h"
-#include "curlx/timeval.h"
 #include "curlx/strcopy.h"
 
 /* check rate limits within this many recent milliseconds, at minimum. */

diff --git a/lib/rand.c b/lib/rand.c
index 25ecdf1086a330ce2d3ce9f546c736cc2cea37b5..a0b168c0ca8e8afcbdec64e962277417e316c4c6 100644 (file)
--- a/lib/rand.c
+++ b/lib/rand.c
@@ -30,7 +30,6 @@
 #include "urldata.h"
 #include "vtls/vtls.h"
 #include "curl_trc.h"
-#include "curlx/timeval.h"
 #include "rand.h"
 #include "escape.h"
 

diff --git a/lib/ratelimit.c b/lib/ratelimit.c
index 5f87c966a5b2adfcf89130e96568cec6dbaf639c..c7ba64615e68f62d64af6b8c4b0466959a0d4639 100644 (file)
--- a/lib/ratelimit.c
+++ b/lib/ratelimit.c
@@ -23,10 +23,8 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/timeval.h"
 #include "ratelimit.h"
 
-
 #define CURL_US_PER_SEC       1000000
 #define CURL_RLIMIT_MIN_CHUNK (16 * 1024)
 #define CURL_RLIMIT_MAX_STEPS 2   /* 500ms interval */

diff --git a/lib/socketpair.c b/lib/socketpair.c
index 69b42da04cb9204236efca918abdf5ac03a07c7a..bdbe956233529588bc5c64556be16dea5b705379 100644 (file)
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -123,7 +123,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 #define INADDR_LOOPBACK 0x7f000001
 #endif
 
-#include "curlx/timeval.h"  /* needed before select.h */
 #include "select.h"   /* for Curl_poll */
 
 int Curl_socketpair(int domain, int type, int protocol,

diff --git a/lib/socks.c b/lib/socks.c
index ee89e892983a18a86c552db61250fe4d87df05b6..e49e8c82205d8fefef370ae7ddc4419044fae0aa 100644 (file)
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -38,7 +38,6 @@
 #include "select.h"
 #include "cfilters.h"
 #include "connect.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "curlx/inet_pton.h"
 #include "url.h"

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 1c2bfee987c375835bb9de55f2788a5f56032295..2da11713ebd884e9ba0cd7a6a6018a3a362b8b13 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -32,7 +32,6 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "curlx/nonblock.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "strdup.h"
 

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 5e9e49f2a908029456c034853d1412efd292cd3d..0f3cfceb272d8aa2e1ab4df7e20e03c7a4240433 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -32,7 +32,6 @@
 #include "connect.h"
 #include "strerror.h"
 #include "curlx/nonblock.h"
-#include "curlx/timeval.h"
 #include "socks.h"
 #include "curl_sspi.h"
 #include "curlx/multibyte.h"

diff --git a/lib/splay.c b/lib/splay.c
index 92a4b16199fa70c01655e237e396b3b79c7f0bed..5e4cd54d27babe055c6bfed9b11af06f016d128e 100644 (file)
--- a/lib/splay.c
+++ b/lib/splay.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/timeval.h"
 #include "splay.h"
 
 /*

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 0fa7cfd6e1279ba27d4ca65e9b4bc9edd570f9f1..934273e0ee1ccb1ca375486f4014d61773fa6c4a 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -52,7 +52,6 @@
 #include "../progress.h"
 #include "../strdup.h"
 #include "../curlx/fopen.h"
-#include "../curlx/timeval.h"
 #include "x509asn1.h"
 
 /* Enable GnuTLS debugging by defining GTLSDEBUG */

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 78f17ea1328e38650bfcac0798808affee720121..be0c032bff7bbb86c8e44c6eac7e03e08cb16c01 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -64,7 +64,6 @@
 #include "../url.h"
 #include "../progress.h"
 #include "../curlx/fopen.h"
-#include "../curlx/timeval.h"
 #include "../curl_sha256.h"
 #include "../curlx/base64.h"
 #include "../curlx/inet_pton.h"