From 8f9f3224aac78ce9d54e19e73acf7ab659787168 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 5 Jun 2019 15:48:33 +0200 Subject: core: Improve the debug messages even more. * src/debug.c (_gpgme_debug): Add arg LINE. Chnage all callers. (_gpgme_debug_begin): Remove. * src/debug.h (TRACE_SEQ): Use the LINE arg of _gpgme_debug. -- This includes chnages to always print fds in decimal as weel as tweaking the TARCE_SEQ function to make use of the new machinery. The standard 'tag' can now always be NULL and no tag information will be printed. Signed-off-by: Werner Koch --- src/data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/data.c') diff --git a/src/data.c b/src/data.c index 44ef2d3d..70595907 100644 --- a/src/data.c +++ b/src/data.c @@ -574,7 +574,7 @@ _gpgme_data_inbound_handler (void *opaque, int fd) char *bufp = buffer; gpgme_ssize_t buflen; TRACE_BEG (DEBUG_CTX, "_gpgme_data_inbound_handler", dh, - "fd=0x%x", fd); + "fd=%d", fd); buflen = _gpgme_io_read (fd, buffer, BUFFER_SIZE); if (buflen < 0) @@ -605,7 +605,7 @@ _gpgme_data_outbound_handler (void *opaque, int fd) gpgme_data_t dh = (gpgme_data_t) data->handler_value; gpgme_ssize_t nwritten; TRACE_BEG (DEBUG_CTX, "_gpgme_data_outbound_handler", dh, - "fd=0x%x", fd); + "fd=%d", fd); if (!dh->pending_len) { -- cgit v1.2.3