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

tidy-up: move literals to right-side of if expressions (where missing)

Browse source 
Closes #20535
This commit is contained in:
Viktor Szakats 2026-02-07 15:59:59 +01:00
parent c6ac2de5b3
commit 85de995208
No known key found for this signature in database
57 changed files with 115 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/server/dnsd.c
View file

@ -483,7 +483,7 @@ static int test_dnsd(int argc, const char **argv)
sock = socket(AF_INET6, SOCK_DGRAM, 0);
#endif
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));

6
tests/server/mqttd.c
View file

@ -703,7 +703,7 @@ static bool mqttd_incoming(curl_socket_t listenfd)
if(FD_ISSET(sockfd, &fds_read)) {
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
if(newfd == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("accept() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -832,7 +832,7 @@ static int test_mqttd(int argc, const char *argv[])
sock = socket(socket_domain, SOCK_STREAM, 0);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -842,7 +842,7 @@ static int test_mqttd(int argc, const char *argv[])
{
/* passive daemon style */
sock = sockdaemon(sock, &server_port, NULL, FALSE);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
goto mqttd_cleanup;
}
msgsock = CURL_SOCKET_BAD; /* no stream socket yet */

4
tests/server/rtspd.c
View file

@ -1111,7 +1111,7 @@ static int test_rtspd(int argc, const char *argv[])
sock = socket(AF_INET6, SOCK_STREAM, 0);
#endif
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -1225,7 +1225,7 @@ static int test_rtspd(int argc, const char *argv[])
if(got_exit_signal)
break;
if(CURL_SOCKET_BAD == msgsock) {
if(msgsock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("MAJOR ERROR, accept() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));

10
tests/server/sockfilt.c
View file

@ -974,7 +974,7 @@ static bool juggle(curl_socket_t *sockfdp,
case PASSIVE_CONNECT:
sockfd = *sockfdp;
if(CURL_SOCKET_BAD == sockfd) {
if(sockfd == CURL_SOCKET_BAD) {
/* eeek, we are supposedly connected and then this cannot be -1 ! */
logmsg("socket is -1! on %s:%d", __FILE__, __LINE__);
maxfd = 0; /* stdin */
@ -990,7 +990,7 @@ static bool juggle(curl_socket_t *sockfdp,
sockfd = *sockfdp;
/* sockfd turns CURL_SOCKET_BAD when our connection has been closed */
if(CURL_SOCKET_BAD != sockfd) {
if(sockfd != CURL_SOCKET_BAD) {
FD_SET(sockfd, &fds_read);
maxfd = (int)sockfd;
}
@ -1125,7 +1125,7 @@ static bool juggle(curl_socket_t *sockfdp,
/* there is no stream set up yet, this is an indication that there is a
client connecting. */
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
if(newfd == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("accept() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -1298,7 +1298,7 @@ static int test_sockfilt(int argc, const char *argv[])
sock = socket(socket_domain, SOCK_STREAM, 0);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -1349,7 +1349,7 @@ static int test_sockfilt(int argc, const char *argv[])
else {
/* passive daemon style */
sock = sockdaemon(sock, &server_port, NULL, s_bind_only);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
}

6
tests/server/socksd.c
View file

@ -679,7 +679,7 @@ static bool socksd_incoming(curl_socket_t listenfd)
if((clients < 2) && FD_ISSET(sockfd, &fds_read)) {
curl_socket_t newfd = accept(sockfd, NULL, NULL);
if(CURL_SOCKET_BAD == newfd) {
if(newfd == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("accept() failed with error (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -866,7 +866,7 @@ static int test_socksd(int argc, const char *argv[])
sock = socket(socket_domain, SOCK_STREAM, 0);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -876,7 +876,7 @@ static int test_socksd(int argc, const char *argv[])
{
/* passive daemon style */
sock = sockdaemon(sock, &server_port, unix_socket, FALSE);
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
goto socks5_cleanup;
}
#ifdef USE_UNIX_SOCKETS

12
tests/server/sws.c
View file

@ -1266,7 +1266,7 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
logmsg("about to connect to %s%s%s:%hu", op_br, ipaddr, cl_br, port);
serverfd = socket(socket_domain, SOCK_STREAM, 0);
if(CURL_SOCKET_BAD == serverfd) {
if(serverfd == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket for server connection (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -1815,12 +1815,12 @@ static curl_socket_t accept_connection(curl_socket_t sock)
msgsock = accept(sock, NULL, NULL);
if(got_exit_signal) {
if(CURL_SOCKET_BAD != msgsock)
if(msgsock != CURL_SOCKET_BAD)
sclose(msgsock);
return CURL_SOCKET_BAD;
}
if(CURL_SOCKET_BAD == msgsock) {
if(msgsock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
if(EAGAIN == error || SOCKEWOULDBLOCK == error) {
/* nothing to accept */
@ -2146,7 +2146,7 @@ static int test_sws(int argc, const char *argv[])
all_sockets[0] = sock;
num_sockets = 1;
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -2303,7 +2303,7 @@ static int test_sws(int argc, const char *argv[])
/* Clear out closed sockets */
for(socket_idx = num_sockets - 1; socket_idx >= 1; --socket_idx) {
if(CURL_SOCKET_BAD == all_sockets[socket_idx]) {
if(all_sockets[socket_idx] == CURL_SOCKET_BAD) {
char *dst = (char *)(all_sockets + socket_idx);
char *src = (char *)(all_sockets + socket_idx + 1);
char *end = (char *)(all_sockets + num_sockets);
@ -2357,7 +2357,7 @@ static int test_sws(int argc, const char *argv[])
msgsock = accept_connection(sock);
logmsg("accept_connection %ld returned %ld",
(long)sock, (long)msgsock);
if(CURL_SOCKET_BAD == msgsock)
if(msgsock == CURL_SOCKET_BAD)
goto sws_cleanup;
if(req->delay)
curlx_wait_ms(req->delay);

6
tests/server/tftpd.c
View file

@ -1120,7 +1120,7 @@ static int test_tftpd(int argc, const char **argv)
sock = socket(AF_INET6, SOCK_DGRAM, 0);
#endif
if(CURL_SOCKET_BAD == sock) {
if(sock == CURL_SOCKET_BAD) {
error = SOCKERRNO;
logmsg("Error creating socket (%d) %s",
error, curlx_strerror(error, errbuf, sizeof(errbuf)));
@ -1251,7 +1251,7 @@ static int test_tftpd(int argc, const char **argv)
#endif
from.sa4.sin_family = AF_INET;
peer = socket(AF_INET, SOCK_DGRAM, 0);
if(CURL_SOCKET_BAD == peer) {
if(peer == CURL_SOCKET_BAD) {
logmsg("socket");
result = 2;
break;
@ -1266,7 +1266,7 @@ static int test_tftpd(int argc, const char **argv)
else {
from.sa6.sin6_family = AF_INET6;
peer = socket(AF_INET6, SOCK_DGRAM, 0);
if(CURL_SOCKET_BAD == peer) {
if(peer == CURL_SOCKET_BAD) {
logmsg("socket");
result = 2;
break;

2
tests/server/util.c
View file

@ -673,7 +673,7 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
curlx_struct_stat statbuf;
/* socket already exists. Perhaps it is stale? */
curl_socket_t unixfd = socket(AF_UNIX, SOCK_STREAM, 0);
if(CURL_SOCKET_BAD == unixfd) {
if(unixfd == CURL_SOCKET_BAD) {
logmsg("Failed to create socket at %s (%d) %s", unix_socket,
SOCKERRNO, curlx_strerror(SOCKERRNO, errbuf, sizeof(errbuf)));
return -1;