diff options
| author | NIIBE Yutaka <[email protected]> | 2018-11-08 03:14:23 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-11-08 03:14:23 +0000 |
| commit | 7fc3decc2e038be905d47701c7ce196ed86a725b (patch) | |
| tree | f1aafcf7e3c86192971b6b36d86ba662dd4e72f6 | |
| parent | g10: Fix print_keygrip for smartcard. (diff) | |
| download | gnupg-7fc3decc2e038be905d47701c7ce196ed86a725b.tar.gz gnupg-7fc3decc2e038be905d47701c7ce196ed86a725b.zip | |
g10: Fix log_debug formatting.
* g10/cipher-aead.c (do_flush): No cast is correct.
* g10/decrypt-data.c (aead_underflow): No cast needed.
Use "%j" for uint64_t for chunklen.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | g10/cipher-aead.c | 2 | ||||
| -rw-r--r-- | g10/decrypt-data.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/g10/cipher-aead.c b/g10/cipher-aead.c index f9a996c80..b14b85444 100644 --- a/g10/cipher-aead.c +++ b/g10/cipher-aead.c @@ -278,7 +278,7 @@ do_flush (cipher_filter_context_t *cfx, iobuf_t a, byte *buf, size_t size) if (DBG_FILTER) log_debug ("chunksize %ju reached;" " cur buflen=%zu using %zu of %zu\n", - (uintmax_t)cfx->chunksize, (uintmax_t)cfx->buflen, + cfx->chunksize, cfx->buflen, n1, n); n = n1; } diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c index 3951fa794..61e01129c 100644 --- a/g10/decrypt-data.c +++ b/g10/decrypt-data.c @@ -647,7 +647,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len) * case when a chunk ends within the buffer. */ if (DBG_FILTER) log_debug ("decrypt: chunklen=%ju total=%ju size=%zu len=%zu%s\n", - (uintmax_t)dfx->chunklen, (uintmax_t)dfx->total, size, len, + dfx->chunklen, dfx->total, size, len, dfx->eof_seen? " eof":""); while (len && dfx->chunklen + len >= dfx->chunksize) @@ -683,7 +683,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len) len -= n; if (DBG_FILTER) - log_debug ("ndecrypted: %zu (nchunk=%zu) bytes left: %zu at off=%zu\n", + log_debug ("ndecrypted: %zu (nchunk=%ju) bytes left: %zu at off=%zu\n", totallen, dfx->chunklen, len, off); /* Check the tag. */ @@ -765,7 +765,7 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len) dfx->chunklen += len; dfx->total += len; if (DBG_FILTER) - log_debug ("ndecrypted: %zu (nchunk=%zu)\n", totallen, dfx->chunklen); + log_debug ("ndecrypted: %zu (nchunk=%ju)\n", totallen, dfx->chunklen); } if (dfx->eof_seen) |