From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 17 Jan 2021 21:36:42 +0000 (+0900)
Subject: terminal-util: use ansi_normal() or friends instead of ANSI_NORMAL
X-Git-Tag: v248-rc1~256^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb146d238fbd65569cc996662beccccbfd184fc9;p=thirdparty%2Fsystemd.git

terminal-util: use ansi_normal() or friends instead of ANSI_NORMAL
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 3fc03050ac1..fc63e134c38 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -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();
         }