Commit 2297bc47 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

changed the 'port' field to long to better work with the va_arg() system

parent 34a2d446

lib/url.c

+1 −3
Original line number Diff line number Diff line
@@ -446,9 +446,7 @@ CURLcode curl_setopt(CURL *curl, CURLoption option, ...) 
    data->url = va_arg(param, char *);

    break;

  case CURLOPT_PORT:

    /* this typecast is used to fool the compiler to NOT warn for a

       "cast from pointer to integer of different size" */

    data->port = (unsigned short)(va_arg(param, long));

    data->port = va_arg(param, long);

    break;

  case CURLOPT_POSTFIELDS:

    data->postfields = va_arg(param, char *);

lib/urldata.h

+3 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ struct ssldata { 
  bool use;              /* use ssl encrypted communications TRUE/FALSE */

  long version;          /* what version the client wants to use */

  long certverifyresult; /* result from the certificate verification */

  bool verifypeer;       /* set TRUE if this is desired */

  long verifypeer;       /* set TRUE if this is desired */

  char *CApath;          /* DOES NOT WORK ON WINDOWS */

  char *CAfile;          /* cerficate to verify peer against */

#ifdef USE_SSLEAY
@@ -401,7 +401,7 @@ struct UrlData { 
  char *url;   /* what to get */

  char *freethis; /* if non-NULL, an allocated string for the URL */

  char *hostname; /* hostname to connect, as parsed from url */

  unsigned short port; /* which port to use (if non-protocol bind) set

  long port; /* which port to use (if non-protocol bind) set

                CONF_PORT to use this */

  unsigned short remote_port; /* what remote port to connect to, not the proxy

				 port! */