Combine StrToInt methods.

fpdfsdk/src/javascript/util.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 "fpdfsdk/src/javascript/util.h"
 
 #include <time.h>
 
@@ skipping 499 matching lines @@
   }
 
   return TRUE;
 }
 
 int64_t FX_atoi64(const char* nptr) {
   int c;         /* current char */
   int64_t total; /* current total */
   int sign;      /* if '-', then negative, otherwise positive */
 
   /* skip whitespace */

[Tom Sepez, 2016/03/03 21:43:03]

nit: I'd feel better here if we immediately created a uint8_t* pointer to use in
place of nptr.  Then |c| can be a uint8_t, we can lose all the casts to ints,
and we only ever widen to wchar as before.

[dsinclair, 2016/03/03 22:01:43]

I'll do one better and just delete the whole method. No errors on removal and,
plus, it should really be using FXSYS_atoi64 instead of reinventing the wheel in
a different shape.

[Tom Sepez, 2016/03/03 22:10:31]

Acknowledged.

   while (isspace((int)(unsigned char)*nptr))
     ++nptr;
 
   c = (int)(unsigned char)*nptr++;
   sign = c; /* save sign indication */
   if (c == '-' || c == '+')
     c = (int)(unsigned char)*nptr++; /* skip sign */
 
   total = 0;
 
   while (isdigit(c)) {
-    total = 10 * total + FXSYS_toDecimalDigit(c); /* accumulate digit */
-    c = (int)(unsigned char)*nptr++; /* get next char */
+    total = 10 * total + FXSYS_toDecimalDigit(static_cast<FX_WCHAR>(c));
+    c = (int)(unsigned char)*nptr++;
   }
 
   return sign == '-' ? -total : total;
 }
 
 FX_BOOL util::byteToChar(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
   int iSize = params.size();
   if (iSize == 0)
     return FALSE;
   int nByte = params[0].ToInt();
   unsigned char cByte = (unsigned char)nByte;
   CFX_WideString csValue;
   csValue.Format(L"%c", cByte);
   vRet = csValue.c_str();
   return TRUE;
 }