CVS commit: src/crypto/external/bsd/openssl/dist/test/testutil

2020-03-23 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Mon Mar 23 22:21:34 UTC 2020

Modified Files:
src/crypto/external/bsd/openssl/dist/test/testutil: format_output.c
main.c output.h tests.c

Log Message:
Fix format string usage.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c \
src/crypto/external/bsd/openssl/dist/test/testutil/main.c \
src/crypto/external/bsd/openssl/dist/test/testutil/tests.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/test/testutil/output.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.4 src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.5
--- src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.4	Sun Mar 22 00:53:11 2020
+++ src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c	Mon Mar 23 22:21:34 2020
@@ -31,9 +31,9 @@ static void test_diff_header(const char 
 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 @@ static void test_fail_string_common(cons
 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 @@ void test_output_bignum(const char *name
 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 @@ static void test_fail_memory_common(cons
 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;
Index: src/crypto/external/bsd/openssl/dist/test/testutil/main.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.4 src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.5
--- src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.4	Sun Mar 22 00:53:11 2020
+++ src/crypto/external/bsd/openssl/dist/test/testutil/main.c	Mon Mar 23 22:21:34 2020
@@ -25,7 +25,7 @@ static void check_arg_usage(void)
 
 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);
Index: src/crypto/external/bsd/openssl/dist/test/testutil/tests.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.4 src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.5
--- src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.4	Sun Mar 22 00:53:11 2020
+++ src/crypto/external/bsd/openssl/dist/test/testutil/tests.c	Mon Mar 23 22:21:34 2020
@@ -72,6 +72,7 @@ static void test_fail_message(const char
   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,

Index: src/crypto/external/bsd/openssl/dist/test/testutil/output.h
diff -u

CVS commit: src/crypto/external/bsd/openssl/dist/test/testutil

2018-10-04 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Thu Oct  4 13:38:41 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/dist/test/testutil: tests.c

Log Message:
Add missing format string annotation.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/tests.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/test/testutil/tests.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.2 src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.3
--- src/crypto/external/bsd/openssl/dist/test/testutil/tests.c:1.2	Sun Sep 23 13:33:03 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/tests.c	Thu Oct  4 13:38:41 2018
@@ -72,6 +72,7 @@ static void test_fail_message(const char
   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,

CVS commit: src/crypto/external/bsd/openssl/dist/test/testutil

2018-09-30 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Sep 30 19:23:13 UTC 2018

Modified Files:
src/crypto/external/bsd/openssl/dist/test/testutil: format_output.c
main.c output.h

Log Message:
Annotate format functions and fix format errors.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/test/testutil/main.c \
src/crypto/external/bsd/openssl/dist/test/testutil/output.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.2 src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.3
--- src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.2	Sun Sep 23 09:33:03 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c	Sun Sep 30 15:23:13 2018
@@ -31,9 +31,9 @@ static void test_diff_header(const char 
 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 @@ static void test_fail_string_common(cons
 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 @@ void test_output_bignum(const char *name
 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 @@ static void test_fail_memory_common(cons
 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;

Index: src/crypto/external/bsd/openssl/dist/test/testutil/main.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.2
--- src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.1.1.1	Sun Sep 23 09:17:35 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/main.c	Sun Sep 30 15:23:13 2018
@@ -25,7 +25,7 @@ static void check_arg_usage(void)
 
 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);
Index: src/crypto/external/bsd/openssl/dist/test/testutil/output.h
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.1.1.1 src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.2
--- src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.1.1.1	Sun Sep 23 09:17:35 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/output.h	Sun Sep 30 15:23:13 2018
@@ -10,8 +10,25 @@
 #ifndef HEADER_TU_OUTPUT_H
 # define HEADER_TU_OUTPUT_H
 
-#include 
+# include 
 
+# define ossl_test__attr__(x)
+# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+&& !defined(__APPLE__)
+/*
+ * Because we support the 'z' modifier, which made its appearance in C99,
+ * we can't use __attribute__ with pre C99 dialects.
+ */
+#  if __STDC_VERSION__ >= 199901L
+#   undef ossl_test__attr__
+#   define ossl_test__attr__ __attribute__
+#   if __GNUC__*10 +