From 6fc982b71a31fd70581f826bff5df6333d094797 Mon Sep 17 00:00:00 2001
From: m-holger <m-holger@kubitscheck.org>
Date: Tue, 30 Aug 2022 06:42:46 +0100
Subject: Move QPDFObjectHandle::setObjectDescriptionFromInput to QPDFParser

Part of #729
---
 libqpdf/QPDFObjectHandle.cc | 14 --------------
 libqpdf/QPDFParser.cc       | 29 +++++++++++++++--------------
 libqpdf/qpdf/QPDFParser.hh  |  3 ++-
 3 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'libqpdf')

diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 377a1cbb..1f6d96e0 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -273,20 +273,6 @@ QPDFObjectHandle::releaseResolved()
     }
 }
 
-void
-QPDFObjectHandle::setObjectDescriptionFromInput(
-    QPDFObjectHandle object,
-    QPDF* context,
-    std::string const& description,
-    std::shared_ptr<InputSource> input,
-    qpdf_offset_t offset)
-{
-    object.setObjectDescription(
-        context,
-        (input->getName() + ", " + description + " at offset " +
-         QUtil::int_to_string(offset)));
-}
-
 QPDFObject::object_type_e
 QPDFObjectHandle::getTypeCode()
 {
diff --git a/libqpdf/QPDFParser.cc b/libqpdf/QPDFParser.cc
index 9ced53e9..64adb449 100644
--- a/libqpdf/QPDFParser.cc
+++ b/libqpdf/QPDFParser.cc
@@ -263,12 +263,7 @@ QPDFParser::parse(bool& empty, bool content_stream)
 
         case st_dictionary:
         case st_array:
-            QPDFObjectHandle::setObjectDescriptionFromInput(
-                object,
-                context,
-                object_description,
-                input,
-                input->getLastOffset());
+            setDescriptionFromInput(object, input->getLastOffset());
             object.setParsedOffset(input->getLastOffset());
             set_offset = true;
             olist.append(object);
@@ -293,8 +288,7 @@ QPDFParser::parse(bool& empty, bool content_stream)
                 // There's no newArray(SparseOHArray) since
                 // SparseOHArray is not part of the public API.
                 object = QPDFObjectHandle(QPDF_Array::create(olist));
-                QPDFObjectHandle::setObjectDescriptionFromInput(
-                    object, context, object_description, input, offset);
+                setDescriptionFromInput(object, offset);
                 // The `offset` points to the next of "[". Set the
                 // rewind offset to point to the beginning of "[".
                 // This has been explicitly tested with whitespace
@@ -347,8 +341,7 @@ QPDFParser::parse(bool& empty, bool content_stream)
                             "dictionary ended prematurely; "
                             "using null as value for last key");
                         val = QPDFObjectHandle::newNull();
-                        QPDFObjectHandle::setObjectDescriptionFromInput(
-                            val, context, object_description, input, offset);
+                        setDescriptionFromInput(val, offset);
                     } else {
                         val = olist.at(++i);
                     }
@@ -372,8 +365,7 @@ QPDFParser::parse(bool& empty, bool content_stream)
                     dict["/Contents"].setParsedOffset(contents_offset);
                 }
                 object = QPDFObjectHandle::newDictionary(dict);
-                QPDFObjectHandle::setObjectDescriptionFromInput(
-                    object, context, object_description, input, offset);
+                setDescriptionFromInput(object, offset);
                 // The `offset` points to the next of "<<". Set the
                 // rewind offset to point to the beginning of "<<".
                 // This has been explicitly tested with whitespace
@@ -396,13 +388,22 @@ QPDFParser::parse(bool& empty, bool content_stream)
     }
 
     if (!set_offset) {
-        QPDFObjectHandle::setObjectDescriptionFromInput(
-            object, context, object_description, input, offset);
+        setDescriptionFromInput(object, offset);
         object.setParsedOffset(offset);
     }
     return object;
 }
 
+void
+QPDFParser::setDescriptionFromInput(
+    QPDFObjectHandle oh, qpdf_offset_t offset) const
+{
+    oh.setObjectDescription(
+        context,
+        (input->getName() + ", " + object_description + " at offset " +
+         QUtil::int_to_string(offset)));
+}
+
 void
 QPDFParser::warn(QPDF* qpdf, QPDFExc const& e)
 {
diff --git a/libqpdf/qpdf/QPDFParser.hh b/libqpdf/qpdf/QPDFParser.hh
index ba92b55c..b83dbb1c 100644
--- a/libqpdf/qpdf/QPDFParser.hh
+++ b/libqpdf/qpdf/QPDFParser.hh
@@ -41,7 +41,8 @@ class QPDFParser
     void warn(std::string const& msg) const;
     static void warn(QPDF*, QPDFExc const&);
     void setParsedOffset(qpdf_offset_t offset);
-
+    void
+    setDescriptionFromInput(QPDFObjectHandle oh, qpdf_offset_t offset) const;
     std::shared_ptr<InputSource> input;
     std::string const& object_description;
     QPDFTokenizer& tokenizer;
-- 
cgit v1.2.3-54-g00ecf