From 5a8b62a6f8dab82c3bf8b8b1812da0857fb893e6 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 18 Sep 2019 11:57:01 -0400 Subject: [PATCH] Use size_t and fixed width format specifiers for printf()... for siphash.c It was forgotten in #17 to apply this to siphash.c as well as halfsiphash.c. Note that as-is this does change to a single 16-hex-char string for v0/1/2/3 in debug output rather than having 8 then a space then 8. If preferred it can be changed back to having the space and using `PRIx32` twice instead of `PRIx64` once. --- siphash.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/siphash.c b/siphash.c index 78bdf9f..c89dc1f 100644 --- a/siphash.c +++ b/siphash.c @@ -15,6 +15,7 @@ . */ #include +#include #include #include #include @@ -66,14 +67,10 @@ #ifdef DEBUG #define TRACE \ do { \ - printf("(%3d) v0 %08x %08x\n", (int)inlen, (uint32_t)(v0 >> 32), \ - (uint32_t)v0); \ - printf("(%3d) v1 %08x %08x\n", (int)inlen, (uint32_t)(v1 >> 32), \ - (uint32_t)v1); \ - printf("(%3d) v2 %08x %08x\n", (int)inlen, (uint32_t)(v2 >> 32), \ - (uint32_t)v2); \ - printf("(%3d) v3 %08x %08x\n", (int)inlen, (uint32_t)(v3 >> 32), \ - (uint32_t)v3); \ + printf("(%3zu) v0 %016"PRIx64"\n", inlen, v0); \ + printf("(%3zu) v1 %016"PRIx64"\n", inlen, v1); \ + printf("(%3zu) v2 %016"PRIx64"\n", inlen, v2); \ + printf("(%3zu) v3 %016"PRIx64"\n", inlen, v3); \ } while (0) #else #define TRACE