Style and shadowing fixes

src/testcurl/https/test_empty_response.c

@@ -78,6 +78,7 @@ testInternalSelectGet ()
   time_t start;
   struct timeval tv;
   int port;
+  char *aes256_sha = "AES256-SHA";
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
     port = 0;
@@ -107,7 +108,6 @@ testInternalSelectGet ()
     }
     port = (int) dinfo->port;
   }
-  char *aes256_sha = "AES256-SHA";
   if (curl_uses_nss_ssl () == 0)
   {
     aes256_sha = "rsa_aes_256_sha";

src/testcurl/https/test_https_get_parallel.c

@@ -140,6 +140,7 @@ main (int argc, char *const *argv)
   unsigned int errorCount = 0;
   const char *aes256_sha = "AES256-SHA";
   int port;
+  unsigned int iseed;
   (void) argc;   /* Unused. Silent compiler warning. */
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
@@ -148,7 +149,7 @@ main (int argc, char *const *argv)
     port = 3020;
 
   /* initialize random seed used by curl clients */
-  unsigned int iseed = (unsigned int) time (NULL);
+  iseed = (unsigned int) time (NULL);
   srand (iseed);
   if (! testsuite_curl_global_init ())
     return 99;

src/testcurl/https/test_https_get_parallel_threads.c

@@ -142,6 +142,8 @@ main (int argc, char *const *argv)
   unsigned int errorCount = 0;
   const char *ssl_version;
   int port;
+  unsigned int iseed;
+  char *aes256_sha = "AES256-SHA";
   (void) argc;   /* Unused. Silent compiler warning. */
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
@@ -150,7 +152,7 @@ main (int argc, char *const *argv)
     port = 3010;
 
   /* initialize random seed used by curl clients */
-  unsigned int iseed = (unsigned int) time (NULL);
+  iseed = (unsigned int) time (NULL);
 
 #ifdef MHD_HTTPS_REQUIRE_GRYPT
 #ifdef GCRYCTL_INITIALIZATION_FINISHED
@@ -174,7 +176,6 @@ main (int argc, char *const *argv)
     return 77;
   }
 
-  char *aes256_sha = "AES256-SHA";
   if (curl_uses_nss_ssl () == 0)
   {
     aes256_sha = "rsa_aes_256_sha";

src/testcurl/https/test_https_session_info.c

@@ -103,6 +103,7 @@ test_query_session ()
   CURLcode errornum;
   char url[256];
   int port;
+  const char *aes256_sha = "AES256-SHA";
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
     port = 0;
@@ -142,7 +143,6 @@ test_query_session ()
     port = (int) dinfo->port;
   }
 
-  const char *aes256_sha = "AES256-SHA";
   if (curl_uses_nss_ssl () == 0)
   {
     aes256_sha = "rsa_aes_256_sha";

src/testcurl/https/test_https_time_out.c

@@ -103,7 +103,7 @@ test_tls_session_time_out (gnutls_session_t session, int port)
 int
 main (int argc, char *const *argv)
 {
-  int errorCount = 0;;
+  int errorCount = 0;
   struct MHD_Daemon *d;
   gnutls_session_t session;
   gnutls_datum_t key;

src/testcurl/https/test_tls_options.c

@@ -47,6 +47,7 @@ test_unmatching_ssl_version (void *cls, int port, const char *cipher_suite,
                              int curl_req_ssl_version)
 {
   struct CBC cbc;
+  char url[255];
   (void) cls;    /* Unused. Silent compiler warning. */
   if (NULL == (cbc.buf = malloc (sizeof (char) * 256)))
   {
@@ -57,7 +58,6 @@ test_unmatching_ssl_version (void *cls, int port, const char *cipher_suite,
   cbc.size = 256;
   cbc.pos = 0;
 
-  char url[255];
   if (gen_test_file_url (url,
                          sizeof (url),
                          port))
@@ -93,6 +93,8 @@ main (int argc, char *const *argv)
     MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD
     | MHD_USE_TLS | MHD_USE_ERROR_LOG;
   int port;
+  const char *aes128_sha = "AES128-SHA";
+  const char *aes256_sha = "AES256-SHA";
   (void) argc; (void) argv;       /* Unused. Silent compiler warning. */
 
   if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT))
@@ -126,8 +128,6 @@ main (int argc, char *const *argv)
   if (! testsuite_curl_global_init ())
     return 99;
 
-  const char *aes128_sha = "AES128-SHA";
-  const char *aes256_sha = "AES256-SHA";
   if (curl_uses_nss_ssl () == 0)
   {
     aes128_sha = "rsa_aes_128_sha";