From 9d6852d3a23f2c9f40ca74a07f19aef819ccf6fb Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 20 May 2019 12:41:12 +0200 Subject: lib/colors: remove unnecessary goto Signed-off-by: Karel Zak --- lib/colors.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/colors.c b/lib/colors.c index 26f3c81f7..77d16d08d 100644 --- a/lib/colors.c +++ b/lib/colors.c @@ -659,17 +659,16 @@ static int colors_terminal_is_ready(void) { int ret; - if (setupterm(NULL, STDOUT_FILENO, &ret) != 0 || ret != 1) - goto none; - ncolors = tigetnum("colors"); + if (setupterm(NULL, STDOUT_FILENO, &ret) == 0 && ret == 1) + ncolors = tigetnum("colors"); } #endif if (1 < ncolors) { DBG(CONF, ul_debug("terminal is ready (supports %d colors)", ncolors)); return 1; } -none: - DBG(CONF, ul_debug("terminal is NOT ready")); + + DBG(CONF, ul_debug("terminal is NOT ready (no colors)")); return 0; } -- cgit v1.2.3-55-g7522