commit 0c42ddf28c330280f66feb7cc92b63f3998468e1
parent 821d29e42040789c59d271ba2f1d87a54d6d1435
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Apr 2019 15:21:18 -0400
fixup! Even more diagnostic messages for bug 28223.
Use TOR_PRIuSZ in place of %zu.
Diffstat:
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
@@ -224,7 +224,8 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out)
const char *nulpos = memchr(md->body, 0, md->bodylen);
if (BUG(nulpos)) {
log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. "
- "offset %"PRId64", bodylen %zu, nul position %zu",
+ "offset %"PRId64", bodylen %"TOR_PRIuSZ", "
+ "nul position %"TOR_PRIuSZ".",
(int64_t)md->off, md->bodylen,
(size_t)(nulpos - md->body));
}
@@ -493,7 +494,7 @@ warn_if_nul_found(const char *inp, size_t len, const char *description)
const char *nul_found = memchr(inp, 0, len);
if (BUG(nul_found)) {
log_warn(LD_BUG, "Found unexpected NUL while reading %s, at "
- "position %zu/%zu.",
+ "position %"TOR_PRIuSZ"/%"TOR_PRIuSZ".",
description, (nul_found - inp), len);
}
}