Templatize the test, expose issue 79.

1 files changed, 3 insertions, 27 deletions

diff --git a/xdelta3/testing/cmp.h b/xdelta3/testing/cmp.h
index d96c386..e5e37cf 100644
--- a/xdelta3/testing/cmp.h
+++ b/xdelta3/testing/cmp.h
@@ -1,7 +1,5 @@
 /* -*- Mode: C++ -*-  */
-namespace regtest {
-
-inline size_t CmpDifferentBlockBytes(const Block &a, const Block &b) {
+static size_t CmpDifferentBlockBytes(const Block &a, const Block &b) {
   size_t total = 0;
   size_t i = 0; 
   size_t m = min(a.Size(), b.Size());
@@ -18,10 +16,10 @@ inline size_t CmpDifferentBlockBytes(const Block &a, const Block &b) {
   return total;
 }
 
-inline xoff_t CmpDifferentBytes(const FileSpec &a, const FileSpec &b) {
+static xoff_t CmpDifferentBytes(const FileSpec &a, const FileSpec &b) {
   Block block_a, block_b;
   xoff_t total = 0;
-  FileSpec::iterator a_i(a), b_i(b);
+  typename FileSpec::iterator a_i(a), b_i(b);
 
   for (; !a_i.Done() && !b_i.Done(); a_i.Next(), b_i.Next()) {
 
@@ -40,25 +38,3 @@ inline xoff_t CmpDifferentBytes(const FileSpec &a, const FileSpec &b) {
 
   return total;
 }
-
-inline bool ExtFile::EqualsSpec(const FileSpec &spec) const {
-  main_file t;
-  main_file_init(&t);
-  CHECK_EQ(0, main_file_open(&t, Name(), XO_READ));
-
-  Block tblock;
-  Block sblock;
-  for (BlockIterator iter(spec); !iter.Done(); iter.Next()) {
-    iter.Get(&sblock);
-    tblock.SetSize(sblock.Size());
-    usize_t tread;
-    CHECK_EQ(0, main_file_read(&t, tblock.Data(), tblock.Size(), &tread, "read failed"));
-    CHECK_EQ(0, CmpDifferentBlockBytes(tblock, sblock));
-  }
-  
-  CHECK_EQ(0, main_file_close(&t));
-  main_file_cleanup(&t);
-  return true;
-}
-
-}  // namespace regtest