From 0ff2d2be0942a28747ec4a4c966f86bde004815f Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 18 Oct 2012 14:35:15 +0300 Subject: [PATCH] Upstream: gresolv: Make debug func print more useful information The file and function names are printed in debug prints. --- gweb/gresolv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gweb/gresolv.c b/gweb/gresolv.c index f7d47ec..e359bf5 100644 --- a/gweb/gresolv.c +++ b/gweb/gresolv.c @@ -115,18 +115,26 @@ struct _GResolv { gpointer debug_data; }; -static inline void debug(GResolv *resolv, const char *format, ...) +#define debug(resolv, format, arg...) \ + _debug(resolv, __FILE__, __func__, format, ## arg) + +static void _debug(GResolv *resolv, const char *file, const char *caller, + const char *format, ...) { char str[256]; va_list ap; + int len; if (resolv->debug_func == NULL) return; va_start(ap, format); - if (vsnprintf(str, sizeof(str), format, ap) > 0) - resolv->debug_func(str, resolv->debug_data); + if ((len = snprintf(str, sizeof(str), "%s:%s() resolv %p ", + file, caller, resolv)) > 0) { + if (vsnprintf(str + len, sizeof(str) - len, format, ap) > 0) + resolv->debug_func(str, resolv->debug_data); + } va_end(ap); } -- 2.7.4