From 7a1e7006d06fdbab86ea79a197c316744b09d933 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 16 Nov 2018 18:17:22 +0100 Subject: core: Protect the trace macros for fun and profit. * src/debug.h: Protect macros using. (_trace_err, _trace_sysres, _trace_syserr): New helper inline functions. Signed-off-by: Werner Koch --- src/data-mem.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/data-mem.c') diff --git a/src/data-mem.c b/src/data-mem.c index 915c3e00..f51d2fd7 100644 --- a/src/data-mem.c +++ b/src/data-mem.c @@ -177,7 +177,8 @@ gpgme_data_new (gpgme_data_t *r_dh) if (err) return TRACE_ERR (err); - return TRACE_SUC ("dh=%p", *r_dh); + TRACE_SUC ("dh=%p", *r_dh); + return 0; } @@ -214,7 +215,8 @@ 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_SUC ("dh=%p", *r_dh); + TRACE_SUC ("dh=%p", *r_dh); + return 0; } @@ -282,13 +284,9 @@ gpgme_data_release_and_get_mem (gpgme_data_t dh, size_t *r_len) gpgme_data_release (dh); if (r_len) - { - TRACE_SUC ("buffer=%p, len=%zu", str, *r_len); - } + TRACE_SUC ("buffer=%p, len=%zu", str, *r_len); else - { - TRACE_SUC ("buffer=%p", str); - } + TRACE_SUC ("buffer=%p", str); return str; } -- cgit v1.2.3