aboutsummaryrefslogtreecommitdiffstats
path: root/src/delete.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-11-16 15:25:49 +0000
committerWerner Koch <[email protected]>2018-11-16 15:25:49 +0000
commit5857491a2aa7d4975100d90f1ad62c08aa345e3e (patch)
treec433d2da27e7b9f98ca783e15b00087f2ce3d6cd /src/delete.c
parentAdd SPDX identifiers to most source files (diff)
downloadgpgme-5857491a2aa7d4975100d90f1ad62c08aa345e3e.tar.gz
gpgme-5857491a2aa7d4975100d90f1ad62c08aa345e3e.zip
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 <GCC>: 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 <[email protected]>
Diffstat (limited to 'src/delete.c')
-rw-r--r--src/delete.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/delete.c b/src/delete.c
index 1bf1cb48..cd7ab570 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -130,7 +130,7 @@ gpgme_op_delete_start (gpgme_ctx_t ctx, const gpgme_key_t key,
{
gpgme_error_t err;
- TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete_start", ctx,
+ TRACE_BEG (DEBUG_CTX, "gpgme_op_delete_start", ctx,
"key=%p (%s), allow_secret=%i", key,
(key->subkeys && key->subkeys->fpr) ?
key->subkeys->fpr : "invalid", allow_secret);
@@ -151,7 +151,7 @@ gpgme_op_delete (gpgme_ctx_t ctx, const gpgme_key_t key, int allow_secret)
{
gpgme_error_t err;
- TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete", ctx,
+ TRACE_BEG (DEBUG_CTX, "gpgme_op_delete", ctx,
"key=%p (%s), allow_secret=%i", key,
(key->subkeys && key->subkeys->fpr) ?
key->subkeys->fpr : "invalid", allow_secret);
@@ -174,7 +174,7 @@ gpgme_op_delete_ext_start (gpgme_ctx_t ctx, const gpgme_key_t key,
{
gpgme_error_t err;
- TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete_ext_start", ctx,
+ TRACE_BEG (DEBUG_CTX, "gpgme_op_delete_ext_start", ctx,
"key=%p (%s), flags=0x%x", key,
(key->subkeys && key->subkeys->fpr) ?
key->subkeys->fpr : "invalid", flags);
@@ -194,7 +194,7 @@ gpgme_op_delete_ext (gpgme_ctx_t ctx, const gpgme_key_t key,
{
gpgme_error_t err;
- TRACE_BEG3 (DEBUG_CTX, "gpgme_op_delete_ext", ctx,
+ TRACE_BEG (DEBUG_CTX, "gpgme_op_delete_ext", ctx,
"key=%p (%s), flags=0x%x", key,
(key->subkeys && key->subkeys->fpr) ?
key->subkeys->fpr : "invalid", flags);