]> granicus.if.org Git - curl/commitdiff
vtls: fix unreferenced variable warnings
authorMarcel Raad <raad@teamviewer.com>
Sat, 8 Apr 2017 11:40:41 +0000 (13:40 +0200)
committerMarcel Raad <raad@teamviewer.com>
Sat, 8 Apr 2017 11:40:41 +0000 (13:40 +0200)
... by moving the variables into the correct #ifdef block.

lib/vtls/gtls.c
lib/vtls/openssl.c

index d705c72d8b37a7254820138313528a5e55c660a5..51a5aa85bb40ae90b1c0e92772ab52c09039a1aa 100644 (file)
@@ -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;
 
index f426f32ffb8115c1a8b23d749bde8f6f89f00a44..be264662a72faf5e5c0747ffca8e318258fedfd1 100644 (file)
@@ -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);