Mark some arrays as constant.

Fix some nits as well.

Change-Id: Iaef79056b68ea0dae7f76c09e7a133cc545896fd
Reviewed-on: https://pdfium-review.googlesource.com/39353
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>

1 files changed, 53 insertions, 49 deletions

diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp
index 55233c1265..cf42fb26c7 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/cfxjse_formcalc_context.cpp
@@ -39,6 +39,8 @@ namespace {
 
 const double kFinancialPrecision = 0.00000001;
 
+const wchar_t kStrCode[] = L"0123456789abcdef";
+
 struct XFA_FMHtmlReserveCode {
   uint32_t m_uCode;
   const wchar_t* m_htmlReserve;
@@ -1195,24 +1197,25 @@ WideString DecodeXML(const WideString& wsXMLString) {
 }
 
 WideString EncodeURL(const ByteString& szURLString) {
+  static const wchar_t kStrUnsafe[] = {' ', '<',  '>', '"', '#', '%', '{', '}',
+                                       '|', '\\', '^', '~', '[', ']', '`'};
+  static const wchar_t kStrReserved[] = {';', '/', '?', ':', '@', '=', '&'};
+  static const wchar_t kStrSpecial[] = {'$',  '-', '+', '!', '*',
+                                        '\'', '(', ')', ','};
+
   WideString wsURLString = WideString::FromUTF8(szURLString.AsStringView());
   CFX_WideTextBuf wsResultBuf;
   wchar_t strEncode[4];
   strEncode[0] = '%';
   strEncode[3] = 0;
-  wchar_t strUnsafe[] = {' ', '<',  '>', '"', '#', '%', '{', '}',
-                         '|', '\\', '^', '~', '[', ']', '`'};
-  wchar_t strReserved[] = {';', '/', '?', ':', '@', '=', '&'};
-  wchar_t strSpecial[] = {'$', '-', '+', '!', '*', '\'', '(', ')', ','};
-  const wchar_t* strCode = L"0123456789abcdef";
-  for (auto ch : wsURLString) {
-    int32_t i = 0;
-    int32_t iCount = FX_ArraySize(strUnsafe);
+  for (wchar_t ch : wsURLString) {
+    size_t i = 0;
+    size_t iCount = FX_ArraySize(kStrUnsafe);
     while (i < iCount) {
-      if (ch == strUnsafe[i]) {
+      if (ch == kStrUnsafe[i]) {
         int32_t iIndex = ch / 16;
-        strEncode[1] = strCode[iIndex];
-        strEncode[2] = strCode[ch - iIndex * 16];
+        strEncode[1] = kStrCode[iIndex];
+        strEncode[2] = kStrCode[ch - iIndex * 16];
         wsResultBuf << strEncode;
         break;
       }
@@ -1222,12 +1225,12 @@ WideString EncodeURL(const ByteString& szURLString) {
       continue;
 
     i = 0;
-    iCount = FX_ArraySize(strReserved);
+    iCount = FX_ArraySize(kStrReserved);
     while (i < iCount) {
-      if (ch == strReserved[i]) {
+      if (ch == kStrReserved[i]) {
         int32_t iIndex = ch / 16;
-        strEncode[1] = strCode[iIndex];
-        strEncode[2] = strCode[ch - iIndex * 16];
+        strEncode[1] = kStrCode[iIndex];
+        strEncode[2] = kStrCode[ch - iIndex * 16];
         wsResultBuf << strEncode;
         break;
       }
@@ -1237,9 +1240,9 @@ WideString EncodeURL(const ByteString& szURLString) {
       continue;
 
     i = 0;
-    iCount = FX_ArraySize(strSpecial);
+    iCount = FX_ArraySize(kStrSpecial);
     while (i < iCount) {
-      if (ch == strSpecial[i]) {
+      if (ch == kStrSpecial[i]) {
         wsResultBuf.AppendChar(ch);
         break;
       }
@@ -1250,8 +1253,8 @@ WideString EncodeURL(const ByteString& szURLString) {
 
     if ((ch >= 0x80 && ch <= 0xff) || ch <= 0x1f || ch == 0x7f) {
       int32_t iIndex = ch / 16;
-      strEncode[1] = strCode[iIndex];
-      strEncode[2] = strCode[ch - iIndex * 16];
+      strEncode[1] = kStrCode[iIndex];
+      strEncode[2] = kStrCode[ch - iIndex * 16];
       wsResultBuf << strEncode;
     } else if (ch >= 0x20 && ch <= 0x7e) {
       wsResultBuf.AppendChar(ch);
@@ -1259,11 +1262,11 @@ WideString EncodeURL(const ByteString& szURLString) {
       const wchar_t iRadix = 16;
       WideString strTmp;
       while (ch >= iRadix) {
-        wchar_t tmp = strCode[ch % iRadix];
+        wchar_t tmp = kStrCode[ch % iRadix];
         ch /= iRadix;
         strTmp += tmp;
       }
-      strTmp += strCode[ch];
+      strTmp += kStrCode[ch];
       int32_t iLen = strTmp.GetLength();
       if (iLen < 2)
         break;
@@ -1293,7 +1296,6 @@ WideString EncodeURL(const ByteString& szURLString) {
 
 WideString EncodeHTML(const ByteString& szHTMLString) {
   WideString wsHTMLString = WideString::FromUTF8(szHTMLString.AsStringView());
-  const wchar_t* strCode = L"0123456789abcdef";
   wchar_t strEncode[9];
   strEncode[0] = '&';
   strEncode[1] = '#';
@@ -1317,18 +1319,18 @@ WideString EncodeHTML(const ByteString& szHTMLString) {
       wsResultBuf.AppendChar((wchar_t)ch);
     } else if (ch < 256) {
       int32_t iIndex = ch / 16;
-      strEncode[3] = strCode[iIndex];
-      strEncode[4] = strCode[ch - iIndex * 16];
+      strEncode[3] = kStrCode[iIndex];
+      strEncode[4] = kStrCode[ch - iIndex * 16];
       strEncode[5] = ';';
       strEncode[6] = 0;
       wsResultBuf << strEncode;
     } else {
       int32_t iBigByte = ch / 256;
       int32_t iLittleByte = ch % 256;
-      strEncode[3] = strCode[iBigByte / 16];
-      strEncode[4] = strCode[iBigByte % 16];
-      strEncode[5] = strCode[iLittleByte / 16];
-      strEncode[6] = strCode[iLittleByte % 16];
+      strEncode[3] = kStrCode[iBigByte / 16];
+      strEncode[4] = kStrCode[iBigByte % 16];
+      strEncode[5] = kStrCode[iLittleByte / 16];
+      strEncode[6] = kStrCode[iLittleByte % 16];
       wsResultBuf << strEncode;
     }
     ++i;
@@ -1348,8 +1350,7 @@ WideString EncodeXML(const ByteString& szXMLString) {
   strEncode[6] = 0;
   strEncode[7] = ';';
   strEncode[8] = 0;
-  const wchar_t* strCode = L"0123456789abcdef";
-  for (const auto& ch : wsXMLString) {
+  for (wchar_t ch : wsXMLString) {
     switch (ch) {
       case '"':
         wsResultBuf.AppendChar('&');
@@ -1381,18 +1382,18 @@ WideString EncodeXML(const ByteString& szXMLString) {
           wsResultBuf.AppendChar(ch);
         } else if (ch < 256) {
           int32_t iIndex = ch / 16;
-          strEncode[3] = strCode[iIndex];
-          strEncode[4] = strCode[ch - iIndex * 16];
+          strEncode[3] = kStrCode[iIndex];
+          strEncode[4] = kStrCode[ch - iIndex * 16];
           strEncode[5] = ';';
           strEncode[6] = 0;
           wsResultBuf << strEncode;
         } else {
           int32_t iBigByte = ch / 256;
           int32_t iLittleByte = ch % 256;
-          strEncode[3] = strCode[iBigByte / 16];
-          strEncode[4] = strCode[iBigByte % 16];
-          strEncode[5] = strCode[iLittleByte / 16];
-          strEncode[6] = strCode[iLittleByte % 16];
+          strEncode[3] = kStrCode[iBigByte / 16];
+          strEncode[4] = kStrCode[iBigByte % 16];
+          strEncode[5] = kStrCode[iLittleByte / 16];
+          strEncode[6] = kStrCode[iLittleByte % 16];
           wsResultBuf << strEncode;
         }
         break;
@@ -1404,18 +1405,20 @@ WideString EncodeXML(const ByteString& szXMLString) {
 }
 
 ByteString TrillionUS(const ByteStringView& szData) {
-  std::ostringstream strBuf;
-  ByteStringView pUnits[] = {"zero", "one", "two",   "three", "four",
-                             "five", "six", "seven", "eight", "nine"};
-  ByteStringView pCapUnits[] = {"Zero", "One", "Two",   "Three", "Four",
-                                "Five", "Six", "Seven", "Eight", "Nine"};
-  ByteStringView pTens[] = {"Ten",      "Eleven",  "Twelve",  "Thirteen",
-                            "Fourteen", "Fifteen", "Sixteen", "Seventeen",
-                            "Eighteen", "Nineteen"};
-  ByteStringView pLastTens[] = {"Twenty", "Thirty",  "Forty",  "Fifty",
-                                "Sixty",  "Seventy", "Eighty", "Ninety"};
-  ByteStringView pComm[] = {" Hundred ", " Thousand ", " Million ", " Billion ",
-                            "Trillion"};
+  static const ByteStringView pUnits[] = {"zero",  "one",  "two", "three",
+                                          "four",  "five", "six", "seven",
+                                          "eight", "nine"};
+  static const ByteStringView pCapUnits[] = {"Zero",  "One",  "Two", "Three",
+                                             "Four",  "Five", "Six", "Seven",
+                                             "Eight", "Nine"};
+  static const ByteStringView pTens[] = {
+      "Ten",     "Eleven",  "Twelve",    "Thirteen", "Fourteen",
+      "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen"};
+  static const ByteStringView pLastTens[] = {"Twenty", "Thirty", "Forty",
+                                             "Fifty",  "Sixty",  "Seventy",
+                                             "Eighty", "Ninety"};
+  static const ByteStringView pComm[] = {" Hundred ", " Thousand ", " Million ",
+                                         " Billion ", "Trillion"};
   const char* pData = szData.unterminated_c_str();
   int32_t iLength = szData.GetLength();
   int32_t iComm = 0;
@@ -1432,6 +1435,7 @@ ByteString TrillionUS(const ByteStringView& szData) {
   if (iFirstCount == 0)
     iFirstCount = 3;
 
+  std::ostringstream strBuf;
   int32_t iIndex = 0;
   if (iFirstCount == 3) {
     if (pData[iIndex] != '0') {
@@ -4029,7 +4033,7 @@ void CFXJSE_FormCalcContext::Lower(CFXJSE_Value* pThis,
   CFX_WideTextBuf lowStringBuf;
   ByteString argString = ValueToUTF8String(argOne.get());
   WideString wsArgString = WideString::FromUTF8(argString.AsStringView());
-  for (auto ch : wsArgString) {
+  for (wchar_t ch : wsArgString) {
     if ((ch >= 0x41 && ch <= 0x5A) || (ch >= 0xC0 && ch <= 0xDE))
       ch += 32;
     else if (ch == 0x100 || ch == 0x102 || ch == 0x104)