socket: use name sockerr for socket error variables

Also:
- add comment explaining a `sockerr = errno` (vs. `SOCKERRNO`)
  assigment.

Closes #21998
This commit is contained in:
Viktor Szakats 2026-06-12 23:42:50 +02:00
parent fb83911aa6
commit fe2df80a5a
No known key found for this signature in database
15 changed files with 205 additions and 202 deletions

View file

@ -742,7 +742,7 @@ static int test_dnsd(int argc, const char **argv)
curl_socket_t sock = CURL_SOCKET_BAD;
int flag;
int rc;
int error;
int sockerr;
char errbuf[STRERROR_LEN];
int result = 0;
struct resp *resp;
@ -840,18 +840,18 @@ static int test_dnsd(int argc, const char **argv)
#endif
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
result = 1;
goto dnsd_cleanup;
}
flag = 1;
if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&flag, sizeof(flag))) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("setsockopt(SO_REUSEADDR) failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
result = 1;
goto dnsd_cleanup;
}
@ -875,9 +875,9 @@ static int test_dnsd(int argc, const char **argv)
}
#endif /* USE_IPV6 */
if(rc) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("Error binding socket on port %hu (%d) %s", port,
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
result = 1;
goto dnsd_cleanup;
}
@ -897,9 +897,9 @@ static int test_dnsd(int argc, const char **argv)
la_size = sizeof(localaddr.sa6);
#endif
if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("getsockname() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
sclose(sock);
goto dnsd_cleanup;
}