diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 0092e3a2f5..7c003f80dd 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -47,7 +47,6 @@ static volatile unsigned cached_columns = 0; static volatile unsigned cached_lines = 0; static volatile int cached_on_tty = -1; -static volatile int cached_colors_enabled = -1; static volatile int cached_color_mode = _COLOR_INVALID; static volatile int cached_underline_enabled = -1; @@ -864,7 +863,6 @@ void reset_terminal_feature_caches(void) { cached_columns = 0; cached_lines = 0; - cached_colors_enabled = -1; cached_color_mode = _COLOR_INVALID; cached_underline_enabled = -1; cached_on_tty = -1; @@ -1252,16 +1250,6 @@ ColorMode get_color_mode(void) { return cached_color_mode; } -bool colors_enabled(void) { - - /* Returns true if colors are considered supported on our stdout. */ - - if (cached_colors_enabled < 0) - cached_colors_enabled = get_color_mode() != COLOR_OFF; - - return cached_colors_enabled; -} - bool dev_console_colors_enabled(void) { _cleanup_free_ char *s = NULL; ColorMode m; diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 11a24b26b7..75e44c8726 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -148,11 +148,16 @@ void reset_terminal_feature_caches(void); bool on_tty(void); bool terminal_is_dumb(void); -bool colors_enabled(void); ColorMode get_color_mode(void); bool underline_enabled(void); bool dev_console_colors_enabled(void); +static inline bool colors_enabled(void) { + + /* Returns true if colors are considered supported on our stdout. */ + return get_color_mode() != COLOR_OFF; +} + #define DEFINE_ANSI_FUNC(name, NAME) \ static inline const char *ansi_##name(void) { \ return colors_enabled() ? ANSI_##NAME : ""; \