osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wslog: Refactor ws_log_set_fatal() for consistency

This commit is contained in:
João Valverde 2022-01-24 17:29:04 +00:00 committed by A Wireshark GitLab Utility
parent d7f3612613
commit 18a2a6827f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wsutil/wslog.c
View File

@ -65,9 +65,6 @@
#define DOMAIN_UNDEFED(domain) ((domain) == NULL || *(domain) == '\0') #define DOMAIN_UNDEFED(domain) ((domain) == NULL || *(domain) == '\0')
#define DOMAIN_DEFINED(domain) (!DOMAIN_UNDEFED(domain)) #define DOMAIN_DEFINED(domain) (!DOMAIN_UNDEFED(domain))
#define VALID_FATAL_LEVEL(level) \
(level >= LOG_LEVEL_WARNING && level <= LOG_LEVEL_ERROR)
/* /*
* Note: I didn't measure it but I assume using a string array is faster than * Note: I didn't measure it but I assume using a string array is faster than
* a GHashTable for small number N of domains. * a GHashTable for small number N of domains.
@ -643,12 +640,17 @@ void ws_log_set_noisy_filter(const char *str_filter)
} }
void ws_log_set_fatal(enum ws_log_level level) enum ws_log_level ws_log_set_fatal(enum ws_log_level level)
{ {
if (!VALID_FATAL_LEVEL(level)) if (level <= LOG_LEVEL_NONE || level >= _LOG_LEVEL_LAST)
return; return LOG_LEVEL_NONE;
if (level > LOG_LEVEL_ERROR)
level = LOG_LEVEL_ERROR;
if (level < LOG_LEVEL_WARNING)
level = LOG_LEVEL_WARNING;
fatal_log_level = level; fatal_log_level = level;
return fatal_log_level;
} }
@ -657,11 +659,7 @@ enum ws_log_level ws_log_set_fatal_str(const char *str_level)
enum ws_log_level level; enum ws_log_level level;
level = string_to_log_level(str_level); level = string_to_log_level(str_level);
if (!VALID_FATAL_LEVEL(level)) return ws_log_set_fatal(level);
return LOG_LEVEL_NONE;
fatal_log_level = level;
return fatal_log_level;
} }

2
wsutil/wslog.h
View File

@ -155,7 +155,7 @@ void ws_log_set_noisy_filter(const char *str_filter);
* Level LOG_LEVEL_ERROR is always fatal. * Level LOG_LEVEL_ERROR is always fatal.
*/ */
WS_DLL_PUBLIC WS_DLL_PUBLIC
void ws_log_set_fatal(enum ws_log_level level); enum ws_log_level ws_log_set_fatal(enum ws_log_level level);
/** Set the fatal log level from a string. /** Set the fatal log level from a string.