[tor-commits] [tor/master] Don't fall back to _atoi64

nickm at torproject.org nickm at torproject.org
Mon Aug 28 14:23:13 UTC 2017


commit b88d00fea35630d96bf91bda362922af43730a04
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 9 09:58:16 2017 -0400

    Don't fall back to _atoi64
    
    We only did this on windows when building with MSVC 6 and earlier,
    which is now considered a screamingly bad idea.
---
 src/common/util.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index 0858d17fe..9cd9ebdc4 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1233,15 +1233,7 @@ tor_parse_uint64(const char *s, int base, uint64_t min,
 #ifdef HAVE_STRTOULL
   r = (uint64_t)strtoull(s, &endptr, base);
 #elif defined(_WIN32)
-#if defined(_MSC_VER) && _MSC_VER < 1300
-  tor_assert(base <= 10);
-  r = (uint64_t)_atoi64(s);
-  endptr = (char*)s;
-  while (TOR_ISSPACE(*endptr)) endptr++;
-  while (TOR_ISDIGIT(*endptr)) endptr++;
-#else
   r = (uint64_t)_strtoui64(s, &endptr, base);
-#endif
 #elif SIZEOF_LONG == 8
   r = (uint64_t)strtoul(s, &endptr, base);
 #else





More information about the tor-commits mailing list