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

wslog: Minor fixes and cleanups

This commit is contained in:
João Valverde 2021-06-29 15:27:04 +01:00 committed by Wireshark GitLab Utility
parent 49ca5fa8ab
commit 6ab67e2aa6
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wsutil/wslog.c
View File

@ -58,9 +58,7 @@
#define DOMAIN_DEFINED(domain) (!DOMAIN_UNDEFED(domain)) #define DOMAIN_DEFINED(domain) (!DOMAIN_UNDEFED(domain))
#define VALID_FATAL_LEVEL(level) \ #define VALID_FATAL_LEVEL(level) \
(level == LOG_LEVEL_ERROR || \ (level >= LOG_LEVEL_WARNING && level <= LOG_LEVEL_ERROR)
level == LOG_LEVEL_CRITICAL || \
level == LOG_LEVEL_WARNING)
/* /*
* 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
@ -191,7 +189,7 @@ static inline gboolean level_filter_matches(log_filter_t *filter,
if (filter == NULL || DOMAIN_UNDEFED(domain)) if (filter == NULL || DOMAIN_UNDEFED(domain))
return FALSE; return FALSE;
if (filter_contains(filter, domain) == FALSE) if (!filter_contains(filter, domain))
return FALSE; return FALSE;
if (filter->positive) { if (filter->positive) {
@ -851,7 +849,7 @@ static void log_write_dispatch(const char *domain, enum ws_log_level level,
void ws_logv(const char *domain, enum ws_log_level level, void ws_logv(const char *domain, enum ws_log_level level,
const char *format, va_list ap) const char *format, va_list ap)
{ {
if (ws_log_msg_is_active(domain, level) == FALSE) if (!ws_log_msg_is_active(domain, level))
return; return;
log_write_dispatch(domain, level, NULL, -1, NULL, format, ap); log_write_dispatch(domain, level, NULL, -1, NULL, format, ap);
@ -862,7 +860,7 @@ void ws_logv_full(const char *domain, enum ws_log_level level,
const char *file, int line, const char *func, const char *file, int line, const char *func,
const char *format, va_list ap) const char *format, va_list ap)
{ {
if (ws_log_msg_is_active(domain, level) == FALSE) if (!ws_log_msg_is_active(domain, level))
return; return;
log_write_dispatch(domain, level, file, line, func, format, ap); log_write_dispatch(domain, level, file, line, func, format, ap);
@ -872,7 +870,7 @@ void ws_logv_full(const char *domain, enum ws_log_level level,
void ws_log(const char *domain, enum ws_log_level level, void ws_log(const char *domain, enum ws_log_level level,
const char *format, ...) const char *format, ...)
{ {
if (ws_log_msg_is_active(domain, level) == FALSE) if (!ws_log_msg_is_active(domain, level))
return; return;
va_list ap; va_list ap;
@ -887,7 +885,7 @@ void ws_log_full(const char *domain, enum ws_log_level level,
const char *file, int line, const char *func, const char *file, int line, const char *func,
const char *format, ...) const char *format, ...)
{ {
if (ws_log_msg_is_active(domain, level) == FALSE) if (!ws_log_msg_is_active(domain, level))
return; return;
va_list ap; va_list ap;

4
wsutil/wslog.h
View File

@ -155,7 +155,7 @@ int ws_log_parse_args(int *argc_ptr, char *argv[],
/** Initializes the logging code. /** Initializes the logging code.
* *
* Must be called at startup before using the log API. If provided * Must be called at startup before using the log API. If provided
* vcmdarg_err is used to print initialization errors. This usuallu means * vcmdarg_err is used to print initialization errors. This usually means
* a misconfigured environment variable. * a misconfigured environment variable.
*/ */
WS_DLL_PUBLIC WS_DLL_PUBLIC
@ -177,7 +177,7 @@ void ws_log_init_with_writer(const char *progname,
/** Initializes the logging code. /** Initializes the logging code.
* *
* Accepts a user data pointer in addition to the writer. This pointer will * Accepts a user data pointer in addition to the writer. This pointer will
* be provided to the writer wit hevery invocation. If provided * be provided to the writer with every invocation. If provided
* free_user_data will be called during cleanup. * free_user_data will be called during cleanup.
*/ */
WS_DLL_PUBLIC WS_DLL_PUBLIC