From: 0xAX <0xAX@users.noreply.github.com>
Date: Fri, 19 Aug 2016 22:51:54 +0000 (+0300)
Subject: terminal-util: remove unnecessary check of result of isatty() (#4000)
X-Git-Tag: v232~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6c9fa74a5b1dc1c29797cab43a078b512438885;p=thirdparty%2Fsystemd.git

terminal-util: remove unnecessary check of result of isatty() (#4000)

After the call of the isatty() we check its result twice in the
open_terminal(). There are no sense to check result of isatty() that
it is less than zero and return -errno, because as described in
documentation:

isatty() returns 1 if fd is an open file descriptor referring to a
terminal;  otherwise 0 is returned, and errno is set to indicate the
error.

So it can't be less than zero.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index bfa936bd4e6..eafdea9eb35 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -346,12 +346,7 @@ int open_terminal(const char *name, int mode) {
         }
 
         r = isatty(fd);
-        if (r < 0) {
-                safe_close(fd);
-                return -errno;
-        }
-
-        if (!r) {
+        if (r == 0) {
                 safe_close(fd);
                 return -ENOTTY;
         }