Fix variable name mismatches in CPDF_Array. Many CPDF_Array methods have a parameter named |index| in the declaration, but |i| in the implementation. Change-Id: Icd1229f1d0a0639e0f1df96c2a37bd8cdcc5caf6 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60651 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp index 076e666..1c51341 100644 --- a/core/fpdfapi/parser/cpdf_array.cpp +++ b/core/fpdfapi/parser/cpdf_array.cpp
@@ -87,56 +87,56 @@ GetNumberAt(3), GetNumberAt(4), GetNumberAt(5)); } -CPDF_Object* CPDF_Array::GetObjectAt(size_t i) { - if (i >= m_Objects.size()) +CPDF_Object* CPDF_Array::GetObjectAt(size_t index) { + if (index >= m_Objects.size()) return nullptr; - return m_Objects[i].Get(); + return m_Objects[index].Get(); } -const CPDF_Object* CPDF_Array::GetObjectAt(size_t i) const { - if (i >= m_Objects.size()) +const CPDF_Object* CPDF_Array::GetObjectAt(size_t index) const { + if (index >= m_Objects.size()) return nullptr; - return m_Objects[i].Get(); + return m_Objects[index].Get(); } -CPDF_Object* CPDF_Array::GetDirectObjectAt(size_t i) { - if (i >= m_Objects.size()) +CPDF_Object* CPDF_Array::GetDirectObjectAt(size_t index) { + if (index >= m_Objects.size()) return nullptr; - return m_Objects[i]->GetDirect(); + return m_Objects[index]->GetDirect(); } -const CPDF_Object* CPDF_Array::GetDirectObjectAt(size_t i) const { - if (i >= m_Objects.size()) +const CPDF_Object* CPDF_Array::GetDirectObjectAt(size_t index) const { + if (index >= m_Objects.size()) return nullptr; - return m_Objects[i]->GetDirect(); + return m_Objects[index]->GetDirect(); } -ByteString CPDF_Array::GetStringAt(size_t i) const { - if (i >= m_Objects.size()) +ByteString CPDF_Array::GetStringAt(size_t index) const { + if (index >= m_Objects.size()) return ByteString(); - return m_Objects[i]->GetString(); + return m_Objects[index]->GetString(); } -WideString CPDF_Array::GetUnicodeTextAt(size_t i) const { - if (i >= m_Objects.size()) +WideString CPDF_Array::GetUnicodeTextAt(size_t index) const { + if (index >= m_Objects.size()) return WideString(); - return m_Objects[i]->GetUnicodeText(); + return m_Objects[index]->GetUnicodeText(); } -int CPDF_Array::GetIntegerAt(size_t i) const { - if (i >= m_Objects.size()) +int CPDF_Array::GetIntegerAt(size_t index) const { + if (index >= m_Objects.size()) return 0; - return m_Objects[i]->GetInteger(); + return m_Objects[index]->GetInteger(); } -float CPDF_Array::GetNumberAt(size_t i) const { - if (i >= m_Objects.size()) +float CPDF_Array::GetNumberAt(size_t index) const { + if (index >= m_Objects.size()) return 0; - return m_Objects[i]->GetNumber(); + return m_Objects[index]->GetNumber(); } -CPDF_Dictionary* CPDF_Array::GetDictAt(size_t i) { - CPDF_Object* p = GetDirectObjectAt(i); +CPDF_Dictionary* CPDF_Array::GetDictAt(size_t index) { + CPDF_Object* p = GetDirectObjectAt(index); if (!p) return nullptr; if (CPDF_Dictionary* pDict = p->AsDictionary()) @@ -146,8 +146,8 @@ return nullptr; } -const CPDF_Dictionary* CPDF_Array::GetDictAt(size_t i) const { - const CPDF_Object* p = GetDirectObjectAt(i); +const CPDF_Dictionary* CPDF_Array::GetDictAt(size_t index) const { + const CPDF_Object* p = GetDirectObjectAt(index); if (!p) return nullptr; if (const CPDF_Dictionary* pDict = p->AsDictionary()) @@ -157,20 +157,20 @@ return nullptr; } -CPDF_Stream* CPDF_Array::GetStreamAt(size_t i) { - return ToStream(GetDirectObjectAt(i)); +CPDF_Stream* CPDF_Array::GetStreamAt(size_t index) { + return ToStream(GetDirectObjectAt(index)); } -const CPDF_Stream* CPDF_Array::GetStreamAt(size_t i) const { - return ToStream(GetDirectObjectAt(i)); +const CPDF_Stream* CPDF_Array::GetStreamAt(size_t index) const { + return ToStream(GetDirectObjectAt(index)); } -CPDF_Array* CPDF_Array::GetArrayAt(size_t i) { - return ToArray(GetDirectObjectAt(i)); +CPDF_Array* CPDF_Array::GetArrayAt(size_t index) { + return ToArray(GetDirectObjectAt(index)); } -const CPDF_Array* CPDF_Array::GetArrayAt(size_t i) const { - return ToArray(GetDirectObjectAt(i)); +const CPDF_Array* CPDF_Array::GetArrayAt(size_t index) const { + return ToArray(GetDirectObjectAt(index)); } void CPDF_Array::Clear() { @@ -178,35 +178,35 @@ m_Objects.clear(); } -void CPDF_Array::RemoveAt(size_t i) { +void CPDF_Array::RemoveAt(size_t index) { CHECK(!IsLocked()); - if (i < m_Objects.size()) - m_Objects.erase(m_Objects.begin() + i); + if (index < m_Objects.size()) + m_Objects.erase(m_Objects.begin() + index); } -void CPDF_Array::ConvertToIndirectObjectAt(size_t i, +void CPDF_Array::ConvertToIndirectObjectAt(size_t index, CPDF_IndirectObjectHolder* pHolder) { CHECK(!IsLocked()); - if (i >= m_Objects.size()) + if (index >= m_Objects.size()) return; - if (!m_Objects[i] || m_Objects[i]->IsReference()) + if (!m_Objects[index] || m_Objects[index]->IsReference()) return; - CPDF_Object* pNew = pHolder->AddIndirectObject(std::move(m_Objects[i])); - m_Objects[i] = pNew->MakeReference(pHolder); + CPDF_Object* pNew = pHolder->AddIndirectObject(std::move(m_Objects[index])); + m_Objects[index] = pNew->MakeReference(pHolder); } -CPDF_Object* CPDF_Array::SetAt(size_t i, RetainPtr<CPDF_Object> pObj) { +CPDF_Object* CPDF_Array::SetAt(size_t index, RetainPtr<CPDF_Object> pObj) { CHECK(!IsLocked()); ASSERT(IsArray()); ASSERT(!pObj || pObj->IsInline()); - if (i >= m_Objects.size()) { + if (index >= m_Objects.size()) { NOTREACHED(); return nullptr; } CPDF_Object* pRet = pObj.Get(); - m_Objects[i] = std::move(pObj); + m_Objects[index] = std::move(pObj); return pRet; }