[tor-commits] [tor/release-0.4.0] fixup! Even more diagnostic messages for bug 28223.

[asn at torproject.org]

commit 0c42ddf28c330280f66feb7cc92b63f3998468e1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 15 15:21:18 2019 -0400

    fixup! Even more diagnostic messages for bug 28223.
    
    Use TOR_PRIuSZ in place of %zu.
---
 src/feature/nodelist/microdesc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c
index af4f608d2..eaa7f0caf 100644
--- 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);
   }
 }