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

socket: use name sockerr for socket error variables

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

36
tests/server/rtspd.c
View file

@ -604,7 +604,7 @@ storerequest_cleanup:
/* return 0 on success, non-zero on failure */
static int rtspd_get_request(curl_socket_t sock, struct rtspd_httprequest *req)
{
int error;
int sockerr;
char errbuf[STRERROR_LEN];
int fail = 0;
int done_processing = 0;
@ -665,9 +665,9 @@ static int rtspd_get_request(curl_socket_t sock, struct rtspd_httprequest *req)
fail = 1;
}
else if(got < 0) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("recv() returned error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
fail = 1;
}
if(fail) {
@ -975,9 +975,9 @@ static int rtspd_send_doc(curl_socket_t sock, struct rtspd_httprequest *req)
break;
if(res) {
/* should not happen */
error = SOCKERRNO;
int sockerr = SOCKERRNO;
logmsg("curlx_wait_ms() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
break;
}
}
@ -1014,7 +1014,7 @@ static int test_rtspd(int argc, const char *argv[])
unsigned short port = 8999;
struct rtspd_httprequest req;
int rc;
int error;
int sockerr;
char errbuf[STRERROR_LEN];
int arg = 1;
@ -1118,17 +1118,17 @@ static int test_rtspd(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)));
goto server_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)));
goto server_cleanup;
}
@ -1151,9 +1151,9 @@ static int test_rtspd(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)));
goto server_cleanup;
}
@ -1172,9 +1172,9 @@ static int test_rtspd(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 server_cleanup;
}
@ -1205,9 +1205,9 @@ static int test_rtspd(int argc, const char *argv[])
/* start accepting connections */
rc = listen(sock, 5);
if(rc) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("listen() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
goto server_cleanup;
}
@ -1232,9 +1232,9 @@ static int test_rtspd(int argc, const char *argv[])
if(got_exit_signal)
break;
if(msgsock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
sockerr = SOCKERRNO;
logmsg("MAJOR ERROR, accept() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
sockerr, curlx_strerror(sockerr, errbuf, sizeof(errbuf)));
break;
}