tidy-up: `curlx/nonblock.h` includes

Delete where unused, include where to used to avoid relying on
side-effect of other headers.

Also: delete "for curlx_nonblock" comments. That's the only symbol
offered by this header.

Closes #20055

diff --git a/lib/cf-ip-happy.h b/lib/cf-ip-happy.h
index 4129ec5610de578089fad7a2dcbee67d6c4635de..71f212250fa07d49811b28e74643839431447116 100644 (file)
--- a/lib/cf-ip-happy.h
+++ b/lib/cf-ip-happy.h
@@ -25,8 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
-
 /**
  * Create a cfilter for making an "ip" connection to the
  * given address, using parameters from `conn`. The "ip" connection

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index 051c0e3407d9a3eb4aa66a37031df7fd3080d30c..f4794eb6c37501feed157cbc6948641ab745f393 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -72,6 +72,7 @@
 #include "rand.h"
 #include "strdup.h"
 #include "system_win32.h"
+#include "curlx/nonblock.h"
 #include "curlx/version_win32.h"
 #include "curlx/strerr.h"
 #include "curlx/strparse.h"

diff --git a/lib/cf-socket.h b/lib/cf-socket.h
index 26a1fc10179f22782cbd1d3e05b39b5159431ab2..9db492e1c3573833942f67385643510452c48c1b 100644 (file)
--- a/lib/cf-socket.h
+++ b/lib/cf-socket.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 
 struct Curl_addrinfo;

diff --git a/lib/connect.h b/lib/connect.h
index d0596f5ce97563a5eb50a92ca65310d49ce26828..01e9dfc029103cd3e35180c65c7a8b7be2208310 100644 (file)
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "curlx/timeval.h"
 
 struct Curl_dns_entry;

diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 90f8f6bbc8f3e7460416901e9f12d0bd93835f89..fd0bfe5f4fc3d0d3b48b911f64df01c3d08b5158 100644 (file)
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -30,7 +30,7 @@
 #include "curl_rtmp.h"
 #include "urldata.h"
 #include "url.h"
-#include "curlx/nonblock.h" /* for curlx_nonblock */
+#include "curlx/nonblock.h"
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "bufref.h"

diff --git a/lib/socketpair.c b/lib/socketpair.c
index 5a9ccb4aed85f24fddeb1e0195194736da41f5f7..756fd7f181eacb3e6c3d9d3e5939a1d24b498c2c 100644 (file)
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -23,9 +23,11 @@
  ***************************************************************************/
 
 #include "curl_setup.h"
+
 #include "socketpair.h"
 #include "urldata.h"
 #include "rand.h"
+#include "curlx/nonblock.h"
 
 #ifdef USE_EVENTFD
 
@@ -122,7 +124,6 @@ int Curl_socketpair(int domain, int type, int protocol,
 #define INADDR_LOOPBACK 0x7f000001
 #endif
 
-#include "curlx/nonblock.h" /* for curlx_nonblock */
 #include "curlx/timeval.h"  /* needed before select.h */
 #include "select.h"   /* for Curl_poll */
 

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 3bee643e41084848c428ce9d672e6c3d72d95350..4df1fc1d20e43abf6f7f51bcf9a388a8e6b7de92 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -32,6 +32,7 @@
 #include "sendf.h"
 #include "cfilters.h"
 #include "connect.h"
+#include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "curlx/warnless.h"

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index 84d530151c5558a34cd1dc6e14c7b531dda535f4..7d6ac253c3987f530a10fe7476e5d3c0e20b9fff 100644 (file)
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -32,6 +32,7 @@
 #include "cfilters.h"
 #include "connect.h"
 #include "strerror.h"
+#include "curlx/nonblock.h"
 #include "curlx/timeval.h"
 #include "socks.h"
 #include "curl_sspi.h"

diff --git a/lib/ws.c b/lib/ws.c
index 7cba8fe09410d852d81353bcf5d46122fa7fac8a..6bb4a7d7427e115a922ba9397f921ee635562b7c 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -38,7 +38,6 @@
 #include "easyif.h"
 #include "transfer.h"
 #include "select.h"
-#include "curlx/nonblock.h"
 #include "curlx/strparse.h"
 #include "curlx/warnless.h"