From 00427701573be171545f2511e4b897ceffd2ac3d Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 19 Jun 2025 14:41:34 +0200 Subject: [PATCH] warnless: drop parts of the `read`/`write` preprocessor hack (Windows) The `#undef` hack is no longer necessary after changing the redifitions to not map back to the original symbols. This makes it unnecessary to repeat the redefinitions after compiling `warnless.c` itself (in unity mode). Which in turns makes it unnecessary to include `warnless.h` again, to trigger such redefinition. This also means that `read`/`write` are now redefined on Windows from the first inclusion of `warnless.h`. Also: - tests/server: drop a repeat `warnless.h` include, that is unnecessary after this patch. - tests/unit: drop repeat `warnless.h` include. - tests/libtest: drop repeat `warnless.h` includes. - tests/libtest: formatting. Follow-up to 2f312a14da94068d58b6a39f79f82acd0bf82149 #17619 Follow-up to 84338c4de2d7c798e3c270c9610d51a4ad18a90b #12331 Follow-up to 6239146e931fd3127f6994975a56d1b4884a708a Closes #17673 --- lib/curlx/warnless.c | 9 --------- lib/curlx/warnless.h | 7 +------ tests/libtest/lib1485.c | 1 - tests/libtest/lib1500.c | 1 - tests/libtest/lib1501.c | 1 - tests/libtest/lib1502.c | 1 - tests/libtest/lib1506.c | 1 - tests/libtest/lib1507.c | 1 - tests/libtest/lib1508.c | 1 - tests/libtest/lib1509.c | 1 - tests/libtest/lib1510.c | 1 - tests/libtest/lib1515.c | 2 +- tests/libtest/lib1522.c | 1 - tests/libtest/lib1523.c | 1 - tests/libtest/lib1531.c | 1 - tests/libtest/lib1540.c | 1 - tests/libtest/lib1541.c | 1 - tests/libtest/lib1542.c | 2 +- tests/libtest/lib1552.c | 1 - tests/libtest/lib1553.c | 1 - tests/libtest/lib1554.c | 1 + tests/libtest/lib1556.c | 1 - tests/libtest/lib1557.c | 1 - tests/libtest/lib1558.c | 1 - tests/libtest/lib1559.c | 1 - tests/libtest/lib1560.c | 1 - tests/libtest/lib1564.c | 1 - tests/libtest/lib1565.c | 1 - tests/libtest/lib1591.c | 2 ++ tests/libtest/lib1592.c | 1 + tests/libtest/lib1598.c | 2 ++ tests/libtest/lib1900.c | 1 - tests/libtest/lib1901.c | 1 - tests/libtest/lib1903.c | 1 - tests/libtest/lib1905.c | 1 - tests/libtest/lib1906.c | 1 - tests/libtest/lib1907.c | 1 - tests/libtest/lib1908.c | 1 - tests/libtest/lib1910.c | 1 - tests/libtest/lib1911.c | 1 - tests/libtest/lib1912.c | 1 - tests/libtest/lib1913.c | 1 - tests/libtest/lib1915.c | 1 - tests/libtest/lib1916.c | 1 - tests/libtest/lib1918.c | 1 - tests/libtest/lib1919.c | 1 - tests/libtest/lib1977.c | 1 - tests/libtest/lib2023.c | 1 + tests/libtest/lib2032.c | 1 - tests/libtest/lib2306.c | 1 + tests/libtest/lib2308.c | 1 + tests/libtest/lib2309.c | 1 + tests/libtest/lib2402.c | 1 - tests/libtest/lib2404.c | 1 - tests/libtest/lib2405.c | 1 - tests/libtest/lib2502.c | 1 - tests/libtest/lib2700.c | 1 + tests/libtest/lib3026.c | 1 - tests/libtest/lib3027.c | 1 - tests/libtest/lib3100.c | 1 + tests/libtest/lib3101.c | 1 + tests/libtest/lib3105.c | 1 - tests/libtest/lib3207.c | 1 + tests/libtest/lib3208.c | 1 - tests/libtest/lib502.c | 1 - tests/libtest/lib503.c | 1 - tests/libtest/lib504.c | 1 - tests/libtest/lib507.c | 1 - tests/libtest/lib518.c | 1 - tests/libtest/lib525.c | 1 - tests/libtest/lib526.c | 1 - tests/libtest/lib530.c | 1 - tests/libtest/lib533.c | 1 - tests/libtest/lib537.c | 1 - tests/libtest/lib540.c | 1 - tests/libtest/lib552.c | 1 - tests/libtest/lib555.c | 2 +- tests/libtest/lib556.c | 1 - tests/libtest/lib560.c | 1 - tests/libtest/lib564.c | 1 - tests/libtest/lib571.c | 1 - tests/libtest/lib573.c | 1 - tests/libtest/lib575.c | 1 - tests/libtest/lib582.c | 1 - tests/libtest/lib586.c | 1 + tests/libtest/lib591.c | 1 - tests/libtest/lib597.c | 1 - tests/libtest/lib658.c | 1 - tests/libtest/lib659.c | 1 - tests/libtest/lib661.c | 1 + tests/libtest/lib674.c | 1 - tests/libtest/lib677.c | 1 - tests/libtest/lib678.c | 1 - tests/libtest/lib751.c | 1 - tests/libtest/lib753.c | 1 - tests/server/sockfilt.c | 1 - tests/unit/unit1309.c | 1 - 97 files changed, 20 insertions(+), 96 deletions(-) diff --git a/lib/curlx/warnless.c b/lib/curlx/warnless.c index 8e3fa17107..c6cb7c6e5e 100644 --- a/lib/curlx/warnless.c +++ b/lib/curlx/warnless.c @@ -35,11 +35,6 @@ #endif /* __INTEL_COMPILER && __unix__ */ -#ifdef _WIN32 -#undef read -#undef write -#endif - #include #define CURL_MASK_UCHAR ((unsigned char)~0) @@ -295,7 +290,3 @@ size_t curlx_sitouz(int sinum) # pragma warning(pop) #endif } - -/* Ensure that warnless.h redefinitions continue to have an effect - in "unity" builds. */ -#undef HEADER_CURL_WARNLESS_H_REDEFS diff --git a/lib/curlx/warnless.h b/lib/curlx/warnless.h index c105feb87e..0a0c608073 100644 --- a/lib/curlx/warnless.h +++ b/lib/curlx/warnless.h @@ -57,11 +57,6 @@ unsigned short curlx_uitous(unsigned int uinum); size_t curlx_sitouz(int sinum); -#endif /* HEADER_CURL_WARNLESS_H */ - -#ifndef HEADER_CURL_WARNLESS_H_REDEFS -#define HEADER_CURL_WARNLESS_H_REDEFS - #ifdef _WIN32 #undef read #define read(fd, buf, count) (ssize_t)_read(fd, buf, curlx_uztoui(count)) @@ -69,4 +64,4 @@ size_t curlx_sitouz(int sinum); #define write(fd, buf, count) (ssize_t)_write(fd, buf, curlx_uztoui(count)) #endif -#endif /* HEADER_CURL_WARNLESS_H_REDEFS */ +#endif /* HEADER_CURL_WARNLESS_H */ diff --git a/tests/libtest/lib1485.c b/tests/libtest/lib1485.c index 9a8e7a297a..6281c2f60d 100644 --- a/tests/libtest/lib1485.c +++ b/tests/libtest/lib1485.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct t1485_transfer_status { diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index dc9e662399..46f0268248 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1500(char *URL) diff --git a/tests/libtest/lib1501.c b/tests/libtest/lib1501.c index 0afbda1cf5..89e35c5128 100644 --- a/tests/libtest/lib1501.c +++ b/tests/libtest/lib1501.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #undef TEST_HANG_TIMEOUT diff --git a/tests/libtest/lib1502.c b/tests/libtest/lib1502.c index 38783802f2..858b4be4ca 100644 --- a/tests/libtest/lib1502.c +++ b/tests/libtest/lib1502.c @@ -34,7 +34,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1502(char *URL) diff --git a/tests/libtest/lib1506.c b/tests/libtest/lib1506.c index b47eb4af06..569a65950f 100644 --- a/tests/libtest/lib1506.c +++ b/tests/libtest/lib1506.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1506(char *URL) diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c index edbce6ca2b..b94e92a85f 100644 --- a/tests/libtest/lib1507.c +++ b/tests/libtest/lib1507.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "timediff.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib1508.c b/tests/libtest/lib1508.c index 488242b56f..b80d7858cd 100644 --- a/tests/libtest/lib1508.c +++ b/tests/libtest/lib1508.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1508(char *URL) diff --git a/tests/libtest/lib1509.c b/tests/libtest/lib1509.c index ba74b2f59e..a9e8a880b3 100644 --- a/tests/libtest/lib1509.c +++ b/tests/libtest/lib1509.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" size_t WriteOutput(char *ptr, size_t size, size_t nmemb, void *stream); diff --git a/tests/libtest/lib1510.c b/tests/libtest/lib1510.c index 14d75fec07..56261e1f53 100644 --- a/tests/libtest/lib1510.c +++ b/tests/libtest/lib1510.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1510(char *URL) diff --git a/tests/libtest/lib1515.c b/tests/libtest/lib1515.c index 11cdef6677..df82b2a81d 100644 --- a/tests/libtest/lib1515.c +++ b/tests/libtest/lib1515.c @@ -29,9 +29,9 @@ */ #include "test.h" + #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define DNS_TIMEOUT 1L diff --git a/tests/libtest/lib1522.c b/tests/libtest/lib1522.c index 5fe4283abc..f225b98c32 100644 --- a/tests/libtest/lib1522.c +++ b/tests/libtest/lib1522.c @@ -27,7 +27,6 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static int sockopt_callback(void *clientp, curl_socket_t curlfd, diff --git a/tests/libtest/lib1523.c b/tests/libtest/lib1523.c index 4003e9faf4..480d569afb 100644 --- a/tests/libtest/lib1523.c +++ b/tests/libtest/lib1523.c @@ -26,7 +26,6 @@ /* test case and code based on https://github.com/curl/curl/issues/3927 */ #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static int dload_progress_cb(void *a, curl_off_t b, curl_off_t c, diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c index 50698d0b4c..32e8abdfbc 100644 --- a/tests/libtest/lib1531.c +++ b/tests/libtest/lib1531.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "timediff.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1531(char *URL) diff --git a/tests/libtest/lib1540.c b/tests/libtest/lib1540.c index ac3271334f..0ed265c42a 100644 --- a/tests/libtest/lib1540.c +++ b/tests/libtest/lib1540.c @@ -25,7 +25,6 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct t1540_transfer_status { diff --git a/tests/libtest/lib1541.c b/tests/libtest/lib1541.c index 762b581454..9ef42a2adf 100644 --- a/tests/libtest/lib1541.c +++ b/tests/libtest/lib1541.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct t1541_transfer_status { diff --git a/tests/libtest/lib1542.c b/tests/libtest/lib1542.c index 95ffbf1d77..00c44dc17a 100644 --- a/tests/libtest/lib1542.c +++ b/tests/libtest/lib1542.c @@ -31,9 +31,9 @@ */ #include "test.h" + #include "testutil.h" #include "testtrace.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1542(char *URL) diff --git a/tests/libtest/lib1552.c b/tests/libtest/lib1552.c index 86fccf270e..ffd08dc2c2 100644 --- a/tests/libtest/lib1552.c +++ b/tests/libtest/lib1552.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1552(char *URL) diff --git a/tests/libtest/lib1553.c b/tests/libtest/lib1553.c index 409835ac41..317d8c8c57 100644 --- a/tests/libtest/lib1553.c +++ b/tests/libtest/lib1553.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "testtrace.h" -#include "warnless.h" #include "memdebug.h" static int t1553_xferinfo(void *p, diff --git a/tests/libtest/lib1554.c b/tests/libtest/lib1554.c index 825c52971d..6e7717fa35 100644 --- a/tests/libtest/lib1554.c +++ b/tests/libtest/lib1554.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "memdebug.h" static const char *ldata_names[] = { diff --git a/tests/libtest/lib1556.c b/tests/libtest/lib1556.c index ff7e1ea778..7e7ee1e07c 100644 --- a/tests/libtest/lib1556.c +++ b/tests/libtest/lib1556.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct headerinfo { diff --git a/tests/libtest/lib1557.c b/tests/libtest/lib1557.c index 9df49fd94f..19012c35cb 100644 --- a/tests/libtest/lib1557.c +++ b/tests/libtest/lib1557.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1557(char *URL) diff --git a/tests/libtest/lib1558.c b/tests/libtest/lib1558.c index 8fa38abd0d..d0a9004ec4 100644 --- a/tests/libtest/lib1558.c +++ b/tests/libtest/lib1558.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1558(char *URL) diff --git a/tests/libtest/lib1559.c b/tests/libtest/lib1559.c index 71d430f00f..efc176333f 100644 --- a/tests/libtest/lib1559.c +++ b/tests/libtest/lib1559.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1559(char *URL) diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index f436cc15b5..e78a0a2e33 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -36,7 +36,6 @@ #endif #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* LAST include file */ static int checkparts(CURLU *u, const char *in, const char *wanted, diff --git a/tests/libtest/lib1564.c b/tests/libtest/lib1564.c index 822bca54cc..e733f0d707 100644 --- a/tests/libtest/lib1564.c +++ b/tests/libtest/lib1564.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define WAKEUP_NUM 10 diff --git a/tests/libtest/lib1565.c b/tests/libtest/lib1565.c index 455a3026e4..76a66c4548 100644 --- a/tests/libtest/lib1565.c +++ b/tests/libtest/lib1565.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #ifdef HAVE_PTHREAD_H diff --git a/tests/libtest/lib1591.c b/tests/libtest/lib1591.c index bdbe26dd97..a601f19574 100644 --- a/tests/libtest/lib1591.c +++ b/tests/libtest/lib1591.c @@ -28,7 +28,9 @@ */ #include "test.h" + #include + #include "memdebug.h" static size_t consumed = 0; diff --git a/tests/libtest/lib1592.c b/tests/libtest/lib1592.c index 3940233983..2331664c7c 100644 --- a/tests/libtest/lib1592.c +++ b/tests/libtest/lib1592.c @@ -37,6 +37,7 @@ CI machines. */ #include "test.h" + #include "testutil.h" #include diff --git a/tests/libtest/lib1598.c b/tests/libtest/lib1598.c index d636fa4d34..cba749b7d3 100644 --- a/tests/libtest/lib1598.c +++ b/tests/libtest/lib1598.c @@ -28,7 +28,9 @@ */ #include "test.h" + #include + #include "memdebug.h" /* diff --git a/tests/libtest/lib1900.c b/tests/libtest/lib1900.c index 6a1d6343fd..4f58fda2c5 100644 --- a/tests/libtest/lib1900.c +++ b/tests/libtest/lib1900.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1900(char *URL) diff --git a/tests/libtest/lib1901.c b/tests/libtest/lib1901.c index 5aee9d3cf7..c6199cf003 100644 --- a/tests/libtest/lib1901.c +++ b/tests/libtest/lib1901.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static size_t t1901_read_cb(char *ptr, size_t size, size_t nmemb, void *stream) diff --git a/tests/libtest/lib1903.c b/tests/libtest/lib1903.c index edd2a09619..d2171746b4 100644 --- a/tests/libtest/lib1903.c +++ b/tests/libtest/lib1903.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "timediff.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1903(char *URL) diff --git a/tests/libtest/lib1905.c b/tests/libtest/lib1905.c index e7fbc366d0..e0cb311530 100644 --- a/tests/libtest/lib1905.c +++ b/tests/libtest/lib1905.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "timediff.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1905(char *URL) diff --git a/tests/libtest/lib1906.c b/tests/libtest/lib1906.c index e49d9bf304..89eef4fb9c 100644 --- a/tests/libtest/lib1906.c +++ b/tests/libtest/lib1906.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1906(char *URL) diff --git a/tests/libtest/lib1907.c b/tests/libtest/lib1907.c index f1d33c6ca6..6591023b08 100644 --- a/tests/libtest/lib1907.c +++ b/tests/libtest/lib1907.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1907(char *URL) diff --git a/tests/libtest/lib1908.c b/tests/libtest/lib1908.c index e5f743adea..498d94b41f 100644 --- a/tests/libtest/lib1908.c +++ b/tests/libtest/lib1908.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1908(char *URL) diff --git a/tests/libtest/lib1910.c b/tests/libtest/lib1910.c index c22244b6be..58d40c4305 100644 --- a/tests/libtest/lib1910.c +++ b/tests/libtest/lib1910.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1910(char *URL) diff --git a/tests/libtest/lib1911.c b/tests/libtest/lib1911.c index f6c3926be5..e76455d55f 100644 --- a/tests/libtest/lib1911.c +++ b/tests/libtest/lib1911.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* The maximum string length limit (CURL_MAX_INPUT_LENGTH) is an internal diff --git a/tests/libtest/lib1912.c b/tests/libtest/lib1912.c index 70edc95a7a..19ea5b6eb0 100644 --- a/tests/libtest/lib1912.c +++ b/tests/libtest/lib1912.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define print_err(name, exp) \ diff --git a/tests/libtest/lib1913.c b/tests/libtest/lib1913.c index 637f667d65..c7d526c918 100644 --- a/tests/libtest/lib1913.c +++ b/tests/libtest/lib1913.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1913(char *URL) diff --git a/tests/libtest/lib1915.c b/tests/libtest/lib1915.c index ec38eeabca..bb7fa3043f 100644 --- a/tests/libtest/lib1915.c +++ b/tests/libtest/lib1915.c @@ -25,7 +25,6 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct state { diff --git a/tests/libtest/lib1916.c b/tests/libtest/lib1916.c index c15db63315..716d405b5f 100644 --- a/tests/libtest/lib1916.c +++ b/tests/libtest/lib1916.c @@ -23,7 +23,6 @@ ***************************************************************************/ #include "test.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1916(char *URL) diff --git a/tests/libtest/lib1918.c b/tests/libtest/lib1918.c index e50ac8ed01..bf26e849d5 100644 --- a/tests/libtest/lib1918.c +++ b/tests/libtest/lib1918.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1918(char *URL) diff --git a/tests/libtest/lib1919.c b/tests/libtest/lib1919.c index faf172af37..43b362f851 100644 --- a/tests/libtest/lib1919.c +++ b/tests/libtest/lib1919.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1919(char *URL) diff --git a/tests/libtest/lib1977.c b/tests/libtest/lib1977.c index 3c5fc7eada..53ad7d55bd 100644 --- a/tests/libtest/lib1977.c +++ b/tests/libtest/lib1977.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib1977(char *URL) diff --git a/tests/libtest/lib2023.c b/tests/libtest/lib2023.c index 2ad7f694db..8359bdef33 100644 --- a/tests/libtest/lib2023.c +++ b/tests/libtest/lib2023.c @@ -27,6 +27,7 @@ */ #include "test.h" + #include "memdebug.h" static CURLcode send_request(CURL *curl, const char *url, int seq, diff --git a/tests/libtest/lib2032.c b/tests/libtest/lib2032.c index 61c191afaf..9d5a1ea61c 100644 --- a/tests/libtest/lib2032.c +++ b/tests/libtest/lib2032.c @@ -27,7 +27,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define MAX_EASY_HANDLES 3 diff --git a/tests/libtest/lib2306.c b/tests/libtest/lib2306.c index 6dcd982924..3adaedc7b6 100644 --- a/tests/libtest/lib2306.c +++ b/tests/libtest/lib2306.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "testtrace.h" static CURLcode test_lib2306(char *URL) diff --git a/tests/libtest/lib2308.c b/tests/libtest/lib2308.c index b91feef3a5..d921f53b92 100644 --- a/tests/libtest/lib2308.c +++ b/tests/libtest/lib2308.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "testtrace.h" static size_t cb_curl(char *buffer, size_t size, size_t nmemb, void *userp) diff --git a/tests/libtest/lib2309.c b/tests/libtest/lib2309.c index 8858961569..aff7bb7ef5 100644 --- a/tests/libtest/lib2309.c +++ b/tests/libtest/lib2309.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "testtrace.h" static size_t cb_ignore(char *buffer, size_t size, size_t nmemb, void *userp) diff --git a/tests/libtest/lib2402.c b/tests/libtest/lib2402.c index c7b52027c0..5a036881c5 100644 --- a/tests/libtest/lib2402.c +++ b/tests/libtest/lib2402.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib2402(char *URL) diff --git a/tests/libtest/lib2404.c b/tests/libtest/lib2404.c index a8c9ed1827..c9383c48e7 100644 --- a/tests/libtest/lib2404.c +++ b/tests/libtest/lib2404.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib2404(char *URL) diff --git a/tests/libtest/lib2405.c b/tests/libtest/lib2405.c index c2a8ccd41b..d7f39f37f3 100644 --- a/tests/libtest/lib2405.c +++ b/tests/libtest/lib2405.c @@ -40,7 +40,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* ---------------------------------------------------------------- */ diff --git a/tests/libtest/lib2502.c b/tests/libtest/lib2502.c index 9b1f8ab734..fe1b9c7838 100644 --- a/tests/libtest/lib2502.c +++ b/tests/libtest/lib2502.c @@ -25,7 +25,6 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib2502(char *URL) diff --git a/tests/libtest/lib2700.c b/tests/libtest/lib2700.c index 53f271a17f..37258a0fd9 100644 --- a/tests/libtest/lib2700.c +++ b/tests/libtest/lib2700.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "testtrace.h" #include "memdebug.h" diff --git a/tests/libtest/lib3026.c b/tests/libtest/lib3026.c index a5b442936d..50d2d40995 100644 --- a/tests/libtest/lib3026.c +++ b/tests/libtest/lib3026.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #define NUM_THREADS 100 diff --git a/tests/libtest/lib3027.c b/tests/libtest/lib3027.c index f13e35b645..1ffd58458a 100644 --- a/tests/libtest/lib3027.c +++ b/tests/libtest/lib3027.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib3027(char *URL) diff --git a/tests/libtest/lib3100.c b/tests/libtest/lib3100.c index 77aee5b151..0b22f86de2 100644 --- a/tests/libtest/lib3100.c +++ b/tests/libtest/lib3100.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "memdebug.h" static CURLcode test_lib3100(char *URL) diff --git a/tests/libtest/lib3101.c b/tests/libtest/lib3101.c index a7d8abf4cb..7a63d8a173 100644 --- a/tests/libtest/lib3101.c +++ b/tests/libtest/lib3101.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "memdebug.h" static CURLcode test_lib3101(char *URL) diff --git a/tests/libtest/lib3105.c b/tests/libtest/lib3105.c index 0252cd9da2..426c7f4270 100644 --- a/tests/libtest/lib3105.c +++ b/tests/libtest/lib3105.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib3105(char *URL) diff --git a/tests/libtest/lib3207.c b/tests/libtest/lib3207.c index bc144ae06a..938867eb43 100644 --- a/tests/libtest/lib3207.c +++ b/tests/libtest/lib3207.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "testutil.h" #include "memdebug.h" diff --git a/tests/libtest/lib3208.c b/tests/libtest/lib3208.c index 8be16c8080..c67ab8573a 100644 --- a/tests/libtest/lib3208.c +++ b/tests/libtest/lib3208.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib3208(char *URL) diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index 108a885f21..db92531316 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c index 7c6e06ba0f..8f1bc4eaeb 100644 --- a/tests/libtest/lib503.c +++ b/tests/libtest/lib503.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c index cd14a9b019..c530ee0c0a 100644 --- a/tests/libtest/lib504.c +++ b/tests/libtest/lib504.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 58322b4352..187106f24b 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib507(char *URL) diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index f31786ce6c..3ff8d5a536 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -28,7 +28,6 @@ #endif #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #ifndef FD_SETSIZE diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index a34a197c11..3a6de9558a 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib525(char *URL) diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index c30070fc84..370e4905e2 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -45,7 +45,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib526(char *URL) diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index 331edf3640..db81b6dfb5 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -33,7 +33,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct t530_Sockets { diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index c22dca3c54..05d31ca2b1 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -28,7 +28,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib533(char *URL) diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index dd2fa2ac10..7970a05689 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -28,7 +28,6 @@ #endif #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #if !defined(HAVE_POLL) && !defined(USE_WINSOCK) && !defined(FD_SETSIZE) diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index 91ff68c1ff..3ec58c1cda 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -35,7 +35,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define PROXY libtest_arg2 diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index 3db4e77c95..8272af8548 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -27,7 +27,6 @@ #include "test.h" -#include "warnless.h" #include "memdebug.h" struct t552_testdata { diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index 9ab7cc9d2c..16eff34f26 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -31,8 +31,8 @@ */ #include "test.h" + #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static const char uploadthis[] = "this is the blurb we want to upload\n"; diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 2aacf55756..964a190718 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -23,7 +23,6 @@ ***************************************************************************/ #include "test.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib556(char *URL) diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index bc4f537218..2f372f52fe 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib564.c b/tests/libtest/lib564.c index 6ff749f44a..7e77392504 100644 --- a/tests/libtest/lib564.c +++ b/tests/libtest/lib564.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib564(char *URL) diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c index 392bb69888..fc9d874910 100644 --- a/tests/libtest/lib571.c +++ b/tests/libtest/lib571.c @@ -40,7 +40,6 @@ #endif #include "testutil.h" -#include "warnless.h" #include "memdebug.h" #define RTP_PKT_CHANNEL(p) ((int)((unsigned char)((p)[1]))) diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c index 2e3b40fc00..19562acb93 100644 --- a/tests/libtest/lib573.c +++ b/tests/libtest/lib573.c @@ -25,7 +25,6 @@ #include "testtrace.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib575.c b/tests/libtest/lib575.c index 7db472b5fc..53bd77b9ec 100644 --- a/tests/libtest/lib575.c +++ b/tests/libtest/lib575.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* 3x download! diff --git a/tests/libtest/lib582.c b/tests/libtest/lib582.c index 676ad69f4c..fa8471da07 100644 --- a/tests/libtest/lib582.c +++ b/tests/libtest/lib582.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" struct t582_Sockets { diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c index 2bf21ba0b9..e8a8034f1e 100644 --- a/tests/libtest/lib586.c +++ b/tests/libtest/lib586.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "memdebug.h" #define THREADS 2 diff --git a/tests/libtest/lib591.c b/tests/libtest/lib591.c index 11e82632d3..b28bed638e 100644 --- a/tests/libtest/lib591.c +++ b/tests/libtest/lib591.c @@ -30,7 +30,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib591(char *URL) diff --git a/tests/libtest/lib597.c b/tests/libtest/lib597.c index 33e290ca3c..e38cd6784f 100644 --- a/tests/libtest/lib597.c +++ b/tests/libtest/lib597.c @@ -26,7 +26,6 @@ #include #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib658.c b/tests/libtest/lib658.c index 001db95888..5b8662e6e4 100644 --- a/tests/libtest/lib658.c +++ b/tests/libtest/lib658.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib659.c b/tests/libtest/lib659.c index 4b721d8ff4..57a5ff17f1 100644 --- a/tests/libtest/lib659.c +++ b/tests/libtest/lib659.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib661.c b/tests/libtest/lib661.c index 5c8d839988..de75963134 100644 --- a/tests/libtest/lib661.c +++ b/tests/libtest/lib661.c @@ -22,6 +22,7 @@ * ***************************************************************************/ #include "test.h" + #include "memdebug.h" static CURLcode test_lib661(char *URL) diff --git a/tests/libtest/lib674.c b/tests/libtest/lib674.c index be737b2ebc..521c351bd8 100644 --- a/tests/libtest/lib674.c +++ b/tests/libtest/lib674.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib677.c b/tests/libtest/lib677.c index a2e739f584..33e39830ad 100644 --- a/tests/libtest/lib677.c +++ b/tests/libtest/lib677.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static CURLcode test_lib677(char *URL) diff --git a/tests/libtest/lib678.c b/tests/libtest/lib678.c index 98e982f1ef..d0c465f9f6 100644 --- a/tests/libtest/lib678.c +++ b/tests/libtest/lib678.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" static int loadfile(const char *filename, void **filedata, size_t *filesize) diff --git a/tests/libtest/lib751.c b/tests/libtest/lib751.c index ae370721c1..c1e36909bb 100644 --- a/tests/libtest/lib751.c +++ b/tests/libtest/lib751.c @@ -24,7 +24,6 @@ #include "test.h" #include "testutil.h" -#include "warnless.h" #include "memdebug.h" /* diff --git a/tests/libtest/lib753.c b/tests/libtest/lib753.c index 6f12069f87..9adbe3ef3d 100644 --- a/tests/libtest/lib753.c +++ b/tests/libtest/lib753.c @@ -25,7 +25,6 @@ #include "testutil.h" #include "testtrace.h" -#include "warnless.h" #include "memdebug.h" struct t753_transfer_status { diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 9728abfadf..7f28facc36 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -102,7 +102,6 @@ #endif #include /* from the private lib dir */ -#include "warnless.h" /* for read() */ /* include memdebug.h last */ #include diff --git a/tests/unit/unit1309.c b/tests/unit/unit1309.c index 5da43328a8..5046305e7a 100644 --- a/tests/unit/unit1309.c +++ b/tests/unit/unit1309.c @@ -24,7 +24,6 @@ #include "curlcheck.h" #include "splay.h" -#include "warnless.h" static void splayprint(struct Curl_tree *t, int d, char output) { -- 2.47.2