moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Renamed strtoll_return to strtoll_type.

Browse Source
This commit is contained in:
hniksic 2005-08-12 05:56:52 -07:00
parent d46f0621b9
commit b23ed889b1
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2005-08-12 Hrvoje Niksic <hniksic@xemacs.org>
* wget.h: Renamed strtoll_return to strtoll_type.
2005-08-11 Hrvoje Niksic <hniksic@xemacs.org> 2005-08-11 Hrvoje Niksic <hniksic@xemacs.org>
* progress.c (eta_to_human_short): Switch to days when printing * progress.c (eta_to_human_short): Switch to days when printing

14
src/cmpt.c
View File

@ -1296,9 +1296,9 @@ char_value (char c, int base)
return value; return value;
} }
#define LL strtoll_return /* long long or __int64 */ #define LL strtoll_type /* long long or __int64 */
/* These constants assume 64-bit strtoll_return. */ /* These constants assume 64-bit strtoll_type. */
/* A roundabout way of writing 2**63-1 = 9223372036854775807 */ /* A roundabout way of writing 2**63-1 = 9223372036854775807 */
#define STRTOLL_OVERFLOW (((LL) 1 << 62) - 1 + ((LL) 1 << 62)) #define STRTOLL_OVERFLOW (((LL) 1 << 62) - 1 + ((LL) 1 << 62))
@ -1306,13 +1306,13 @@ char_value (char c, int base)
#define STRTOLL_UNDERFLOW (-STRTOLL_OVERFLOW - 1) #define STRTOLL_UNDERFLOW (-STRTOLL_OVERFLOW - 1)
/* A strtoll replacement for systems that have LFS but don't supply /* A strtoll replacement for systems that have LFS but don't supply
strtoll. The headers typedef strtoll_return to long long or to strtoll. The headers typedef strtoll_type to long long or to
__int64. */ __int64. */
strtoll_return strtoll_type
strtoll (const char *nptr, char **endptr, int base) strtoll (const char *nptr, char **endptr, int base)
{ {
strtoll_return result = 0; strtoll_type result = 0;
bool negative; bool negative;
if (base != 0 && (base < 2 || base > 36)) if (base != 0 && (base < 2 || base > 36))
@ -1360,7 +1360,7 @@ strtoll (const char *nptr, char **endptr, int base)
int val; int val;
for (; (val = char_value (*nptr, base)) != -1; ++nptr) for (; (val = char_value (*nptr, base)) != -1; ++nptr)
{ {
strtoll_return newresult = base * result + val; strtoll_type newresult = base * result + val;
if (newresult < result) if (newresult < result)
{ {
result = STRTOLL_OVERFLOW; result = STRTOLL_OVERFLOW;
@ -1376,7 +1376,7 @@ strtoll (const char *nptr, char **endptr, int base)
int val; int val;
for (; (val = char_value (*nptr, base)) != -1; ++nptr) for (; (val = char_value (*nptr, base)) != -1; ++nptr)
{ {
strtoll_return newresult = base * result - val; strtoll_type newresult = base * result - val;
if (newresult > result) if (newresult > result)
{ {
result = STRTOLL_UNDERFLOW; result = STRTOLL_UNDERFLOW;

2
src/mswindows.h
View File

@ -95,7 +95,7 @@ typedef __int64 wgint;
#else #else
# define str_to_wgint strtoll # define str_to_wgint strtoll
# define NEED_STRTOLL # define NEED_STRTOLL
# define strtoll_return __int64 # define strtoll_type __int64
#endif #endif
/* Windows has no symlink, therefore no lstat. Without symlinks lstat /* Windows has no symlink, therefore no lstat. Without symlinks lstat

14
src/wget.h
View File

@ -125,10 +125,8 @@ so, delete this exception statement from your version. */
#ifndef WINDOWS #ifndef WINDOWS
typedef off_t wgint; typedef off_t wgint;
# define SIZEOF_WGINT SIZEOF_OFF_T # define SIZEOF_WGINT SIZEOF_OFF_T
#endif
/* Define a strtol/strtoll clone that works with wgint. */ /* Pick the strtol-like function that will work with wgint. */
#ifndef str_to_wgint /* mswindows.h defines its own alias */
# if SIZEOF_WGINT == SIZEOF_LONG # if SIZEOF_WGINT == SIZEOF_LONG
# define str_to_wgint strtol # define str_to_wgint strtol
# define WGINT_MAX LONG_MAX # define WGINT_MAX LONG_MAX
@ -136,22 +134,22 @@ typedef off_t wgint;
# define WGINT_MAX LLONG_MAX # define WGINT_MAX LLONG_MAX
# ifdef HAVE_STRTOLL # ifdef HAVE_STRTOLL
# define str_to_wgint strtoll # define str_to_wgint strtoll
# elif HAVE_STRTOIMAX # elif HAVE_STRTOIMAX /* HPUX 11.0 has strtoimax, but no strtoll */
# define str_to_wgint strtoimax # define str_to_wgint strtoimax
# else # else
# define str_to_wgint strtoll # define str_to_wgint strtoll
# define NEED_STRTOLL # define NEED_STRTOLL
# define strtoll_return long long # define strtoll_type long long
# endif
# endif # endif
# endif # endif
#endif /* not WINDOWS */
/* Declare our strtoll replacement. */ /* Declare our strtoll replacement. */
#ifdef NEED_STRTOLL #ifdef NEED_STRTOLL
strtoll_return strtoll (const char *, char **, int); strtoll_type strtoll (const char *, char **, int);
#endif #endif
/* Now define a large integral type useful for storing sizes of *sums* /* Now define a large numeric type useful for storing sizes of *sums*
of downloads, such as the value of the --quota option. This should of downloads, such as the value of the --quota option. This should
be a type able to hold 2G+ values even on systems without large be a type able to hold 2G+ values even on systems without large
file support. (It is useful to limit Wget's download quota to say file support. (It is useful to limit Wget's download quota to say