commit 29b9bb023e3b12e208d8babf4ae2df28bfa6d2b1
author Lei Zhang <thestig@chromium.org> Thu May 23 18:04:33 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 23 18:04:33 2024 +0000
tree 36aa09ab40e3e622794b7174dcd0bcdd616b43eb
parent 151ec02bc547f4d0a52a2386b12e0bb17e89dd4d

Rename CPDF_String variables

- Follow Google C++ style guide.
- Clarify what "m_bHex" does.

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

core/fpdfapi/parser/cpdf_string.cpp

diff --git a/core/fpdfapi/parser/cpdf_string.cpp b/core/fpdfapi/parser/cpdf_string.cpp
index ab56541..8bdba04 100644
--- a/core/fpdfapi/parser/cpdf_string.cpp
+++ b/core/fpdfapi/parser/cpdf_string.cpp
@@ -17,24 +17,24 @@
 
 CPDF_String::CPDF_String() = default;
 
-CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pPool,
+CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pool,
                          pdfium::span<const uint8_t> data,
                          DataType is_hex)
-    : m_String(ByteStringView(data)), m_bHex(true) {
-  if (pPool) {
-    m_String = pPool->Intern(m_String);
+    : data_(ByteStringView(data)), output_is_hex_(true) {
+  if (pool) {
+    data_ = pool->Intern(data_);
   }
 }
 
-CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pPool, const ByteString& str)
-    : m_String(str) {
-  if (pPool) {
-    m_String = pPool->Intern(m_String);
+CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pool, const ByteString& str)
+    : data_(str) {
+  if (pool) {
+    data_ = pool->Intern(data_);
   }
 }
 
-CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pPool, WideStringView str)
-    : CPDF_String(pPool, PDF_EncodeText(str)) {
+CPDF_String::CPDF_String(WeakPtr<ByteStringPool> pool, WideStringView str)
+    : CPDF_String(pool, PDF_EncodeText(str)) {
   // Delegates to ctor above.
 }
 
@@ -45,18 +45,18 @@
 }
 
 RetainPtr<CPDF_Object> CPDF_String::Clone() const {
-  auto pRet = pdfium::MakeRetain<CPDF_String>();
-  pRet->m_String = m_String;
-  pRet->m_bHex = m_bHex;
-  return pRet;
+  auto clone = pdfium::MakeRetain<CPDF_String>();
+  clone->data_ = data_;
+  clone->output_is_hex_ = output_is_hex_;
+  return clone;
 }
 
 ByteString CPDF_String::GetString() const {
-  return m_String;
+  return data_;
 }
 
 void CPDF_String::SetString(const ByteString& str) {
-  m_String = str;
+  data_ = str;
 }
 
 CPDF_String* CPDF_String::AsMutableString() {
@@ -64,24 +64,24 @@
 }
 
 WideString CPDF_String::GetUnicodeText() const {
-  return PDF_DecodeText(m_String.unsigned_span());
+  return PDF_DecodeText(data_.unsigned_span());
 }
 
 bool CPDF_String::WriteTo(IFX_ArchiveStream* archive,
                           const CPDF_Encryptor* encryptor) const {
   DataVector<uint8_t> encrypted_data;
-  pdfium::span<const uint8_t> data = m_String.unsigned_span();
+  pdfium::span<const uint8_t> data = data_.unsigned_span();
   if (encryptor) {
     encrypted_data = encryptor->Encrypt(data);
     data = encrypted_data;
   }
   ByteStringView raw(data);
   ByteString content =
-      m_bHex ? PDF_HexEncodeString(raw) : PDF_EncodeString(raw);
+      output_is_hex_ ? PDF_HexEncodeString(raw) : PDF_EncodeString(raw);
   return archive->WriteString(content.AsStringView());
 }
 
 ByteString CPDF_String::EncodeString() const {
-  return m_bHex ? PDF_HexEncodeString(m_String.AsStringView())
-                : PDF_EncodeString(m_String.AsStringView());
+  return output_is_hex_ ? PDF_HexEncodeString(data_.AsStringView())
+                        : PDF_EncodeString(data_.AsStringView());
 }

core/fpdfapi/parser/cpdf_string.h

diff --git a/core/fpdfapi/parser/cpdf_string.h b/core/fpdfapi/parser/cpdf_string.h
index aa6af77..407629b 100644
--- a/core/fpdfapi/parser/cpdf_string.h
+++ b/core/fpdfapi/parser/cpdf_string.h
@@ -31,20 +31,20 @@
   bool WriteTo(IFX_ArchiveStream* archive,
                const CPDF_Encryptor* encryptor) const override;
 
-  bool IsHex() const { return m_bHex; }
+  bool IsHex() const { return output_is_hex_; }
   ByteString EncodeString() const;
 
  private:
   CPDF_String();
-  CPDF_String(WeakPtr<ByteStringPool> pPool,
+  CPDF_String(WeakPtr<ByteStringPool> pool,
               pdfium::span<const uint8_t> data,
               DataType is_hex);
-  CPDF_String(WeakPtr<ByteStringPool> pPool, const ByteString& str);
-  CPDF_String(WeakPtr<ByteStringPool> pPool, WideStringView str);
+  CPDF_String(WeakPtr<ByteStringPool> pool, const ByteString& str);
+  CPDF_String(WeakPtr<ByteStringPool> pool, WideStringView str);
   ~CPDF_String() override;
 
-  ByteString m_String;
-  bool m_bHex = false;
+  ByteString data_;
+  bool output_is_hex_ = false;
 };
 
 inline CPDF_String* ToString(CPDF_Object* obj) {