Use kConstant naming in xfa
Change-Id: I8e6d476bb63afee92a44109e3d88ab951a1ee419
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83793
Auto-Submit: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/xfa/fxfa/cxfa_ffbarcode.cpp b/xfa/fxfa/cxfa_ffbarcode.cpp
index 67329c5..ac38104 100644
--- a/xfa/fxfa/cxfa_ffbarcode.cpp
+++ b/xfa/fxfa/cxfa_ffbarcode.cpp
@@ -22,7 +22,7 @@
namespace {
-const BarCodeInfo g_BarCodeData[] = {
+const BarCodeInfo kBarCodeData[] = {
{0x7fb4a18, "ean13", BarcodeType::ean13, BC_EAN13},
{0x8d13a3d, "code11", BarcodeType::code11, BC_UNKNOWN},
{0x8d149a8, "code49", BarcodeType::code49, BC_UNKNOWN},
@@ -123,11 +123,11 @@
return nullptr;
auto* it = std::lower_bound(
- std::begin(g_BarCodeData), std::end(g_BarCodeData),
+ std::begin(kBarCodeData), std::end(kBarCodeData),
FX_HashCode_GetLoweredW(wsName.AsStringView()),
[](const BarCodeInfo& arg, uint32_t hash) { return arg.uHash < hash; });
- if (it != std::end(g_BarCodeData) && wsName.EqualsASCII(it->pName))
+ if (it != std::end(kBarCodeData) && wsName.EqualsASCII(it->pName))
return it;
return nullptr;
diff --git a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
index 54b1763..030bff5 100644
--- a/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
+++ b/xfa/fxfa/fm2js/cxfa_fmexpression.cpp
@@ -24,7 +24,7 @@
const wchar_t kPlusEqual[] = L" += ";
const wchar_t kMinusEqual[] = L" -= ";
-const wchar_t* const g_BuiltInFuncs[] = {
+const wchar_t* const kBuiltInFuncs[] = {
L"Abs", L"Apr", L"At", L"Avg",
L"Ceil", L"Choose", L"Concat", L"Count",
L"Cterm", L"Date", L"Date2Num", L"DateFmt",
@@ -44,7 +44,7 @@
L"Within", L"WordNum",
};
-const size_t g_BuiltInFuncsMaxLen = 12;
+const size_t kBuiltInFuncsMaxLen = 12;
struct XFA_FMSOMMethod {
const wchar_t* m_wsSomMethodName; // Ok, POD struct.
@@ -424,16 +424,16 @@
}
bool CXFA_FMCallExpression::IsBuiltInFunc(CFX_WideTextBuf* funcName) const {
- if (funcName->GetLength() > g_BuiltInFuncsMaxLen)
+ if (funcName->GetLength() > kBuiltInFuncsMaxLen)
return false;
WideString str = funcName->MakeString();
- const wchar_t* const* pMatchResult = std::lower_bound(
- std::begin(g_BuiltInFuncs), std::end(g_BuiltInFuncs), str,
- [](const wchar_t* iter, const WideString& val) -> bool {
- return val.CompareNoCase(iter) > 0;
- });
- if (pMatchResult != std::end(g_BuiltInFuncs) &&
+ const wchar_t* const* pMatchResult =
+ std::lower_bound(std::begin(kBuiltInFuncs), std::end(kBuiltInFuncs), str,
+ [](const wchar_t* iter, const WideString& val) -> bool {
+ return val.CompareNoCase(iter) > 0;
+ });
+ if (pMatchResult != std::end(kBuiltInFuncs) &&
!str.CompareNoCase(*pMatchResult)) {
funcName->Clear();
*funcName << *pMatchResult;
diff --git a/xfa/fxfa/parser/cxfa_localemgr.cpp b/xfa/fxfa/parser/cxfa_localemgr.cpp
index b870c45..3e92d0d 100644
--- a/xfa/fxfa/parser/cxfa_localemgr.cpp
+++ b/xfa/fxfa/parser/cxfa_localemgr.cpp
@@ -34,7 +34,7 @@
// <month>January</month>
// <month>February</month>
// ...
-const uint8_t g_enUS_Locale[] = {
+const uint8_t k_enUS_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0x9B, 0x30, 0x14, 0x7D, 0x9F, 0xB4,
0x7F, 0x40, 0xD6, 0x2A, 0xB5, 0x52, 0x56, 0x6F, 0x8F, 0xA9, 0x88, 0xA5,
0x6C, 0x24, 0x9B, 0x3A, 0xD1, 0x55, 0x22, 0x55, 0xB5, 0xBE, 0x4C, 0x0E,
@@ -88,7 +88,8 @@
0x20, 0xF2, 0x94, 0x44, 0xB3, 0x45, 0x63, 0xCB, 0x5D, 0x09, 0xB6, 0x7B,
0xD5, 0x58, 0xF7, 0x55, 0xA4, 0x96, 0x7F, 0x01, 0x75, 0x37, 0x1B, 0x8B,
};
-const uint8_t g_enGB_Locale[] = {
+
+const uint8_t k_enGB_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6E, 0xD3, 0x30, 0x14, 0x7D, 0x47, 0xE2,
0x1F, 0xA2, 0x88, 0x49, 0x20, 0x6D, 0x33, 0x3C, 0x6E, 0xEA, 0x2C, 0x75,
0xEB, 0xD6, 0x32, 0xC8, 0xA8, 0x48, 0xC5, 0xC4, 0x5E, 0x90, 0x9B, 0x78,
@@ -153,7 +154,8 @@
0x2F, 0x06, 0x90, 0xBC, 0x5C, 0xF1, 0xD5, 0x67, 0xB1, 0xE1, 0xE9, 0xE6,
0xD0, 0xFD, 0x9E, 0x95, 0x51, 0xF5, 0x19, 0x0B, 0xCB, 0x7F, 0x8E, 0x69,
0xAC, 0xD0};
-const uint8_t g_zhCN_Locale[] = {
+
+const uint8_t k_zhCN_Locale[] = {
0x78, 0x9C, 0xED, 0x56, 0x41, 0x4F, 0xD4, 0x40, 0x14, 0xBE, 0x9B, 0xF8,
0x1F, 0x9A, 0x46, 0x52, 0x4D, 0x58, 0x46, 0x8F, 0x90, 0xD2, 0x64, 0x03,
0x08, 0x06, 0xBB, 0x21, 0x96, 0x68, 0xE0, 0x62, 0xBA, 0xED, 0xB0, 0x2D,
@@ -221,7 +223,8 @@
0xD8, 0x68, 0x39, 0xA9, 0x1D, 0xFA, 0x8D, 0x55, 0xD2, 0xE3, 0xF1, 0x7D,
0xD1, 0xCD, 0x33, 0x63, 0x51, 0xFC, 0x15, 0x0D, 0xCB, 0xBF, 0xC0, 0xE4,
0x3D, 0x40};
-const uint8_t g_zhTW_Locale[] = {
+
+const uint8_t k_zhTW_Locale[] = {
0x78, 0x9C, 0xED, 0x57, 0xCD, 0x4F, 0xD4, 0x40, 0x14, 0x3F, 0x63, 0xE2,
0xFF, 0x30, 0x69, 0x20, 0xD5, 0x04, 0xA8, 0x1E, 0x21, 0xA5, 0xC9, 0xC6,
0x45, 0x30, 0x58, 0x42, 0xEC, 0x46, 0x22, 0x17, 0x33, 0xDB, 0x0E, 0xDB,
@@ -290,7 +293,8 @@
0xF0, 0x6A, 0x0D, 0x5F, 0x21, 0x77, 0xF4, 0x2A, 0x6D, 0xCF, 0x69, 0xAC,
0xE0, 0x00, 0x19, 0xDE, 0x1E, 0x2C, 0xB6, 0xD4, 0x7B, 0xCA, 0x52, 0xF8,
0x67, 0x41, 0xF9, 0x03, 0x11, 0xC2, 0x4A, 0xC9};
-const uint8_t g_zhHK_Locale[] = {
+
+const uint8_t k_zhHK_Locale[] = {
0x78, 0x9C, 0xA5, 0x57, 0x4D, 0x4F, 0x13, 0x41, 0x18, 0x3E, 0x63, 0xE2,
0x7F, 0x98, 0x6C, 0x20, 0x0B, 0x09, 0x50, 0x8A, 0x9F, 0x25, 0xCB, 0x26,
0x44, 0x90, 0x9A, 0x5A, 0x43, 0x2C, 0xD1, 0xC8, 0xC5, 0x6C, 0x77, 0x87,
@@ -364,7 +368,8 @@
0x52, 0xAB, 0x1A, 0xA5, 0x15, 0x64, 0x33, 0x9D, 0xDD, 0xED, 0x47, 0x2E,
0x70, 0x9E, 0x42, 0xCA, 0xF9, 0x27, 0x42, 0xFC, 0x0B, 0xD9, 0x0E, 0x4B,
0xED};
-const uint8_t g_jaJP_Locale[] = {
+
+const uint8_t k_jaJP_Locale[] = {
0x78, 0x9C, 0xED, 0x56, 0xCB, 0x6E, 0xD3, 0x40, 0x14, 0x5D, 0x17, 0x89,
0x7F, 0x18, 0x59, 0x20, 0x83, 0xD4, 0xD6, 0x0D, 0xEF, 0x56, 0xAE, 0xA5,
0x8A, 0x96, 0x86, 0x16, 0xA3, 0x08, 0x57, 0xA0, 0x76, 0x83, 0x26, 0xF6,
@@ -431,7 +436,8 @@
0x21, 0x6A, 0x01, 0xB7, 0xC6, 0xD2, 0x0C, 0x5A, 0x8A, 0xA6, 0x77, 0x5C,
0xD2, 0xD8, 0xA2, 0x3E, 0x33, 0x18, 0x89, 0x7F, 0xAA, 0x25, 0xE6, 0xA9,
0x2A, 0xC1, 0x87, 0xBD, 0xF6, 0x17, 0x6C, 0x42, 0x08, 0x21};
-const uint8_t g_koKR_Locale[] = {
+
+const uint8_t k_koKR_Locale[] = {
0x78, 0x9C, 0xED, 0x56, 0x4D, 0x6B, 0xD4, 0x40, 0x18, 0x3E, 0x57, 0xF0,
0x3F, 0x0C, 0xC1, 0x12, 0x85, 0x76, 0xB7, 0xEB, 0x77, 0x4B, 0x1A, 0x28,
0x6E, 0x6D, 0x65, 0x8D, 0x94, 0xA6, 0x58, 0xEC, 0x45, 0x66, 0x93, 0xE9,
@@ -500,7 +506,8 @@
0x3E, 0x9A, 0x72, 0x3B, 0x81, 0xDD, 0xF7, 0x47, 0xD2, 0x64, 0x9C, 0xA1,
0x05, 0x53, 0x2D, 0x75, 0x9E, 0x42, 0x3D, 0xFC, 0xFC, 0x17, 0xFF, 0x01,
0xDC, 0xF1, 0x18, 0xD3};
-const uint8_t g_esES_Locale[] = {
+
+const uint8_t k_esES_Locale[] = {
0x78, 0x9C, 0x9D, 0x56, 0xCF, 0x6B, 0xD4, 0x40, 0x14, 0xBE, 0x0B, 0xFE,
0x0F, 0x21, 0x58, 0x56, 0xA1, 0xDD, 0xD1, 0x63, 0xCB, 0x36, 0x50, 0xDA,
0xDA, 0x95, 0x1A, 0x59, 0x9A, 0xAA, 0xD8, 0x8B, 0x4C, 0x92, 0xE9, 0xEE,
@@ -570,7 +577,8 @@
0x61, 0xC3, 0x23, 0x3E, 0xE5, 0xA9, 0xE6, 0xD0, 0x6C, 0xCF, 0x64, 0x94,
0xFD, 0xFC, 0xC2, 0xF2, 0x2F, 0x7C, 0xDC, 0xCC, 0x2F,
};
-const uint8_t g_esLA_Locale[] = {
+
+const uint8_t k_esLA_Locale[] = {
0x78, 0x9C, 0x9D, 0x56, 0xCD, 0x4E, 0xDC, 0x30, 0x10, 0x3E, 0x53, 0xA9,
0xEF, 0x60, 0x45, 0x45, 0x80, 0x04, 0x9B, 0xF6, 0xB8, 0x28, 0x44, 0x5A,
0x01, 0xA5, 0x15, 0x0D, 0x5A, 0x75, 0x51, 0x4B, 0xB9, 0x54, 0x4E, 0x62,
@@ -638,7 +646,8 @@
0x0D, 0xDC, 0x69, 0xDA, 0x25, 0x7A, 0xD3, 0x4B, 0x9B, 0xF0, 0xA5, 0x68,
0xD6, 0x3C, 0x66, 0xD3, 0x73, 0x9E, 0x31, 0xF3, 0x22, 0xB3, 0x11, 0x57,
0x3B, 0x4F, 0x43, 0xCF, 0x3F, 0xEF, 0xCD, 0xBF, 0xC4, 0xB5, 0xD4, 0x04};
-const uint8_t g_deDE_Loacale[] = {
+
+const uint8_t k_deDE_Loacale[] = {
0x78, 0x9C, 0x95, 0x56, 0x4D, 0x6F, 0xD4, 0x30, 0x10, 0xBD, 0x23, 0xF1,
0x1F, 0xAC, 0x88, 0xAA, 0x20, 0xB5, 0x1B, 0x38, 0xB6, 0xDA, 0x46, 0x5A,
0x75, 0xFB, 0x41, 0x4B, 0xCA, 0xAA, 0x69, 0x41, 0xF4, 0x82, 0xBC, 0x89,
@@ -705,7 +714,8 @@
0xB3, 0x2B, 0xBE, 0xE4, 0xA9, 0xE6, 0xDC, 0xFB, 0x3D, 0x2B, 0xA3, 0xEA,
0x73, 0x16, 0x96, 0xFF, 0x00, 0x29, 0x27, 0xAF, 0x17,
};
-const uint8_t g_frFR_Locale[] = {
+
+const uint8_t k_frFR_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0x4D, 0x6F, 0xD3, 0x40, 0x10, 0xBD, 0x23, 0xF1,
0x1F, 0x56, 0x16, 0x55, 0x41, 0x6A, 0xBD, 0x70, 0x4C, 0x95, 0x5A, 0xAA,
0xFA, 0x15, 0x28, 0x46, 0x51, 0x53, 0x40, 0xF4, 0x82, 0x36, 0xF6, 0x36,
@@ -772,7 +782,8 @@
0xCC, 0x49, 0x3E, 0x19, 0x7A, 0xBE, 0x86, 0x34, 0x12, 0x1D, 0x48, 0xEE,
0x22, 0xE5, 0x93, 0xA9, 0x58, 0xF2, 0x54, 0x73, 0xF8, 0x76, 0xCF, 0xF2,
0xA8, 0xF8, 0xD2, 0x85, 0xE5, 0x3F, 0x5D, 0x49, 0xBE, 0x1B};
-const uint8_t g_itIT_Locale[] = {
+
+const uint8_t k_itIT_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0xD1, 0x6A, 0xD4, 0x40, 0x14, 0x7D, 0x17, 0xFC,
0x87, 0x21, 0x58, 0x50, 0x68, 0x3B, 0xFA, 0xD8, 0x92, 0x06, 0x4A, 0x5B,
0xBB, 0xA5, 0x46, 0x96, 0xEE, 0xAA, 0xD8, 0x17, 0x99, 0x64, 0xA6, 0xD9,
@@ -838,7 +849,8 @@
0x64, 0xE8, 0xC5, 0x1A, 0xD2, 0x4C, 0x8E, 0x20, 0xF9, 0x45, 0x2E, 0xA2,
0xF7, 0x72, 0xC5, 0xD3, 0xCD, 0xE1, 0xDB, 0x3D, 0xAB, 0xA2, 0xFA, 0xD3,
0x16, 0x96, 0xFF, 0x00, 0x20, 0x8B, 0xBE, 0xF7};
-const uint8_t g_ptBR_Locale[] = {
+
+const uint8_t k_ptBR_Locale[] = {
0x78, 0x9C, 0x9D, 0x56, 0x3D, 0x6F, 0xD4, 0x40, 0x10, 0xAD, 0x83, 0xC4,
0x7F, 0x58, 0x59, 0x89, 0x0E, 0xA4, 0x24, 0x86, 0x92, 0xC8, 0x67, 0xE9,
0x92, 0x0B, 0x39, 0x94, 0x18, 0x9D, 0xCE, 0x11, 0x88, 0x34, 0x68, 0x6D,
@@ -907,7 +919,8 @@
0xD6, 0x4E, 0xAA, 0x04, 0x67, 0xBD, 0x30, 0x9D, 0x0E, 0x82, 0x69, 0x51,
0x48, 0xEC, 0x4B, 0x9A, 0x22, 0xB3, 0x24, 0xD3, 0xC1, 0x56, 0x39, 0x4F,
0x45, 0xCE, 0xFE, 0xF7, 0xD5, 0x3F, 0x30, 0xBB, 0xD9, 0x9B};
-const uint8_t g_nlNL_Locale[] = {
+
+const uint8_t k_nlNL_Locale[] = {
0x78, 0x9C, 0x95, 0x56, 0x4D, 0x4F, 0xDC, 0x30, 0x10, 0x3D, 0x53, 0xA9,
0xFF, 0xC1, 0x8A, 0x8A, 0x68, 0x25, 0x96, 0x2D, 0x47, 0x50, 0x88, 0xB4,
0x05, 0x0A, 0x15, 0x04, 0xAD, 0x58, 0xDA, 0xAA, 0x5C, 0x2A, 0x6F, 0x62,
@@ -973,7 +986,8 @@
0x17, 0xAA, 0x4B, 0x74, 0xDE, 0x4B, 0x9B, 0xF1, 0x41, 0x34, 0x37, 0x91,
0x6C, 0xB1, 0xE2, 0x19, 0x33, 0x2F, 0x32, 0x1B, 0x6D, 0xB5, 0xF3, 0xB4,
0xC7, 0xF9, 0xA7, 0xBA, 0xF3, 0x0F, 0xD5, 0xFA, 0xC0, 0xFA};
-const uint8_t g_ruRU_Locale[] = {
+
+const uint8_t k_ruRU_Locale[] = {
0x78, 0x9C, 0xAD, 0x57, 0x4D, 0x4F, 0x13, 0x41, 0x18, 0x3E, 0x63, 0xE2,
0x7F, 0x98, 0x6C, 0x24, 0x68, 0x02, 0xAD, 0x1E, 0x25, 0x65, 0x13, 0x22,
0x0A, 0x06, 0xD7, 0x90, 0x16, 0x34, 0x72, 0x31, 0xDB, 0xDD, 0xA1, 0x5D,
@@ -1157,36 +1171,36 @@
CXFA_XMLLocale* CXFA_LocaleMgr::GetLocale(LangID lcid) {
switch (lcid) {
case LangID::k_zh_CN:
- return GetLocaleFromBuffer(m_pHeap, g_zhCN_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_zhCN_Locale);
case LangID::k_zh_TW:
- return GetLocaleFromBuffer(m_pHeap, g_zhTW_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_zhTW_Locale);
case LangID::k_zh_HK:
- return GetLocaleFromBuffer(m_pHeap, g_zhHK_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_zhHK_Locale);
case LangID::k_ja_JP:
- return GetLocaleFromBuffer(m_pHeap, g_jaJP_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_jaJP_Locale);
case LangID::k_ko_KR:
- return GetLocaleFromBuffer(m_pHeap, g_koKR_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_koKR_Locale);
case LangID::k_en_GB:
- return GetLocaleFromBuffer(m_pHeap, g_enGB_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_enGB_Locale);
case LangID::k_es_LA:
- return GetLocaleFromBuffer(m_pHeap, g_esLA_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_esLA_Locale);
case LangID::k_es_ES:
- return GetLocaleFromBuffer(m_pHeap, g_esES_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_esES_Locale);
case LangID::k_de_DE:
- return GetLocaleFromBuffer(m_pHeap, g_deDE_Loacale);
+ return GetLocaleFromBuffer(m_pHeap, k_deDE_Loacale);
case LangID::k_fr_FR:
- return GetLocaleFromBuffer(m_pHeap, g_frFR_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_frFR_Locale);
case LangID::k_it_IT:
- return GetLocaleFromBuffer(m_pHeap, g_itIT_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_itIT_Locale);
case LangID::k_pt_BR:
- return GetLocaleFromBuffer(m_pHeap, g_ptBR_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_ptBR_Locale);
case LangID::k_nl_NL:
- return GetLocaleFromBuffer(m_pHeap, g_nlNL_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_nlNL_Locale);
case LangID::k_ru_RU:
- return GetLocaleFromBuffer(m_pHeap, g_ruRU_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_ruRU_Locale);
case LangID::k_en_US:
default:
- return GetLocaleFromBuffer(m_pHeap, g_enUS_Locale);
+ return GetLocaleFromBuffer(m_pHeap, k_enUS_Locale);
}
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index aa1fbbc..1916098 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -371,7 +371,7 @@
constexpr uint8_t kMaxExecuteRecursion = 2;
-constexpr uint8_t g_inv_base64[128] = {
+constexpr uint8_t kInvBase64[128] = {
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 62, 255,
@@ -384,7 +384,7 @@
};
inline uint8_t GetInvBase64(uint8_t x) {
- return (x & 128) == 0 ? g_inv_base64[x] : 255;
+ return (x & 128) == 0 ? kInvBase64[x] : 255;
}
std::vector<uint8_t, FxAllocAllocator<uint8_t>> XFA_RemoveBase64Whitespace(
@@ -416,21 +416,21 @@
break;
}
if (buffer[i + 2] == '=') {
- dwLimb = ((uint32_t)g_inv_base64[buffer[i]] << 6) |
- ((uint32_t)g_inv_base64[buffer[i + 1]]);
+ dwLimb = ((uint32_t)kInvBase64[buffer[i]] << 6) |
+ ((uint32_t)kInvBase64[buffer[i + 1]]);
result.push_back((uint8_t)(dwLimb >> 4) & 0xFF);
} else {
- dwLimb = ((uint32_t)g_inv_base64[buffer[i]] << 12) |
- ((uint32_t)g_inv_base64[buffer[i + 1]] << 6) |
- ((uint32_t)g_inv_base64[buffer[i + 2]]);
+ dwLimb = ((uint32_t)kInvBase64[buffer[i]] << 12) |
+ ((uint32_t)kInvBase64[buffer[i + 1]] << 6) |
+ ((uint32_t)kInvBase64[buffer[i + 2]]);
result.push_back((uint8_t)(dwLimb >> 10) & 0xFF);
result.push_back((uint8_t)(dwLimb >> 2) & 0xFF);
}
} else {
- dwLimb = ((uint32_t)g_inv_base64[buffer[i]] << 18) |
- ((uint32_t)g_inv_base64[buffer[i + 1]] << 12) |
- ((uint32_t)g_inv_base64[buffer[i + 2]] << 6) |
- ((uint32_t)g_inv_base64[buffer[i + 3]]);
+ dwLimb = ((uint32_t)kInvBase64[buffer[i]] << 18) |
+ ((uint32_t)kInvBase64[buffer[i + 1]] << 12) |
+ ((uint32_t)kInvBase64[buffer[i + 2]] << 6) |
+ ((uint32_t)kInvBase64[buffer[i + 3]]);
result.push_back((uint8_t)(dwLimb >> 16) & 0xff);
result.push_back((uint8_t)(dwLimb >> 8) & 0xff);
result.push_back((uint8_t)(dwLimb)&0xff);
diff --git a/xfa/fxfa/parser/cxfa_nodelocale.cpp b/xfa/fxfa/parser/cxfa_nodelocale.cpp
index 65da971..03c6cbd 100644
--- a/xfa/fxfa/parser/cxfa_nodelocale.cpp
+++ b/xfa/fxfa/parser/cxfa_nodelocale.cpp
@@ -17,23 +17,23 @@
namespace {
-const wchar_t g_FX_Percent[] = L"z,zzz,zzz,zzz,zzz,zzz%";
-const wchar_t g_FX_Currency[] = L"$z,zzz,zzz,zzz,zzz,zz9.99";
-const wchar_t g_FX_Decimal[] = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
-const wchar_t g_FX_Integer[] = L"z,zzz,zzz,zzz,zzz,zzz";
+const wchar_t kFxPercent[] = L"z,zzz,zzz,zzz,zzz,zzz%";
+const wchar_t kFxCurrency[] = L"$z,zzz,zzz,zzz,zzz,zz9.99";
+const wchar_t kFxDecimal[] = L"z,zzz,zzz,zzz,zzz,zz9.zzz";
+const wchar_t kFxInteger[] = L"z,zzz,zzz,zzz,zzz,zzz";
} // namespace
WideString XFA_PatternToString(LocaleIface::NumSubcategory category) {
switch (category) {
case LocaleIface::NumSubcategory::kPercent:
- return g_FX_Percent;
+ return kFxPercent;
case LocaleIface::NumSubcategory::kCurrency:
- return g_FX_Currency;
+ return kFxCurrency;
case LocaleIface::NumSubcategory::kDecimal:
- return g_FX_Decimal;
+ return kFxDecimal;
case LocaleIface::NumSubcategory::kInteger:
- return g_FX_Integer;
+ return kFxInteger;
}
return WideString();
}
diff --git a/xfa/fxfa/parser/xfa_basic_data.cpp b/xfa/fxfa/parser/xfa_basic_data.cpp
index 55a95c2..211a396 100644
--- a/xfa/fxfa/parser/xfa_basic_data.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data.cpp
@@ -53,7 +53,7 @@
const wchar_t* uri;
};
-const PacketRecord g_PacketTable[] = {
+const PacketRecord kPacketTable[] = {
#undef PCKT____
#define PCKT____(a, b, c, d, e, f) \
{XFA_PacketType::c, a, XFA_XDPPACKET_FLAGS_##e | XFA_XDPPACKET_FLAGS_##f, \
@@ -166,16 +166,16 @@
} // namespace
XFA_PACKETINFO XFA_GetPacketByIndex(XFA_PacketType ePacket) {
- const PacketRecord* pRecord = &g_PacketTable[static_cast<uint8_t>(ePacket)];
+ const PacketRecord* pRecord = &kPacketTable[static_cast<uint8_t>(ePacket)];
return {pRecord->name, pRecord->packet_type, pRecord->uri, pRecord->flags};
}
Optional<XFA_PACKETINFO> XFA_GetPacketByName(WideStringView wsName) {
uint32_t hash = FX_HashCode_GetW(wsName);
auto* elem = std::lower_bound(
- std::begin(g_PacketTable), std::end(g_PacketTable), hash,
+ std::begin(kPacketTable), std::end(kPacketTable), hash,
[](const PacketRecord& a, uint32_t hash) { return a.hash < hash; });
- if (elem != std::end(g_PacketTable) && elem->name == wsName)
+ if (elem != std::end(kPacketTable) && elem->name == wsName)
return XFA_GetPacketByIndex(elem->packet_type);
return pdfium::nullopt;
}
