diff options
author | dan sinclair <dsinclair@chromium.org> | 2015-11-10 13:17:58 -0500 |
---|---|---|
committer | dan sinclair <dsinclair@chromium.org> | 2015-11-10 13:17:58 -0500 |
commit | b27902b8995bb3e003daed6b0811ed746763c68d (patch) | |
tree | 26817dd2ff198b9c93db85724171766b87077a54 /core/src/fxcrt/fx_basic_gcc.cpp | |
parent | c813e21d261c24867234107f2e2ca72e15cb2534 (diff) | |
download | pdfium-b27902b8995bb3e003daed6b0811ed746763c68d.tar.xz |
Revert "Revert "Revert "Revert "Cleanup some numeric code.""""
This reverts commit da06e60fb5a095a91c9a4f509466667878624cb3.
Cleanup some numeric code.
This changes the various comparisons of char >= '0' && char <= '9' and
char < '0' || char > '9' to use std::isdigit checks. It also cleans up
a handful of hex to digit conversions to call one common method.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1433513002 .
Diffstat (limited to 'core/src/fxcrt/fx_basic_gcc.cpp')
-rw-r--r-- | core/src/fxcrt/fx_basic_gcc.cpp | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/core/src/fxcrt/fx_basic_gcc.cpp b/core/src/fxcrt/fx_basic_gcc.cpp index f8b0c7ac78..c352ee3f81 100644 --- a/core/src/fxcrt/fx_basic_gcc.cpp +++ b/core/src/fxcrt/fx_basic_gcc.cpp @@ -5,29 +5,49 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <limits> +#include <cctype> +#include <cwctype> #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxcrt/fx_string.h" -template <class T, class STR_T> -T FXSYS_StrToInt(STR_T str) { +template <class T> +T FXSYS_StrToInt(const FX_CHAR* str) { FX_BOOL neg = FALSE; - if (str == NULL) { + if (!str) return 0; - } + if (*str == '-') { neg = TRUE; str++; } T num = 0; - while (*str) { - if ((*str) < '0' || (*str) > '9') { + while (*str && std::isdigit(*str)) { + if (num > (std::numeric_limits<T>::max() - 9) / 10) break; - } - if (num > (std::numeric_limits<T>::max() - 9) / 10) { + + num = num * 10 + FXSYS_toDecimalDigit(*str); + str++; + } + return neg ? -num : num; +} + +template <class T> +T FXSYS_StrToInt(const FX_WCHAR* str) { + FX_BOOL neg = FALSE; + if (!str) + return 0; + + if (*str == '-') { + neg = TRUE; + str++; + } + T num = 0; + while (*str && std::iswdigit(*str)) { + if (num > (std::numeric_limits<T>::max() - 9) / 10) break; - } - num = num * 10 + (*str) - '0'; + + num = num * 10 + FXSYS_toDecimalDigitWide(*str); str++; } return neg ? -num : num; @@ -71,16 +91,16 @@ STR_T FXSYS_IntToStr(T value, STR_T string, int radix) { extern "C" { #endif int32_t FXSYS_atoi(const FX_CHAR* str) { - return FXSYS_StrToInt<int32_t, const FX_CHAR*>(str); + return FXSYS_StrToInt<int32_t>(str); } int32_t FXSYS_wtoi(const FX_WCHAR* str) { - return FXSYS_StrToInt<int32_t, const FX_WCHAR*>(str); + return FXSYS_StrToInt<int32_t>(str); } int64_t FXSYS_atoi64(const FX_CHAR* str) { - return FXSYS_StrToInt<int64_t, const FX_CHAR*>(str); + return FXSYS_StrToInt<int64_t>(str); } int64_t FXSYS_wtoi64(const FX_WCHAR* str) { - return FXSYS_StrToInt<int64_t, const FX_WCHAR*>(str); + return FXSYS_StrToInt<int64_t>(str); } const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix) { return FXSYS_IntToStr<int64_t, uint64_t, FX_CHAR*>(value, str, radix); |