From: Marcel Raad <raad@teamviewer.com>
Date: Sat, 8 Apr 2017 11:40:41 +0000 (+0200)
Subject: vtls: fix unreferenced variable warnings
X-Git-Tag: curl-7_54_0~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45c78ad5b4883f0ce5978b36fb6a23fbd1f5e12b;p=curl

vtls: fix unreferenced variable warnings

... by moving the variables into the correct #ifdef block.
---

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index d705c72d8..51a5aa85b 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -973,7 +973,9 @@ gtls_connect_step3(struct connectdata *conn,
   gnutls_datum_t proto;
 #endif
   CURLcode result = CURLE_OK;
+#ifndef CURL_DISABLE_VERBOSE_STRINGS
   gnutls_protocol_t version = gnutls_protocol_get_version(session);
+#endif
   const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name :
     conn->host.name;
 
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index f426f32ff..be264662a 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1805,6 +1805,8 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
   long ctx_options = 0;
 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
   bool sni;
+  const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name :
+    conn->host.name;
 #ifdef ENABLE_IPV6
   struct in6_addr addr;
 #else
@@ -1823,8 +1825,6 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
   const char * const ssl_capath = SSL_CONN_CONFIG(CApath);
   const bool verifypeer = SSL_CONN_CONFIG(verifypeer);
   const char * const ssl_crlfile = SSL_SET_OPTION(CRLfile);
-  const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name :
-    conn->host.name;
 
   DEBUGASSERT(ssl_connect_1 == connssl->connecting_state);