Remove redundant parameters from QPDF_Stream::warn

m-holger · Jay Berkenbilt
1 parent 69e67b45
Showing 2 changed files with 15 additions and 40 deletions
libqpdf/QPDF_Stream.cc
libqpdf/qpdf/QPDF_Stream.hh
@@ -415,10 +415,7 @@ QPDF_Stream::filterable(
  
     if (!filters_okay) {
         QTC::TC("qpdf", "QPDF_Stream invalid filter");
-        warn(
-            qpdf_e_damaged_pdf,
-            this->offset,
-            "stream filter type is not name or array");
+        warn("stream filter type is not name or array");
         return false;
     }
  
@@ -466,11 +463,7 @@ QPDF_Stream::filterable(
     // one case of a file whose /DecodeParms was [ << >> ] when
     // /Filters was empty has been seen in the wild.
     if ((filters.size() != 0) && (decode_parms.size() != filters.size())) {
-        warn(
-            qpdf_e_damaged_pdf,
-            this->offset,
-            "stream /DecodeParms length is"
-            " inconsistent with filters");
+        warn("stream /DecodeParms length is inconsistent with filters");
         filterable = false;
     }
  
@@ -582,9 +575,8 @@ QPDF_Stream::pipeStreamData(
             }
             Pl_Flate* flate = dynamic_cast<Pl_Flate*>(pipeline);
             if (flate != nullptr) {
-                flate->setWarnCallback([this](char const* msg, int code) {
-                    warn(qpdf_e_damaged_pdf, this->offset, msg);
-                });
+                flate->setWarnCallback(
+                    [this](char const* msg, int code) { warn(msg); });
             }
         }
     }
@@ -647,28 +639,17 @@ QPDF_Stream::pipeStreamData(
  
     if (filter && (!suppress_warnings) && normalizer.get() &&
         normalizer->anyBadTokens()) {
-        warn(
-            qpdf_e_damaged_pdf,
-            this->offset,
-            "content normalization encountered bad tokens");
+        warn("content normalization encountered bad tokens");
         if (normalizer->lastTokenWasBad()) {
             QTC::TC("qpdf", "QPDF_Stream bad token at end during normalize");
-            warn(
-                qpdf_e_damaged_pdf,
-                this->offset,
-                "normalized content ended with a bad token;"
-                " you may be able to resolve this by"
-                " coalescing content streams in combination"
-                " with normalizing content. From the command"
-                " line, specify --coalesce-contents");
+            warn("normalized content ended with a bad token; you may be able "
+                 "to resolve this by coalescing content streams in combination "
+                 "with normalizing content. From the command line, specify "
+                 "--coalesce-contents");
         }
-        warn(
-            qpdf_e_damaged_pdf,
-            this->offset,
-            "Resulting stream data may be corrupted but is"
-            " may still useful for manual inspection."
-            " For more information on this warning, search"
-            " for content normalization in the manual.");
+        warn("Resulting stream data may be corrupted but is may still useful "
+             "for manual inspection. For more information on this warning, "
+             "search for content normalization in the manual.");
     }
  
     return success;
@@ -733,10 +714,7 @@ QPDF_Stream::replaceDict(QPDFObjectHandle const&amp; new_dict)
 }
  
 void
-QPDF_Stream::warn(
-    qpdf_error_code_e error_code,
-    qpdf_offset_t offset,
-    std::string const& message)
+QPDF_Stream::warn(std::string const& message)
 {
-    this->qpdf->warn(error_code, "", offset, message);
+    this->qpdf->warn(qpdf_e_damaged_pdf, "", this->offset, message);
 }
@@ -98,10 +98,7 @@ class QPDF_Stream: public QPDFValue
         std::vector<std::shared_ptr<QPDFStreamFilter>>& filters,
         bool& specialized_compression,
         bool& lossy_compression);
-    void warn(
-        qpdf_error_code_e error_code,
-        qpdf_offset_t offset,
-        std::string const& message);
+    void warn(std::string const& message);
     void setDictDescription();
  
     bool filter_on_write;