Refactor `Pl_MD5`: move implementation to `MD5.cc`, update `CMakeLists.txt`, and…

… clean up unused file.

Refactor `Pl_MD5`: move implementation to `MD5.cc`, update `CMakeLists.txt`, and…
… clean up unused file.
m-holger
1 parent 0ed62d9e
Showing 3 changed files with 28 additions and 30 deletions
libqpdf/CMakeLists.txt
libqpdf/MD5.cc
libqpdf/Pl_MD5.cc
@@ -44,7 +44,6 @@ set(libqpdf_SOURCES
   Pl_Flate.cc
   Pl_Function.cc
   Pl_LZWDecoder.cc
-  Pl_MD5.cc
   Pl_OStream.cc
   Pl_PNGFilter.cc
   Pl_QPDFTokenizer.cc
 #include <qpdf/MD5.hh>
+#include <qpdf/Pl_MD5.hh>
+
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDFCryptoProvider.hh>
 #include <qpdf/QUtil.hh>
@@ -163,3 +165,29 @@ MD5::checkFileChecksum(char const* const checksum, char const* filename, qpdf_of
     }
     return result;
 }
+
+void
+Pl_MD5::write(unsigned char const* buf, size_t len)
+{
+    if (enabled) {
+        if (!in_progress) {
+            md5.reset();
+            in_progress = true;
+        }
+
+        // Write in chunks in case len is too big to fit in an int. Assume int is at least 32 bits.
+        static size_t const max_bytes = 1 << 30;
+        size_t bytes_left = len;
+        unsigned char const* data = buf;
+        while (bytes_left > 0) {
+            size_t bytes = (bytes_left >= max_bytes ? max_bytes : bytes_left);
+            md5.encodeDataIncrementally(reinterpret_cast<char const*>(data), bytes);
+            bytes_left -= bytes;
+            data += bytes;
+        }
+    }
+
+    if (next()) {
+        next()->write(buf, len);
+    }
+}
-#include <qpdf/Pl_MD5.hh>
-
-#include <stdexcept>
-
-void
-Pl_MD5::write(unsigned char const* buf, size_t len)
-{
-    if (enabled) {
-        if (!in_progress) {
-            md5.reset();
-            in_progress = true;
-        }
-
-        // Write in chunks in case len is too big to fit in an int. Assume int is at least 32 bits.
-        static size_t const max_bytes = 1 << 30;
-        size_t bytes_left = len;
-        unsigned char const* data = buf;
-        while (bytes_left > 0) {
-            size_t bytes = (bytes_left >= max_bytes ? max_bytes : bytes_left);
-            md5.encodeDataIncrementally(reinterpret_cast<char const*>(data), bytes);
-            bytes_left -= bytes;
-            data += bytes;
-        }
-    }
-
-    if (next()) {
-        next()->write(buf, len);
-    }
-}