X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Ftestutil%2Foutput.h;h=8da73e2ac7198c261db7125a2c0f73cae3103d39;hb=c720fc35f4aa90cdc7cdc424b976c5322fb0098e;hp=7c03affcc830d319ab83c31e320f408f288dd5e2;hpb=0918b94c9c01307a1cc4cfc347d458827e30ffea;p=oweals%2Fopenssl.git

diff --git a/test/testutil/output.h b/test/testutil/output.h
index 7c03affcc8..8da73e2ac7 100644
--- a/test/testutil/output.h
+++ b/test/testutil/output.h
@@ -1,32 +1,67 @@
 /*
  * Copyright 2014-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TU_OUTPUT_H
-# define HEADER_TU_OUTPUT_H
+#ifndef OSSL_TESTUTIL_OUTPUT_H
+# define OSSL_TESTUTIL_OUTPUT_H
 
-#include <stdarg.h>
+# include <stdarg.h>
 
+# 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 + __GNUC_MINOR__ >= 44
+#    define ossl_test__printf__ __gnu_printf__
+#   else
+#    define ossl_test__printf__ __printf__
+#   endif
+#  endif
+# endif
 /*
  * The basic I/O functions used internally by the test framework.  These
- * can be overriden when needed. Note that if one is, then all must be.
+ * can be overridden when needed. Note that if one is, then all must be.
  */
 void test_open_streams(void);
 void test_close_streams(void);
+void test_adjust_streams_tap_level(int level);
 /* 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)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 0)));
+int test_vprintf_tapout(const char *fmt, va_list ap)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 0)));
+int test_vprintf_stderr(const char *fmt, va_list ap)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 0)));
+int test_vprintf_taperr(const char *fmt, va_list ap)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 0)));
 /* These return failure or success */
 int test_flush_stdout(void);
+int test_flush_tapout(void);
 int test_flush_stderr(void);
+int test_flush_taperr(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, ...)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 2)));
+int test_printf_tapout(const char *fmt, ...)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 2)));
+int test_printf_stderr(const char *fmt, ...)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 2)));
+int test_printf_taperr(const char *fmt, ...)
+    ossl_test__attr__((__format__(ossl_test__printf__, 1, 2)));
 
-#endif                          /* HEADER_TU_OUTPUT_H */
+# undef ossl_test__printf__
+# undef ossl_test__attr__
+
+#endif                          /* OSSL_TESTUTIL_OUTPUT_H */