From b5aafb81df1c097a77ec49e6bcb505d82f312604 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 20 Dec 2025 18:50:12 +0100 Subject: [PATCH] lib: use `SOCKET_WRITABLE()`/`SOCKET_READABLE()` where possible Closes #20052 --- lib/cf-socket.c | 3 +-- lib/ftp.c | 3 +-- lib/vssh/libssh.c | 3 +-- lib/ws.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/cf-socket.c b/lib/cf-socket.c index fe2941ed38..94cd33b8ff 100644 --- 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 3db88a899d..4411bb1239 100644 --- 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 7635111a8d..9879d44c7a 100644 --- 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 d4cacd9835..7cba8fe094 100644 --- 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; -- 2.43.0