From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 17 Jan 2021 21:37:18 +0000 (+0900)
Subject: logs-show: simplify code
X-Git-Tag: v248-rc1~256^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd7ae1b44e48b4658476d65fe4b104a75ef05d43;p=thirdparty%2Fsystemd.git

logs-show: simplify code
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 6a1810888c9..e60ee50e1cb 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -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;
 }