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-gpg.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-gpg.c')
| -rw-r--r-- | src/engine-gpg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index c88e970a..31d219a3 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -165,7 +165,7 @@ gpg_io_event (void *engine, gpgme_event_io_t type, void *type_data) { engine_gpg_t gpg = engine; - TRACE3 (DEBUG_ENGINE, "gpgme:gpg_io_event", gpg, + TRACE (DEBUG_ENGINE, "gpgme:gpg_io_event", gpg, "event %p, type %d, type_data %p", gpg->io_cbs.event, type, type_data); if (gpg->io_cbs.event) @@ -1313,7 +1313,7 @@ read_status (engine_gpg_t gpg) received and the next thing will be that the command handler does its action. */ if (nread > 1) - TRACE0 (DEBUG_CTX, "gpgme:read_status", 0, + TRACE (DEBUG_CTX, "gpgme:read_status", 0, "error: unexpected data"); add_io_cb (gpg, gpg->cmd.fd, 0, @@ -1686,7 +1686,7 @@ gpg_decrypt (void *engine, if (have_gpg_version (gpg, "2.1.16")) { gpgme_data_release (gpg->override_session_key); - TRACE2 (DEBUG_ENGINE, "override", gpg, "seskey='%s' len=%zu\n", + TRACE (DEBUG_ENGINE, "override", gpg, "seskey='%s' len=%zu\n", override_session_key, strlen (override_session_key)); |