tidy-up: prefer ifdef/ifndef for single checks

Closes #18018
2026-08-14 23:13:39 +03:00 · 2025-07-25 14:31:16 +02:00 · 2025-07-25 14:31:16 +02:00 · 89771d19d5
commit 89771d19d5
parent b2bccdc257
109 changed files with 319 additions and 324 deletions
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@ -666,12 +666,12 @@ static bool mqttd_incoming(curl_socket_t listenfd)
    FD_ZERO(&fds_err);

    /* there's always a socket to wait for */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
    FD_SET(sockfd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif

--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@ -42,7 +42,7 @@ static int test_resolve(int argc, char *argv[])
  while(argc > arg) {
    if(!strcmp("--version", argv[arg])) {
      printf("resolve IPv4%s\n",
-#if defined(CURLRES_IPV6)
+#ifdef CURLRES_IPV6
             "/IPv6"
 #else
             ""
@ -51,7 +51,7 @@ static int test_resolve(int argc, char *argv[])
      return 0;
    }
    else if(!strcmp("--ipv6", argv[arg])) {
-#if defined(CURLRES_IPV6)
+#ifdef CURLRES_IPV6
      ipv_inuse = "IPv6";
      use_ipv6 = TRUE;
      arg++;
@ -63,7 +63,7 @@ static int test_resolve(int argc, char *argv[])
    else if(!strcmp("--ipv4", argv[arg])) {
      /* for completeness, we support this option as well */
      ipv_inuse = "IPv4";
-#if defined(CURLRES_IPV6)
+#ifdef CURLRES_IPV6
      use_ipv6 = FALSE;
 #endif
      arg++;
@ -76,7 +76,7 @@ static int test_resolve(int argc, char *argv[])
    puts("Usage: resolve [option] <host>\n"
         " --version\n"
         " --ipv4"
-#if defined(CURLRES_IPV6)
+#ifdef CURLRES_IPV6
         "\n --ipv6"
 #endif
         );
@ -88,7 +88,7 @@ static int test_resolve(int argc, char *argv[])
    return 2;
 #endif

-#if defined(CURLRES_IPV6)
+#ifdef CURLRES_IPV6
  if(use_ipv6) {
    /* Check that the system has IPv6 enabled before checking the resolver */
    curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0);
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@ -965,12 +965,12 @@ static bool juggle(curl_socket_t *sockfdp,
  FD_ZERO(&fds_write);
  FD_ZERO(&fds_err);

-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
  FD_SET((curl_socket_t)fileno(stdin), &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif

@ -981,12 +981,12 @@ static bool juggle(curl_socket_t *sockfdp,
    /* server mode */
    sockfd = listenfd;
    /* there's always a socket to wait for */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
    FD_SET(sockfd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
    maxfd = (int)sockfd;
@ -1002,12 +1002,12 @@ static bool juggle(curl_socket_t *sockfdp,
    }
    else {
      /* there's always a socket to wait for */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
      FD_SET(sockfd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
      maxfd = (int)sockfd;
@ -1019,12 +1019,12 @@ 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 defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
      FD_SET(sockfd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
      maxfd = (int)sockfd;
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@ -629,35 +629,35 @@ static bool socksd_incoming(curl_socket_t listenfd)
    FD_ZERO(&fds_err);

    /* there's always a socket to wait for */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
    FD_SET(sockfd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif

    for(i = 0; i < 2; i++) {
      if(c[i].used) {
        curl_socket_t fd = c[i].clientfd;
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
        FD_SET(fd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
        if((int)fd > maxfd)
          maxfd = (int)fd;
        fd = c[i].remotefd;
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
        FD_SET(fd, &fds_read);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
        if((int)fd > maxfd)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@ -830,12 +830,12 @@ static int sws_get_request(curl_socket_t sock, struct sws_httprequest *req)
          FD_ZERO(&input);
          FD_ZERO(&output);
          got = 0;
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
          FD_SET(sock, &input);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
          do {
@ -1307,12 +1307,12 @@ static curl_socket_t connect_to(const char *ipaddr, unsigned short port)
      timeout.tv_sec = 1; /* 1000 ms */

      FD_ZERO(&output);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
      FD_SET(serverfd, &output);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
      while(1) {
@ -1439,12 +1439,12 @@ static void http_connect(curl_socket_t *infdp,
      /* listener socket is monitored to allow client to establish
         secondary tunnel only when this tunnel is not established
         and primary one is fully operational */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
      FD_SET(rootfd, &input);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
      maxfd = rootfd;
@ -1456,12 +1456,12 @@ static void http_connect(curl_socket_t *infdp,
      if(clientfd[i] != CURL_SOCKET_BAD) {
        if(poll_client_rd[i]) {
          /* unless told not to do so, monitor readability */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
          FD_SET(clientfd[i], &input);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
          if(clientfd[i] > maxfd)
@ -1470,12 +1470,12 @@ static void http_connect(curl_socket_t *infdp,
        if(poll_client_wr[i] && toc[i]) {
          /* unless told not to do so, monitor writability
             if there is data ready to be sent to client */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
          FD_SET(clientfd[i], &output);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
          if(clientfd[i] > maxfd)
@ -1486,12 +1486,12 @@ static void http_connect(curl_socket_t *infdp,
      if(serverfd[i] != CURL_SOCKET_BAD) {
        if(poll_server_rd[i]) {
          /* unless told not to do so, monitor readability */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
          FD_SET(serverfd[i], &input);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
          if(serverfd[i] > maxfd)
@ -1500,12 +1500,12 @@ static void http_connect(curl_socket_t *infdp,
        if(poll_server_wr[i] && tos[i]) {
          /* unless told not to do so, monitor writability
             if there is data ready to be sent to server */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
          FD_SET(serverfd[i], &output);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
          if(serverfd[i] > maxfd)
@ -2322,12 +2322,12 @@ static int test_sws(int argc, char *argv[])

    for(socket_idx = 0; socket_idx < num_sockets; ++socket_idx) {
      /* Listen on all sockets */
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warith-conversion"
 #endif
      FD_SET(all_sockets[socket_idx], &input);
-#if defined(__DJGPP__)
+#ifdef __DJGPP__
 #pragma GCC diagnostic pop
 #endif
      if(all_sockets[socket_idx] > maxfd)
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@ -508,7 +508,7 @@ static int synchnet(curl_socket_t f /* socket to flush */)
  curl_socklen_t fromaddrlen;

  for(;;) {
-#if defined(HAVE_IOCTLSOCKET_CAMEL_FIONBIO)
+#ifdef HAVE_IOCTLSOCKET_CAMEL_FIONBIO
    long i;
    (void)IoctlSocket(f, FIONBIO, &i);
 #elif defined(HAVE_IOCTLSOCKET)