Commit ec91206f authored by Christos Zoulas's avatar Christos Zoulas Committed by Viktor Dukhovni
Browse files

Add a format attribute to the format functions and fix the broken format 


strings.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 5db120dc

test/testutil/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

test/testutil/output.h

+29 −5
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ 


# 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 overridden when needed. Note that if one is, then all must be.
@@ -19,14 +36,21 @@ 
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)

    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)));

/* 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, ...)

    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)));



# undef ossl_test__printf__

# undef ossl_test__attr__



#endif                          /* HEADER_TU_OUTPUT_H */

test/testutil/format_output.c

+8 −8

File changed.

Contains only whitespace changes.