From d8fd633ebb5c0ef288ab184fe55e534b36600745 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 25 Oct 2015 20:43:15 +0200 Subject: [PATCH] Do not write ERROR level log entries if debug file is not used wpa_debug_reopen_file() used to write an error message at MSG_ERROR level if it was called with last_path == NULL (the last debug log file path not known). This is not a fatal error, but a normal case if wpa_debug_open_file() has not been used. Remove the error message and return success in such case. Signed-off-by: Jouni Malinen --- src/utils/wpa_debug.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c index 61c0d5ce6..3275524f6 100644 --- a/src/utils/wpa_debug.c +++ b/src/utils/wpa_debug.c @@ -517,16 +517,18 @@ int wpa_debug_reopen_file(void) { #ifdef CONFIG_DEBUG_FILE int rv; - if (last_path) { - char *tmp = os_strdup(last_path); - wpa_debug_close_file(); - rv = wpa_debug_open_file(tmp); - os_free(tmp); - } else { - wpa_printf(MSG_ERROR, "Last-path was not set, cannot " - "re-open log file."); - rv = -1; - } + char *tmp; + + if (!last_path) + return 0; /* logfile not used */ + + tmp = os_strdup(last_path); + if (!tmp) + return -1; + + wpa_debug_close_file(); + rv = wpa_debug_open_file(tmp); + os_free(tmp); return rv; #else /* CONFIG_DEBUG_FILE */ return 0;