commit 4d0aaaa07e07f6dd12bdf6466ef401aa375a13c2
author Lei Zhang <thestig@chromium.org> Tue Nov 28 02:11:33 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 28 02:11:33 2023 +0000
tree 08d3fb5f15b4ccacad14beeb676c9897205ac06e
parent d1debc7735c5e84c1f750dd3b94edcaa031291ba

Consistently name variables in CPDF_Document::InsertDeletePDFPage()

Use Google C++ style for all variable names.

Change-Id: If3a18a40225629f19faad2b73ee4f2dc57b85a94
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/113990
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>

core/fpdfapi/parser/cpdf_document.cpp

diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index 9728ea3..e12b7af 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -457,23 +457,24 @@
 }
 
 bool CPDF_Document::InsertDeletePDFPage(
-    RetainPtr<CPDF_Dictionary> pPages,
-    int nPagesToGo,
-    RetainPtr<CPDF_Dictionary> pPageDict,
-    bool bInsert,
-    std::set<RetainPtr<CPDF_Dictionary>>* pVisited) {
-  RetainPtr<CPDF_Array> pKidList = pPages->GetMutableArrayFor("Kids");
-  if (!pKidList)
+    RetainPtr<CPDF_Dictionary> pages_dict,
+    int pages_to_go,
+    RetainPtr<CPDF_Dictionary> page_dict,
+    bool is_insert,
+    std::set<RetainPtr<CPDF_Dictionary>>* visited) {
+  RetainPtr<CPDF_Array> kids_list = pages_dict->GetMutableArrayFor("Kids");
+  if (!kids_list) {
     return false;
+  }
 
-  for (size_t i = 0; i < pKidList->size(); i++) {
+  for (size_t i = 0; i < kids_list->size(); i++) {
     enum class NodeType : bool {
       kBranch,  // /Type /Pages, AKA page tree node.
       kLeaf,    // /Type /Page, AKA page object.
     };
 
-    RetainPtr<CPDF_Dictionary> pKid = pKidList->GetMutableDictAt(i);
-    const ByteString kid_type_value = pKid->GetNameFor("Type");
+    RetainPtr<CPDF_Dictionary> kid_dict = kids_list->GetMutableDictAt(i);
+    const ByteString kid_type_value = kid_dict->GetNameFor("Type");
     NodeType kid_type;
     if (kid_type_value == "Pages") {
       kid_type = NodeType::kBranch;
@@ -483,45 +484,46 @@
       // Even though /Type is required for page tree nodes and page objects,
       // PDFs may not have them or have the wrong type. Tolerate these errors
       // and guess the type. Then fix the in-memory representation.
-      const bool has_kids = pKid->KeyExist("Kids");
+      const bool has_kids = kid_dict->KeyExist("Kids");
       kid_type = has_kids ? NodeType::kBranch : NodeType::kLeaf;
-      pKid->SetNewFor<CPDF_Name>("Type", has_kids ? "Pages" : "Page");
+      kid_dict->SetNewFor<CPDF_Name>("Type", has_kids ? "Pages" : "Page");
     }
 
     if (kid_type == NodeType::kLeaf) {
-      if (nPagesToGo != 0) {
-        nPagesToGo--;
+      if (pages_to_go != 0) {
+        pages_to_go--;
         continue;
       }
-      if (bInsert) {
-        pKidList->InsertNewAt<CPDF_Reference>(i, this, pPageDict->GetObjNum());
-        pPageDict->SetNewFor<CPDF_Reference>("Parent", this,
-                                             pPages->GetObjNum());
+      if (is_insert) {
+        kids_list->InsertNewAt<CPDF_Reference>(i, this, page_dict->GetObjNum());
+        page_dict->SetNewFor<CPDF_Reference>("Parent", this,
+                                             pages_dict->GetObjNum());
       } else {
-        pKidList->RemoveAt(i);
+        kids_list->RemoveAt(i);
       }
-      pPages->SetNewFor<CPDF_Number>(
-          "Count", pPages->GetIntegerFor("Count") + (bInsert ? 1 : -1));
+      pages_dict->SetNewFor<CPDF_Number>(
+          "Count", pages_dict->GetIntegerFor("Count") + (is_insert ? 1 : -1));
       ResetTraversal();
       break;
     }
 
     CHECK_EQ(kid_type, NodeType::kBranch);
-    int nPages = pKid->GetIntegerFor("Count");
-    if (nPagesToGo >= nPages) {
-      nPagesToGo -= nPages;
+    int page_count = kid_dict->GetIntegerFor("Count");
+    if (pages_to_go >= page_count) {
+      pages_to_go -= page_count;
       continue;
     }
-    if (pdfium::Contains(*pVisited, pKid))
-      return false;
-
-    ScopedSetInsertion<RetainPtr<CPDF_Dictionary>> insertion(pVisited, pKid);
-    if (!InsertDeletePDFPage(std::move(pKid), nPagesToGo, pPageDict, bInsert,
-                             pVisited)) {
+    if (pdfium::Contains(*visited, kid_dict)) {
       return false;
     }
-    pPages->SetNewFor<CPDF_Number>(
-        "Count", pPages->GetIntegerFor("Count") + (bInsert ? 1 : -1));
+
+    ScopedSetInsertion<RetainPtr<CPDF_Dictionary>> insertion(visited, kid_dict);
+    if (!InsertDeletePDFPage(std::move(kid_dict), pages_to_go, page_dict,
+                             is_insert, visited)) {
+      return false;
+    }
+    pages_dict->SetNewFor<CPDF_Number>(
+        "Count", pages_dict->GetIntegerFor("Count") + (is_insert ? 1 : -1));
     break;
   }
   return true;

core/fpdfapi/parser/cpdf_document.h

diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h
index 554831a..1c95d0e 100644
--- a/core/fpdfapi/parser/cpdf_document.h
+++ b/core/fpdfapi/parser/cpdf_document.h
@@ -183,11 +183,11 @@
   RetainPtr<const CPDF_Dictionary> GetPagesDict() const;
   RetainPtr<CPDF_Dictionary> GetMutablePagesDict();
 
-  bool InsertDeletePDFPage(RetainPtr<CPDF_Dictionary> pPages,
-                           int nPagesToGo,
-                           RetainPtr<CPDF_Dictionary> pPageDict,
-                           bool bInsert,
-                           std::set<RetainPtr<CPDF_Dictionary>>* pVisited);
+  bool InsertDeletePDFPage(RetainPtr<CPDF_Dictionary> pages_dict,
+                           int pages_to_go,
+                           RetainPtr<CPDF_Dictionary> page_dict,
+                           bool is_insert,
+                           std::set<RetainPtr<CPDF_Dictionary>>* visited);
 
   bool InsertNewPage(int iPage, RetainPtr<CPDF_Dictionary> pPageDict);
   void ResetTraversal();