build: fix Codacy/CppCheck warnings

- remove unused variables
- declare conditionally used variables conditionally
- suppress unused variable warnings in the CMake tests
- remove dead variable stores
- consistently use WIN32 macro to detect Windows

Closes https://github.com/curl/curl/pull/3739

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index 0756b2a31ec8d147a1a1b08783a531eb98a0ce9f..848e0d5d79f606c7ec0c23b7ab5aa74331c25c1e 100644 (file)
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -240,6 +240,7 @@ int main()
 #ifndef inet_ntoa_r
   func_type func;
   func = (func_type)inet_ntoa_r;
+  (void)func;
 #endif
   return 0;
 }
@@ -255,6 +256,7 @@ int main()
 #ifndef inet_ntoa_r
   func_type func;
   func = (func_type)&inet_ntoa_r;
+  (void)func;
 #endif
   return 0;
 }
@@ -582,7 +584,9 @@ int fun2(int arg1, int arg2) {
 int
 main() {
   int res3 = c99_vmacro3(1, 2, 3);
+  (void)res3;
   int res2 = c99_vmacro2(1, 2);
+  (void)res2;
   return 0;
 }
 #endif

diff --git a/include/curl/curl.h b/include/curl/curl.h
index 86a24184aa0838757e57c6c6cb80017c197c9512..b1184fab5edaf1e1e58e573eb65b703da0fa7fd0 100644 (file)
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -114,7 +114,7 @@ typedef void CURLSH;
 
 #ifdef CURL_STATICLIB
 #  define CURL_EXTERN
-#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__) || \
+#elif defined(WIN32) || defined(__SYMBIAN32__) || \
      (__has_declspec_attribute(dllexport) && \
       __has_declspec_attribute(dllimport))
 #  if defined(BUILDING_LIBCURL)

diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c
index 5e6ba3dd8965a891459c9841d75680edbc8cec8a..fc107bc6baab90f0f9bdd203416d38274ec41078 100644 (file)
--- a/lib/asyn-ares.c
+++ b/lib/asyn-ares.c
@@ -68,7 +68,7 @@
 #include "progress.h"
 
 #  if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \
-     (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__))
+     (defined(WIN32) || defined(__SYMBIAN32__))
 #    define CARES_STATICLIB
 #  endif
 #  include <ares.h>

diff --git a/lib/if2ip.c b/lib/if2ip.c
index acbcff71e5e96fbb6626e69fd59e1f1c326d474e..6e27685a016ad39d8aa943e301803ecdb89b0933 100644 (file)
--- a/lib/if2ip.c
+++ b/lib/if2ip.c
@@ -123,7 +123,9 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
             char ipstr[64];
 #ifdef ENABLE_IPV6
             if(af == AF_INET6) {
+#ifdef HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
               unsigned int scopeid = 0;
+#endif
               unsigned int ifscope = Curl_ipv6_scope(iface->ifa_addr);
 
               if(ifscope != remote_scope) {
@@ -149,9 +151,10 @@ if2ip_result_t Curl_if2ip(int af, unsigned int remote_scope,
 
                 continue;
               }
-#endif
+
               if(scopeid)
-                msnprintf(scope, sizeof(scope), "%%%u", scopeid);
+                  msnprintf(scope, sizeof(scope), "%%%u", scopeid);
+#endif
             }
             else
 #endif

diff --git a/lib/md5.c b/lib/md5.c
index db4cc2656f361620fa91db77a21119a86a364efd..e345065eaae5ee300014b871cdddb94fa8829c97 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -124,7 +124,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
   CC_MD5_Final(digest, ctx);
 }
 
-#elif defined(_WIN32) && !defined(CURL_WINDOWS_APP)
+#elif defined(WIN32) && !defined(CURL_WINDOWS_APP)
 
 #include <wincrypt.h>
 #include "curl_memory.h"

diff --git a/lib/timeval.c b/lib/timeval.c
index ff8d8a69af1ae2eaf7b55950ff6a5282e4a6741f..e2bd7fd143b30d5c8bef6b91d22248d43b468699 100644 (file)
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -66,7 +66,9 @@ struct curltime Curl_now(void)
   ** in any case the time starting point does not change once that the
   ** system has started up.
   */
+#ifdef HAVE_GETTIMEOFDAY
   struct timeval now;
+#endif
   struct curltime cnow;
   struct timespec tsnow;
 

diff --git a/lib/version.c b/lib/version.c
index 9369ae8e3f57db8a523d6baf7f71bc201efa640b..4c885dc33ba0179d93f6a2736c01eb4c76afac4f 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -31,7 +31,7 @@
 
 #ifdef USE_ARES
 #  if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \
-     (defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__))
+     (defined(WIN32) || defined(__SYMBIAN32__))
 #    define CARES_STATICLIB
 #  endif
 #  include <ares.h>

diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c
index c4afc890410aeb6e021a9cd4745ad92286d52a94..0498bf05fd156727511b584ff0c7e2c3c73967f4 100644 (file)
--- a/lib/vtls/gskit.c
+++ b/lib/vtls/gskit.c
@@ -1160,7 +1160,6 @@ static CURLcode gskit_connect_common(struct connectdata *conn, int sockindex,
   struct Curl_easy *data = conn->data;
   struct ssl_connect_data *connssl = &conn->ssl[sockindex];
   long timeout_ms;
-  Qso_OverlappedIO_t cstat;
   CURLcode result = CURLE_OK;
 
   *done = connssl->state == ssl_connection_complete;

diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index c80f01080b31c26d7957c5bcf341eaaa1f0d44fe..84bc10abd707480739de3130ca489abe08c59f37 100644 (file)
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -389,7 +389,6 @@ Curl_gsk_environment_open(gsk_handle * my_env_handle)
 
 {
   struct Curl_gsk_descriptor * p;
-  gsk_handle h;
   int rc;
 
   if(!my_env_handle)

diff --git a/packages/vms/curl_crtl_init.c b/packages/vms/curl_crtl_init.c
index 01a34e5559699b5ff7eece77b1b1e73d0fd79567..7a8d8474335261a7c3b6c5696f6cc5efb9e017c0 100644 (file)
--- a/packages/vms/curl_crtl_init.c
+++ b/packages/vms/curl_crtl_init.c
@@ -183,7 +183,6 @@ static void set_features(void)
     status = sys_trnlnm("GNV$UNIX_SHELL",
                         unix_shell_name, sizeof unix_shell_name -1);
     if (!$VMS_STATUS_SUCCESS(status)) {
-        unix_shell_name[0] = 0;
         use_unix_settings = 0;
     }
 

diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 0539e9895e91de57e133347538514e49be63c079..e2ee542258a3a5179beb48c2a5e42808dc40dcc6 100644 (file)
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -221,7 +221,7 @@ void progressbarinit(struct ProgressData *bar,
     struct winsize ts;
     if(!ioctl(STDIN_FILENO, TIOCGWINSZ, &ts))
       cols = ts.ws_col;
-#elif defined(_WIN32)
+#elif defined(WIN32)
     {
       HANDLE  stderr_hnd = GetStdHandle(STD_ERROR_HANDLE);
       CONSOLE_SCREEN_BUFFER_INFO console_info;

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index f403ab34cdc7e8f23094bcf81584c46fccda50c2..2f699f32641133ef8574a3415ce36c9828d828b2 100644 (file)
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -159,7 +159,7 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
     }
   }
 
-#ifdef _WIN32
+#ifdef WIN32
   fhnd = _get_osfhandle(fileno(outs->stream));
   if(isatty(fileno(outs->stream)) &&
      GetConsoleScreenBufferInfo((HANDLE)fhnd, &console_info)) {

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 8b5bdadafb2af644b387430790ebe5ed844c8f6e..779a3cb8fd90a1faec947a935200c9bea119c903 100644 (file)
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -599,7 +599,6 @@ SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized,
       }
       memmove(base + 1, base, blen + 1);
       base[0] = '_';
-      ++blen;
     }
   }
 #endif

diff --git a/src/tool_main.c b/src/tool_main.c
index 5679f361efa7df60dc7a19dab6a871e7ff4e7c86..7d1e62b79a2319a97b2dc36064fc8afcf861d3ef 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -237,7 +237,7 @@ static void main_free(struct GlobalConfig *config)
   config->last = NULL;
 }
 
-#ifdef _WIN32
+#ifdef WIN32
 /* TerminalSettings for Windows */
 static struct TerminalSettings {
   HANDLE hStdOut;
@@ -275,7 +275,7 @@ static void configure_terminal(void)
 
 static void restore_terminal(void)
 {
-#ifdef _WIN32
+#ifdef WIN32
   /* Restore Console output mode and codepage to whatever they were
    * when Curl started */
   SetConsoleMode(TerminalSettings.hStdOut, TerminalSettings.dwOutputMode);

diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index 4c4261472d5ffd4e799a44b1db22d4e8af039c33..28aa71707ac12cd1f7c72afd979cc20e248f504f 100644 (file)
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -73,7 +73,7 @@
    and later. If you're building for an older cat, well, sorry. */
 #  define COMMON_DIGEST_FOR_OPENSSL
 #  include <CommonCrypto/CommonDigest.h>
-#elif defined(_WIN32)
+#elif defined(WIN32)
 /* For Windows: If no other crypto library is provided, we fallback
    to the hash functions provided within the Microsoft Windows CryptoAPI */
 #  include <wincrypt.h>
@@ -380,7 +380,7 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
   sha256_finish(ctx, digest);
 }
 
-#elif defined(_WIN32)
+#elif defined(WIN32)
 
 static void win32_crypto_final(struct win32_crypto_hash *ctx,
                                unsigned char *digest,

diff --git a/tests/libtest/lib1522.c b/tests/libtest/lib1522.c
index 2de95528414aef4220212c854ca821b226ba4c2a..6ac2f93582a9c8a147027c254456061c338f1ead 100644 (file)
--- a/tests/libtest/lib1522.c
+++ b/tests/libtest/lib1522.c
@@ -32,14 +32,16 @@ static char g_Data[40 * 1024]; /* POST 40KB */
 static int sockopt_callback(void *clientp, curl_socket_t curlfd,
                             curlsocktype purpose)
 {
+#if defined(SOL_SOCKET) && defined(SO_SNDBUF)
   int sndbufsize = 4 * 1024; /* 4KB send buffer */
   (void) clientp;
   (void) purpose;
-#if defined(SOL_SOCKET) && defined(SO_SNDBUF)
   setsockopt(curlfd, SOL_SOCKET, SO_SNDBUF,
              (const char *)&sndbufsize, sizeof(sndbufsize));
 #else
+  (void)clientp;
   (void)curlfd;
+  (void)purpose;
 #endif
   return CURL_SOCKOPT_OK;
 }