From 188b08ca557a73aacf9b7b877ebb1e88aa06f8a9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 2 Aug 2007 14:42:16 +0000 Subject: [PATCH] Patrick Monnerat's cleanup fix after my alloc-strings commit --- lib/connect.c | 2 +- lib/qssl.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index 634595766..9877ae8f4 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -242,7 +242,7 @@ static CURLcode bindlocal(struct connectdata *conn, int in6 = -1; /* First check if the given name is an IP address */ - in=inet_addr(dev); + in=inet_addr((char *) dev); if((in == CURL_INADDR_NONE) && Curl_if2ip(dev, myhost, sizeof(myhost))) { diff --git a/lib/qssl.c b/lib/qssl.c index 79de7a48e..bbff445f0 100644 --- a/lib/qssl.c +++ b/lib/qssl.c @@ -78,10 +78,10 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data) * We first try to SSL_Init_Application(), then SSL_Init() if it failed. */ - certname = data->set.cert; + certname = data->set.str[STRING_CERT]; if (!certname) { - certname = data->set.ssl.CAfile; + certname = data->set.str[STRING_SSL_CAFILE]; if (!certname) return CURLE_OK; /* Use previous setup. */ @@ -96,7 +96,7 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data) if (rc == SSL_ERROR_NOT_REGISTERED) { initstr.keyringFileName = certname; - initstr.keyringPassword = data->set.key; + initstr.keyringPassword = data->set.str[STRING_KEY]; initstr.cipherSuiteList = NULL; /* Use default. */ initstr.cipherSuiteListLen = 0; rc = SSL_Init(&initstr); @@ -190,7 +190,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex) /* Set-up protocol. */ - switch(data->set.ssl.version) { + switch (data->set.ssl.version) { default: case CURL_SSLVERSION_DEFAULT: