Refactor linearization checks: change `checkLinearizationInternal` to `void`, si…

…mplify control flow, and update method returns.

Refactor linearization checks: change `checkLinearizationInternal` to `void`, si…
…mplify control flow, and update method returns.
m-holger
1 parent 3fbae967
Showing 3 changed files with 6 additions and 8 deletions
include/qpdf/QPDF.hh
libqpdf/QPDF_linearization.cc
libqpdf/qpdf/QPDF_private.hh
@@ -1001,7 +1001,7 @@ class QPDF
     // methods to support linearization checking -- implemented in QPDF_linearization.cc
     void readLinearizationData();
-    bool checkLinearizationInternal();
+    void checkLinearizationInternal();
     void dumpLinearizationDataInternal();
     void linearizationWarning(std::string_view);
     QPDFObjectHandle readHintStream(Pipeline&, qpdf_offset_t offset, size_t length);
@@ -77,15 +77,15 @@ QPDF::linearizationWarning(std::string_view msg)
 bool
 QPDF::checkLinearization()
 {
-    bool result = false;
     try {
         readLinearizationData();
-        result = checkLinearizationInternal();
+        checkLinearizationInternal();
+        return !m->linearization_warnings;
     } catch (std::runtime_error& e) {
         linearizationWarning(
             "error encountered while checking linearization data: " + std::string(e.what()));
+        return false;
     }
-    return result;
 }
 bool
@@ -404,7 +404,7 @@ QPDF::readHGeneric(BitStream h, HGeneric&amp; t)
     t.group_length = h.getBitsInt(32);        // 4
 }
-bool
+void
 QPDF::checkLinearizationInternal()
 {
     // All comments referring to the PDF spec refer to the spec for version 1.4.
@@ -521,8 +521,6 @@ QPDF::checkLinearizationInternal()
     checkHSharedObject(pages, shared_idx_to_obj);
     checkHPageOffset(pages, shared_idx_to_obj);
     checkHOutlines();
-
-    return !m->linearization_warnings;
 }
 qpdf_offset_t
@@ -519,7 +519,7 @@ class QPDF::Members
     // Linearization data
     qpdf_offset_t first_xref_item_offset{0}; // actual value from file
     bool uncompressed_after_compressed{false};
-    bool linearization_warnings{false};
+    bool linearization_warnings{false}; // set by linearizationWarning, used by checkLinearization
     // Linearization parameter dictionary and hint table data: may be read from file or computed
     // prior to writing a linearized file