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

wslog: Rename default log level

This commit is contained in:
João Valverde 2021-06-14 15:02:23 +01:00 committed by Wireshark GitLab Utility
parent 42c6c4781f
commit 59eff63794
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ws_log_domains.h
View File

@ -14,7 +14,7 @@
/* Null domain */
#define LOG_DOMAIN_NONE "(notset)"
/* Default domain */
#define LOG_DOMAIN_DEFAULT "Default"
#define LOG_DOMAIN_DEFAULT "()"
/* Main execution domain (wireshark, tshark, etc) */
#define LOG_DOMAIN_MAIN "Main"
/* Capture domain (except for capture child, see below) */
@ -25,7 +25,7 @@
#define LOG_DOMAIN_WIRETAP "Wiretap"
#define LOG_DOMAIN_EPAN "Epan"
#define LOG_DOMAIN_WSUTIL "WSUtil"
#define LOG_DOMAIN_QTUI "GUI"
#define LOG_DOMAIN_QTUI "GUI"
#endif /* __WS_LOG_DOMAINS_H__ */

23
wsutil/wslog.c
View File

@ -314,22 +314,6 @@ void ws_log_init_with_data(ws_log_writer_cb *writer, void *user_data,
}
static inline const char *_lvl_to_str(enum ws_log_level level)
{
switch (level) {
case LOG_LEVEL_NONE: return "(NONE)";
case LOG_LEVEL_ERROR: return "ERROR";
case LOG_LEVEL_CRITICAL: return "CRITICAL";
case LOG_LEVEL_WARNING: return "WARNING";
case LOG_LEVEL_MESSAGE: return "MESSAGE";
case LOG_LEVEL_INFO: return "INFO";
case LOG_LEVEL_DEBUG: return "DEBUG";
default:
return "(BOGUS LOG LEVEL)";
}
}
struct logstr {
char buffer[PREFIX_BUFSIZE];
char *ptr;
@ -412,7 +396,12 @@ static void logstr_prefix_print(struct logstr *str,
create_log_time(str);
logstr_snprintf(str, " [%s-%s]", domain, _lvl_to_str(level));
const char *level_str = ws_log_level_to_string(level);
if (strcmp(domain, LOG_DOMAIN_DEFAULT) != 0)
logstr_snprintf(str, " [%s-%s]", domain, level_str);
else
logstr_snprintf(str, " [%s]", level_str);
if (func)
logstr_snprintf(str, " %s()", func);