Fix nits involving 'constexpr const' code.
- Mark constants not in anonymous namespaces as static.
- Rename constants to kFoo.
- Remove constexpr or const if having both is redundant.
- Change one unsigned long variable to size_t.
Change-Id: Id1fb2f2d56ec659622123546b8c709f9df3f8caf
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/52873
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index cb18a1c..584abb0 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -716,20 +716,20 @@
}
TEST(PDFArrayTest, AddStringAndName) {
- static constexpr const char* vals[] = {
+ static constexpr const char* kVals[] = {
"", "a", "ehjhRIOYTTFdfcdnv", "122323",
"$#%^&**", " ", "This is a test.\r\n"};
auto string_array = pdfium::MakeRetain<CPDF_Array>();
auto name_array = pdfium::MakeRetain<CPDF_Array>();
- for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
- string_array->AddNew<CPDF_String>(vals[i], false);
- name_array->AddNew<CPDF_Name>(vals[i]);
+ for (const char* val : kVals) {
+ string_array->AddNew<CPDF_String>(val, false);
+ name_array->AddNew<CPDF_Name>(val);
}
- for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
+ for (size_t i = 0; i < FX_ArraySize(kVals); ++i) {
EXPECT_EQ(CPDF_Object::kString, string_array->GetObjectAt(i)->GetType());
- EXPECT_STREQ(vals[i], string_array->GetObjectAt(i)->GetString().c_str());
+ EXPECT_STREQ(kVals[i], string_array->GetObjectAt(i)->GetString().c_str());
EXPECT_EQ(CPDF_Object::kName, name_array->GetObjectAt(i)->GetType());
- EXPECT_STREQ(vals[i], name_array->GetObjectAt(i)->GetString().c_str());
+ EXPECT_STREQ(kVals[i], name_array->GetObjectAt(i)->GetString().c_str());
}
}
diff --git a/core/fpdfdoc/cpdf_aaction.cpp b/core/fpdfdoc/cpdf_aaction.cpp
index 633161e..8284913 100644
--- a/core/fpdfdoc/cpdf_aaction.cpp
+++ b/core/fpdfdoc/cpdf_aaction.cpp
@@ -10,7 +10,7 @@
namespace {
-constexpr const char* g_sAATypes[] = {
+constexpr const char* kAATypes[] = {
"E", // kCursorEnter
"X", // kCursorExit
"D", // kButtonDown
@@ -34,10 +34,10 @@
"DP", // kDocumentPrinted
};
-// |g_sAATypes| should have one less element than enum AActionType due to
-// kDocumentOpen, which is an artificial type.
-static_assert(FX_ArraySize(g_sAATypes) == CPDF_AAction::kNumberOfActions - 1,
- "g_sAATypes count mismatch");
+// |kAATypes| should have one less element than enum AActionType due to
+// |kDocumentOpen|, which is an artificial type.
+static_assert(FX_ArraySize(kAATypes) == CPDF_AAction::kNumberOfActions - 1,
+ "kAATypes count mismatch");
} // namespace
@@ -48,12 +48,11 @@
CPDF_AAction::~CPDF_AAction() = default;
bool CPDF_AAction::ActionExist(AActionType eType) const {
- return m_pDict && m_pDict->KeyExist(g_sAATypes[eType]);
+ return m_pDict && m_pDict->KeyExist(kAATypes[eType]);
}
CPDF_Action CPDF_AAction::GetAction(AActionType eType) const {
- return CPDF_Action(m_pDict ? m_pDict->GetDictFor(g_sAATypes[eType])
- : nullptr);
+ return CPDF_Action(m_pDict ? m_pDict->GetDictFor(kAATypes[eType]) : nullptr);
}
// static
diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp
index 41c5405..70d6d5e 100644
--- a/core/fpdfdoc/cpdf_filespec.cpp
+++ b/core/fpdfdoc/cpdf_filespec.cpp
@@ -138,7 +138,7 @@
// List of keys to check for the file specification string.
// Follows the same precedence order as GetFileName().
- constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"};
+ static constexpr const char* kKeys[] = {"UF", "F", "DOS", "Mac", "Unix"};
size_t end = pDict->GetStringFor("FS") == "URL" ? 2 : FX_ArraySize(kKeys);
for (size_t i = 0; i < end; ++i) {
ByteString key = kKeys[i];
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index 0ebd6fb..0028119 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -756,11 +756,12 @@
if (appearanceMode < 0 || appearanceMode >= FPDF_ANNOT_APPEARANCEMODE_COUNT)
return false;
- constexpr const char* modeKeyForMode[] = {"N", "R", "D"};
- static_assert(FX_ArraySize(modeKeyForMode) == FPDF_ANNOT_APPEARANCEMODE_COUNT,
- "length of modeKeyForMode should be equal to "
- "FPDF_ANNOT_APPEARANCEMODE_COUNT");
- const char* modeKey = modeKeyForMode[appearanceMode];
+ static constexpr const char* kModeKeyForMode[] = {"N", "R", "D"};
+ static_assert(
+ FX_ArraySize(kModeKeyForMode) == FPDF_ANNOT_APPEARANCEMODE_COUNT,
+ "length of kModeKeyForMode should be equal to "
+ "FPDF_ANNOT_APPEARANCEMODE_COUNT");
+ const char* modeKey = kModeKeyForMode[appearanceMode];
CPDF_Dictionary* pApDict = pAnnotDict->GetDictFor(pdfium::annotation::kAP);
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index ccea1a1..559e46d 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -2016,7 +2016,7 @@
TEST_F(FPDFEditEmbedderTest, LoadStandardFonts) {
CreateNewDocument();
- static constexpr const char* standard_font_names[] = {
+ static constexpr const char* kStandardFontNames[] = {
"Arial",
"Arial-Bold",
"Arial-BoldItalic",
@@ -2039,16 +2039,16 @@
"TimesNewRoman-BoldItalic",
"TimesNewRoman-Italic",
"ZapfDingbats"};
- for (const char* font_name : standard_font_names) {
+ for (const char* font_name : kStandardFontNames) {
FPDF_FONT font = FPDFText_LoadStandardFont(document(), font_name);
EXPECT_TRUE(font) << font_name << " should be considered a standard font.";
}
- static constexpr const char* not_standard_font_names[] = {
+ static constexpr const char* kNotStandardFontNames[] = {
"Abcdefg", "ArialB", "Arial-Style",
"Font Name", "FontArial", "NotAStandardFontName",
"TestFontName", "Quack", "Symbol-Italic",
"Zapf"};
- for (const char* font_name : not_standard_font_names) {
+ for (const char* font_name : kNotStandardFontNames) {
FPDF_FONT font = FPDFText_LoadStandardFont(document(), font_name);
EXPECT_FALSE(font) << font_name
<< " should not be considered a standard font.";
@@ -2626,7 +2626,7 @@
// - int "IntKey" : 42
// - string "StringKey": "StringValue"
// - blob "BlobKey": "\x01\x02\x03\0BlobValue1\0\0\0BlobValue2\0"
- constexpr const size_t kBlobLen = 28;
+ constexpr size_t kBlobLen = 28;
char block_value[kBlobLen];
memcpy(block_value, "\x01\x02\x03\0BlobValue1\0\0\0BlobValue2\0", kBlobLen);
EXPECT_EQ(0, FPDFPageObjMark_CountParams(mark));
diff --git a/fpdfsdk/fpdf_ppo_embeddertest.cpp b/fpdfsdk/fpdf_ppo_embeddertest.cpp
index 8b36045..8072d86 100644
--- a/fpdfsdk/fpdf_ppo_embeddertest.cpp
+++ b/fpdfsdk/fpdf_ppo_embeddertest.cpp
@@ -103,7 +103,7 @@
TEST_F(FPDFPPOEmbedderTest, NupRenderImage) {
ASSERT_TRUE(OpenDocument("rectangles_multi_pages.pdf"));
const int kPageCount = 2;
- constexpr const char* kExpectedMD5s[kPageCount] = {
+ static constexpr const char* kExpectedMD5s[kPageCount] = {
"4d225b961da0f1bced7c83273e64c9b6", "fb18142190d770cfbc329d2b071aee4d"};
ScopedFPDFDocument output_doc_3up(
FPDF_ImportNPagesToOne(document(), 792, 612, 3, 1));
diff --git a/samples/pdfium_test_dump_helper.cc b/samples/pdfium_test_dump_helper.cc
index 46e4b27..047a670 100644
--- a/samples/pdfium_test_dump_helper.cc
+++ b/samples/pdfium_test_dump_helper.cc
@@ -101,10 +101,10 @@
}
void DumpMetaData(FPDF_DOCUMENT doc) {
- constexpr const char* meta_tags[] = {"Title", "Author", "Subject",
- "Keywords", "Creator", "Producer",
- "CreationDate", "ModDate"};
- for (const char* meta_tag : meta_tags) {
+ static constexpr const char* kMetaTags[] = {
+ "Title", "Author", "Subject", "Keywords",
+ "Creator", "Producer", "CreationDate", "ModDate"};
+ for (const char* meta_tag : kMetaTags) {
char meta_buffer[4096];
unsigned long len =
FPDF_GetMetaText(doc, meta_tag, meta_buffer, sizeof(meta_buffer));
diff --git a/xfa/fgas/font/cfx_fontsourceenum_file.cpp b/xfa/fgas/font/cfx_fontsourceenum_file.cpp
index f9eafb3..83283ec 100644
--- a/xfa/fgas/font/cfx_fontsourceenum_file.cpp
+++ b/xfa/fgas/font/cfx_fontsourceenum_file.cpp
@@ -14,10 +14,12 @@
constexpr char kFolderSeparator = '/';
-constexpr const char* g_FontFolders[] = {
+constexpr const char* kFontFolders[] = {
#if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_
- "/usr/share/fonts", "/usr/share/X11/fonts/Type1",
- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",
+ "/usr/share/fonts",
+ "/usr/share/X11/fonts/Type1",
+ "/usr/share/X11/fonts/TTF",
+ "/usr/local/share/fonts",
#elif defined(OS_MACOSX)
"~/Library/Fonts",
"/Library/Fonts",
@@ -30,7 +32,7 @@
} // namespace
CFX_FontSourceEnum_File::CFX_FontSourceEnum_File()
- : m_FolderPaths(std::begin(g_FontFolders), std::end(g_FontFolders)) {}
+ : m_FolderPaths(std::begin(kFontFolders), std::end(kFontFolders)) {}
CFX_FontSourceEnum_File::~CFX_FontSourceEnum_File() = default;
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp
index 541d317..ab03c9f 100644
--- a/xfa/fxfa/parser/cxfa_document.cpp
+++ b/xfa/fxfa/parser/cxfa_document.cpp
@@ -49,8 +49,7 @@
namespace {
-constexpr const wchar_t kTemplateNS[] =
- L"http://www.xfa.org/schema/xfa-template/";
+const wchar_t kTemplateNS[] = L"http://www.xfa.org/schema/xfa-template/";
struct RecurseRecord {
CXFA_Node* pTemplateChild;
diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp
index 9f921e4..ea986d2 100644
--- a/xfa/fxfa/parser/cxfa_document_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_document_parser.cpp
@@ -656,10 +656,10 @@
CFX_XMLNode* pXMLDoc,
XFA_PacketType ePacketID,
bool bUseAttribute) {
- constexpr const unsigned long kMaxExecuteRecursion = 1000;
+ constexpr size_t kMaxExecuteRecursion = 1000;
if (m_ExecuteRecursionDepth > kMaxExecuteRecursion)
return nullptr;
- AutoRestorer<unsigned long> restorer(&m_ExecuteRecursionDepth);
+ AutoRestorer<size_t> restorer(&m_ExecuteRecursionDepth);
++m_ExecuteRecursionDepth;
bool bOneOfPropertyFound = false;
diff --git a/xfa/fxfa/parser/cxfa_document_parser.h b/xfa/fxfa/parser/cxfa_document_parser.h
index ad8d56c..a494b4f 100644
--- a/xfa/fxfa/parser/cxfa_document_parser.h
+++ b/xfa/fxfa/parser/cxfa_document_parser.h
@@ -76,7 +76,7 @@
std::unique_ptr<CFX_XMLDocument> xml_doc_;
// TODO(dsinclair): Figure out who owns this.
CXFA_Node* m_pRootNode = nullptr;
- unsigned long m_ExecuteRecursionDepth = 0;
+ size_t m_ExecuteRecursionDepth = 0;
};
#endif // XFA_FXFA_PARSER_CXFA_DOCUMENT_PARSER_H_
diff --git a/xfa/fxfa/parser/xfa_utils.cpp b/xfa/fxfa/parser/xfa_utils.cpp
index 15fbd6f..4ce9b23 100644
--- a/xfa/fxfa/parser/xfa_utils.cpp
+++ b/xfa/fxfa/parser/xfa_utils.cpp
@@ -30,7 +30,7 @@
namespace {
-constexpr const char kFormNS[] = "http://www.xfa.org/schema/xfa-form/";
+const char kFormNS[] = "http://www.xfa.org/schema/xfa-form/";
WideString ExportEncodeAttribute(const WideString& str) {
CFX_WideTextBuf textBuf;
