BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log.c: Avoid using the same name for a variable and enum.

This commit is contained in:
Uwe Hermann 2014-05-04 20:57:38 +02:00
parent 4711724141
commit f897acaee8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
log.c
View File

@ -41,7 +41,7 @@
*/ */
/* Currently selected libsigrok loglevel. Default: SR_LOG_WARN. */ /* 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. */ /* Function prototype. */
static int sr_logv(void *cb_data, int loglevel, const char *format, 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; return SR_ERR_ARG;
} }
sr_loglevel = loglevel; cur_loglevel = loglevel;
sr_dbg("libsigrok loglevel set to %d.", 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) SR_API int sr_log_loglevel_get(void)
{ {
return sr_loglevel; return cur_loglevel;
} }
/** /**
@ -210,7 +210,7 @@ static int sr_logv(void *cb_data, int loglevel, const char *format, va_list args
(void)cb_data; (void)cb_data;
/* Only output messages of at least the selected loglevel(s). */ /* Only output messages of at least the selected loglevel(s). */
if (loglevel > sr_loglevel) if (loglevel > cur_loglevel)
return SR_OK; /* TODO? */ return SR_OK; /* TODO? */
if (sr_log_domain[0] != '\0') if (sr_log_domain[0] != '\0')