diff options
| -rw-r--r-- | testing/delta.h | 6 | ||||
| -rw-r--r-- | testing/file.h | 2 | ||||
| -rw-r--r-- | testing/regtest.cc | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/testing/delta.h b/testing/delta.h index b0cca7c..53b6425 100644 --- a/testing/delta.h +++ b/testing/delta.h @@ -53,13 +53,13 @@ public: xd3_winst &winst = stream_.whole_target.inst[i]; switch (winst.type) { case XD3_RUN: - DP(RINT "%"Q"u run %u\n", winst.position, winst.size); + DP(RINT "%" Q "u run %u\n", winst.position, winst.size); break; case XD3_ADD: - DP(RINT "%"Q"u add %u\n", winst.position, winst.size); + DP(RINT "%" Q "u add %u\n", winst.position, winst.size); break; default: - DP(RINT "%"Q"u copy %u @ %"Q"u (mode %u)\n", + DP(RINT "%" Q "u copy %u @ %" Q "u (mode %u)\n", winst.position, winst.size, winst.addr, winst.mode); break; } diff --git a/testing/file.h b/testing/file.h index 55b0eb8..c559b0b 100644 --- a/testing/file.h +++ b/testing/file.h @@ -66,7 +66,7 @@ public: xoff_t pos = 0; for (size_t i = 0; i < Size(); i++) { if (pos % 16 == 0) { - DP(RINT "%5"Q"x: ", pos); + DP(RINT "%5" Q "x: ", pos); } DP(RINT "%02x ", (*this)[i]); if (pos % 16 == 15) { diff --git a/testing/regtest.cc b/testing/regtest.cc index b2cdaa5..b2b696a 100644 --- a/testing/regtest.cc +++ b/testing/regtest.cc @@ -92,7 +92,7 @@ public: bool done = false; bool done_after_input = false; - IF_DEBUG1 (XPR(NTR "source %"Q"u[%"Q"u] target %"Q"u winsize %"Z"u\n", + IF_DEBUG1 (XPR(NTR "source %" Q "u[%" Q "u] target %" Q "u winsize %" Z "u\n", source_file.Size(), options.block_size, target_file.Size(), Constants::WINDOW_SIZE)); @@ -102,8 +102,8 @@ public: xoff_t blks = target_iterator.Blocks(); - IF_DEBUG2(XPR(NTR "target in %s: %"Q"u..%"Q"u %"Q"u(%"Q"u) " - "verified %"Q"u\n", + IF_DEBUG2(XPR(NTR "target in %s: %" Q "u..%" Q "u %" Q "u(%" Q "u) " + "verified %" Q "u\n", encoding ? "encoding" : "decoding", target_iterator.Offset(), target_iterator.Offset() + target_block.Size(), @@ -153,8 +153,8 @@ public: xd3_source *src = (encoding ? &encode_source : &decode_source); Block *block = (encoding ? &encode_source_block : &decode_source_block); if (encoding) { - IF_DEBUG2(XPR(NTR "[srcblock] %"Q"u last srcpos %"Q"u " - "encodepos %"Q"u\n", + IF_DEBUG2(XPR(NTR "[srcblock] %" Q "u last srcpos %" Q "u " + "encodepos %" Q "u\n", encode_source.getblkno, encode_stream.match_last_srcpos, encode_stream.input_position + encode_stream.total_in)); @@ -231,7 +231,7 @@ public: const Options &options) { vector<const char*> ecmd; char bbuf[16]; - snprintf(bbuf, sizeof(bbuf), "-B%"Q"u", options.encode_srcwin_maxsz); + snprintf(bbuf, sizeof(bbuf), "-B%" Q "u", options.encode_srcwin_maxsz); ecmd.push_back("xdelta3"); ecmd.push_back(bbuf); ecmd.push_back("-s"); @@ -371,7 +371,7 @@ public: void TestPrintf() { char buf[64]; xoff_t x = XOFF_T_MAX; - snprintf_func (buf, sizeof(buf), "%"Q"u", x); + snprintf_func (buf, sizeof(buf), "%" Q "u", x); const char *expect = XD3_USE_LARGEFILE64 ? "18446744073709551615" : "4294967295"; XD3_ASSERT(strcmp (buf, expect) == 0); @@ -813,7 +813,7 @@ void TestSmallStride() { InMemoryEncodeDecode(spec0, spec1, &block, options); Delta delta(block); - IF_DEBUG1(DP(RINT "[stride=%d] changes=%u adds=%"Q"u\n", + IF_DEBUG1(DP(RINT "[stride=%d] changes=%u adds=%" Q "u\n", s, changes, delta.AddedBytes())); double allowance = Constants::BLOCK_SIZE < 8192 || s < 30 ? 3.0 : 1.1; CHECK_GE(allowance * changes, (double)delta.AddedBytes()); @@ -1259,7 +1259,7 @@ void UnitTest() { // These are Xdelta tests. template <class T> void MainTest() { - XPR(NT "Blocksize %"Q"u windowsize %"Z"u\n", + XPR(NT "Blocksize %" Q "u windowsize %" Z "u\n", T::BLOCK_SIZE, T::WINDOW_SIZE); Regtest<T> regtest; TEST(TestEmptyInMemory); |