From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 8 Dec 2020 16:44:36 +0000 (+0900)
Subject: log: make show_color variable tristate
X-Git-Tag: v248-rc1~551^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db987463fe2df3e2999e1968709a32a674d8e78d;p=thirdparty%2Fsystemd.git

log: make show_color variable tristate

Should not change any behavior.
---

diff --git a/src/basic/log.c b/src/basic/log.c
index 5a87ad3c726..d2aaf08368a 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -51,7 +51,7 @@ static int journal_fd = -1;
 
 static bool syslog_is_stream = false;
 
-static bool show_color = false;
+static int show_color = -1; /* tristate */
 static bool show_location = false;
 static bool show_time = false;
 static bool show_tid = false;
@@ -398,12 +398,12 @@ static int write_to_console(
                 iovec[n++] = IOVEC_MAKE_STRING(tid_string);
         }
 
-        if (show_color)
+        if (log_get_show_color())
                 get_log_colors(LOG_PRI(level), &on, &off, NULL);
 
         if (show_location) {
                 const char *lon = "", *loff = "";
-                if (show_color) {
+                if (log_get_show_color()) {
                         lon = ANSI_HIGHLIGHT_YELLOW4;
                         loff = ANSI_NORMAL;
                 }
@@ -1221,7 +1221,7 @@ void log_show_color(bool b) {
 }
 
 bool log_get_show_color(void) {
-        return show_color;
+        return show_color > 0; /* Defaults to false. */
 }
 
 void log_show_location(bool b) {