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, 14 insertions, 14 deletions

diff --git a/src/import.c b/src/import.c
index 33779e96..3d49146f 100644
--- a/src/import.c
+++ b/src/import.c
@@ -67,13 +67,13 @@ gpgme_op_import_result (gpgme_ctx_t ctx)
   op_data_t opd;
   gpgme_error_t err;
 
-  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_result", ctx);
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_result", ctx, "");
 
   err = _gpgme_op_data_lookup (ctx, OPDATA_IMPORT, &hook, -1, NULL);
   opd = hook;
   if (err || !opd)
     {
-      TRACE_SUC0 ("result=(null)");
+      TRACE_SUC ("result=(null)");
       return NULL;
     }
 
@@ -83,18 +83,18 @@ gpgme_op_import_result (gpgme_ctx_t ctx)
       gpgme_import_status_t impstat;
       int i;
 
-      TRACE_LOG5 ("%i considered, %i no UID, %i imported, %i imported RSA, "
+      TRACE_LOG  ("%i considered, %i no UID, %i imported, %i imported RSA, "
 		  "%i unchanged", opd->result.considered,
 		  opd->result.no_user_id, opd->result.imported,
 		  opd->result.imported_rsa, opd->result.unchanged);
-      TRACE_LOG4 ("%i new UIDs, %i new sub keys, %i new signatures, "
+      TRACE_LOG  ("%i new UIDs, %i new sub keys, %i new signatures, "
 		  "%i new revocations", opd->result.new_user_ids,
 		  opd->result.new_sub_keys, opd->result.new_signatures,
 		  opd->result.new_revocations);
-      TRACE_LOG3 ("%i secret keys, %i imported, %i unchanged",
+      TRACE_LOG  ("%i secret keys, %i imported, %i unchanged",
 		  opd->result.secret_read, opd->result.secret_imported,
 		  opd->result.secret_unchanged);
-      TRACE_LOG3 ("%i skipped new keys, %i not imported, %i v3 skipped",
+      TRACE_LOG  ("%i skipped new keys, %i not imported, %i v3 skipped",
 		  opd->result.skipped_new_keys, opd->result.not_imported,
                   opd->result.skipped_v3_keys);
 
@@ -102,14 +102,14 @@ gpgme_op_import_result (gpgme_ctx_t ctx)
       i = 0;
       while (impstat)
 	{
-	  TRACE_LOG4 ("import[%i] for %s = 0x%x (%s)",
+	  TRACE_LOG  ("import[%i] for %s = 0x%x (%s)",
 		      i, impstat->fpr, impstat->status, impstat->result);
 	  impstat = impstat->next;
 	  i++;
 	}
     }
 
-  TRACE_SUC1 ("result=%p", &opd->result);
+  TRACE_SUC ("result=%p", &opd->result);
   return &opd->result;
 }
 
@@ -290,7 +290,7 @@ gpgme_op_import_start (gpgme_ctx_t ctx, gpgme_data_t keydata)
 {
   gpg_error_t err;
 
-  TRACE_BEG1 (DEBUG_CTX, "gpgme_op_import_start", ctx,
+  TRACE_BEG  (DEBUG_CTX, "gpgme_op_import_start", ctx,
 	      "keydata=%p", keydata);
 
   if (!ctx)
@@ -307,7 +307,7 @@ gpgme_op_import (gpgme_ctx_t ctx, gpgme_data_t keydata)
 {
   gpgme_error_t err;
 
-  TRACE_BEG1 (DEBUG_CTX, "gpgme_op_import", ctx,
+  TRACE_BEG  (DEBUG_CTX, "gpgme_op_import", ctx,
 	      "keydata=%p", keydata);
 
   if (!ctx)
@@ -374,7 +374,7 @@ gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t *keys)
 {
   gpg_error_t err;
 
-  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys_start", ctx);
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys_start", ctx, "");
 
   if (!ctx)
     return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
@@ -385,7 +385,7 @@ gpgme_op_import_keys_start (gpgme_ctx_t ctx, gpgme_key_t *keys)
 
       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++;
@@ -412,7 +412,7 @@ gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t *keys)
 {
   gpgme_error_t err;
 
-  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys", ctx);
+  TRACE_BEG (DEBUG_CTX, "gpgme_op_import_keys", ctx, "");
 
   if (!ctx)
     return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));
@@ -423,7 +423,7 @@ gpgme_op_import_keys (gpgme_ctx_t ctx, gpgme_key_t *keys)
 
       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++;