fix-qdf: replace hard-coded std::cout with member variable

Jay Berkenbilt
1 parent a5cab082
Showing 1 changed file with 29 additions and 26 deletions
qpdf/fix-qdf.cc
@@ -20,7 +20,8 @@ usage()
 class QdfFixer
 {
   public:
-    QdfFixer(std::string const& filename);
+    QdfFixer(std::string const& filename, std::ostream& out);
+    ~QdfFixer() = default;
     void processLines(std::string const& input);
   private:
@@ -31,6 +32,7 @@ class QdfFixer
     void writeBinary(unsigned long long val, size_t bytes);
     std::string filename;
+    std::ostream& out;
     enum {
         st_top,
         st_in_obj,
@@ -67,8 +69,9 @@ class QdfFixer
     std::string ostream_extends;
 };
-QdfFixer::QdfFixer(std::string const& filename) :
-    filename(filename)
+QdfFixer::QdfFixer(std::string const& filename, std::ostream& out) :
+    filename(filename),
+    out(out)
 {
 }
@@ -131,9 +134,9 @@ QdfFixer::processLines(std::string const&amp; input)
                 xref_offset = last_offset;
                 state = st_at_xref;
             }
-            std::cout << line;
+            out << line;
         } else if (state == st_in_obj) {
-            std::cout << line;
+            out << line;
             if (line.compare("stream\n"sv) == 0) {
                 state = st_in_stream;
                 stream_start = offset;
@@ -166,8 +169,8 @@ QdfFixer::processLines(std::string const&amp; input)
                 auto esize = 1 + xref_f1_nbytes + xref_f2_nbytes;
                 xref_size = 1 + xref.size();
                 auto length = xref_size * esize;
-                std::cout << "  /Length " << length << "\n"
-                          << "  /W [ 1 " << xref_f1_nbytes << " " << xref_f2_nbytes << " ]\n";
+                out << "  /Length " << length << "\n"
+                    << "  /W [ 1 " << xref_f1_nbytes << " " << xref_f2_nbytes << " ]\n";
                 state = st_in_xref_stream_dict;
             }
         } else if (state == st_in_ostream_dict) {
@@ -209,10 +212,10 @@ QdfFixer::processLines(std::string const&amp; input)
             if ((line.find("/Length"sv) != line.npos) || (line.find("/W"sv) != line.npos)) {
                 // already printed
             } else if (line.find("/Size"sv) != line.npos) {
-                auto xref_size = 1 + xref.size();
-                std::cout << "  /Size " << xref_size << "\n";
+                auto size = 1 + xref.size();
+                out << "  /Size " << size << "\n";
             } else {
-                std::cout << line;
+                out << line;
             }
             if (line.compare("stream\n"sv) == 0) {
                 writeBinary(0, 1);
@@ -232,9 +235,9 @@ QdfFixer::processLines(std::string const&amp; input)
                     writeBinary(f1, xref_f1_nbytes);
                     writeBinary(f2, xref_f2_nbytes);
                 }
-                std::cout << "\nendstream\nendobj\n\n"
-                          << "startxref\n"
-                          << xref_offset << "\n%%EOF\n";
+                out << "\nendstream\nendobj\n\n"
+                    << "startxref\n"
+                    << xref_offset << "\n%%EOF\n";
                 state = st_done;
             }
         } else if (state == st_in_stream) {
@@ -242,7 +245,7 @@ QdfFixer::processLines(std::string const&amp; input)
                 stream_length = QIntC::to_size(last_offset - stream_start);
                 state = st_after_stream;
             }
-            std::cout << line;
+            out << line;
         } else if (state == st_after_stream) {
             if (line.compare("%QDF: ignore_newline\n"sv) == 0) {
                 if (stream_length > 0) {
@@ -252,7 +255,7 @@ QdfFixer::processLines(std::string const&amp; input)
                 checkObjId(m[1].str());
                 state = st_in_length;
             }
-            std::cout << line;
+            out << line;
         } else if (state == st_in_length) {
             if (!matches(re_num)) {
                 fatal(filename + ":" + std::to_string(lineno) + ": expected integer");
@@ -260,29 +263,29 @@ QdfFixer::processLines(std::string const&amp; input)
             std::string new_length = std::to_string(stream_length) + "\n";
             offset -= QIntC::to_offset(line.length());
             offset += QIntC::to_offset(new_length.length());
-            std::cout << new_length;
+            out << new_length;
             state = st_top;
         } else if (state == st_at_xref) {
             auto n = xref.size();
-            std::cout << "0 " << 1 + n << "\n0000000000 65535 f \n";
+            out << "0 " << 1 + n << "\n0000000000 65535 f \n";
             for (auto const& e: xref) {
-                std::cout << QUtil::int_to_string(e.getOffset(), 10) << " 00000 n \n";
+                out << QUtil::int_to_string(e.getOffset(), 10) << " 00000 n \n";
             }
             state = st_before_trailer;
         } else if (state == st_before_trailer) {
             if (line.compare("trailer <<\n"sv) == 0) {
-                std::cout << line;
+                out << line;
                 state = st_in_trailer;
             }
             // no output
         } else if (state == st_in_trailer) {
             if (matches(re_size_n)) {
-                std::cout << "  /Size " << 1 + xref.size() << "\n";
+                out << "  /Size " << 1 + xref.size() << "\n";
             } else {
-                std::cout << line;
+                out << line;
             }
             if (line.compare(">>\n"sv) == 0) {
-                std::cout << "startxref\n" << xref_offset << "\n%%EOF\n";
+                out << "startxref\n" << xref_offset << "\n%%EOF\n";
                 state = st_done;
             }
         } else if (state == st_done) {
@@ -332,9 +335,9 @@ QdfFixer::writeOstream()
     }
     dict_data += ">>\n";
     offset_adjust += QIntC::to_offset(dict_data.length());
-    std::cout << dict_data << "stream\n" << offsets;
+    out << dict_data << "stream\n" << offsets;
     for (auto const& o: ostream) {
-        std::cout << o;
+        out << o;
     }
     for (auto const& o: ostream_discarded) {
@@ -361,7 +364,7 @@ QdfFixer::writeBinary(unsigned long long val, size_t bytes)
         data[i - 1] = static_cast<char>(val & 0xff); // i.e. val % 256
         val >>= 8;                                   // i.e. val = val / 256
     }
-    std::cout << data;
+    out << data;
 }
 static int
@@ -389,7 +392,7 @@ realmain(int argc, char* argv[])
         input = QUtil::read_file_into_string(filename);
     }
     QUtil::binary_stdout();
-    QdfFixer qf(filename);
+    QdfFixer qf(filename, std::cout);
     qf.processLines(input);
     return 0;
 }