diff --git a/lib/socketpair.c b/lib/socketpair.c index eb4a0f2db9..ed410ec180 100644 --- a/lib/socketpair.c +++ b/lib/socketpair.c @@ -336,12 +336,12 @@ CURLcode Curl_wakeup_consume(curl_socket_t socks[2], bool all) if(!rc) break; else if(rc < 0) { - int err = SOCKERRNO; + int sockerr = SOCKERRNO; #ifndef USE_WINSOCK - if(err == SOCKEINTR) + if(sockerr == SOCKEINTR) continue; #endif - if(SOCK_EAGAIN(err)) + if(SOCK_EAGAIN(sockerr)) break; result = CURLE_READ_ERROR; break; diff --git a/lib/vquic/vquic.c b/lib/vquic/vquic.c index 19a6b2d719..fe5683dbd3 100644 --- a/lib/vquic/vquic.c +++ b/lib/vquic/vquic.c @@ -165,10 +165,10 @@ static CURLcode do_sendmsg(struct Curl_cfilter *cf, ; if(!curlx_sztouz(rv, psent)) { - int err = SOCKERRNO; - if(SOCK_EAGAIN(err)) + int sockerr = SOCKERRNO; + if(SOCK_EAGAIN(sockerr)) return CURLE_AGAIN; - switch(err) { + switch(sockerr) { case SOCKEMSGSIZE: /* UDP datagram is too large; caused by PMTUD. Let it be lost. */ *psent = pktlen; @@ -176,13 +176,14 @@ static CURLcode do_sendmsg(struct Curl_cfilter *cf, case EIO: if(pktlen > gsolen) { /* GSO failure */ - infof(data, "sendmsg() returned %zd (errno %d); disable GSO", rv, err); + infof(data, "sendmsg() returned %zd (errno %d); disable GSO", rv, + sockerr); qctx->no_gso = TRUE; return send_packet_no_gso(cf, data, qctx, pkt, pktlen, gsolen, psent); } FALLTHROUGH(); default: - failf(data, "sendmsg() returned %zd (errno %d)", rv, err); + failf(data, "sendmsg() returned %zd (errno %d)", rv, sockerr); result = CURLE_SEND_ERROR; goto out; }