diff options
| author | Werner Koch <[email protected]> | 2018-11-16 15:25:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-11-16 15:25:49 +0000 |
| commit | 5857491a2aa7d4975100d90f1ad62c08aa345e3e (patch) | |
| tree | c433d2da27e7b9f98ca783e15b00087f2ce3d6cd /src/engine-g13.c | |
| parent | Add SPDX identifiers to most source files (diff) | |
| download | gpgme-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/engine-g13.c')
| -rw-r--r-- | src/engine-g13.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/engine-g13.c b/src/engine-g13.c index 90f8e7ea..edb8d54f 100644 --- a/src/engine-g13.c +++ b/src/engine-g13.c @@ -486,7 +486,7 @@ status_handler (void *opaque, int fd) { /* Try our best to terminate the connection friendly. */ /* assuan_write_line (g13->assuan_ctx, "BYE"); */ - TRACE2 (DEBUG_CTX, "gpgme:status_handler", g13, + TRACE (DEBUG_CTX, "gpgme:status_handler", g13, "fd 0x%x: error reading assuan line: %s", fd, gpg_strerror (err)); } @@ -498,7 +498,7 @@ status_handler (void *opaque, int fd) err = atoi (&line[4]); if (! err) err = gpg_error (GPG_ERR_GENERAL); - TRACE2 (DEBUG_CTX, "gpgme:status_handler", g13, + TRACE (DEBUG_CTX, "gpgme:status_handler", g13, "fd 0x%x: ERR line: %s", fd, err ? gpg_strerror (err) : "ok"); @@ -514,7 +514,7 @@ status_handler (void *opaque, int fd) && line[0] == 'O' && line[1] == 'K' && (line[2] == '\0' || line[2] == ' ')) { - TRACE1 (DEBUG_CTX, "gpgme:status_handler", g13, + TRACE (DEBUG_CTX, "gpgme:status_handler", g13, "fd 0x%x: OK line", fd); _gpgme_io_close (g13->status_cb.fd); @@ -556,7 +556,7 @@ status_handler (void *opaque, int fd) else err = 0; - TRACE2 (DEBUG_CTX, "gpgme:g13_status_handler", g13, + TRACE (DEBUG_CTX, "gpgme:g13_status_handler", g13, "fd 0x%x: D inlinedata; status from cb: %s", fd, (g13->user.data_cb ? (err? gpg_strerror (err):"ok"):"no callback")); @@ -587,7 +587,7 @@ status_handler (void *opaque, int fd) else err = 0; - TRACE3 (DEBUG_CTX, "gpgme:g13_status_handler", g13, + TRACE (DEBUG_CTX, "gpgme:g13_status_handler", g13, "fd 0x%x: S line (%s) - status from cb: %s", fd, line+2, (g13->user.status_cb ? (err? gpg_strerror (err):"ok"):"no callback")); @@ -638,7 +638,7 @@ add_io_cb (engine_g13_t g13, iocb_data_t *iocbd, gpgme_io_cb_t handler) { gpgme_error_t err; - TRACE_BEG2 (DEBUG_ENGINE, "engine-g13:add_io_cb", g13, + TRACE_BEG (DEBUG_ENGINE, "engine-g13:add_io_cb", g13, "fd %d, dir %d", iocbd->fd, iocbd->dir); err = (*g13->io_cbs.add) (g13->io_cbs.add_priv, iocbd->fd, iocbd->dir, @@ -760,7 +760,7 @@ g13_io_event (void *engine, gpgme_event_io_t type, void *type_data) { engine_g13_t g13 = engine; - TRACE3 (DEBUG_ENGINE, "gpgme:g13_io_event", g13, + TRACE (DEBUG_ENGINE, "gpgme:g13_io_event", g13, "event %p, type %d, type_data %p", g13->io_cbs.event, type, type_data); if (g13->io_cbs.event) |