diff options
| author | Marcel Raad <raad@teamviewer.com> | 2017-04-06 20:04:58 +0200 |
|---|---|---|
| committer | Marcel Raad <raad@teamviewer.com> | 2017-04-07 08:57:52 +0200 |
| commit | 33ca733ee2132ab8518f2316f8e4b5629ecedab7 (patch) | |
| tree | 5bd177e77a072a004cee5cdc786df23db7925d84 | |
| parent | 1f152a42ae9c2985b8a0cedf90d3b63b2e64a898 (diff) | |
| download | gnurl-33ca733ee2132ab8518f2316f8e4b5629ecedab7.tar.gz gnurl-33ca733ee2132ab8518f2316f8e4b5629ecedab7.tar.bz2 gnurl-33ca733ee2132ab8518f2316f8e4b5629ecedab7.zip | |
schannel: fix compiler warnings
When UNICODE is not defined, the Curl_convert_UTF8_to_tchar macro maps
directly to its argument. As it is declared as a pointer to const and
InitializeSecurityContext expects a pointer to non-const, both MSVC and MinGW
issue a warning about implicitly casting away the const. Fix this by declaring
the variables as pointers to non-const.
Closes https://github.com/curl/curl/pull/1394
| -rw-r--r-- | lib/vtls/schannel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 6d83e9ed1..e0fb2d5f6 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -159,7 +159,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) #endif TCHAR *host_name; CURLcode result; - const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : + char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name; infof(data, "schannel: SSL/TLS connection with %s port %hu (step 1/3)\n", @@ -456,7 +456,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) TCHAR *host_name; CURLcode result; bool doread; - const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : + char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name; doread = (connssl->connecting_state != ssl_connect_2_writing) ? TRUE : FALSE; @@ -1434,7 +1434,7 @@ int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) */ struct Curl_easy *data = conn->data; struct ssl_connect_data *connssl = &conn->ssl[sockindex]; - const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : + char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : conn->host.name; infof(data, "schannel: shutting down SSL/TLS connection with %s port %hu\n", |