diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2016-03-20 17:51:06 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2016-03-20 17:51:06 +0000 |
| commit | 935138374516ef723a00bd7327e1f0d2653dcb9d (patch) | |
| tree | eab460f8fb50ab6c7248b89c1c913a06122a8d21 | |
| parent | 89f397d7eb04c1baa7f3e04fcf7128ff1b5c7f2a (diff) | |
| download | curl-935138374516ef723a00bd7327e1f0d2653dcb9d.tar.gz | |
connect/ntlm/http: Fixed compilation warnings when verbose strings disabled
warning C4189: 'data': local variable is initialized but not referenced
| -rw-r--r-- | lib/connect.c | 12 | ||||
| -rw-r--r-- | lib/curl_ntlm_msgs.c | 4 | ||||
| -rw-r--r-- | lib/http.c | 6 |
3 files changed, 17 insertions, 5 deletions
diff --git a/lib/connect.c b/lib/connect.c index 4ad4ec403..567186a69 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -859,8 +859,10 @@ CURLcode Curl_is_connected(struct connectdata *conn, void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd) { -#ifdef TCP_NODELAY - struct SessionHandle *data= conn->data; +#if defined(TCP_NODELAY) +#if !defined(CURL_DISABLE_VERBOSE_STRINGS) + struct SessionHandle *data = conn->data; +#endif curl_socklen_t onoff = (curl_socklen_t) 1; int level = IPPROTO_TCP; @@ -877,6 +879,10 @@ void Curl_tcpnodelay(struct connectdata *conn, curl_socket_t sockfd) level = pe->p_proto; #endif +#if defined(CURL_DISABLE_VERBOSE_STRINGS) + (void) conn; +#endif + if(setsockopt(sockfd, level, TCP_NODELAY, (void *)&onoff, sizeof(onoff)) < 0) infof(data, "Could not set TCP_NODELAY: %s\n", diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index bf1aaf376..fc9547207 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -170,6 +170,10 @@ static CURLcode ntlm_decode_type2_target(struct SessionHandle *data, unsigned short target_info_len = 0; unsigned int target_info_offset = 0; +#if defined(CURL_DISABLE_VERBOSE_STRINGS) + (void) data; +#endif + if(size >= 48) { target_info_len = Curl_read16_le(&buffer[40]); target_info_offset = Curl_read32_le(&buffer[44]); diff --git a/lib/http.c b/lib/http.c index 409baa7e5..b85ff0d5a 100644 --- a/lib/http.c +++ b/lib/http.c @@ -567,10 +567,12 @@ output_auth_headers(struct connectdata *conn, { const char *auth = NULL; CURLcode result = CURLE_OK; +#if !defined(CURL_DISABLE_VERBOSE_STRINGS) || defined(USE_SPNEGO) struct SessionHandle *data = conn->data; +#endif #ifdef USE_SPNEGO - struct negotiatedata *negdata = proxy? - &data->state.proxyneg:&data->state.negotiate; + struct negotiatedata *negdata = proxy ? + &data->state.proxyneg : &data->state.negotiate; #endif #ifdef CURL_DISABLE_CRYPTO_AUTH |