Patrick Monnerat's cleanup fix after my alloc-strings commit

diff --git a/lib/connect.c b/lib/connect.c
index 6345957..9877ae8 100644 (file)
--- 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 79de7a4..bbff445 100644 (file)
--- 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: