Combine StrToInt methods.

core/include/fxcrt/fx_ext.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_EXT_H_
 #define CORE_INCLUDE_FXCRT_FX_EXT_H_
 
 #include <cctype>
@@ skipping 35 matching lines @@
   return FXSYS_iswalpha(wch) || FXSYS_iswdigit(wch);
 }
 
 inline int FXSYS_toHexDigit(const FX_CHAR c) {
   if (!std::isxdigit(c))
     return 0;
   char upchar = std::toupper(c);
   return upchar > '9' ? upchar - 'A' + 10 : upchar - '0';
 }
 
+inline bool FXSYS_isDecimalDigit(const FX_CHAR c) {
+  return std::isdigit(c);
+}
+
+inline bool FXSYS_isDecimalDigit(const FX_WCHAR c) {
+  return std::iswdigit(c);
+}
+
+inline int FXSYS_toDecimalDigit(const uint8_t c) {

[Tom Sepez, 2016/03/03 19:26:47]

I worry about duplicate definitions if we hit a platform where FX_CHAR is
uint8_t or FX_WCHAR is int.

[dsinclair, 2016/03/03 19:36:12]

So, if I try to compile without these I get errors that it's ambiguous which
method to choose for uint8_t and int. Without these, I'll need to cast on the
calling side to FX_CHAR, would that be better?

[Tom Sepez, 2016/03/03 20:14:58]

Yes, that would be clearer and safer.

[dsinclair, 2016/03/03 20:26:01]

Done.

+  if (!std::isdigit(c))
+    return 0;
+  return c - '0';
+}
+
+inline int FXSYS_toDecimalDigit(const int c) {
+  if (!std::isdigit(c))
+    return 0;
+  return c - '0';
+}
+
 inline int FXSYS_toDecimalDigit(const FX_CHAR c) {
   if (!std::isdigit(c))
     return 0;
   return c - '0';
 }
 
-inline int FXSYS_toDecimalDigitWide(const FX_WCHAR c) {
+inline int FXSYS_toDecimalDigit(const FX_WCHAR c) {
   if (!std::iswdigit(c))
     return 0;
   return c - L'0';
 }
 
 FX_DWORD FX_HashCode_String_GetA(const FX_CHAR* pStr,
                                  int32_t iLength,
                                  FX_BOOL bIgnoreCase = FALSE);
 FX_DWORD FX_HashCode_String_GetW(const FX_WCHAR* pStr,
                                  int32_t iLength,
@@ skipping 42 matching lines @@
           j -= gap;
         }
         pArray[j + gap] = v1;
       }
       gap >>= 1;
     }
   }
 };
 
 #endif  // CORE_INCLUDE_FXCRT_FX_EXT_H_