logs-show: simplify code

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 6a1810888c9b2161eb0d2f64745eee036399fce1..e60ee50e1cbcb218f2bd9c17f58ada94cfbae764 100644 (file)
--- 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;
 }