[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 174/205: vtls: fix unreferenced variable warnings
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 174/205: vtls: fix unreferenced variable warnings |
Date: |
Thu, 20 Apr 2017 16:21:54 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit 45c78ad5b4883f0ce5978b36fb6a23fbd1f5e12b
Author: Marcel Raad <address@hidden>
AuthorDate: Sat Apr 8 13:40:41 2017 +0200
vtls: fix unreferenced variable warnings
... by moving the variables into the correct #ifdef block.
---
lib/vtls/gtls.c | 2 ++
lib/vtls/openssl.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
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);
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 167/205: low_speed_limit: improved function for longer time periods, (continued)
- [GNUnet-SVN] [gnurl] 167/205: low_speed_limit: improved function for longer time periods, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 157/205: multi: fix queueing of pending easy handles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 78/205: Improve code readbility, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 118/205: http: Fix proxy connection reuse with basic-auth, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 108/205: asiohiper: make sure socket is open in event_cb, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 140/205: libcurl.def: removed, unused, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 182/205: openssl: fix this statement may fall through [-Wimplicit-fallthrough=], gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 48/205: insecure.d: clarify that this is for server connections, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 147/205: multi: make curl_multi_wait avoid malloc in the typical case, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 196/205: extern-scan.pl: strip trailing CR, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 174/205: vtls: fix unreferenced variable warnings,
gnunet <=
- [GNUnet-SVN] [gnurl] 191/205: http2: fix handle leak in error path, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 24/205: fix some typos in the doc (#1306), gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 64/205: authneg: clear auth.multi flag at http_done, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 104/205: tests/README: mention nroff for --manual tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 73/205: tests: clear the SSL_CERT_FILE variable on --libcurl tests, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 55/205: mkhelp: simplified the gzip code, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 102/205: travis: run tests-nonflaky instead of tests-full, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 77/205: winbuild: add basic support for OpenSSL 1.1.x, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 41/205: http2: Fix assertion error on redirect with CL=0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 46/205: maketgz: Run updatemanpages.pl to update man pages, gnunet, 2017/04/20