Fixed and muted compiler warnings

5 files changed, 37 insertions, 32 deletions

diff --git a/src/testcurl/https/test_https_get.c b/src/testcurl/https/test_https_get.c
index ab0dd9cf..b3f2fbf7 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -236,7 +236,7 @@ main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
   const char *aes256_sha_tlsv1   = "AES256-SHA";
-  (void) argc;   /* Unused. Silent compiler warning. */
+  (void) argc; (void) argv;   /* Unused. Silent compiler warning. */
 
 #ifdef MHD_HTTPS_REQUIRE_GRYPT
   gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
diff --git a/src/testcurl/test_add_conn.c b/src/testcurl/test_add_conn.c
index c81939d4..daa45206 100644
--- a/src/testcurl/test_add_conn.c
+++ b/src/testcurl/test_add_conn.c
@@ -260,9 +260,11 @@ static MHD_socket
 createListeningSocket (int *pport)
 {
   MHD_socket skt;
-  static const int on = 1;
   struct sockaddr_in sin;
   socklen_t sin_len;
+#ifdef MHD_POSIX_SOCKETS
+  static const int on = 1;
+#endif /* MHD_POSIX_SOCKETS */
 
   skt = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
   if (MHD_INVALID_SOCKET == skt)
@@ -286,11 +288,11 @@ createListeningSocket (int *pport)
   if (0 == *pport)
   {
     memset (&sin, 0, sizeof(sin));
-    sin_len = sizeof(sin);
+    sin_len = (socklen_t) sizeof(sin);
     if (0 != getsockname (skt, (struct sockaddr *) &sin, &sin_len))
       externalErrorExitDesc ("getsockname() failed");
 
-    if (sizeof(sin) < sin_len)
+    if (sizeof(sin) < (size_t) sin_len)
       externalErrorExitDesc ("getsockname() failed");
 
     if (AF_INET != sin.sin_family)
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 6a82c5a2..389cfd5a 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -91,6 +91,7 @@ ahc_echo (void *cls,
   const char *password = "testpass";
   const char *realm = "test@example.com";
   enum MHD_Result ret;
+  int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
   (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
@@ -110,14 +111,14 @@ ahc_echo (void *cls,
     MHD_destroy_response (response);
     return ret;
   }
-  ret = MHD_digest_auth_check (connection,
-                               realm,
-                               username,
-                               password,
-                               300);
+  ret_i = MHD_digest_auth_check (connection,
+                                 realm,
+                                 username,
+                                 password,
+                                 300);
   free (username);
-  if ( (ret == MHD_INVALID_NONCE) ||
-       (ret == MHD_NO) )
+  if ( (ret_i == MHD_INVALID_NONCE) ||
+       (ret_i == MHD_NO) )
   {
     response = MHD_create_response_from_buffer (strlen (DENIED),
                                                 DENIED,
@@ -128,8 +129,8 @@ ahc_echo (void *cls,
                                         realm,
                                         MY_OPAQUE,
                                         response,
-                                        (MHD_INVALID_NONCE == ret) ? MHD_YES :
-                                        MHD_NO);
+                                        (MHD_INVALID_NONCE == ret_i) ?
+                                        MHD_YES : MHD_NO);
     MHD_destroy_response (response);
     return ret;
   }
diff --git a/src/testcurl/test_digestauth_sha256.c b/src/testcurl/test_digestauth_sha256.c
index 4088dc32..5023bcad 100644
--- a/src/testcurl/test_digestauth_sha256.c
+++ b/src/testcurl/test_digestauth_sha256.c
@@ -92,6 +92,7 @@ ahc_echo (void *cls,
   const char *password = "testpass";
   const char *realm = "test@example.com";
   enum MHD_Result ret;
+  int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
   (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
@@ -112,15 +113,15 @@ ahc_echo (void *cls,
     MHD_destroy_response (response);
     return ret;
   }
-  ret = MHD_digest_auth_check2 (connection,
-                                realm,
-                                username,
-                                password,
-                                300,
-                                MHD_DIGEST_ALG_SHA256);
+  ret_i = MHD_digest_auth_check2 (connection,
+                                  realm,
+                                  username,
+                                  password,
+                                  300,
+                                  MHD_DIGEST_ALG_SHA256);
   free (username);
-  if ( (ret == MHD_INVALID_NONCE) ||
-       (ret == MHD_NO) )
+  if ( (ret_i == MHD_INVALID_NONCE) ||
+       (ret_i == MHD_NO) )
   {
     response = MHD_create_response_from_buffer (strlen (DENIED),
                                                 DENIED,
@@ -131,8 +132,8 @@ ahc_echo (void *cls,
                                          realm,
                                          MY_OPAQUE,
                                          response,
-                                         (MHD_INVALID_NONCE == ret) ? MHD_YES :
-                                         MHD_NO,
+                                         (MHD_INVALID_NONCE == ret_i) ?
+                                         MHD_YES : MHD_NO,
                                          MHD_DIGEST_ALG_SHA256);
     MHD_destroy_response (response);
     return ret;
@@ -297,7 +298,7 @@ main (int argc, char *const *argv)
   (void) argc; (void) argv; /* Unused. Silent compiler warning. */
 
 #ifdef CURL_VERSION_SSPI
-  if (0 != (d->features | CURL_VERSION_SSPI))
+  if (0 != (d->features & CURL_VERSION_SSPI))
     return 77; /* Skip test, W32 SSPI doesn't support sha256 digest */
 #endif /* CURL_VERSION_SSPI */
 
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c
index 3d90f0db..c6154ffb 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -85,6 +85,7 @@ ahc_echo (void *cls,
   const char *password = "testpass";
   const char *realm = "test@example.com";
   enum MHD_Result ret;
+  int ret_i;
   (void) cls; (void) url;                         /* Unused. Silent compiler warning. */
   (void) method; (void) version; (void) upload_data; /* Unused. Silent compiler warning. */
   (void) upload_data_size; (void) unused;         /* Unused. Silent compiler warning. */
@@ -103,13 +104,13 @@ ahc_echo (void *cls,
     MHD_destroy_response (response);
     return ret;
   }
-  ret = MHD_digest_auth_check (connection, realm,
-                               username,
-                               password,
-                               300);
+  ret_i = MHD_digest_auth_check (connection, realm,
+                                 username,
+                                 password,
+                                 300);
   free (username);
-  if ( (ret == MHD_INVALID_NONCE) ||
-       (ret == MHD_NO) )
+  if ( (ret_i == MHD_INVALID_NONCE) ||
+       (ret_i == MHD_NO) )
   {
     response = MHD_create_response_from_buffer (strlen (DENIED),
                                                 DENIED,
@@ -119,8 +120,8 @@ ahc_echo (void *cls,
     ret = MHD_queue_auth_fail_response (connection, realm,
                                         MY_OPAQUE,
                                         response,
-                                        (ret == MHD_INVALID_NONCE) ? MHD_YES :
-                                        MHD_NO);
+                                        (ret_i == MHD_INVALID_NONCE) ?
+                                        MHD_YES : MHD_NO);
     MHD_destroy_response (response);
     return ret;
   }