From 5857491a2aa7d4975100d90f1ad62c08aa345e3e Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 16 Nov 2018 16:25:49 +0100 Subject: core: Simplify the trace maros by using variadics. * src/debug.h (TRACE_BEG, TRACE_LOG, TRACE_SUC): Use variadic macros and remove the TRACE_BEG1 et al. Change all users to always pass a format string. (TRACE): Ditto. * src/debug.c (_gpgme_debugf): New. * configure.ac : Add -Wno-format-zero-length. -- This makes it easier for use to enable format checks. The zero-length format is required to allow for an empty format due to the comman problematic of __VA_ARGS__. Signed-off-by: Werner Koch --- src/data-stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/data-stream.c') diff --git a/src/data-stream.c b/src/data-stream.c index 8961d079..19a5a079 100644 --- a/src/data-stream.c +++ b/src/data-stream.c @@ -96,7 +96,7 @@ gpgme_error_t gpgme_data_new_from_stream (gpgme_data_t *r_dh, FILE *stream) { gpgme_error_t err; - TRACE_BEG1 (DEBUG_DATA, "gpgme_data_new_from_stream", r_dh, "stream=%p", + TRACE_BEG (DEBUG_DATA, "gpgme_data_new_from_stream", r_dh, "stream=%p", stream); err = _gpgme_data_new (r_dh, &stream_cbs); @@ -104,5 +104,5 @@ gpgme_data_new_from_stream (gpgme_data_t *r_dh, FILE *stream) return TRACE_ERR (err); (*r_dh)->data.stream = stream; - return TRACE_SUC1 ("dh=%p", *r_dh); + return TRACE_SUC ("dh=%p", *r_dh); } -- cgit v1.2.3