shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

logs-show: simplify code

Browse Source
This commit is contained in:
Yu Watanabe 2021-01-18 06:37:18 +09:00
parent bb146d238f
commit cd7ae1b44e
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/logs-show.c
View File

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