Revert "Revert "Cleanup some numeric code.""

core/src/fxcrt/fx_basic_bstring.cpp

 // 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
 
 #include <stddef.h>  // For offsetof().
+#include <cctype>
 
 #include "../../include/fxcrt/fx_basic.h"
 #include "../../../third_party/base/numerics/safe_math.h"
 
 static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) {
   if (i == 0) {
     buf[0] = '0';
     return 1;
   }
   char buf1[32];
@@ skipping 437 matching lines @@
   ASSERT(dest.m_pData == NULL);
   dest.m_pData = StringData::Create(nCopyLen);
   if (dest.m_pData) {
     FXSYS_memcpy(dest.m_pData->m_String, m_pData->m_String + nCopyIndex,
                  nCopyLen);
   }
 }
 #define FORCE_ANSI 0x10000
 #define FORCE_UNICODE 0x20000
 #define FORCE_INT64 0x40000
 void CFX_ByteString::FormatV(const FX_CHAR* lpszFormat, va_list argList) {

[Tom Sepez, 2015/10/29 19:28:31]

test, may already have one.

[dsinclair, 2015/11/03 15:59:02]

https://codereview.chromium.org/1411973005/

   va_list argListSave;
 #if defined(__ARMCC_VERSION) ||                                              \
     (!defined(_MSC_VER) && (_FX_CPU_ == _FX_X64_ || _FX_CPU_ == _FX_IA64_ || \
                             _FX_CPU_ == _FX_ARM64_)) ||                      \
     defined(__native_client__)
   va_copy(argListSave, argList);
 #else
   argListSave = argList;
 #endif
   int nMaxLen = 0;
@@ skipping 10 matching lines @@
       } else if (*lpsz == '*') {
         nWidth = va_arg(argList, int);
       } else if (*lpsz == '-' || *lpsz == '+' || *lpsz == '0' || *lpsz == ' ')
         ;
       else {
         break;
       }
     }
     if (nWidth == 0) {
       nWidth = FXSYS_atoi(lpsz);
-      for (; (*lpsz) >= '0' && (*lpsz) <= '9'; lpsz++)
+      for (; std::isdigit(*lpsz); lpsz++)
         ;
     }
     if (nWidth < 0 || nWidth > 128 * 1024) {
       lpszFormat = "Bad width";
       nMaxLen = 10;
       break;
     }
     int nPrecision = 0;
     if (*lpsz == '.') {
       lpsz++;
       if (*lpsz == '*') {
         nPrecision = va_arg(argList, int);
         lpsz++;
       } else {
         nPrecision = FXSYS_atoi(lpsz);
-        for (; (*lpsz) >= '0' && (*lpsz) <= '9'; lpsz++)
+        for (; std::isdigit(*lpsz); lpsz++)
           ;
       }
     }
     if (nPrecision < 0 || nPrecision > 128 * 1024) {
       lpszFormat = "Bad precision";
       nMaxLen = 14;
       break;
     }
     int nModifier = 0;
     if (FXSYS_strncmp(lpsz, "I64", 3) == 0) {
@@ skipping 563 matching lines @@
     fraction %= scale;
     scale /= 10;
   }
   return buf_size;
 }
 CFX_ByteString CFX_ByteString::FormatFloat(FX_FLOAT d, int precision) {
   FX_CHAR buf[32];
   FX_STRSIZE len = FX_ftoa(d, buf);
   return CFX_ByteString(buf, len);
 }