From: Uwe Hermann <redacted>
Date: Sat, 21 Apr 2018 22:17:49 +0000 (+0200)
Subject: log: Move log level check so that it affects all handlers.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=5292279cbe4c228bbc31b8caf05eb6ebdfa29bde;p=libsigrokdecode.git

log: Move log level check so that it affects all handlers.

Before this change, the loglevel check would only be performed for the
default log handler in libsigrokdecode, but not for other handlers set
via srd_log_callback_set().

This fixes bug #698.
---

diff --git a/log.c b/log.c
index a94bde7..459a5c1 100644
--- a/log.c
+++ b/log.c
@@ -156,9 +156,7 @@ static int srd_logv(void *cb_data, int loglevel, const char *format,
 	/* This specific log callback doesn't need the void pointer data. */
 	(void)cb_data;
 
-	/* Only output messages of at least the selected loglevel(s). */
-	if (loglevel > cur_loglevel)
-		return SRD_OK;
+	(void)loglevel;
 
 	if (fputs("srd: ", stderr) < 0
 			|| g_vfprintf(stderr, format, args) < 0
@@ -176,6 +174,10 @@ SRD_PRIV int srd_log(int loglevel, const char *format, ...)
 	int ret;
 	va_list args;
 
+	/* Only output messages of at least the selected loglevel(s). */
+	if (loglevel > cur_loglevel)
+		return SRD_OK;
+
 	va_start(args, format);
 	ret = srd_log_cb(srd_log_cb_data, loglevel, format, args);
 	va_end(args);