summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
author0xAX <0xAX@users.noreply.github.com>2016-08-20 01:51:54 +0300
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-08-19 18:51:54 -0400
commite6c9fa74a5b1dc1c29797cab43a078b512438885 (patch)
tree7d25a9bcc545e010243df0ff902c17bb74b7b8e0 /src
parent29272c04a73b00b5420ee686d73c3bc74d29d169 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/basic/terminal-util.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index bfa936bd4e..eafdea9eb3 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;
}