X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=log.c;h=9d0bc73d5fb18891d12222c0d4e15f922d998533;hp=a5ca2142fc32ee2b3f70735b8044396b16742916;hb=3a1501e9e07a93a9b157fcce53aa070c5a0bf3d8;hpb=2372b1998ae5d252433d7a7a07744ba2ea81b96e

diff --git a/log.c b/log.c
index a5ca214..9d0bc73 100644
--- a/log.c
+++ b/log.c
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "libsigrokdecode.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#include "libsigrokdecode-internal.h"
+#include "libsigrokdecode-internal.h" /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include "libsigrokdecode.h"
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -38,7 +38,7 @@
  */
 
 /* Currently selected libsigrokdecode loglevel. Default: SRD_LOG_WARN. */
-static int srd_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
+static int cur_loglevel = SRD_LOG_WARN; /* Show errors+warnings per default. */
 
 /* Function prototype. */
 static int srd_logv(void *cb_data, int loglevel, const char *format,
@@ -85,7 +85,7 @@ SRD_API int srd_log_loglevel_set(int loglevel)
 		return SRD_ERR_ARG;
 	}
 
-	srd_loglevel = loglevel;
+	cur_loglevel = loglevel;
 
 	srd_dbg("libsigrokdecode loglevel set to %d.", loglevel);
 
@@ -101,7 +101,7 @@ SRD_API int srd_log_loglevel_set(int loglevel)
  */
 SRD_API int srd_log_loglevel_get(void)
 {
-	return srd_loglevel;
+	return cur_loglevel;
 }
 
 /**
@@ -162,7 +162,7 @@ SRD_API char *srd_log_logdomain_get(void)
  *
  * @return SRD_OK upon success, SRD_ERR_ARG upon invalid arguments.
  *
- * @since 0.1.0
+ * @since 0.3.0
  */
 SRD_API int srd_log_callback_set(srd_log_callback cb, void *cb_data)
 {
@@ -209,7 +209,7 @@ static int srd_logv(void *cb_data, int loglevel, const char *format,
 	(void)cb_data;
 
 	/* Only output messages of at least the selected loglevel(s). */
-	if (loglevel > srd_loglevel)
+	if (loglevel > cur_loglevel)
 		return SRD_OK;
 
 	if (srd_log_domain[0] != '\0')