commit d58ff63d18c334a6f2351f2e8bc4c0e93b426a0e
author Lei Zhang <thestig@chromium.org> Fri Jul 12 16:50:04 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jul 12 16:50:04 2019 +0000
tree a069521193fc0219aee553ccd60c9c5bb8aecca2
parent 2420af4d84b1390dca3fe044d90fbb22fb307a92

Use more Google-style C++ variable names in RenderPdf().

Be more consistent with variable naming. Also give some variables
smaller scopes, and fix some nits too.

Change-Id: I6484a4502dd0de45ed0057292e900314a8ed542d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/57691
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

samples/pdfium_test.cc

diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index 0fd7327..442ad34 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -729,11 +729,11 @@
 }
 
 void RenderPdf(const std::string& name,
-               const char* pBuf,
+               const char* buf,
                size_t len,
                const Options& options,
                const std::string& events) {
-  TestLoader loader({pBuf, len});
+  TestLoader loader({buf, len});
 
   FPDF_FILEACCESS file_access = {};
   file_access.m_FileLen = static_cast<unsigned long>(len);
@@ -748,32 +748,32 @@
   hints.version = 1;
   hints.AddSegment = Add_Segment;
 
-  // The pdf_avail must outlive doc.
+  // |pdf_avail| must outlive |doc|.
   ScopedFPDFAvail pdf_avail(FPDFAvail_Create(&file_avail, &file_access));
 
-  // The document must outlive |form_callbacks.loaded_pages|.
+  // |doc| must outlive |form_callbacks.loaded_pages|.
   ScopedFPDFDocument doc;
 
-  int nRet = PDF_DATA_NOTAVAIL;
-  bool bIsLinearized = false;
+  bool is_linearized = false;
   if (FPDFAvail_IsLinearized(pdf_avail.get()) == PDF_LINEARIZED) {
+    int avail_status = PDF_DATA_NOTAVAIL;
     doc.reset(FPDFAvail_GetDocument(pdf_avail.get(), nullptr));
     if (doc) {
-      while (nRet == PDF_DATA_NOTAVAIL)
-        nRet = FPDFAvail_IsDocAvail(pdf_avail.get(), &hints);
+      while (avail_status == PDF_DATA_NOTAVAIL)
+        avail_status = FPDFAvail_IsDocAvail(pdf_avail.get(), &hints);
 
-      if (nRet == PDF_DATA_ERROR) {
+      if (avail_status == PDF_DATA_ERROR) {
         fprintf(stderr, "Unknown error in checking if doc was available.\n");
         return;
       }
-      nRet = FPDFAvail_IsFormAvail(pdf_avail.get(), &hints);
-      if (nRet == PDF_FORM_ERROR || nRet == PDF_FORM_NOTAVAIL) {
+      avail_status = FPDFAvail_IsFormAvail(pdf_avail.get(), &hints);
+      if (avail_status == PDF_FORM_ERROR || avail_status == PDF_FORM_NOTAVAIL) {
         fprintf(stderr,
                 "Error %d was returned in checking if form was available.\n",
-                nRet);
+                avail_status);
         return;
       }
-      bIsLinearized = true;
+      is_linearized = true;
     }
   } else {
     doc.reset(FPDF_LoadCustomDocument(&file_access, nullptr));
@@ -854,12 +854,12 @@
   int first_page = options.pages ? options.first_page : 0;
   int last_page = options.pages ? options.last_page + 1 : page_count;
   for (int i = first_page; i < last_page; ++i) {
-    if (bIsLinearized) {
-      nRet = PDF_DATA_NOTAVAIL;
-      while (nRet == PDF_DATA_NOTAVAIL)
-        nRet = FPDFAvail_IsPageAvail(pdf_avail.get(), i, &hints);
+    if (is_linearized) {
+      int avail_status = PDF_DATA_NOTAVAIL;
+      while (avail_status == PDF_DATA_NOTAVAIL)
+        avail_status = FPDFAvail_IsPageAvail(pdf_avail.get(), i, &hints);
 
-      if (nRet == PDF_DATA_ERROR) {
+      if (avail_status == PDF_DATA_ERROR) {
         fprintf(stderr, "Unknown error in checking if page %d is available.\n",
                 i);
         return;