Commit 7831c1ae authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Fixed a few compile errors and warnings.

parent 5ce3eb06

lib/ftp.c

+13 −6
Original line number Diff line number Diff line
@@ -4111,8 +4111,15 @@ static CURLcode Curl_ftp_setup_connection(struct connectdata * conn) 
#ifndef CURL_DISABLE_HTTP

    if (conn->handler == &Curl_handler_ftp)

      conn->handler = &Curl_handler_ftp_proxy;

  else

    else {

#ifdef USE_SSL

      conn->handler = &Curl_handler_ftps_proxy;

#else

      failf(data, "FTPS not supported!");

      return CURLE_UNSUPPORTED_PROTOCOL;

#endif

    }



#else

    failf(data, "FTP over http proxy requires HTTP support built-in!");

    return CURLE_UNSUPPORTED_PROTOCOL;

lib/http.c

+2 −0
Original line number Diff line number Diff line
@@ -110,9 +110,11 @@ 
 */



static CURLcode Curl_https_connecting(struct connectdata *conn, bool *done);

#ifdef USE_SSL

static int Curl_https_getsock(struct connectdata *conn,

                              curl_socket_t *socks,

                              int numsocks);

#endif



/*

 * HTTP handler interface.

lib/url.c

+3 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ extern sigjmp_buf curl_jmpenv; 
 * Protocol table.

 */



static const struct Curl_handler * protocols[] = {

static const struct Curl_handler * const protocols[] = {



#ifndef CURL_DISABLE_HTTP

  &Curl_handler_http,
@@ -3020,7 +3020,7 @@ static CURLcode setup_range(struct SessionHandle *data) 
static CURLcode setup_connection_internals(struct SessionHandle *data,

                                           struct connectdata *conn)

{

  const struct Curl_handler * * pp;

  const struct Curl_handler * const * pp;

  const struct Curl_handler * p;

  CURLcode result;
@@ -3028,7 +3028,7 @@ static CURLcode setup_connection_internals(struct SessionHandle *data, 


  /* Scan protocol handler table. */



  for (pp = protocols; p = *pp; pp++)

  for (pp = protocols; (p = *pp) != NULL; pp++)

    if (strequal(p->scheme, conn->protostr)) {

      /* Protocol found in table. Perform setup complement if some. */

      conn->handler = p;