SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18371 from yuwata/use-ansi-normal

Browse Source 
tree-wide: use ansi_normal() instead of ANSI_NORMAL
This commit is contained in:
Yu Watanabe
2021-01-25 23:40:14 +09:00
committed by GitHub
parent 5312fa8751 6d533e56f8
commit 4c6eb1d77d
4 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/log.c
+1 -1
View File
@@ -403,7 +403,7 @@ static int write_to_console(
const char *lon = "", *loff = "";
if (log_get_show_color()) {
lon = ansi_highlight_yellow4();
loff = ANSI_NORMAL;
loff = ansi_normal();
}
(void) snprintf(location, sizeof location, "%s%s:%i%s: ", lon, file, line, loff);
src/basic/terminal-util.c
+7 -7
View File
@@ -1375,23 +1375,23 @@ void get_log_colors(int priority, const char **on, const char **off, const char
if (on)
*on = ansi_highlight_red();
if (off)
*off = ANSI_NORMAL;
*off = ansi_normal();
if (highlight)
*highlight = ANSI_HIGHLIGHT;
*highlight = ansi_highlight();
} else if (priority <= LOG_WARNING) {
if (on)
*on = ansi_highlight_yellow();
if (off)
*off = ANSI_NORMAL;
*off = ansi_normal();
if (highlight)
*highlight = ANSI_HIGHLIGHT;
*highlight = ansi_highlight();
} else if (priority <= LOG_NOTICE) {
if (on)
*on = ANSI_HIGHLIGHT;
*on = ansi_highlight();
if (off)
*off = ANSI_NORMAL;
*off = ansi_normal();
if (highlight)
*highlight = ansi_highlight_red();
@@ -1399,7 +1399,7 @@ void get_log_colors(int priority, const char **on, const char **off, const char
if (on)
*on = ansi_grey();
if (off)
*off = ANSI_NORMAL;
*off = ansi_normal();
if (highlight)
*highlight = ansi_highlight_red();
}