60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
From 028f717e06d8496e15de6c4eaef3ecd88bd9c8d0 Mon Sep 17 00:00:00 2001
|
|
From: Phil Sutter <phil@nwl.cc>
|
|
Date: Fri, 17 Aug 2018 18:38:46 +0200
|
|
Subject: [PATCH] lib: Make check_enable_color() return boolean
|
|
|
|
As suggested, turn return code into true/false although it's not checked
|
|
anywhere yet.
|
|
|
|
Fixes: 4d82962cccc6a ("Merge common code for conditionally colored output")
|
|
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
(cherry picked from commit 515a766cd29bbed8a180733e93bc8590b001cad7)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
include/color.h | 2 +-
|
|
lib/color.c | 8 ++++----
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/include/color.h b/include/color.h
|
|
index a22a00c2277e0..e30f28c51c844 100644
|
|
--- a/include/color.h
|
|
+++ b/include/color.h
|
|
@@ -21,7 +21,7 @@ enum color_opt {
|
|
};
|
|
|
|
void enable_color(void);
|
|
-int check_enable_color(int color, int json);
|
|
+bool check_enable_color(int color, int json);
|
|
bool matches_color(const char *arg, int *val);
|
|
void set_color_palette(void);
|
|
int color_fprintf(FILE *fp, enum color_attr attr, const char *fmt, ...);
|
|
diff --git a/lib/color.c b/lib/color.c
|
|
index 9c9023587748f..eaf69e74d673a 100644
|
|
--- a/lib/color.c
|
|
+++ b/lib/color.c
|
|
@@ -79,16 +79,16 @@ void enable_color(void)
|
|
set_color_palette();
|
|
}
|
|
|
|
-int check_enable_color(int color, int json)
|
|
+bool check_enable_color(int color, int json)
|
|
{
|
|
if (json || color == COLOR_OPT_NEVER)
|
|
- return 1;
|
|
+ return false;
|
|
|
|
if (color == COLOR_OPT_ALWAYS || isatty(fileno(stdout))) {
|
|
enable_color();
|
|
- return 0;
|
|
+ return true;
|
|
}
|
|
- return 1;
|
|
+ return false;
|
|
}
|
|
|
|
bool matches_color(const char *arg, int *val)
|
|
--
|
|
2.18.0
|
|
|