b5aafb81df — curl

Subject

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

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

lib/cf-socket.c+1 -2

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

lib/ftp.c+1 -2

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

lib/vssh/libssh.c+1 -2

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

lib/ws.c+1 -2

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