From 3e6d9257dbc24dcb6787122a0dab0cd706add1a9 Mon Sep 17 00:00:00 2001
From: Adam Wujek <adam.wujek@cern.ch>
Date: Tue, 7 Jul 2015 18:00:03 +0200
Subject: [PATCH] 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/wrs-msg.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/userspace/libwr/wrs-msg.c b/userspace/libwr/wrs-msg.c
index f94b8bdf8..9185c6087 100644
--- 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);
--
GitLab