Unverified Commit 93843c37 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

conversions: fix several compiler warnings

parent 452c906d

lib/transfer.c

+14 −13
Original line number Original line Diff line number Diff line
@@ -221,20 +221,21 @@ CURLcode Curl_fillreadbuffer(struct connectdata *conn, int bytes, int *nreadp) 
           strlen(endofline_network));

           strlen(endofline_network));





#ifdef CURL_DOES_CONVERSIONS

#ifdef CURL_DOES_CONVERSIONS

    {

      CURLcode result;

      CURLcode result;

      int length;

      int length;

    if(data->set.prefer_ascii) {

      if(data->set.prefer_ascii)

        /* translate the protocol and data */

        /* translate the protocol and data */

        length = nread;

        length = nread;

    }

      else

    else {

        /* just translate the protocol portion */

        /* just translate the protocol portion */

      length = strlen(hexbuffer);

        length = (int)strlen(hexbuffer);

    }

      result = Curl_convert_to_network(data, data->req.upload_fromhere,

    result = Curl_convert_to_network(data, data->req.upload_fromhere, length);

                                       length);

      /* Curl_convert_to_network calls failf if unsuccessful */

      /* Curl_convert_to_network calls failf if unsuccessful */

      if(result)

      if(result)

        return result;

        return result;

    }

#endif /* CURL_DOES_CONVERSIONS */

#endif /* CURL_DOES_CONVERSIONS */





    if((nread - hexlen) == 0)

    if((nread - hexlen) == 0)

lib/vtls/openssl.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1478,7 +1478,8 @@ static CURLcode verifyhost(struct connectdata *conn, X509 *server_cert) 
       peer_CN = NULL;

       peer_CN = NULL;

    else {

    else {

      /* convert peer_CN from UTF8 */

      /* convert peer_CN from UTF8 */

      CURLcode rc = Curl_convert_from_utf8(data, peer_CN, strlen(peer_CN));

      CURLcode rc = Curl_convert_from_utf8(data, (char *)peer_CN,

                                           strlen((char *)peer_CN));

      /* Curl_convert_from_utf8 calls failf if unsuccessful */

      /* Curl_convert_from_utf8 calls failf if unsuccessful */

      if(rc) {

      if(rc) {

        OPENSSL_free(peer_CN);

        OPENSSL_free(peer_CN);