lib: include `curlx/warnless.h` from `curl_setup.h`

To make it available for all files. Drop includes from individual
sources. This header was already included from most sources and not
specific to any internal subsystem.

Also to ensure that two system symbol redefines on Windows (`read()` and
`write()`) get applied to all sources. Move them to `curl_setup.h`.

Closes #20056

diff --git a/lib/altsvc.c b/lib/altsvc.c
index 855ebf812188d77a09d8bbdbf6255c8f8fc8856c..3aa88c2cdbf6d01ae77a7764ae923adae8548aa6 100644 (file)
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -34,7 +34,6 @@
 #include "curl_get_line.h"
 #include "parsedate.h"
 #include "sendf.h"
-#include "curlx/warnless.h"
 #include "curlx/inet_pton.h"
 #include "curlx/strparse.h"
 #include "curlx/timeval.h"

diff --git a/lib/cf-h2-proxy.c b/lib/cf-h2-proxy.c
index ff4e8dd9387cc6f4b8cdccaeece42b21353336e4..cc9a1672d0bcc5c70400f4e84a7719aae1d66c74 100644 (file)
--- a/lib/cf-h2-proxy.c
+++ b/lib/cf-h2-proxy.c
@@ -43,7 +43,6 @@
 #include "multiif.h"
 #include "sendf.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "cf-h2-proxy.h"
 
 #define PROXY_H2_CHUNK_SIZE  (16 * 1024)

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index f4794eb6c37501feed157cbc6948641ab745f393..28326ee78f8ce43ade67c71b55f0e50cffc7e79f 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -66,7 +66,6 @@
 #include "multiif.h"
 #include "curlx/inet_pton.h"
 #include "progress.h"
-#include "curlx/warnless.h"
 #include "conncache.h"
 #include "multihandle.h"
 #include "rand.h"

diff --git a/lib/cfilters.c b/lib/cfilters.c
index a02e4bffd9bacbda5562753df2809a2f9a1fc9df..495ba078ba4e8ce0c1e1f5f63dbd421c94cde6ae 100644 (file)
--- a/lib/cfilters.c
+++ b/lib/cfilters.c
@@ -32,7 +32,6 @@
 #include "sendf.h"
 #include "progress.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/strparse.h"
 
 static void cf_cntrl_update_info(struct Curl_easy *data,

diff --git a/lib/connect.c b/lib/connect.c
index bf38c8f111a7de792b8915d05cca5441f5daeb7a..3e1cda561bcfe0b2e23a22f7909526682cb556f1 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -64,7 +64,6 @@
 #include "curlx/strparse.h"
 #include "vtls/vtls.h" /* for vtsl cfilters */
 #include "progress.h"
-#include "curlx/warnless.h"
 #include "conncache.h"
 #include "multihandle.h"
 #include "http_proxy.h"

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 27282dd9f9fa828adcc9f393b9211eaaedf2eb6e..43dcfd25c790e88ee4b2d3013ac3890c07829ee2 100644 (file)
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -50,7 +50,6 @@
 #include "curl_addrinfo.h"
 #include "fake_addrinfo.h"
 #include "curlx/inet_pton.h"
-#include "curlx/warnless.h"
 
 /*
  * Curl_freeaddrinfo()

diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c
index b7d67598eeaf8b516f2d2c3b312aac3a02e3acfb..36778ecae7c9a08a75d086f82b13beb2be725d50 100644 (file)
--- a/lib/curl_ntlm_core.c
+++ b/lib/curl_ntlm_core.c
@@ -114,7 +114,6 @@
 #include "curl_ntlm_core.h"
 #include "curl_md5.h"
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 #include "curl_md4.h"
 #include "vauth/vauth.h"
 

diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index fd0bfe5f4fc3d0d3b48b911f64df01c3d08b5158..36f81464a4ea5251356dc736d1a3e749969c584a 100644 (file)
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -34,7 +34,6 @@
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "bufref.h"
-#include "curlx/warnless.h"
 
 #include <librtmp/rtmp.h>
 

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 864344da6a412455cc37c37fea9b74a8cb6faf76..22acd23411361a0ef63453f54fac822a0ea46491 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -44,7 +44,6 @@
 #include "vauth/vauth.h"
 #include "cfilters.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 #include "sendf.h"
 
 /* Supported mechanisms */

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 9a9596ea69d392219f71cfccdf1fbfcdefa9fbaf..e3903f475acf829c9256187e2a07a75f9bfa1436 100644 (file)
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -779,6 +779,18 @@
 #include "curl_setup_once.h"
 #endif
 
+/*
+ * Macros and functions to safely suppress warnings
+ */
+#include "curlx/warnless.h"
+
+#ifdef _WIN32
+#  undef  read
+#  define read(fd, buf, count)  (ssize_t)_read(fd, buf, curlx_uztoui(count))
+#  undef  write
+#  define write(fd, buf, count) (ssize_t)_write(fd, buf, curlx_uztoui(count))
+#endif
+
 /*
  * Definition of our NOP statement Object-like macro
  */

diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c
index df6aa059964ad92cdffe4da93cecd904845009fc..aff0ce0a473795284b6bce4c94b31fa6d08a15a4 100644 (file)
--- a/lib/curl_sha512_256.c
+++ b/lib/curl_sha512_256.c
@@ -27,7 +27,6 @@
 #if !defined(CURL_DISABLE_DIGEST_AUTH) && !defined(CURL_DISABLE_SHA512_256)
 
 #include "curl_sha512_256.h"
-#include "curlx/warnless.h"
 
 /* The recommended order of the TLS backends:
  * 1. OpenSSL

diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c
index ce0ff40160b1d4284850160e037b6b23d9d266e1..93a68e56c580d134fd26ca8c055f620852b25852 100644 (file)
--- a/lib/curl_sspi.c
+++ b/lib/curl_sspi.c
@@ -29,7 +29,6 @@
 #include "curl_sspi.h"
 #include "strdup.h"
 #include "curlx/multibyte.h"
-#include "curlx/warnless.h"
 
 /* Pointer to SSPI dispatch table */
 PSecurityFunctionTable Curl_pSecFn = NULL;

diff --git a/lib/curlx/base64.c b/lib/curlx/base64.c
index e7d2defa03ee93162323a42908a22c7ca534b222..6635fc328c75bab937d77a24fbfe655bff08fbf0 100644 (file)
--- a/lib/curlx/base64.c
+++ b/lib/curlx/base64.c
@@ -26,7 +26,6 @@
 
 #include "../curl_setup.h"
 
-#include "warnless.h"
 #include "base64.h"
 
 /* ---- Base64 Encoding/Decoding Table --- */

diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index af46fae671d54a3b6c95c7fa1af287aa189d611b..67219603f96f4fad3baac378ce1a92b2bdb9cbb2 100644 (file)
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -37,14 +37,6 @@
 #include "nonblock.h"
 /* "nonblock.h" provides curlx_nonblock() */
 
-#include "warnless.h"
-/* "warnless.h" provides functions:
-
-  curlx_ultous()
-  curlx_ultouc()
-  curlx_uztosi()
-*/
-
 #include "multibyte.h"
 /* "multibyte.h" provides these functions and macros:
 

diff --git a/lib/curlx/version_win32.c b/lib/curlx/version_win32.c
index c8d45bb1479e762f04fe1e10f27bb59f07f94bdc..be5b13c9de3c42cd7f6ef6faf129a7eaf51acf12 100644 (file)
--- a/lib/curlx/version_win32.c
+++ b/lib/curlx/version_win32.c
@@ -27,7 +27,6 @@
 #ifdef _WIN32
 
 #include "version_win32.h"
-#include "warnless.h"
 
 /* This Unicode version struct works for VerifyVersionInfoW (OSVERSIONINFOEXW)
    and RtlVerifyVersionInfo (RTLOSVERSIONINFOEXW) */

diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h
index 31b7dcd0703779b657fcde0505377e83473ebd0e..290aaac28db4520180d190a5ecc94d9db17866f9 100644 (file)
--- a/lib/curlx/warnless.h
+++ b/lib/curlx/warnless.h
@@ -73,11 +73,4 @@ bool curlx_sotouz_fits(curl_off_t sonum, size_t *puznum);
  * and set 0 */
 bool curlx_sltouz(long sznum, size_t *puznum);
 
-#ifdef _WIN32
-#undef  read
-#define read(fd, buf, count)  (ssize_t)_read(fd, buf, curlx_uztoui(count))
-#undef  write
-#define write(fd, buf, count) (ssize_t)_write(fd, buf, curlx_uztoui(count))
-#endif
-
 #endif /* HEADER_CURL_WARNLESS_H */

diff --git a/lib/easy.c b/lib/easy.c
index 2bd91da79b614dc67d5490f5ab6b4a3d6348ba61..3e3ac4cff86de460730441aae61e0ee594ba26be 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -64,7 +64,6 @@
 #include "mime.h"
 #include "amigaos.h"
 #include "macos.h"
-#include "curlx/warnless.h"
 #include "curlx/wait.h"
 #include "sigpipe.h"
 #include "vssh/ssh.h"

diff --git a/lib/escape.c b/lib/escape.c
index bd1096538072786af0b3a5c5a6a70b8ea4ffb497..f9f69a8000d6d5c6fce3d6ef2045845a1eb0859f 100644 (file)
--- a/lib/escape.c
+++ b/lib/escape.c
@@ -30,7 +30,6 @@
 struct Curl_easy;
 
 #include "urldata.h"
-#include "curlx/warnless.h"
 #include "escape.h"
 #include "curlx/strparse.h"
 #include "curl_printf.h"

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

diff --git a/lib/formdata.c b/lib/formdata.c
index 208d1d7f47ff46b7978e5969d80aabbc38ed0778..358bb4c49853bbc38a9faf1ae1b40ebfe93902df 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -36,7 +36,6 @@ struct Curl_easy;
 #include "strdup.h"
 #include "bufref.h"
 #include "curlx/fopen.h"
-#include "curlx/warnless.h"
 
 
 #define HTTPPOST_PTRNAME     CURL_HTTPPOST_PTRNAME

diff --git a/lib/ftp.c b/lib/ftp.c
index 3df55de7bbc936c324abf6fddb9f6f74276072de..94735d22f5dfe7ceb1974c07a2f19cb1b1222a6e 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -64,7 +64,6 @@
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "multiif.h"
 #include "url.h"
-#include "curlx/warnless.h"
 #include "http_proxy.h"
 #include "strdup.h"
 #include "curlx/strerr.h"

diff --git a/lib/gopher.c b/lib/gopher.c
index e83d9cfc4609acbabb341c0fc8d64707b1da5268..348e675561a7e1f8fb016cef278edbc88cf84c4c 100644 (file)
--- a/lib/gopher.c
+++ b/lib/gopher.c
@@ -35,7 +35,6 @@
 #include "select.h"
 #include "url.h"
 #include "escape.h"
-#include "curlx/warnless.h"
 
 /*
  * Forward declarations.

diff --git a/lib/hmac.c b/lib/hmac.c
index b4ee071ad17a9b3111a6a1b1411fec32ba7d9c69..f9248b09774e5b22078d915233ad3d56b86e91d4 100644 (file)
--- a/lib/hmac.c
+++ b/lib/hmac.c
@@ -31,7 +31,6 @@
   defined(USE_SSL)
 
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 
 /*
  * Generic HMAC algorithm.

diff --git a/lib/hostip.c b/lib/hostip.c
index b18e5e0bd401bb3b0f37194217eed3364e9e5c4f..aa10839c20a605d5ec016c9574dad51eb535b371 100644 (file)
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -56,7 +56,6 @@
 #include "curlx/inet_pton.h"
 #include "multiif.h"
 #include "doh.h"
-#include "curlx/warnless.h"
 #include "progress.h"
 #include "select.h"
 #include "strcase.h"

diff --git a/lib/http.c b/lib/http.c
index 202808f1f2898dccab1b470d21ee7365549e41a1..69361b88ec64da464c1701f0d000611e4523f6c9 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -74,7 +74,6 @@
 #include "strcase.h"
 #include "content_encoding.h"
 #include "http_proxy.h"
-#include "curlx/warnless.h"
 #include "http2.h"
 #include "cfilters.h"
 #include "connect.h"

diff --git a/lib/http2.c b/lib/http2.c
index 931640e93fe3e58e3ff6822fd281a8713946dc0c..29ca95cb0925cefbca3d969219b4ba4f4edb43b0 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -46,7 +46,6 @@
 #include "transfer.h"
 #include "bufref.h"
 #include "curlx/dynbuf.h"
-#include "curlx/warnless.h"
 #include "headers.h"
 
 #if (NGHTTP2_VERSION_NUM < 0x010c00)

diff --git a/lib/http_chunks.c b/lib/http_chunks.c
index 8ec04987ad5dcb6680e42d55bf25088f0bebbeb8..a12d2dce72c8704a876aa91a53d4d6d15ac4dd2e 100644 (file)
--- a/lib/http_chunks.c
+++ b/lib/http_chunks.c
@@ -33,7 +33,6 @@
 #include "http.h"
 #include "multiif.h"
 #include "curlx/strparse.h"
-#include "curlx/warnless.h"
 
 /*
  * Chunk format (simplified):

diff --git a/lib/idn.c b/lib/idn.c
index 62149cf84e7e2b2e1e719b81e2f21d1ab9ca9486..1907a224bf262626f19bb7d6e2e9b8a7623809f5 100644 (file)
--- a/lib/idn.c
+++ b/lib/idn.c
@@ -31,7 +31,6 @@
 #include "urldata.h"
 #include "idn.h"
 #include "sendf.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_LIBIDN2
 #include <idn2.h>

diff --git a/lib/imap.c b/lib/imap.c
index 5ec30e6dc6d06bd3392372fe88bea46216e22de4..b826b67bde0c4500cdf1cf4dad15c1805adb118b 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -72,7 +72,6 @@
 #include "url.h"
 #include "bufref.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 
 
 /* meta key for storing protocol meta at easy handle */

diff --git a/lib/md4.c b/lib/md4.c
index 044ceb066fc8272a29bd2bedc349e2fdcaf89d03..535369579562c81ef7439aa00d05181970c8bebb 100644 (file)
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -27,7 +27,6 @@
 #ifdef USE_CURL_NTLM_CORE
 
 #include "curl_md4.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_OPENSSL
 #include <openssl/opensslv.h>

diff --git a/lib/md5.c b/lib/md5.c
index f6c330cfc6a691b55dfa5b86a3d7b9205ff537c8..12997d175d76255621b9f6168c53cdcc7c8cbcc0 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -29,7 +29,6 @@
 
 #include "curl_md5.h"
 #include "curl_hmac.h"
-#include "curlx/warnless.h"
 
 #ifdef USE_OPENSSL
   #include <openssl/opensslconf.h>

diff --git a/lib/mime.c b/lib/mime.c
index f772833d26469b3461cd491016be04e98edaec53..31b5306bf1de01b71e607bc7fdb6ccdf8b313144 100644 (file)
--- a/lib/mime.c
+++ b/lib/mime.c
@@ -27,7 +27,6 @@
 struct Curl_easy;
 
 #include "mime.h"
-#include "curlx/warnless.h"
 #include "urldata.h"
 #include "sendf.h"
 #include "transfer.h"

diff --git a/lib/mqtt.c b/lib/mqtt.c
index ae98cce258e42288cb53963e8374a4b69acf69c1..27b163317896d2d433482458c6be4052862de3d0 100644 (file)
--- a/lib/mqtt.c
+++ b/lib/mqtt.c
@@ -35,7 +35,6 @@
 #include "select.h"
 #include "url.h"
 #include "escape.h"
-#include "curlx/warnless.h"
 #include "rand.h"
 
 /* first byte is command.

diff --git a/lib/multi.c b/lib/multi.c
index 2c4eb86c7be6a9765874a1caf85e77231c46103e..710df8548d5cf66a6d824dfb78c9815c80e95a6d 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -38,7 +38,6 @@
 #include "curlx/timeval.h"
 #include "http.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/wait.h"
 #include "conncache.h"
 #include "multihandle.h"

diff --git a/lib/multi_ev.c b/lib/multi_ev.c
index 51481704e3e5a2d9492d501788e36588fc836807..5d55ed8ebcee13bca86b274577ef40950c6dff23 100644 (file)
--- a/lib/multi_ev.c
+++ b/lib/multi_ev.c
@@ -34,7 +34,6 @@
 #include "select.h"
 #include "uint-bset.h"
 #include "uint-spbset.h"
-#include "curlx/warnless.h"
 #include "multihandle.h"
 
 

diff --git a/lib/parsedate.c b/lib/parsedate.c
index 69dbfe7fc09df3612451fedcc74938103ef5f053..b622b5ad907399ba850745fa1c197551e15316d1 100644 (file)
--- a/lib/parsedate.c
+++ b/lib/parsedate.c
@@ -77,7 +77,6 @@
 
 #include "curl_setup.h"
 
-#include "curlx/warnless.h"
 #include "parsedate.h"
 #include "curlx/strparse.h"
 

diff --git a/lib/pop3.c b/lib/pop3.c
index 8a80d55321961b27feb80a85e4762e6fcded11f4..a1321125b9e767d44faef58b8bbefb7873f97742 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -72,7 +72,6 @@
 #include "bufref.h"
 #include "curl_sasl.h"
 #include "curl_md5.h"
-#include "curlx/warnless.h"
 #include "strdup.h"
 
 /* Authentication type flags */

diff --git a/lib/select.c b/lib/select.c
index 0c9fce782784545542fbbb479c7907112c4d872d..5761084242d14eab869f8f6558cd98ff6c8bdfdd 100644 (file)
--- a/lib/select.c
+++ b/lib/select.c
@@ -40,7 +40,6 @@
 #include "curl_trc.h"
 #include "curlx/timediff.h"
 #include "curlx/wait.h"
-#include "curlx/warnless.h"
 
 #ifndef HAVE_POLL
 /*

diff --git a/lib/sendf.c b/lib/sendf.c
index 209514f449ddec7a9f9a897b6db4d7a0640148ec..b2b5d0f9fe58dceab858f799da99fdaf7a1304e1 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -45,7 +45,6 @@
 #include "strerror.h"
 #include "http2.h"
 #include "progress.h"
-#include "curlx/warnless.h"
 
 
 static CURLcode do_init_writer_stack(struct Curl_easy *data);

diff --git a/lib/setopt.c b/lib/setopt.c
index dc1353dc45cabb3e09b594cea4a37381a362a746..f6e1d7643f26036dad2c6976c3b905f84a3ad502 100644 (file)
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -41,7 +41,6 @@
 #include "strcase.h"
 #include "curl_share.h"
 #include "vtls/vtls.h"
-#include "curlx/warnless.h"
 #include "sendf.h"
 #include "hostip.h"
 #include "http2.h"

diff --git a/lib/sha256.c b/lib/sha256.c
index 910f65e1c0ae73c415ef886b28e6de24d5359d34..b653100d5dd4946326cab3caa5e6b51e983eed41 100644 (file)
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -28,7 +28,6 @@
 #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \
   defined(USE_LIBSSH2) || defined(USE_SSL)
 
-#include "curlx/warnless.h"
 #include "curl_sha256.h"
 
 #ifdef USE_MBEDTLS

diff --git a/lib/smtp.c b/lib/smtp.c
index ebed05d2e5cd4a41ec2199ebef39f7a025dd6cf2..f868179bed1eb77b005bab1ecf14be24c58395fb 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -74,7 +74,6 @@
 #include "curl_gethostname.h"
 #include "bufref.h"
 #include "curl_sasl.h"
-#include "curlx/warnless.h"
 #include "idn.h"
 #include "curlx/strparse.h"
 

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 4df1fc1d20e43abf6f7f51bcf9a388a8e6b7de92..9523d936dd9051dc2ff979b63e5bad344d847608 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -35,7 +35,6 @@
 #include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
-#include "curlx/warnless.h"
 #include "strdup.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 7d6ac253c3987f530a10fe7476e5d3c0e20b9fff..560df242056892cd5429b317b0ecf682b3de5a64 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -37,7 +37,6 @@
 #include "socks.h"
 #include "curl_sspi.h"
 #include "curlx/multibyte.h"
-#include "curlx/warnless.h"
 
 /*
  * Helper sspi error functions.

diff --git a/lib/system_win32.c b/lib/system_win32.c
index 21a991eb09262c5c6e3c364394e1839b17f19b31..a53f61724e0921fa97dce7edf9e6cb0fb2260300 100644 (file)
--- a/lib/system_win32.c
+++ b/lib/system_win32.c
@@ -29,7 +29,6 @@
 #include "system_win32.h"
 #include "curlx/version_win32.h"
 #include "curl_sspi.h"
-#include "curlx/warnless.h"
 
 #ifndef HAVE_IF_NAMETOINDEX
 /* Handle of iphlpapp.dll */

diff --git a/lib/telnet.c b/lib/telnet.c
index cdf33b97dee173ffab51f479bfa7a78991d195ed..03a5bb7f452c4086e7d0f089d2dd8df75dac6486 100644 (file)
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -55,7 +55,6 @@
 #include "progress.h"
 #include "arpa_telnet.h"
 #include "select.h"
-#include "curlx/warnless.h"
 #include "curlx/strparse.h"
 
 #define SUBBUFSIZE 512

diff --git a/lib/transfer.c b/lib/transfer.c
index 10a609701717b859a664b3fa77efb27288036e6a..30ca3cb4de13dccf76fe149ff6f8ebebf961a836 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -74,7 +74,6 @@
 #include "setopt.h"
 #include "headers.h"
 #include "bufref.h"
-#include "curlx/warnless.h"
 
 #if !defined(CURL_DISABLE_HTTP) || !defined(CURL_DISABLE_SMTP) || \
   !defined(CURL_DISABLE_IMAP)

diff --git a/lib/uint-bset.c b/lib/uint-bset.c
index d41d982b3a23725591302dd5202e1e28b3792118..32aebe7cda7d98604add1a8c437ad821ee8ec15a 100644 (file)
--- a/lib/uint-bset.c
+++ b/lib/uint-bset.c
@@ -23,6 +23,7 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "uint-bset.h"
 
 #ifdef DEBUGBUILD

diff --git a/lib/url.c b/lib/url.c
index c8ba6a07727d7eb8a67b14cc56e3748c481656e8..d605adb3a0b19afd4a29fd5941bf7c73c80a6541 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -82,7 +82,6 @@
 #include "curl_share.h"
 #include "http_digest.h"
 #include "multiif.h"
-#include "curlx/warnless.h"
 #include "getinfo.h"
 #include "pop3.h"
 #include "urlapi-int.h"

diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c
index a9fe574d635b379bcd55d5618c39a926bd672a69..90e9178491ed8a61128de3ab0158dd3ed6700b62 100644 (file)
--- a/lib/vauth/cleartext.c
+++ b/lib/vauth/cleartext.c
@@ -32,7 +32,6 @@
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 /*

diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c
index 3251d90822b7b55ef08b2d943b6a4c293eb9fb99..8aa4055231cdd228aa83acde0e2c4a12e185b6f3 100644 (file)
--- a/lib/vauth/cram.c
+++ b/lib/vauth/cram.c
@@ -31,7 +31,6 @@
 #include "vauth.h"
 #include "../curl_hmac.h"
 #include "../curl_md5.h"
-#include "../curlx/warnless.h"
 
 
 /*

diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c
index ceb2d8523bb8283bfa906013770a0e17b150e9e8..c67be1dd848463dfc4ac9d48907597773ddaabec 100644 (file)
--- a/lib/vauth/digest.c
+++ b/lib/vauth/digest.c
@@ -35,7 +35,6 @@
 #include "../curl_md5.h"
 #include "../curl_sha256.h"
 #include "../curl_sha512_256.h"
-#include "../curlx/warnless.h"
 #include "../curlx/strparse.h"
 #include "../rand.h"
 

diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c
index 812b4735566dda3234cfaac58428cad6eee8e7c6..46377d22b2a78d8c1a88dba2a4de9fa36f29f260 100644 (file)
--- a/lib/vauth/digest_sspi.c
+++ b/lib/vauth/digest_sspi.c
@@ -31,7 +31,6 @@
 
 #include "vauth.h"
 #include "digest.h"
-#include "../curlx/warnless.h"
 #include "../curlx/multibyte.h"
 #include "../sendf.h"
 #include "../strdup.h"

diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c
index 19cc3d34b0475d9f982ace1bada890c086e248cc..8159c88aec1ece9cf8ce405ffa2df8c695c8243a 100644 (file)
--- a/lib/vauth/krb5_sspi.c
+++ b/lib/vauth/krb5_sspi.c
@@ -29,7 +29,6 @@
 #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5)
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 /*

diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c
index 82edbe6b1b43e23a04eaa7f63eaa4f281911ecb0..c5b226362288a3ff8f803a76a9ee3a014d574a49 100644 (file)
--- a/lib/vauth/ntlm.c
+++ b/lib/vauth/ntlm.c
@@ -38,7 +38,6 @@
 #include "vauth.h"
 #include "../sendf.h"
 #include "../curl_ntlm_core.h"
-#include "../curlx/warnless.h"
 #include "../rand.h"
 #include "../strdup.h"
 #include "../curl_endian.h"

diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c
index e5e37b771f478e389a90067d4803ec6eb97ec6d9..eea18281e5ceabd736b99d6ca9553cf97a4cc81b 100644 (file)
--- a/lib/vauth/ntlm_sspi.c
+++ b/lib/vauth/ntlm_sspi.c
@@ -28,7 +28,6 @@
 
 #include "vauth.h"
 #include "../curl_ntlm_core.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 #include "../strdup.h"
 

diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c
index d9f07bba563a1c0df19c2a71417d1d8ae01802a1..fc89cba49f44dbe2b61fcd91788696aa78d61f32 100644 (file)
--- a/lib/vauth/oauth2.c
+++ b/lib/vauth/oauth2.c
@@ -31,7 +31,6 @@
   (!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
 
 #include "vauth.h"
-#include "../curlx/warnless.h"
 
 /*
  * Curl_auth_create_oauth_bearer_message()

diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c
index 5df8cc9ce7bbe8fb33bae07d2125e8b6ff2c426a..a1c92612c6fc295ebbb91f761a37537acd48b432 100644 (file)
--- a/lib/vauth/spnego_gssapi.c
+++ b/lib/vauth/spnego_gssapi.c
@@ -31,7 +31,6 @@
 #include "vauth.h"
 #include "../curlx/base64.h"
 #include "../curl_gssapi.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 
 #if defined(__GNUC__) && defined(__APPLE__)

diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c
index e58957d29e0fe29c4174a1b6e8423d81f0876b65..68adb8591b8d6f36ba4c258c04505eb2b96e6160 100644 (file)
--- a/lib/vauth/spnego_sspi.c
+++ b/lib/vauth/spnego_sspi.c
@@ -30,7 +30,6 @@
 
 #include "vauth.h"
 #include "../curlx/base64.h"
-#include "../curlx/warnless.h"
 #include "../sendf.h"
 #include "../strerror.h"
 

diff --git a/lib/vquic/curl_ngtcp2.c b/lib/vquic/curl_ngtcp2.c
index fd7f9a332421bdae3654c8945ad65cd34f326787..167e68aa33fcca92bb855024cbea164bb49d9b01 100644 (file)
--- a/lib/vquic/curl_ngtcp2.c
+++ b/lib/vquic/curl_ngtcp2.c
@@ -69,8 +69,6 @@
 #include "../vtls/vtls_scache.h"
 #include "curl_ngtcp2.h"
 
-#include "../curlx/warnless.h"
-
 
 #define QUIC_MAX_STREAMS       (256 * 1024)
 #define QUIC_HANDSHAKE_TIMEOUT (10 * NGTCP2_SECONDS)

diff --git a/lib/vquic/curl_osslq.c b/lib/vquic/curl_osslq.c
index a3dc088e31a529f672d1304c5380889802b5d5a5..0afae1a25aa528d5aa2d4ba42cebb186d0f1b2bb 100644 (file)
--- a/lib/vquic/curl_osslq.c
+++ b/lib/vquic/curl_osslq.c
@@ -52,7 +52,6 @@
 #include "curl_osslq.h"
 #include "../url.h"
 #include "../bufref.h"
-#include "../curlx/warnless.h"
 #include "../curlx/strerr.h"
 
 /* A stream window is the maximum amount we need to buffer for

diff --git a/lib/vquic/curl_quiche.c b/lib/vquic/curl_quiche.c
index c06b091a0dcb0b4dbe5b16e240dc902c97162ac8..454de658ce6b5bccd86fd4fce00e02945854781f 100644 (file)
--- a/lib/vquic/curl_quiche.c
+++ b/lib/vquic/curl_quiche.c
@@ -47,7 +47,6 @@
 #include "../transfer.h"
 #include "../url.h"
 #include "../bufref.h"
-#include "../curlx/warnless.h"
 #include "../vtls/openssl.h"
 #include "../vtls/keylog.h"
 #include "../vtls/vtls.h"

diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c
index 3bc6835184521a9657fc09163ef9bc028c35cd47..5869e70bbc697c024c76bd687299c774f575418f 100644 (file)
--- a/lib/vquic/vquic.c
+++ b/lib/vquic/vquic.c
@@ -34,7 +34,6 @@
 #include "../bufq.h"
 #include "../curlx/dynbuf.h"
 #include "../curlx/fopen.h"
-#include "../curlx/warnless.h"
 #include "../cfilters.h"
 #include "../curl_trc.h"
 #include "curl_ngtcp2.h"

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 2ed89c0c9bee0d8941e6dc2923cdf5a468f5159e..b9cffa4b97e2ee7a82304165a51a356a17087632 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -57,7 +57,6 @@
 #include "../curlx/strparse.h"
 #include "../multiif.h"
 #include "../select.h"
-#include "../curlx/warnless.h"
 #include "vssh.h"
 
 #ifdef HAVE_UNISTD_H

diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
index 284a095340a5e8eb96b76a899a902ce72e5d7bd8..b448d9ea346d7e59e213da280d4ee7d4472e08d3 100644 (file)
--- a/lib/vssh/libssh2.c
+++ b/lib/vssh/libssh2.c
@@ -56,7 +56,6 @@
 #include "../multiif.h"
 #include "../select.h"
 #include "../curlx/fopen.h"
-#include "../curlx/warnless.h"
 #include "vssh.h"
 #include "../curlx/strparse.h"
 #include "../curlx/base64.h" /* for base64 encoding/decoding */

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 6ecb1deb43d688f9790340b9ce8ffe4c94de17b4..62e81556ddb488af747f73727a54fdbbb4c01906 100644 (file)
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -55,7 +55,6 @@
 #include "../strdup.h"
 #include "../curlx/fopen.h"
 #include "../curlx/timeval.h"
-#include "../curlx/warnless.h"
 #include "x509asn1.h"
 
 /* Enable GnuTLS debugging by defining GTLSDEBUG */

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 7201ecb7244af0fa108ebbd5ec345ec15964b2f6..de747926facc3279dd05abe4b267a7668fca00e5 100644 (file)
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -119,8 +119,6 @@ static void ossl_provider_cleanup(struct Curl_easy *data);
 #define HAVE_SSL_CTX_SET_DEFAULT_READ_BUFFER_LEN 1
 #endif
 
-#include "../curlx/warnless.h"
-
 #if defined(USE_OPENSSL_ENGINE) || defined(OPENSSL_HAS_PROVIDERS)
 #include <openssl/ui.h>
 #endif

diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 289f10d66f99742015d9f19db57c1514a563fecb..823844e7e574fb16ef9cb137179f7bec38fb46c6 100644 (file)
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -49,7 +49,6 @@
 #include "../select.h" /* for the socket readiness */
 #include "../curlx/fopen.h"
 #include "../curlx/multibyte.h"
-#include "../curlx/warnless.h"
 #include "x509asn1.h"
 #include "../system_win32.h"
 #include "../curlx/version_win32.h"

diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 88741e60132447bcfd355b8c30bc533ab49135a3..3375e33c270744ed539a163b89b3c58b21b480b4 100644 (file)
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -66,7 +66,6 @@
 #include "../curlx/fopen.h"
 #include "../curlx/timeval.h"
 #include "../curl_sha256.h"
-#include "../curlx/warnless.h"
 #include "../curlx/base64.h"
 #include "../curlx/inet_pton.h"
 #include "../connect.h"

diff --git a/lib/vtls/vtls_scache.c b/lib/vtls/vtls_scache.c
index b968d8b8f36adfe854c0ea15286752cc623c6922..ea4ea4e68efa73c1f794f8a0b3f546c2e97baae6 100644 (file)
--- a/lib/vtls/vtls_scache.c
+++ b/lib/vtls/vtls_scache.c
@@ -45,7 +45,6 @@
 #include "../curl_trc.h"
 #include "../curl_sha256.h"
 #include "../rand.h"
-#include "../curlx/warnless.h"
 
 
 static bool cf_ssl_peer_key_is_global(const char *peer_key);

diff --git a/lib/ws.c b/lib/ws.c
index 6bb4a7d7427e115a922ba9397f921ee635562b7c..0884ac58eff598ea1ba3e7745ca0322af5ae657d 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -39,7 +39,6 @@
 #include "transfer.h"
 #include "select.h"
 #include "curlx/strparse.h"
-#include "curlx/warnless.h"
 
 /***
     RFC 6455 Section 5.2