mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-06 01:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Checking __STDC_VERSION__ rather than __STRICT_ANSI__

Browse Source 
`__STRICT_ANSI__` is a gnuish flag macro that indicates if `-ansi`
was given on the command line.  To check the C version, it's better
to check the macro `__STDC_VERSION__`.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/19197)
This commit is contained in:
Richard Levitte 2022-09-12 17:29:53 +02:00
parent e1035957eb
commit b1104a3a2d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/lib/log.c
View File

@ -56,18 +56,31 @@ static void log_with_prefix(const char *prog, const char *fmt, va_list ap)
BIO_free(pre); BIO_free(pre);
} }
/*
* Unfortunately, C before C99 does not define va_copy, so we must
* check if it can be assumed to be present. We do that with an internal
* antifeature macro.
* C versions since C94 define __STDC_VERSION__, so it's enough to
* check its existence and value.
*/
#undef OSSL_NO_C99
#if !defined(__STDC_VERSION__) || __STDC_VERSION__ + 0 < 199900L
# define OSSL_NO_C99
#endif
void trace_log_message(int category, void trace_log_message(int category,
const char *prog, int level, const char *fmt, ...) const char *prog, int level, const char *fmt, ...)
{ {
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
#ifdef __STRICT_ANSI__ /* unfortuantely, ANSI does not define va_copy */
#ifdef OSSL_NO_C99
if (verbosity >= level) if (verbosity >= level)
category = -1; /* disabling trace output in addition to logging */ category = -1; /* disabling trace output in addition to logging */
#endif #endif
if (category >= 0 && OSSL_trace_enabled(category)) { if (category >= 0 && OSSL_trace_enabled(category)) {
BIO *out = OSSL_trace_begin(category); BIO *out = OSSL_trace_begin(category);
#ifndef __STRICT_ANSI__ #ifndef OSSL_NO_C99
va_list ap_copy; va_list ap_copy;
va_copy(ap_copy, ap); va_copy(ap_copy, ap);