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]>

1 files changed, 10 insertions, 10 deletions

diff --git a/src/verify.c b/src/verify.c
index a80563a0..78e549ed 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -92,12 +92,12 @@ gpgme_op_verify_result (gpgme_ctx_t ctx)
   gpgme_error_t err;
   gpgme_signature_t sig;
 
-  TRACE_BEG (DEBUG_CTX, "gpgme_op_verify_result", ctx);
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_verify_result", ctx, "");
   err = _gpgme_op_data_lookup (ctx, OPDATA_VERIFY, &hook, -1, NULL);
   opd = hook;
   if (err || !opd)
     {
-      TRACE_SUC0 ("result=(null)");
+      TRACE_SUC ("result=(null)");
       return NULL;
     }
 
@@ -133,30 +133,30 @@ gpgme_op_verify_result (gpgme_ctx_t ctx)
 
       for (sig = opd->result.signatures, i = 0; sig; sig = sig->next, i++)
 	{
-	  TRACE_LOG4 ("sig[%i] = fpr %s, summary 0x%x, status %s",
+	  TRACE_LOG  ("sig[%i] = fpr %s, summary 0x%x, status %s",
 		      i, sig->fpr, sig->summary, gpg_strerror (sig->status));
-	  TRACE_LOG6 ("sig[%i] = timestamps 0x%x/0x%x flags:%s%s%s",
+	  TRACE_LOG  ("sig[%i] = timestamps 0x%x/0x%x flags:%s%s%s",
 		      i, sig->timestamp, sig->exp_timestamp,
 		      sig->wrong_key_usage ? "wrong key usage" : "",
 		      sig->pka_trust == 1 ? "pka bad"
 		      : (sig->pka_trust == 2 ? "pka_okay" : "pka RFU"),
 		      sig->chain_model ? "chain model" : "");
-	  TRACE_LOG5 ("sig[%i] = validity 0x%x (%s), algos %s/%s",
+	  TRACE_LOG  ("sig[%i] = validity 0x%x (%s), algos %s/%s",
 		      i, sig->validity, gpg_strerror (sig->validity_reason),
 		      gpgme_pubkey_algo_name (sig->pubkey_algo),
 		      gpgme_hash_algo_name (sig->hash_algo));
 	  if (sig->pka_address)
 	    {
-	      TRACE_LOG2 ("sig[%i] = PKA address %s", i, sig->pka_address);
+	      TRACE_LOG  ("sig[%i] = PKA address %s", i, sig->pka_address);
 	    }
 	  if (sig->notations)
 	    {
-	      TRACE_LOG1 ("sig[%i] = has notations (not shown)", i);
+	      TRACE_LOG  ("sig[%i] = has notations (not shown)", i);
 	    }
 	}
     }
 
-  TRACE_SUC1 ("result=%p", &opd->result);
+  TRACE_SUC ("result=%p", &opd->result);
   return &opd->result;
 }
 
@@ -1165,7 +1165,7 @@ gpgme_op_verify_start (gpgme_ctx_t ctx, gpgme_data_t sig,
 		       gpgme_data_t signed_text, gpgme_data_t plaintext)
 {
   gpg_error_t err;
-  TRACE_BEG3 (DEBUG_CTX, "gpgme_op_verify_start", ctx,
+  TRACE_BEG  (DEBUG_CTX, "gpgme_op_verify_start", ctx,
 	      "sig=%p, signed_text=%p, plaintext=%p",
 	      sig, signed_text, plaintext);
 
@@ -1185,7 +1185,7 @@ gpgme_op_verify (gpgme_ctx_t ctx, gpgme_data_t sig, gpgme_data_t signed_text,
 {
   gpgme_error_t err;
 
-  TRACE_BEG3 (DEBUG_CTX, "gpgme_op_verify", ctx,
+  TRACE_BEG  (DEBUG_CTX, "gpgme_op_verify", ctx,
 	      "sig=%p, signed_text=%p, plaintext=%p",
 	      sig, signed_text, plaintext);