summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/parser/cpdf_syntax_parser.cpp12
-rw-r--r--core/fxcrt/fx_system_unittest.cpp5
2 files changed, 9 insertions, 8 deletions
diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.cpp b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
index 9dccbd936e..ce5a83579d 100644
--- a/core/fpdfapi/parser/cpdf_syntax_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_syntax_parser.cpp
@@ -387,10 +387,10 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObject(
if (bIsNumber) {
CFX_ByteString nextword2 = GetNextWord(nullptr);
if (nextword2 == "R") {
- uint32_t objnum = FXSYS_atoui(word.c_str());
- if (objnum == CPDF_Object::kInvalidObjNum)
+ uint32_t refnum = FXSYS_atoui(word.c_str());
+ if (refnum == CPDF_Object::kInvalidObjNum)
return nullptr;
- return pdfium::MakeUnique<CPDF_Reference>(pObjList, objnum);
+ return pdfium::MakeUnique<CPDF_Reference>(pObjList, refnum);
}
}
m_Pos = SavedPos;
@@ -508,10 +508,10 @@ std::unique_ptr<CPDF_Object> CPDF_SyntaxParser::GetObjectForStrict(
if (bIsNumber) {
CFX_ByteString nextword2 = GetNextWord(nullptr);
if (nextword2 == "R") {
- uint32_t objnum = FXSYS_atoui(word.c_str());
- if (objnum == CPDF_Object::kInvalidObjNum)
+ uint32_t refnum = FXSYS_atoui(word.c_str());
+ if (refnum == CPDF_Object::kInvalidObjNum)
return nullptr;
- return pdfium::MakeUnique<CPDF_Reference>(pObjList, objnum);
+ return pdfium::MakeUnique<CPDF_Reference>(pObjList, refnum);
}
}
m_Pos = SavedPos;
diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index 7747086b1b..da616b4ee6 100644
--- a/core/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp
@@ -184,8 +184,9 @@ TEST(fxcrt, FXSYS_wcsftime) {
for (int year = -2500; year <= 2500; ++year) {
year_time.tm_year = year;
- wchar_t buf[100] = {};
- FXSYS_wcsftime(buf, FX_ArraySize(buf), L"%Y-%m-%dT%H:%M:%S", &year_time);
+ wchar_t year_buf[100] = {};
+ FXSYS_wcsftime(year_buf, FX_ArraySize(year_buf), L"%Y-%m-%dT%H:%M:%S",
+ &year_time);
}
// Ensure wcsftime handles bad years, etc. without crashing.