testo: Detach kernel driver as needed, and code optimization.

[libsigrok.git] / log.c

diff --git a/log.c b/log.c
index 44bd49c57dc9f5494397e4b7f1fb153e6c2f6e6d..db16c30dabb00597d438307196a19a310b01104f 100644 (file)
--- a/log.c
+++ b/log.c
@@ -41,7 +41,7 @@
  */
 
 /* Currently selected libsigrok loglevel. Default: SR_LOG_WARN. */
-static int sr_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
+static int cur_loglevel = SR_LOG_WARN; /* Show errors+warnings per default. */
 
 /* Function prototype. */
 static int sr_logv(void *cb_data, int loglevel, const char *format,
@@ -87,7 +87,7 @@ SR_API int sr_log_loglevel_set(int loglevel)
                return SR_ERR_ARG;
        }
 
-       sr_loglevel = loglevel;
+       cur_loglevel = loglevel;
 
        sr_dbg("libsigrok loglevel set to %d.", loglevel);
 
@@ -103,7 +103,7 @@ SR_API int sr_log_loglevel_set(int loglevel)
  */
 SR_API int sr_log_loglevel_get(void)
 {
-       return sr_loglevel;
+       return cur_loglevel;
 }
 
 /**
@@ -164,7 +164,7 @@ SR_API char *sr_log_logdomain_get(void)
  *
  * @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
  *
- * @since 0.1.0
+ * @since 0.3.0
  */
 SR_API int sr_log_callback_set(sr_log_callback cb, void *cb_data)
 {
@@ -210,7 +210,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
        (void)cb_data;
 
        /* Only output messages of at least the selected loglevel(s). */
-       if (loglevel > sr_loglevel)
+       if (loglevel > cur_loglevel)
                return SR_OK; /* TODO? */
 
        if (sr_log_domain[0] != '\0')