diff options
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/hostip.c | 3 | ||||
| -rw-r--r-- | lib/parsedate.c | 3 | ||||
| -rw-r--r-- | lib/smtp.c | 3 | ||||
| -rw-r--r-- | lib/url.c | 22 | ||||
| -rw-r--r-- | lib/warnless.c | 54 | ||||
| -rw-r--r-- | lib/warnless.h | 6 |
7 files changed, 85 insertions, 8 deletions
@@ -379,7 +379,7 @@ static int ftp_endofresp(struct pingpong *pp, size_t len = pp->nread_resp; if((len > 3) && LASTLINE(line)) { - *code = strtol(line, NULL, 10); + *code = curlx_sltosi(strtol(line, NULL, 10)); return 1; } return 0; diff --git a/lib/hostip.c b/lib/hostip.c index 0ae6518f5..3db5b4967 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -67,6 +67,7 @@ #include "strerror.h" #include "url.h" #include "inet_ntop.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -597,7 +598,7 @@ int Curl_resolv_timeout(struct connectdata *conn, /* alarm() makes a signal get sent when the timeout fires off, and that will abort system calls */ - prev_alarm = alarm((unsigned int) (timeout/1000L)); + prev_alarm = alarm(curlx_sltoui(timeout/1000L)); /* This allows us to time-out from the name resolver, as the timeout will generate a signal and we will siglongjmp() from that here. diff --git a/lib/parsedate.c b/lib/parsedate.c index 5d8af2692..3e003db31 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -83,6 +83,7 @@ #include <curl/curl.h> #include "rawstr.h" +#include "warnless.h" #include "parsedate.h" const char * const Curl_wkday[] = @@ -378,7 +379,7 @@ int Curl_parsedate(const char *date, time_t *output) secnum = 0; } else { - val = (int)strtol(date, &end, 10); + val = curlx_sltosi(strtol(date, &end, 10)); if((tzoff == -1) && ((end - date) == 4) && diff --git a/lib/smtp.c b/lib/smtp.c index 5ccdcb671..1e2e75b29 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -92,6 +92,7 @@ #include "curl_md5.h" #include "curl_hmac.h" #include "curl_gethostname.h" +#include "warnless.h" #define _MPRINTF_REPLACE /* use our functions only */ #include <curl/mprintf.h> @@ -226,7 +227,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp) return FALSE; /* Nothing for us. */ if((result = line[3] == ' ')) - *resp = strtol(line, NULL, 10); + *resp = curlx_sltosi(strtol(line, NULL, 10)); line += 4; len -= 4; @@ -1006,7 +1006,21 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, * An FTP option that modifies an upload to create missing directories on * the server. */ - data->set.ftp_create_missing_dirs = (int)va_arg(param, long); + switch(va_arg(param, long)) { + case 0: + data->set.ftp_create_missing_dirs = 0; + break; + case 1: + data->set.ftp_create_missing_dirs = 1; + break; + case 2: + data->set.ftp_create_missing_dirs = 2; + break; + default: + /* reserve other values for future use */ + result = CURLE_FAILED_INIT; + break; + } break; case CURLOPT_SERVER_RESPONSE_TIMEOUT: /* @@ -2001,13 +2015,13 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, /* * Set what local port to bind the socket to when performing an operation. */ - data->set.localport = (unsigned short) va_arg(param, long); + data->set.localport = curlx_sltous(va_arg(param, long)); break; case CURLOPT_LOCALPORTRANGE: /* * Set number of local ports to try, starting with CURLOPT_LOCALPORT. */ - data->set.localportrange = (int) va_arg(param, long); + data->set.localportrange = curlx_sltosi(va_arg(param, long)); break; case CURLOPT_KRBLEVEL: /* @@ -2356,7 +2370,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, * know that an unsigned int will always hold the value so we blindly * typecast to this type */ - data->set.scope = (unsigned int) va_arg(param, long); + data->set.scope = curlx_sltoui(va_arg(param, long)); break; case CURLOPT_PROTOCOLS: diff --git a/lib/warnless.c b/lib/warnless.c index 4f42dd07f..471e4b2c7 100644 --- a/lib/warnless.c +++ b/lib/warnless.c @@ -125,3 +125,57 @@ int curlx_uztosi(size_t uznum) # pragma warning(pop) #endif } + +/* +** signed long to signed int +*/ + +int curlx_sltosi(long slnum) +{ +#ifdef __INTEL_COMPILER +# pragma warning(push) +# pragma warning(disable:810) /* conversion may lose significant bits */ +#endif + + return (int)(slnum & (long) CURL_MASK_SINT); + +#ifdef __INTEL_COMPILER +# pragma warning(pop) +#endif +} + +/* +** signed long to unsigned int +*/ + +unsigned int curlx_sltoui(long slnum) +{ +#ifdef __INTEL_COMPILER +# pragma warning(push) +# pragma warning(disable:810) /* conversion may lose significant bits */ +#endif + + return (unsigned int)(slnum & (long) CURL_MASK_UINT); + +#ifdef __INTEL_COMPILER +# pragma warning(pop) +#endif +} + +/* +** signed long to unsigned short +*/ + +unsigned short curlx_sltous(long slnum) +{ +#ifdef __INTEL_COMPILER +# pragma warning(push) +# pragma warning(disable:810) /* conversion may lose significant bits */ +#endif + + return (unsigned short)(slnum & (long) CURL_MASK_USHORT); + +#ifdef __INTEL_COMPILER +# pragma warning(pop) +#endif +} diff --git a/lib/warnless.h b/lib/warnless.h index ac654fbc5..ed692d8cd 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -28,4 +28,10 @@ unsigned char curlx_ultouc(unsigned long ulnum); int curlx_uztosi(size_t uznum); +int curlx_sltosi(long slnum); + +unsigned int curlx_sltoui(long slnum); + +unsigned short curlx_sltous(long slnum); + #endif /* HEADER_CURL_WARNLESS_H */ |