1
0
mirror of https://github.com/systemd/systemd.git synced 2025-01-13 17:18:18 +03:00

Merge pull request from yuwata/use-ansi-normal

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
commit 4c6eb1d77d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 27 deletions

@ -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);

@ -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();
}

@ -1080,14 +1080,12 @@ static int run(int argc, char *argv[]) {
case '?':
case 'h':
#define ON ANSI_HIGHLIGHT
#define OFF ANSI_NORMAL
fprintf(stdout,
"\t<" ON "p" OFF "> By path; <" ON "t" OFF "> By tasks/procs; <" ON "c" OFF "> By CPU; <" ON "m" OFF "> By memory; <" ON "i" OFF "> By I/O\n"
"\t<" ON "+" OFF "> Inc. delay; <" ON "-" OFF "> Dec. delay; <" ON "%%" OFF "> Toggle time; <" ON "SPACE" OFF "> Refresh\n"
"\t<" ON "P" OFF "> Toggle count userspace processes; <" ON "k" OFF "> Toggle count all processes\n"
"\t<" ON "r" OFF "> Count processes recursively; <" ON "q" OFF "> Quit");
"\t<%1$sp%2$s> By path; <%1$st%2$s> By tasks/procs; <%1$sc%2$s> By CPU; <%1$sm%2$s> By memory; <%1$si%2$s> By I/O\n"
"\t<%1$s+%2$s> Inc. delay; <%1$s-%2$s> Dec. delay; <%1$s%%%2$s> Toggle time; <%1$sSPACE%2$s> Refresh\n"
"\t<%1$sP%2$s> Toggle count userspace processes; <%1$sk%2$s> Toggle count all processes\n"
"\t<%1$sr%2$s> Count processes recursively; <%1$sq%2$s> Quit",
ansi_highlight(), ansi_normal());
fflush(stdout);
sleep(3);
break;

@ -66,26 +66,17 @@ static int print_catalog(FILE *f, sd_journal *j) {
else
prefix = "--";
if (colors_enabled())
newline = strjoina(ANSI_NORMAL "\n", ansi_grey(), prefix, ANSI_NORMAL " ", ansi_green());
else
newline = strjoina("\n", prefix, " ");
newline = strjoina(ansi_normal(), "\n", ansi_grey(), prefix, ansi_normal(), " ", ansi_green());
z = strreplace(strstrip(t), "\n", newline);
if (!z)
return log_oom();
if (colors_enabled())
fprintf(f, "%s%s %s%s", ansi_grey(), prefix, ANSI_NORMAL, ansi_green());
else
fprintf(f, "%s ", prefix);
fprintf(f, "%s%s %s%s", ansi_grey(), prefix, ansi_normal(), ansi_green());
fputs(z, f);
if (colors_enabled())
fputs(ANSI_NORMAL "\n", f);
else
fputc('\n', f);
fprintf(f, "%s\n", ansi_normal());
return 1;
}