Commit 2d6831b7 authored by Michael Kaufmann's avatar Michael Kaufmann
Browse files

CURLOPT_CONNECT_TO: Fix compile warnings 

Fix compile warnings that appeared only when curl has been configured
with '--disable-verbose'.
parent 3a4326ef

lib/url.c

+11 −15
Original line number Original line Diff line number Diff line
@@ -3412,15 +3412,10 @@ ConnectionExists(struct Curl_easy *data, 
      max_pipeline_length(data->multi):0;

      max_pipeline_length(data->multi):0;

    size_t best_pipe_len = max_pipe_len;

    size_t best_pipe_len = max_pipe_len;

    struct curl_llist_element *curr;

    struct curl_llist_element *curr;

    const char *hostname;



    if(needle->bits.conn_to_host)

      hostname = needle->conn_to_host.name;

    else

      hostname = needle->host.name;





    infof(data, "Found bundle for host %s: %p [%s]\n",

    infof(data, "Found bundle for host %s: %p [%s]\n",

          hostname, (void *)bundle,

          (needle->bits.conn_to_host ? needle->conn_to_host.name :

           needle->host.name), (void *)bundle,

          (bundle->multiuse == BUNDLE_PIPELINING ?

          (bundle->multiuse == BUNDLE_PIPELINING ?

           "can pipeline" :

           "can pipeline" :

           (bundle->multiuse == BUNDLE_MULTIPLEX ?

           (bundle->multiuse == BUNDLE_MULTIPLEX ?
@@ -5639,6 +5634,10 @@ static CURLcode parse_connect_to_host_port(struct Curl_easy *data, 
  char *portptr;

  char *portptr;

  int port = -1;

  int port = -1;





#if defined(CURL_DISABLE_VERBOSE_STRINGS)

  (void) data;

#endif



  *hostname_result = NULL;

  *hostname_result = NULL;

  *port_result = -1;

  *port_result = -1;
@@ -5804,14 +5803,11 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data, 
      return result;

      return result;





    if(host && *host) {

    if(host && *host) {

      bool ipv6host;

      conn->conn_to_host.rawalloc = host;

      conn->conn_to_host.rawalloc = host;

      conn->conn_to_host.name = host;

      conn->conn_to_host.name = host;

      conn->bits.conn_to_host = TRUE;

      conn->bits.conn_to_host = TRUE;





      ipv6host = strchr(host, ':') != NULL;

      infof(data, "Connecting to hostname: %s\n", host);

      infof(data, "Connecting to hostname: %s%s%s\n",

            ipv6host ? "[" : "", host, ipv6host ? "]" : "");

    }

    }

    else {

    else {

      /* no "connect to host" */

      /* no "connect to host" */