From 95de667e243fe48783da0fdc92270a0d3d28ff0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Thu, 24 Feb 2011 15:37:03 +0100 Subject: [PATCH] log: debug level is between silent and debug output levels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It wasn't previously possible to silence the output. Signed-off-by: Øyvind Harboe --- src/helper/log.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/helper/log.c b/src/helper/log.c index b6fab0169..8a8f08a70 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -224,19 +224,18 @@ void log_printf_lf(enum log_levels level, const char *file, unsigned line, const va_end(ap); } -/* change the current debug level on the fly - * 0: only ERRORS - * 1: + WARNINGS - * 2: + INFORMATIONAL MSGS - * 3: + DEBUG MSGS - */ COMMAND_HANDLER(handle_debug_level_command) { if (CMD_ARGC == 1) { - unsigned new_level; - COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], new_level); - debug_level = MIN(new_level, LOG_LVL_DEBUG); + int new_level; + COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], new_level); + if ((debug_level > LOG_LVL_DEBUG) || (new_level < LOG_LVL_SILENT)) + { + LOG_ERROR("level must be between %d and %d", LOG_LVL_SILENT, LOG_LVL_DEBUG); + return ERROR_COMMAND_SYNTAX_ERROR; + } + debug_level = new_level; } else if (CMD_ARGC > 1) return ERROR_COMMAND_SYNTAX_ERROR;