commit d751406f8d1d17f96d49321ed53951312e640d89
author Gilles Peskine <Gilles.Peskine@arm.com> Fri Nov 03 19:41:44 2023 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Nov 29 20:51:56 2023 +0100
tree 5ff339d6e1934c81370b2dc4dc75cfaca0ac84f8
parent ac8cd66bda0b52988ea604fc1ce92e03f7a3206b

Port to platforms where printf doesn't have %zu

Reuse the existing abstraction from include/mbedtls/debug.h.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

programs/test/metatest.c

diff --git a/programs/test/metatest.c b/programs/test/metatest.c
index 6a3e7a9..6e476b7 100644
--- a/programs/test/metatest.c
+++ b/programs/test/metatest.c
@@ -28,6 +28,7 @@
 
 #define MBEDTLS_ALLOW_PRIVATE_ACCESS
 
+#include <mbedtls/debug.h>
 #include <mbedtls/platform.h>
 #include <mbedtls/platform_util.h>
 #include "test/helpers.h"
@@ -156,7 +157,10 @@
 void test_memory_poison(const char *name)
 {
     size_t start = 0, offset = 0, count = 0;
-    if (sscanf(name, "%*[^0-9]%zu%*[^0-9]%zu%*[^0-9]%zu",
+    if (sscanf(name,
+               "%*[^0-9]%" MBEDTLS_PRINTF_SIZET
+               "%*[^0-9]%" MBEDTLS_PRINTF_SIZET
+               "%*[^0-9]%" MBEDTLS_PRINTF_SIZET,
                &start, &offset, &count) != 3) {
         mbedtls_fprintf(stderr, "%s: Bad name format: %s\n", __func__, name);
         return;
@@ -169,18 +173,24 @@
     memset(aligned.buf, 'a', sizeof(aligned.buf));
 
     if (start > sizeof(aligned.buf)) {
-        mbedtls_fprintf(stderr, "%s: start=%zu > size=%zu", __func__,
-                        start, sizeof(aligned.buf));
+        mbedtls_fprintf(stderr,
+                        "%s: start=%" MBEDTLS_PRINTF_SIZET
+                        " > size=%" MBEDTLS_PRINTF_SIZET,
+                        __func__, start, sizeof(aligned.buf));
         return;
     }
     if (start + count > sizeof(aligned.buf)) {
-        mbedtls_fprintf(stderr, "%s: start+count=%zu > size=%zu", __func__,
-                        start + count, sizeof(aligned.buf));
+        mbedtls_fprintf(stderr,
+                        "%s: start+count=%" MBEDTLS_PRINTF_SIZET
+                        " > size=%" MBEDTLS_PRINTF_SIZET,
+                        __func__, start + count, sizeof(aligned.buf));
         return;
     }
     if (offset >= count) {
-        mbedtls_fprintf(stderr, "%s: offset=%zu >= count=%zu", __func__,
-                        offset, count);
+        mbedtls_fprintf(stderr,
+                        "%s: offset=%" MBEDTLS_PRINTF_SIZET
+                        " >= count=%" MBEDTLS_PRINTF_SIZET,
+                        __func__, offset, count);
         return;
     }