lib: use `SOCKET_WRITABLE()`/`SOCKET_READABLE()` where possible

Closes #20052

diff --git a/lib/cf-socket.c b/lib/cf-socket.c
index fe2941ed384122e6a0e2429037982f595f4f2b7e..94cd33b8ff02675489302e5e60851e83a5fbbca6 100644 (file)
--- a/lib/cf-socket.c
+++ b/lib/cf-socket.c
@@ -2086,8 +2086,7 @@ static CURLcode cf_tcp_accept_connect(struct Curl_cfilter *cf,
 
   CURL_TRC_CF(data, cf, "Checking for incoming on fd=%" FMT_SOCKET_T
               " ip=%s:%d", ctx->sock, ctx->ip.local_ip, ctx->ip.local_port);
-  socketstate = Curl_socket_check(ctx->sock, CURL_SOCKET_BAD,
-                                  CURL_SOCKET_BAD, 0);
+  socketstate = SOCKET_READABLE(ctx->sock, 0);
   CURL_TRC_CF(data, cf, "socket_check -> %x", socketstate);
   switch(socketstate) {
   case -1: /* error */

diff --git a/lib/ftp.c b/lib/ftp.c
index 3db88a899dc14f30bdb049d71bc291dfee670b6f..4411bb1239155db64c06d6a9de4de34f23f85636 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -445,8 +445,7 @@ static CURLcode ftp_check_ctrl_on_data_wait(struct Curl_easy *data,
     /* there is pending control data still in the buffer to read */
     response = TRUE;
   else {
-    int socketstate = Curl_socket_check(ctrl_sock, CURL_SOCKET_BAD,
-                                        CURL_SOCKET_BAD, 0);
+    int socketstate = SOCKET_READABLE(ctrl_sock, 0);
     /* see if the connection request is already here */
     switch(socketstate) {
     case -1: /* error */

diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index 7635111a8d7b30cce5cc51f441ece8c6d286da0a..9879d44c7aa0ef79f40120776231b1e0965b784d 100644 (file)
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -2506,8 +2506,7 @@ static CURLcode myssh_block_statemach(struct Curl_easy *data,
     if(block) {
       curl_socket_t fd_read = conn->sock[FIRSTSOCKET];
       /* wait for the socket to become ready */
-      (void)Curl_socket_check(fd_read, CURL_SOCKET_BAD, CURL_SOCKET_BAD,
-                              left_ms > 1000 ? 1000 : left_ms);
+      (void)SOCKET_READABLE(fd_read, left_ms > 1000 ? 1000 : left_ms);
     }
   }
 

diff --git a/lib/ws.c b/lib/ws.c
index d4cacd98351a006c52508e41ce8743a429e62d88..7cba8fe09410d852d81353bcf5d46122fa7fac8a 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -1702,8 +1702,7 @@ static CURLcode ws_send_raw_blocking(struct Curl_easy *data,
       /* POLLOUT socket */
       if(sock == CURL_SOCKET_BAD)
         return CURLE_SEND_ERROR;
-      ev = Curl_socket_check(CURL_SOCKET_BAD, CURL_SOCKET_BAD, sock,
-                             left_ms ? left_ms : 500);
+      ev = SOCKET_WRITABLE(sock, left_ms ? left_ms : 500);
       if(ev < 0) {
         failf(data, "[WS] Error while waiting for socket becoming writable");
         return CURLE_SEND_ERROR;