Build fixes w/ XD3_DEBUG=9 and Clang -Weverything

1 files changed, 20 insertions, 18 deletions

diff --git a/xdelta3/testing/delta.h b/xdelta3/testing/delta.h
index f874bf2..deac217 100644
--- a/xdelta3/testing/delta.h
+++ b/xdelta3/testing/delta.h
@@ -30,7 +30,7 @@ public:
       case XD3_WINFINISH:
         break;
       default:
-        DP(RINT "error code %s\n", xd3_strerror (ret));
+        cerr << "decode: " << done;
         abort();
       }
     }
@@ -48,23 +48,25 @@ public:
     return stream_.whole_target.wininfolen;
   }
 
-  void Print() const {
-    for (size_t i = 0; i < stream_.whole_target.instlen; i++) {
-      xd3_winst &winst = stream_.whole_target.inst[i];
-      switch (winst.type) {
-      case XD3_RUN: 
-        DP(RINT "%"Q" run %u\n", winst.position, winst.size);
-        break;
-      case XD3_ADD: 
-        DP(RINT "%"Q" add %u\n", winst.position, winst.size);
-        break;
-      default:
-        DP(RINT "%"Q" copy %u @ %"Q" (mode %u)\n", 
-           winst.position, winst.size, winst.addr, winst.mode);
-        break;
-      }
-    }
-  }
+// Note: This does not benefit from -Wformat= checking, due to the
+// enclosing template. Further, it was not used.
+// void Print() const {
+//     for (size_t i = 0; i < stream_.whole_target.instlen; i++) {
+//       xd3_winst &winst = stream_.whole_target.inst[i];
+//       switch (winst.type) {
+//       case XD3_RUN: 
+//      DP(RINT, "%" Q "u run %" W "u\n", winst.position, winst.size);
+//      break;
+//       case XD3_ADD: 
+//      DP(RINT "%" Q "u add %" W "u\n", winst.position, winst.size);
+//      break;
+//       default:
+//      DP(RINT "%" Q "u copy %" W "u @ %" Q "u (mode %u)\n", 
+//         winst.position, winst.size, winst.addr, winst.mode);
+//      break;
+//       }
+//     }
+//   }
 
 private:
   xd3_stream stream_;