X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=log.c;h=9d0bc73d5fb18891d12222c0d4e15f922d998533;hp=7d3e0619691974a03ffe7239a53a496df752d9b2;hb=903e9b14c84400579e0d786b7a96e9e587b5849b;hpb=c57d10136f77a9011c1179d584dca68fecb12b09 diff --git a/log.c b/log.c index 7d3e061..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 #include @@ -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; } /** @@ -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')