From 2297bc4791e1cb5c6ed034b4d4a1355c1e4e1b0c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 17 Nov 2000 09:48:21 +0000 Subject: changed the 'port' field to long to better work with the va_arg() system --- lib/url.c | 4 +--- lib/urldata.h | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/url.c b/lib/url.c index 9e32eaff4..eea7808ea 100644 --- a/lib/url.c +++ b/lib/url.c @@ -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 *); diff --git a/lib/urldata.h b/lib/urldata.h index 29b4e725f..bda19f73b 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -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,8 +401,8 @@ 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 - CONF_PORT to use this */ + 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! */ struct Configbits bits; /* new-style (v7) flag data */ -- cgit v1.2.3