From 3cdc2935cd751e99462c717b5cf64fc0d19aac34 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 8 Jun 2026 01:21:44 +0200 Subject: [PATCH] silence ``` /Users/runner/work/curl/curl/lib/cf-socket.c: In function 'cf_socket_send': /Users/runner/work/curl/curl/lib/cf-socket.c:1498:36: error: logical 'or' of equal expressions [-Werror=logical-op] 1498 | (SOCKEWOULDBLOCK == sockerr) || | ^~ /Users/runner/work/curl/curl/lib/cf-socket.c: In function 'cf_socket_recv': /Users/runner/work/curl/curl/lib/cf-socket.c:1564:36: error: logical 'or' of equal expressions [-Werror=logical-op] 1564 | (SOCKEWOULDBLOCK == sockerr) || | ^~ In file included from /Users/runner/work/curl/curl/bld/lib/CMakeFiles/libcurl_shared.dir/Unity/unity_0_c.c:331: /Users/runner/work/curl/curl/lib/socketpair.c: In function 'Curl_wakeup_signal': /Users/runner/work/curl/curl/lib/socketpair.c:329:35: error: logical 'or' of equal expressions [-Werror=logical-op] 329 | if((err == SOCKEWOULDBLOCK) || (err == EAGAIN)) | ^~ ``` --- lib/cf-socket.c | 10 ++++++++-- lib/socketpair.c | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/cf-socket.c b/lib/cf-socket.c index e30f605adb..7255fecead 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -1570,7 +1570,10 @@ static CURLcode cf_socket_send(struct Curl_cfilter *cf, struct Curl_easy *data, due to its inability to send off data without blocking. We therefore treat both error codes the same here */ (SOCKEWOULDBLOCK == sockerr) || - (EAGAIN == sockerr) || (SOCKEINTR == sockerr) || +#if EAGAIN != SOCKEWOULDBLOCK + (EAGAIN == sockerr) || +#endif + (SOCKEINTR == sockerr) || (SOCKEINPROGRESS == sockerr) #endif ) { @@ -1636,7 +1639,10 @@ static CURLcode cf_socket_recv(struct Curl_cfilter *cf, struct Curl_easy *data, due to its inability to send off data without blocking. We therefore treat both error codes the same here */ (SOCKEWOULDBLOCK == sockerr) || - (EAGAIN == sockerr) || (SOCKEINTR == sockerr) +#if EAGAIN != SOCKEWOULDBLOCK + (EAGAIN == sockerr) || +#endif + (SOCKEINTR == sockerr) #endif ) { /* EWOULDBLOCK */ diff --git a/lib/socketpair.c b/lib/socketpair.c index 76b959dd4a..3611458dbc 100644 --- a/lib/socketpair.c +++ b/lib/socketpair.c @@ -326,7 +326,11 @@ int Curl_wakeup_signal(curl_socket_t socks[2]) #else if(SOCKEINTR == err) continue; - if((err == SOCKEWOULDBLOCK) || (err == EAGAIN)) + if((err == SOCKEWOULDBLOCK) +#if EAGAIN != SOCKEWOULDBLOCK + || (err == EAGAIN) +#endif + ) err = 0; /* wakeup is already ongoing */ #endif }