Make CJS_PublicMethods::StrTrim() take a CFX_ByteString

fpdfsdk/javascript/PublicMethods.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/javascript/PublicMethods.h"
 
 #include <algorithm>
 #include <string>
@@ skipping 34 matching lines @@
 JS_STATIC_GLOBAL_FUN_ENTRY(AFMakeNumber)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFSimple_Calculate)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFRange_Validate)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFMergeChange)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFParseDateEx)
 JS_STATIC_GLOBAL_FUN_ENTRY(AFExtractNums)
 END_JS_STATIC_GLOBAL_FUN()
 
 IMPLEMENT_JS_STATIC_GLOBAL_FUN(CJS_PublicMethods)
 
-static const FX_WCHAR* const months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
-                                         L"May", L"Jun", L"Jul", L"Aug",
-                                         L"Sep", L"Oct", L"Nov", L"Dec"};
+namespace {
 
-static const FX_WCHAR* const fullmonths[] = {
-    L"January",   L"February", L"March",    L"April",
-    L"May",       L"June",     L"July",     L"August",
-    L"September", L"October",  L"November", L"December"};
+const FX_WCHAR* const months[] = {L"Jan", L"Feb", L"Mar", L"Apr",
+                                  L"May", L"Jun", L"Jul", L"Aug",
+                                  L"Sep", L"Oct", L"Nov", L"Dec"};
 
-bool CJS_PublicMethods::IsNumber(const FX_WCHAR* str) {
+const FX_WCHAR* const fullmonths[] = {L"January", L"February", L"March",
+                                      L"April",   L"May",      L"June",
+                                      L"July",    L"August",   L"September",
+                                      L"October", L"November", L"December"};
+
+CFX_ByteString StrTrim(const CFX_ByteString& pStr) {
+  CFX_ByteString result(pStr);
+  result.TrimLeft(' ');
+  result.TrimRight(' ');
+  return result;
+}
+
+CFX_WideString StrTrim(const CFX_WideString& pStr) {
+  CFX_WideString result(pStr);
+  result.TrimLeft(' ');
+  result.TrimRight(' ');
+  return result;
+}
+
+}  // namespace
+
+bool CJS_PublicMethods::IsNumber(const CFX_WideString& str) {
   CFX_WideString sTrim = StrTrim(str);
   const FX_WCHAR* pTrim = sTrim.c_str();
   const FX_WCHAR* p = pTrim;
-
   bool bDot = false;
   bool bKXJS = false;
 
   wchar_t c;
   while ((c = *p) != L'\0') {
     if (c == L'.' || c == L',') {
       if (bDot)
         return false;
       bDot = true;
     } else if (c == L'-' || c == L'+') {
@@ skipping 50 matching lines @@
   }
   if (FXSYS_wcsicmp(sFuction, L"MIN") == 0) {
     return std::min(dValue1, dValue2);
   }
   if (FXSYS_wcsicmp(sFuction, L"MAX") == 0) {
     return std::max(dValue1, dValue2);
   }
   return dValue1;
 }
 
-CFX_WideString CJS_PublicMethods::StrLTrim(const FX_WCHAR* pStr) {
-  while (*pStr && *pStr == L' ')
-    pStr++;
-
-  return pStr;
-}
-
-CFX_WideString CJS_PublicMethods::StrRTrim(const FX_WCHAR* pStr) {
-  const FX_WCHAR* p = pStr;
-  while (*p)
-    p++;
-  while (p > pStr && *(p - 1) == L' ')
-    p--;
-
-  return CFX_WideString(pStr, p - pStr);
-}
-
-CFX_WideString CJS_PublicMethods::StrTrim(const FX_WCHAR* pStr) {
-  return StrRTrim(StrLTrim(pStr).c_str());
-}
-
-CFX_ByteString CJS_PublicMethods::StrLTrim(const FX_CHAR* pStr) {
-  while (*pStr && *pStr == ' ')
-    pStr++;
-
-  return pStr;
-}
-
-CFX_ByteString CJS_PublicMethods::StrRTrim(const FX_CHAR* pStr) {
-  const FX_CHAR* p = pStr;
-  while (*p)
-    p++;
-  while (p > pStr && *(p - 1) == L' ')
-    p--;
-
-  return CFX_ByteString(pStr, p - pStr);
-}
-
-CFX_ByteString CJS_PublicMethods::StrTrim(const FX_CHAR* pStr) {
-  return StrRTrim(StrLTrim(pStr));
-}
-
 CJS_Array CJS_PublicMethods::AF_MakeArrayFromList(CJS_Runtime* pRuntime,
                                                   CJS_Value val) {
   CJS_Array StrArray(pRuntime);
   if (val.IsArrayObject()) {
     val.ConvertToArray(StrArray);
     return StrArray;
   }
   CFX_WideString wsStr = val.ToCFXWideString();
   CFX_ByteString t = CFX_ByteString::FromUnicode(wsStr);
   const char* p = (const char*)t;
 
   int ch = ',';
   int nIndex = 0;
 
   while (*p) {
     const char* pTemp = strchr(p, ch);
     if (!pTemp) {
-      StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(p).c_str()));
+      StrArray.SetElement(nIndex,
+                          CJS_Value(pRuntime, StrTrim(CFX_ByteString(p))));
       break;
     }
 
     char* pSub = new char[pTemp - p + 1];
     strncpy(pSub, p, pTemp - p);
     *(pSub + (pTemp - p)) = '\0';
 
-    StrArray.SetElement(nIndex, CJS_Value(pRuntime, StrTrim(pSub).c_str()));
+    StrArray.SetElement(nIndex,
+                        CJS_Value(pRuntime, StrTrim(CFX_ByteString(pSub))));
     delete[] pSub;
 
     nIndex++;
     p = ++pTemp;
   }
   return StrArray;
 }
 
 int CJS_PublicMethods::ParseStringInteger(const CFX_WideString& str,
                                           int nStart,
@@ skipping 713 matching lines @@
   if (iSepStyle < 0 || iSepStyle > 3)
     iSepStyle = 0;
   if (!pEvent->m_pValue)
     return FALSE;
   CFX_WideString& val = pEvent->Value();
   CFX_WideString& w_strChange = pEvent->Change();
   CFX_WideString w_strValue = val;
 
   if (pEvent->WillCommit()) {
     CFX_WideString wstrChange = w_strChange;
-    CFX_WideString wstrValue = StrLTrim(w_strValue.c_str());
+    CFX_WideString wstrValue = StrTrim(w_strValue);

[Tom Sepez, 2016/04/12 19:25:33]

note: trimming right is not strictly necessary but harmless 

     if (wstrValue.IsEmpty())
       return TRUE;
 
     CFX_WideString swTemp = wstrValue;
     swTemp.Replace(L",", L".");
     if (!IsNumber(swTemp.c_str())) {
       pEvent->Rc() = FALSE;
       sError = JSGetStringFromID(pContext, IDS_STRING_JSAFNUMBER_KEYSTROKE);
       Alert(pContext, sError.c_str());
       return TRUE;
@@ skipping 218 matching lines @@
     swMsg.Format(JSGetStringFromID(pContext, IDS_STRING_JSPARSEDATE).c_str(),
                  sFormat.c_str());
     Alert(pContext, swMsg.c_str());
     return FALSE;
   }
 
   val = MakeFormatDate(dDate, sFormat);
   return TRUE;
 }
 
-double CJS_PublicMethods::MakeInterDate(CFX_WideString strValue) {
+double CJS_PublicMethods::MakeInterDate(const CFX_WideString& strValue) {
   std::vector<CFX_WideString> wsArray;
   CFX_WideString sTemp = L"";
   for (int i = 0; i < strValue.GetLength(); ++i) {
     FX_WCHAR c = strValue.GetAt(i);
     if (c == L' ' || c == L':') {
       wsArray.push_back(sTemp);
       sTemp = L"";
       continue;
     }
     sTemp += c;
@@ skipping 677 matching lines @@
     nums.SetElement(nIndex, CJS_Value(pRuntime, sPart.c_str()));
   }
 
   if (nums.GetLength() > 0)
     vRet = nums;
   else
     vRet.SetNull();
 
   return TRUE;
 }