urldata: change port num storage to int and unsigned short

Instead of long.

Closes #9946

diff --git a/lib/setopt.c b/lib/setopt.c
index d53131a0ec610e8407df6106702c2a373fd45bc6..a12526176078ce6077546991cf3862facd3c6bbf 100644 (file)
--- a/lib/setopt.c
+++ b/lib/setopt.c
@@ -1057,7 +1057,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
     arg = va_arg(param, long);
     if((arg < 0) || (arg > 65535))
       return CURLE_BAD_FUNCTION_ARGUMENT;
-    data->set.proxyport = arg;
+    data->set.proxyport = (unsigned short)arg;
     break;
 
   case CURLOPT_PROXYAUTH:

diff --git a/lib/urldata.h b/lib/urldata.h
index c50171e73cb3ac192be4589e005f607abe991899..5691fec3e3f45b687caa359e9e9675425041c763 100644 (file)
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -865,7 +865,7 @@ struct postponed_data {
 
 struct proxy_info {
   struct hostname host;
-  long port;
+  int port;
   unsigned char proxytype; /* curl_proxytype: what kind of proxy that is in
                               use */
   char *user;    /* proxy user name string, allocated */
@@ -1622,12 +1622,12 @@ struct UserDefined {
   FILE *err;         /* the stderr user data goes here */
   void *debugdata;   /* the data that will be passed to fdebug */
   char *errorbuffer; /* (Static) store failure messages in here */
-  long proxyport; /* If non-zero, use this port number by default. If the
-                     proxy string features a ":[port]" that one will override
-                     this. */
   void *out;         /* CURLOPT_WRITEDATA */
   void *in_set;      /* CURLOPT_READDATA */
   void *writeheader; /* write the header to this if non-NULL */
+  unsigned short proxyport; /* If non-zero, use this port number by
+                               default. If the proxy string features a
+                               ":[port]" that one will override this. */
   unsigned short use_port; /* which port to use (when not using default) */
   unsigned long httpauth;  /* kind of HTTP authentication to use (bitmask) */
   unsigned long proxyauth; /* kind of proxy authentication to use (bitmask) */