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-gpgsm.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-gpgsm.c')
| -rw-r--r-- | src/engine-gpgsm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index a13af7fb..324c92a7 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -836,7 +836,7 @@ status_handler (void *opaque, int fd) { /* Try our best to terminate the connection friendly. */ /* assuan_write_line (gpgsm->assuan_ctx, "BYE"); */ - TRACE3 (DEBUG_CTX, "gpgme:status_handler", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: error from assuan (%d) getting status line : %s", fd, err, gpg_strerror (err)); } @@ -848,7 +848,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", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: ERR line - mapped to: %s", fd, err ? gpg_strerror (err) : "ok"); /* Try our best to terminate the connection friendly. */ @@ -877,7 +877,7 @@ status_handler (void *opaque, int fd) gpgsm->colon.any = 0; err = gpgsm->colon.fnc (gpgsm->colon.fnc_value, NULL); } - TRACE2 (DEBUG_CTX, "gpgme:status_handler", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: OK line - final status: %s", fd, err ? gpg_strerror (err) : "ok"); _gpgme_io_close (gpgsm->status_cb.fd); @@ -952,7 +952,7 @@ status_handler (void *opaque, int fd) dst++; } } - TRACE2 (DEBUG_CTX, "gpgme:status_handler", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: D line; final status: %s", fd, err? gpg_strerror (err):"ok"); } @@ -994,7 +994,7 @@ status_handler (void *opaque, int fd) linelen -= nwritten; } - TRACE2 (DEBUG_CTX, "gpgme:status_handler", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: D inlinedata; final status: %s", fd, err? gpg_strerror (err):"ok"); } @@ -1032,7 +1032,7 @@ status_handler (void *opaque, int fd) } else fprintf (stderr, "[UNKNOWN STATUS]%s %s", line + 2, rest); - TRACE3 (DEBUG_CTX, "gpgme:status_handler", gpgsm, + TRACE (DEBUG_CTX, "gpgme:status_handler", gpgsm, "fd 0x%x: S line (%s) - final status: %s", fd, line+2, err? gpg_strerror (err):"ok"); } @@ -1062,7 +1062,7 @@ add_io_cb (engine_gpgsm_t gpgsm, iocb_data_t *iocbd, gpgme_io_cb_t handler) { gpgme_error_t err; - TRACE_BEG2 (DEBUG_ENGINE, "engine-gpgsm:add_io_cb", gpgsm, + TRACE_BEG (DEBUG_ENGINE, "engine-gpgsm:add_io_cb", gpgsm, "fd %d, dir %d", iocbd->fd, iocbd->dir); err = (*gpgsm->io_cbs.add) (gpgsm->io_cbs.add_priv, iocbd->fd, iocbd->dir, @@ -2148,7 +2148,7 @@ gpgsm_io_event (void *engine, gpgme_event_io_t type, void *type_data) { engine_gpgsm_t gpgsm = engine; - TRACE3 (DEBUG_ENGINE, "gpgme:gpgsm_io_event", gpgsm, + TRACE (DEBUG_ENGINE, "gpgme:gpgsm_io_event", gpgsm, "event %p, type %d, type_data %p", gpgsm->io_cbs.event, type, type_data); if (gpgsm->io_cbs.event) |