diff options
Diffstat (limited to 'xdelta3/xdelta3-blkcache.h')
-rw-r--r-- | xdelta3/xdelta3-blkcache.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h index e73a2ab..839ba33 100644 --- a/xdelta3/xdelta3-blkcache.h +++ b/xdelta3/xdelta3-blkcache.h | |||
@@ -246,7 +246,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd, | |||
246 | 246 | ||
247 | if (sfile->size_known) | 247 | if (sfile->size_known) |
248 | { | 248 | { |
249 | short_sprintf (srcszbuf, "source size %s [%"Q"u]", | 249 | short_sprintf (srcszbuf, "source size %s [%"Q"]", |
250 | main_format_bcnt (source_size, &srccntbuf), | 250 | main_format_bcnt (source_size, &srccntbuf), |
251 | source_size); | 251 | source_size); |
252 | } | 252 | } |
@@ -259,7 +259,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd, | |||
259 | 259 | ||
260 | if (option_verbose > 1) | 260 | if (option_verbose > 1) |
261 | { | 261 | { |
262 | short_sprintf (nbufs, " #bufs %u", lru_size); | 262 | short_sprintf (nbufs, " #bufs %"Z, lru_size); |
263 | } | 263 | } |
264 | 264 | ||
265 | XPR(NT "source %s %s blksize %s window %s%s%s\n", | 265 | XPR(NT "source %s %s blksize %s window %s%s%s\n", |
@@ -366,7 +366,7 @@ main_read_seek_source (xd3_stream *stream, | |||
366 | if (!option_quiet) | 366 | if (!option_quiet) |
367 | { | 367 | { |
368 | XPR(NT "source can't seek backwards; requested block offset " | 368 | XPR(NT "source can't seek backwards; requested block offset " |
369 | "%"Q"u source position is %"Q"u\n", | 369 | "%"Q" source position is %"Q"\n", |
370 | pos, sfile->source_position); | 370 | pos, sfile->source_position); |
371 | } | 371 | } |
372 | 372 | ||
@@ -386,7 +386,7 @@ main_read_seek_source (xd3_stream *stream, | |||
386 | 386 | ||
387 | if (option_verbose > 1) | 387 | if (option_verbose > 1) |
388 | { | 388 | { |
389 | XPR(NT "seek error at offset %"Q"u: %s\n", | 389 | XPR(NT "seek error at offset %"Q": %s\n", |
390 | pos, xd3_mainerror (ret)); | 390 | pos, xd3_mainerror (ret)); |
391 | } | 391 | } |
392 | } | 392 | } |
@@ -395,7 +395,7 @@ main_read_seek_source (xd3_stream *stream, | |||
395 | 395 | ||
396 | if (option_verbose > 1 && pos != sfile->source_position) | 396 | if (option_verbose > 1 && pos != sfile->source_position) |
397 | { | 397 | { |
398 | XPR(NT "non-seekable source skipping %"Q"u bytes @ %"Q"u\n", | 398 | XPR(NT "non-seekable source skipping %"Q" bytes @ %"Q"\n", |
399 | pos - sfile->source_position, | 399 | pos - sfile->source_position, |
400 | sfile->source_position); | 400 | sfile->source_position); |
401 | } | 401 | } |
@@ -440,7 +440,7 @@ main_read_seek_source (xd3_stream *stream, | |||
440 | sfile->source_position += nread; | 440 | sfile->source_position += nread; |
441 | blru->size = nread; | 441 | blru->size = nread; |
442 | 442 | ||
443 | IF_DEBUG1 (DP(RINT "[getblk] skip blkno %"Q"u size %u\n", | 443 | IF_DEBUG1 (DP(RINT "[getblk] skip blkno %"Q" size %u\n", |
444 | skip_blkno, blru->size)); | 444 | skip_blkno, blru->size)); |
445 | 445 | ||
446 | XD3_ASSERT (sfile->source_position <= pos); | 446 | XD3_ASSERT (sfile->source_position <= pos); |
@@ -536,20 +536,20 @@ main_getblk_func (xd3_stream *stream, | |||
536 | { | 536 | { |
537 | if (blru->blkno != blkno) | 537 | if (blru->blkno != blkno) |
538 | { | 538 | { |
539 | XPR(NT "source block %"Q"u read %zu ejects %"Q"u (lru_hits=%u, " | 539 | XPR(NT "source block %"Q" read %zu ejects %"Q" (lru_hits=%u, " |
540 | "lru_misses=%u, lru_filled=%u)\n", | 540 | "lru_misses=%u, lru_filled=%u)\n", |
541 | blkno, nread, blru->blkno, lru_hits, lru_misses, lru_filled); | 541 | blkno, nread, blru->blkno, lru_hits, lru_misses, lru_filled); |
542 | } | 542 | } |
543 | else | 543 | else |
544 | { | 544 | { |
545 | XPR(NT "source block %"Q"u read %zu (lru_hits=%u, " | 545 | XPR(NT "source block %"Q" read %zu (lru_hits=%u, " |
546 | "lru_misses=%u, lru_filled=%u)\n", | 546 | "lru_misses=%u, lru_filled=%u)\n", |
547 | blkno, nread, lru_hits, lru_misses, lru_filled); | 547 | blkno, nread, lru_hits, lru_misses, lru_filled); |
548 | } | 548 | } |
549 | } | 549 | } |
550 | else | 550 | else |
551 | { | 551 | { |
552 | XPR(NT "source block %"Q"u read %zu (lru_hits=%u, lru_misses=%u, " | 552 | XPR(NT "source block %"Q" read %zu (lru_hits=%u, lru_misses=%u, " |
553 | "lru_filled=%u)\n", blkno, nread, | 553 | "lru_filled=%u)\n", blkno, nread, |
554 | lru_hits, lru_misses, lru_filled); | 554 | lru_hits, lru_misses, lru_filled); |
555 | } | 555 | } |
@@ -561,8 +561,8 @@ main_getblk_func (xd3_stream *stream, | |||
561 | blru->size = nread; | 561 | blru->size = nread; |
562 | blru->blkno = blkno; | 562 | blru->blkno = blkno; |
563 | 563 | ||
564 | IF_DEBUG1 (DP(RINT "[main_getblk] blkno %"Q"u onblk %zu pos %"Q"u " | 564 | IF_DEBUG1 (DP(RINT "[main_getblk] blkno %"Q" onblk %zu pos %"Q" " |
565 | "srcpos %"Q"u\n", | 565 | "srcpos %"Q"\n", |
566 | blkno, nread, pos, sfile->source_position)); | 566 | blkno, nread, pos, sfile->source_position)); |
567 | 567 | ||
568 | return 0; | 568 | return 0; |