romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-14 00:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

silence

Browse source 
```
/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))
      |                                   ^~
```
This commit is contained in:
Viktor Szakats 2026-06-08 01:21:44 +02:00
parent 4f53234309
commit 3cdc2935cd
No known key found for this signature in database
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/cf-socket.c
View file

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

6
lib/socketpair.c
View file

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