From: Sami Kerola <kerolasa@iki.fi>
Date: Mon, 1 Jul 2019 21:02:06 +0000 (+0100)
Subject: lib/ttyutils: avoid checking same thing twice
X-Git-Tag: v2.35-rc1~317^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5119ef0a8335a7a9e3fde2b6990ed66e2c0b5974;p=thirdparty%2Futil-linux.git

lib/ttyutils: avoid checking same thing twice

Check cols and lines are not NULL only once.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/lib/ttyutils.c b/lib/ttyutils.c
index 166e49e11a..8649f435ae 100644
--- a/lib/ttyutils.c
+++ b/lib/ttyutils.c
@@ -47,16 +47,16 @@ int get_terminal_dimension(int *cols, int *lines)
 		l = t_win.ts_lines;
 	}
 #endif
-
-	if (cols && c <= 0)
-		c = get_env_int("COLUMNS");
-	if (lines && l <= 0)
-		l = get_env_int("LINES");
-
-	if (cols)
+	if (cols) {
+		if (c <= 0)
+			c = get_env_int("COLUMNS");
 		*cols = c;
-	if (lines)
+	}
+	if (lines) {
+		if (l <= 0)
+			l = get_env_int("LINES");
 		*lines = l;
+	}
 	return 0;
 }