Merge to XFA: Cleanup CJS_PublicMethods:

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 "util.h"
 
 #include "JS_Context.h"
 #include "JS_Define.h"
@@ skipping 87 matching lines @@
       if (c == L'e' || c == L'E' || c == L'f' || c == L'g' || c == L'G') {
         return UTIL_DOUBLE;
       }
       if (c == L's' || c == L'S') {
         // Map s to S since we always deal internally
         // with wchar_t strings.
         (*sFormat)[i] = L'S';
         return UTIL_STRING;
       }
       if (c == L'.' || c == L'+' || c == L'-' || c == L'#' || c == L' ' ||
-          CJS_PublicMethods::IsDigit(c)) {
+          FXSYS_iswdigit(c)) {
         continue;
       }
       break;
     }
   }
 
   return -1;
 }
 
 FX_BOOL util::printf(IJS_Context* cc,
@@ skipping 376 matching lines @@
                     CJS_Value& vRet,
                     CFX_WideString& sError) {
   int iSize = params.size();
   if (iSize < 2)
     return FALSE;
 
   CFX_WideString sFormat = params[0].ToCFXWideString();
   CFX_WideString sDate = params[1].ToCFXWideString();
   double dDate = JS_GetDateTime();
   if (sDate.GetLength() > 0) {
-    FX_BOOL bWrongFormat = FALSE;
-    dDate = CJS_PublicMethods::MakeRegularDate(sDate, sFormat, bWrongFormat);
+    dDate = CJS_PublicMethods::MakeRegularDate(sDate, sFormat, nullptr);
   }
 
   if (!JS_PortIsNan(dDate)) {
     vRet = CJS_Date(CJS_Runtime::FromContext(cc), dDate);
   } else {
     vRet.SetNull();
   }
 
   return TRUE;
 }
@@ skipping 29 matching lines @@
   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;
 }