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

diff --git a/src/data-mem.c b/src/data-mem.c
index 2d19a99c..c461a606 100644
--- a/src/data-mem.c
+++ b/src/data-mem.c
@@ -170,14 +170,14 @@ gpgme_error_t
 gpgme_data_new (gpgme_data_t *r_dh)
 {
   gpgme_error_t err;
-  TRACE_BEG (DEBUG_DATA, "gpgme_data_new", r_dh);
+  TRACE_BEG  (DEBUG_DATA, "gpgme_data_new", r_dh, "");
 
   err = _gpgme_data_new (r_dh, &mem_cbs);
 
   if (err)
     return TRACE_ERR (err);
 
-  return TRACE_SUC1 ("dh=%p", *r_dh);
+  return TRACE_SUC ("dh=%p", *r_dh);
 }
 
 
@@ -189,7 +189,7 @@ gpgme_data_new_from_mem (gpgme_data_t *r_dh, const char *buffer,
 			 size_t size, int copy)
 {
   gpgme_error_t err;
-  TRACE_BEG4 (DEBUG_DATA, "gpgme_data_new_from_mem", r_dh,
+  TRACE_BEG  (DEBUG_DATA, "gpgme_data_new_from_mem", r_dh,
 	      "buffer=%p, size=%u, copy=%i (%s)", buffer, size,
 	      copy, copy ? "yes" : "no");
 
@@ -214,7 +214,7 @@ gpgme_data_new_from_mem (gpgme_data_t *r_dh, const char *buffer,
 
   (*r_dh)->data.mem.size = size;
   (*r_dh)->data.mem.length = size;
-  return TRACE_SUC1 ("dh=%p", *r_dh);
+  return TRACE_SUC ("dh=%p", *r_dh);
 }
 
 
@@ -229,7 +229,7 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
   size_t len;
   int blankout;
 
-  TRACE_BEG1 (DEBUG_DATA, "gpgme_data_release_and_get_mem", dh,
+  TRACE_BEG  (DEBUG_DATA, "gpgme_data_release_and_get_mem", dh,
 	      "r_len=%p", r_len);
 
   if (!dh || dh->cbs != &mem_cbs)
@@ -283,11 +283,11 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
 
   if (r_len)
     {
-      TRACE_SUC2 ("buffer=%p, len=%u", str, *r_len);
+      TRACE_SUC ("buffer=%p, len=%u", str, *r_len);
     }
   else
     {
-      TRACE_SUC1 ("buffer=%p", str);
+      TRACE_SUC ("buffer=%p", str);
     }
   return str;
 }
@@ -298,7 +298,7 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len)
 void
 gpgme_free (void *buffer)
 {
-  TRACE (DEBUG_DATA, "gpgme_free", buffer);
+  TRACE (DEBUG_DATA, "gpgme_free", buffer, "");
 
   if (buffer)
     free (buffer);