Use our CURL_LLONG_MAX and CURL_LLONG_MIN which are defined with the proper suffix.

This commit is contained in:
Yang Tse 2008-08-14 03:39:45 +00:00
parent 34281925d6
commit cebaab8ee5

View File

@ -1388,20 +1388,8 @@ static int str2num(long *val, const char *str)
static int str2offset(curl_off_t *val, const char *str) static int str2offset(curl_off_t *val, const char *str)
{ {
#if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG) #if (CURL_SIZEOF_CURL_OFF_T > CURL_SIZEOF_LONG)
/* Ugly, but without going through a bunch of rigmarole, we don't have the
* definitions for LLONG_{MIN,MAX} or LONG_LONG_{MIN,MAX}.
*/
#ifndef LLONG_MAX
# define LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF)
# define LLONG_MIN CURL_OFF_T_C(0x8000000000000000)
#endif
/* this is a duplicate of the function that is also used in libcurl */
*val = curlx_strtoofft(str, NULL, 0); *val = curlx_strtoofft(str, NULL, 0);
if((*val == CURL_LLONG_MAX || *val == CURL_LLONG_MIN) && (ERRNO == ERANGE))
if( ( (*val == LLONG_MAX) ||
(*val == LLONG_MIN) ) &&
(ERRNO == ERANGE) )
return 1; return 1;
#else #else
*val = strtol(str, NULL, 0); *val = strtol(str, NULL, 0);