osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

wslog: Shorten ws_log_message_is_active() name

This commit is contained in:
João Valverde 2021-06-19 22:26:58 +01:00 committed by Wireshark GitLab Utility
parent 628fe2549a
commit 7dea683bf1
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
capture/capture_sync.c
View File

@ -1098,7 +1098,7 @@ sync_pipe_run_command(char* const argv[], gchar **data, gchar **primary_msg,
int logging_enabled;
/* check if logging is actually enabled, otherwise don't expend the CPU generating logging */
logging_enabled = ws_log_message_is_active(WS_LOG_DOMAIN, LOG_LEVEL_INFO);
logging_enabled = ws_log_msg_is_active(WS_LOG_DOMAIN, LOG_LEVEL_INFO);
if (logging_enabled) {
start_time = g_get_monotonic_time();
ws_info("sync_pipe_run_command() starts");

2
debian/libwsutil0.symbols vendored
View File

@ -233,7 +233,7 @@ libwsutil.so.0 libwsutil0 #MINVER#
ws_log_init@Base 3.5.0
ws_log_init_with_data@Base 3.5.0
ws_log_level_to_string@Base 3.5.0
ws_log_message_is_active@Base 3.5.0
ws_log_msg_is_active@Base 3.5.0
ws_log_parse_args@Base 3.5.0
ws_log_print_usage@Base 3.5.0
ws_log_set_debug_filter@Base 3.5.0

2
epan/crypt/dot11decrypt_debug.h
View File

@ -24,7 +24,7 @@ static inline void
debug_dump(const char *file, int line, const char* func,
const char* x, const guint8* y, size_t z, enum ws_log_level level)
{
if (!ws_log_message_is_active(WS_LOG_DOMAIN, level))
if (!ws_log_msg_is_active(WS_LOG_DOMAIN, level))
return;
char* tmp_str = bytes_to_str(NULL, y, (z));
ws_log_full(WS_LOG_DOMAIN, level, file, line, func, "%s: %s", x, tmp_str);

10
wsutil/wslog.c
View File

@ -221,7 +221,7 @@ static inline int level_filter_matches(GPtrArray *ptr, const char *domain,
LOG_LEVEL_NOISY, noisy_filter_positive)
gboolean ws_log_message_is_active(const char *domain, enum ws_log_level level)
gboolean ws_log_msg_is_active(const char *domain, enum ws_log_level level)
{
int action;
@ -623,7 +623,7 @@ void ws_logv(const char *domain, enum ws_log_level level,
const char *format, va_list ap)
{
if (ws_log_message_is_active(domain, level) == FALSE)
if (ws_log_msg_is_active(domain, level) == FALSE)
return;
log_write_dispatch(domain, level, NULL, -1, NULL, format, ap);
@ -634,7 +634,7 @@ void ws_logv_full(const char *domain, enum ws_log_level level,
const char *file, int line, const char *func,
const char *format, va_list ap)
{
if (ws_log_message_is_active(domain, level) == FALSE)
if (ws_log_msg_is_active(domain, level) == FALSE)
return;
log_write_dispatch(domain, level, file, line, func, format, ap);
@ -646,7 +646,7 @@ void ws_log(const char *domain, enum ws_log_level level,
{
va_list ap;
if (ws_log_message_is_active(domain, level) == FALSE)
if (ws_log_msg_is_active(domain, level) == FALSE)
return;
va_start(ap, format);
@ -661,7 +661,7 @@ void ws_log_full(const char *domain, enum ws_log_level level,
{
va_list ap;
if (ws_log_message_is_active(domain, level) == FALSE)
if (ws_log_msg_is_active(domain, level) == FALSE)
return;
va_start(ap, format);

2
wsutil/wslog.h
View File

@ -55,7 +55,7 @@ const char *ws_log_level_to_string(enum ws_log_level level);
* Returns TRUE if a message will be printed for the domain/log_level combo.
*/
WS_DLL_PUBLIC
gboolean ws_log_message_is_active(const char *domain, enum ws_log_level level);
gboolean ws_log_msg_is_active(const char *domain, enum ws_log_level level);
/** Return the currently active log level. */