[src/trunk]: src/crypto/external/bsd/openssl/dist/test/testutil Fix format st...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f5946512303d
branches:  trunk
changeset: 970443:f5946512303d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Mar 23 22:21:34 2020 +0000

description:
Fix format string usage.

diffstat:

 crypto/external/bsd/openssl/dist/test/testutil/format_output.c |  16 +++++-----
 crypto/external/bsd/openssl/dist/test/testutil/main.c          |   2 +-
 crypto/external/bsd/openssl/dist/test/testutil/output.h        |   9 +++--
 crypto/external/bsd/openssl/dist/test/testutil/tests.c         |   1 +
 4 files changed, 15 insertions(+), 13 deletions(-)

diffs (109 lines):

diff -r 6292fe84de49 -r f5946512303d crypto/external/bsd/openssl/dist/test/testutil/format_output.c
--- a/crypto/external/bsd/openssl/dist/test/testutil/format_output.c    Mon Mar 23 20:02:13 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/test/testutil/format_output.c    Mon Mar 23 22:21:34 2020 +0000
@@ -31,9 +31,9 @@
 static void test_string_null_empty(const char *m, char c)
 {
     if (m == NULL)
-        test_printf_stderr("% 4s %c NULL\n", "", c);
+        test_printf_stderr("%4s %c NULL\n", "", c);
     else
-        test_printf_stderr("% 4u:%c ''\n", 0u, c);
+        test_printf_stderr("%4u:%c ''\n", 0u, c);
 }
 
 static void test_fail_string_common(const char *prefix, const char *file,
@@ -94,18 +94,18 @@
             bdiff[i] = '\0';
         }
         if (n1 == n2 && !diff) {
-            test_printf_stderr("% 4u:  '%s'\n", cnt, n2 > n1 ? b2 : b1);
+            test_printf_stderr("%4u:  '%s'\n", cnt, n2 > n1 ? b2 : b1);
         } else {
             if (cnt == 0 && (m1 == NULL || *m1 == '\0'))
                 test_string_null_empty(m1, '-');
             else if (n1 > 0)
-                test_printf_stderr("% 4u:- '%s'\n", cnt, b1);
+                test_printf_stderr("%4u:- '%s'\n", cnt, b1);
             if (cnt == 0 && (m2 == NULL || *m2 == '\0'))
                test_string_null_empty(m2, '+');
             else if (n2 > 0)
-                test_printf_stderr("% 4u:+ '%s'\n", cnt, b2);
+                test_printf_stderr("%4u:+ '%s'\n", cnt, b2);
             if (diff && i > 0)
-                test_printf_stderr("% 4s    %s\n", "", bdiff);
+                test_printf_stderr("%4s    %s\n", "", bdiff);
         }
         m1 += n1;
         m2 += n2;
@@ -410,7 +410,7 @@
 static void test_memory_null_empty(const unsigned char *m, char c)
 {
     if (m == NULL)
-        test_printf_stderr("% 4s %c%s\n", "", c, "NULL");
+        test_printf_stderr("%4s %c%s\n", "", c, "NULL");
     else
         test_printf_stderr("%04x %c%s\n", 0u, c, "empty");
 }
@@ -494,7 +494,7 @@
             else if (n2 > 0)
                 test_printf_stderr("%04x:+%s\n", cnt, b2);
             if (diff && i > 0)
-                test_printf_stderr("% 4s  %s\n", "", bdiff);
+                test_printf_stderr("%4s  %s\n", "", bdiff);
         }
         m1 += n1;
         m2 += n2;
diff -r 6292fe84de49 -r f5946512303d crypto/external/bsd/openssl/dist/test/testutil/main.c
--- a/crypto/external/bsd/openssl/dist/test/testutil/main.c     Mon Mar 23 20:02:13 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/test/testutil/main.c     Mon Mar 23 22:21:34 2020 +0000
@@ -25,7 +25,7 @@
 
     for (i = 0; i < n; i++)
         if (!arg_used[i+1])
-            test_printf_stderr("Warning ignored command-line argument %d: %s\n",
+            test_printf_stderr("Warning ignored command-line argument %zu: %s\n",
                                i, args[i+1]);
     if (i < arg_count)
         test_printf_stderr("Warning arguments %zu and later unchecked\n", i);
diff -r 6292fe84de49 -r f5946512303d crypto/external/bsd/openssl/dist/test/testutil/output.h
--- a/crypto/external/bsd/openssl/dist/test/testutil/output.h   Mon Mar 23 20:02:13 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/test/testutil/output.h   Mon Mar 23 22:21:34 2020 +0000
@@ -11,6 +11,7 @@
 # define OSSL_TESTUTIL_OUTPUT_H
 
 #include <stdarg.h>
+#include "../testutil.h"
 
 /*
  * The basic I/O functions used internally by the test framework.  These
@@ -19,14 +20,14 @@
 void test_open_streams(void);
 void test_close_streams(void);
 /* The following ALL return the number of characters written */
-int test_vprintf_stdout(const char *fmt, va_list ap);
-int test_vprintf_stderr(const char *fmt, va_list ap);
+int test_vprintf_stdout(const char *fmt, va_list ap) PRINTF_FORMAT(1, 0);
+int test_vprintf_stderr(const char *fmt, va_list ap) PRINTF_FORMAT(1, 0);
 /* These return failure or success */
 int test_flush_stdout(void);
 int test_flush_stderr(void);
 
 /* Commodity functions.  There's no need to override these */
-int test_printf_stdout(const char *fmt, ...);
-int test_printf_stderr(const char *fmt, ...);
+int test_printf_stdout(const char *fmt, ...) PRINTF_FORMAT(1, 2);
+int test_printf_stderr(const char *fmt, ...) PRINTF_FORMAT(1, 2);
 
 #endif                          /* OSSL_TESTUTIL_OUTPUT_H */
diff -r 6292fe84de49 -r f5946512303d crypto/external/bsd/openssl/dist/test/testutil/tests.c
--- a/crypto/external/bsd/openssl/dist/test/testutil/tests.c    Mon Mar 23 20:02:13 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/test/testutil/tests.c    Mon Mar 23 22:21:34 2020 +0000
@@ -72,6 +72,7 @@
                               const char *fmt, ...)
             PRINTF_FORMAT(8, 9);
 
+PRINTF_FORMAT(8, 0)
 static void test_fail_message_va(const char *prefix, const char *file,
                                  int line, const char *type,
                                  const char *left, const char *right,