userspace/libwr: fix changing verbosity level from cmd

Fix specifying verbosity level by setting WRS_MSG_LEVEL env variable and fix changing verbosity with -v/-q Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/libwr: fix changing verbosity level from cmd
Fix specifying verbosity level by setting WRS_MSG_LEVEL env variable and fix changing verbosity with -v/-q Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
3e6d9257 · Adam Wujek · c23a80e9 · 3e6d9257
Commit 3e6d9257 authored Jul 07, 2015 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

wrs-msg.c userspace/libwr/wrs-msg.c +6 -2

No files found.
--- a/userspace/libwr/wrs-msg.c
+++ b/userspace/libwr/wrs-msg.c
@@ -44,12 +44,14 @@ void wrs_msg_init(int argc, char **argv)
 {
 	int i;
 	int max = ARRAY_SIZE(wrs_msg_used_levels) - 1;
+	char *e;

 	prgname = argv[0];
 	wrs_msg_f = stderr;

-	if (getenv("WRS_MSG_LEVEL")) {
-		i = atoi("WRS_MSG_LEVEL");
+	e = getenv("WRS_MSG_LEVEL");
+	if (e) {
+		i = atoi(e);
 		if (i) /* not 0 (EMERG) as atoi returns 0 on error */
 			wrs_msg_level = i;
 	}
@@ -65,6 +67,8 @@ void wrs_msg_init(int argc, char **argv)
 			wrs_msg_pos++;
 	}

+	wrs_msg_level = wrs_msg_used_levels[wrs_msg_pos];
+
 	/* Prepare for run-time changes */
 	signal(SIGUSR1, wrs_msg_sighandler);
 	signal(SIGUSR2, wrs_msg_sighandler);