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/export.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/export.c') diff --git a/src/export.c b/src/export.c index 0cc1099f..abf260ad 100644 --- a/src/export.c +++ b/src/export.c @@ -176,7 +176,7 @@ gpgme_op_export_start (gpgme_ctx_t ctx, const char *pattern, { gpgme_error_t err; - TRACE_BEG3 (DEBUG_CTX, "gpgme_op_export_start", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export_start", ctx, "pattern=%s, mode=0x%x, keydata=%p", pattern, mode, keydata); if (!ctx) @@ -194,7 +194,7 @@ gpgme_op_export (gpgme_ctx_t ctx, const char *pattern, { gpgme_error_t err; - TRACE_BEG3 (DEBUG_CTX, "gpgme_op_export", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export", ctx, "pattern=%s, mode=0x%x, keydata=%p", pattern, mode, keydata); if (!ctx) @@ -270,7 +270,7 @@ gpgme_op_export_ext_start (gpgme_ctx_t ctx, const char *pattern[], { gpgme_error_t err; - TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_ext_start", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export_ext_start", ctx, "mode=0x%x, keydata=%p", mode, keydata); if (!ctx) @@ -282,7 +282,7 @@ gpgme_op_export_ext_start (gpgme_ctx_t ctx, const char *pattern[], while (pattern[i]) { - TRACE_LOG2 ("pattern[%i] = %s", i, pattern[i]); + TRACE_LOG ("pattern[%i] = %s", i, pattern[i]); i++; } } @@ -299,7 +299,7 @@ gpgme_op_export_ext (gpgme_ctx_t ctx, const char *pattern[], { gpgme_error_t err; - TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_ext_start", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export_ext_start", ctx, "mode=0x%x, keydata=%p", mode, keydata); if (!ctx) @@ -311,7 +311,7 @@ gpgme_op_export_ext (gpgme_ctx_t ctx, const char *pattern[], while (pattern[i]) { - TRACE_LOG2 ("pattern[%i] = %s", i, pattern[i]); + TRACE_LOG ("pattern[%i] = %s", i, pattern[i]); i++; } } @@ -406,7 +406,7 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx, { gpg_error_t err; - TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_keys_start", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export_keys_start", ctx, "mode=0x%x, keydata=%p", mode, keydata); if (!ctx) @@ -418,7 +418,7 @@ gpgme_op_export_keys_start (gpgme_ctx_t ctx, while (keys[i]) { - TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i], + TRACE_LOG ("keys[%i] = %p (%s)", i, keys[i], (keys[i]->subkeys && keys[i]->subkeys->fpr) ? keys[i]->subkeys->fpr : "invalid"); i++; @@ -437,7 +437,7 @@ gpgme_op_export_keys (gpgme_ctx_t ctx, { gpgme_error_t err; - TRACE_BEG2 (DEBUG_CTX, "gpgme_op_export_keys", ctx, + TRACE_BEG (DEBUG_CTX, "gpgme_op_export_keys", ctx, "mode=0x%x, keydata=%p", mode, keydata); if (!ctx) @@ -449,7 +449,7 @@ gpgme_op_export_keys (gpgme_ctx_t ctx, while (keys[i]) { - TRACE_LOG3 ("keys[%i] = %p (%s)", i, keys[i], + TRACE_LOG ("keys[%i] = %p (%s)", i, keys[i], (keys[i]->subkeys && keys[i]->subkeys->fpr) ? keys[i]->subkeys->fpr : "invalid"); i++; -- cgit v1.2.3