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 2f312a14da #17619
Follow-up to 84338c4de2 #12331
Follow-up to 6239146e93

Closes #17673

lib/curlx/warnless.c

@@ -35,11 +35,6 @@
 
 #endif /* __INTEL_COMPILER && __unix__ */
 
-#ifdef _WIN32
-#undef read
-#undef write
-#endif
-
 #include <limits.h>
 
 #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

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 */

tests/libtest/lib1485.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t1485_transfer_status {

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)

tests/libtest/lib1501.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #undef TEST_HANG_TIMEOUT

tests/libtest/lib1502.c

@@ -34,7 +34,6 @@
 #include <limits.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib1502(char *URL)

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)

tests/libtest/lib1507.c

@@ -25,7 +25,6 @@
 
 #include "testutil.h"
 #include "timediff.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

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)

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);

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)

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

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,

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,

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)

tests/libtest/lib1540.c

@@ -25,7 +25,6 @@
 
 #include "testtrace.h"
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t1540_transfer_status {

tests/libtest/lib1541.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t1541_transfer_status {

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)

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)

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,

tests/libtest/lib1554.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "memdebug.h"
 
 static const char *ldata_names[] = {

tests/libtest/lib1556.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct headerinfo {

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)

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)

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)

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,

tests/libtest/lib1564.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #define WAKEUP_NUM 10

tests/libtest/lib1565.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #ifdef HAVE_PTHREAD_H

tests/libtest/lib1591.c

@@ -28,7 +28,9 @@
  */
 
 #include "test.h"
+
 #include <stdio.h>
+
 #include "memdebug.h"
 
 static size_t consumed = 0;

tests/libtest/lib1592.c

@@ -37,6 +37,7 @@
    CI machines. */
 
 #include "test.h"
+
 #include "testutil.h"
 
 #include <sys/stat.h>

tests/libtest/lib1598.c

@@ -28,7 +28,9 @@
  */
 
 #include "test.h"
+
 #include <stdio.h>
+
 #include "memdebug.h"
 
 /*

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)

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)

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)

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)

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)

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)

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)

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)

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

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)                                            \

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)

tests/libtest/lib1915.c

@@ -25,7 +25,6 @@
 
 #include "testtrace.h"
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct state {

tests/libtest/lib1916.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib1916(char *URL)

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)

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)

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)

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,

tests/libtest/lib2032.c

@@ -27,7 +27,6 @@
 #include <assert.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #define MAX_EASY_HANDLES 3

tests/libtest/lib2306.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "testtrace.h"
 
 static CURLcode test_lib2306(char *URL)

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)

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)

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)

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)

tests/libtest/lib2405.c

@@ -40,7 +40,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /* ---------------------------------------------------------------- */

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)

tests/libtest/lib2700.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "testtrace.h"
 #include "memdebug.h"
 

tests/libtest/lib3026.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 
 #define NUM_THREADS 100
 

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)

tests/libtest/lib3100.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "memdebug.h"
 
 static CURLcode test_lib3100(char *URL)

tests/libtest/lib3101.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "memdebug.h"
 
 static CURLcode test_lib3101(char *URL)

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)

tests/libtest/lib3207.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "testutil.h"
 #include "memdebug.h"
 

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)

tests/libtest/lib502.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib503.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib504.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

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)

tests/libtest/lib518.c

@@ -28,7 +28,6 @@
 #endif
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #ifndef FD_SETSIZE

tests/libtest/lib525.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib525(char *URL)

tests/libtest/lib526.c

@@ -45,7 +45,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib526(char *URL)

tests/libtest/lib530.c

@@ -33,7 +33,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t530_Sockets {

tests/libtest/lib533.c

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib533(char *URL)

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)

tests/libtest/lib540.c

@@ -35,7 +35,6 @@
 #include <limits.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 #define PROXY libtest_arg2

tests/libtest/lib552.c

@@ -27,7 +27,6 @@
 
 #include "test.h"
 
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t552_testdata {

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";

tests/libtest/lib556.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "test.h"
 
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib556(char *URL)

tests/libtest/lib560.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib564.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib564(char *URL)

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])))

tests/libtest/lib573.c

@@ -25,7 +25,6 @@
 
 #include "testtrace.h"
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib575.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /* 3x download!

tests/libtest/lib582.c

@@ -26,7 +26,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t582_Sockets {

tests/libtest/lib586.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "memdebug.h"
 
 #define THREADS 2

tests/libtest/lib591.c

@@ -30,7 +30,6 @@
 #include <fcntl.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 static CURLcode test_lib591(char *URL)

tests/libtest/lib597.c

@@ -26,7 +26,6 @@
 #include <limits.h>
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib658.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib659.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib661.c

@@ -22,6 +22,7 @@
  *
  ***************************************************************************/
 #include "test.h"
+
 #include "memdebug.h"
 
 static CURLcode test_lib661(char *URL)

tests/libtest/lib674.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

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)

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)

tests/libtest/lib751.c

@@ -24,7 +24,6 @@
 #include "test.h"
 
 #include "testutil.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 /*

tests/libtest/lib753.c

@@ -25,7 +25,6 @@
 
 #include "testutil.h"
 #include "testtrace.h"
-#include "warnless.h"
 #include "memdebug.h"
 
 struct t753_transfer_status {

tests/server/sockfilt.c

@@ -102,7 +102,6 @@
 #endif
 
 #include <curlx.h> /* from the private lib dir */
-#include "warnless.h" /* for read() */
 
 /* include memdebug.h last */
 #include <memdebug.h>

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)
 {