summaryrefslogtreecommitdiffstats
path: root/login-utils/sulogin-consoles.c
diff options
context:
space:
mode:
authorKarel Zak2013-04-17 17:23:26 +0200
committerKarel Zak2013-04-17 17:23:26 +0200
commita303e047bb0a464914b962c4cabb5c9b241ed418 (patch)
tree8f4d1ad78dee6160004ff0949b4edcfaeb216208 /login-utils/sulogin-consoles.c
parentbuild-sys: fix nsenter requirements (diff)
downloadkernel-qcow2-util-linux-a303e047bb0a464914b962c4cabb5c9b241ed418.tar.gz
kernel-qcow2-util-linux-a303e047bb0a464914b962c4cabb5c9b241ed418.tar.xz
kernel-qcow2-util-linux-a303e047bb0a464914b962c4cabb5c9b241ed418.zip
sulogin: fix compiler warnings
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils/sulogin-consoles.c')
-rw-r--r--login-utils/sulogin-consoles.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/login-utils/sulogin-consoles.c b/login-utils/sulogin-consoles.c
index 305d1e7dc..d0f0eab2b 100644
--- a/login-utils/sulogin-consoles.c
+++ b/login-utils/sulogin-consoles.c
@@ -507,11 +507,11 @@ done:
return rc;
}
+#ifdef TIOCGDEV
static int detect_consoles_from_tiocgdev(struct list_head *consoles,
int fallback,
const char *device)
{
-#ifdef TIOCGDEV
unsigned int devnum;
char *name;
int rc = 1, fd = -1;
@@ -566,9 +566,8 @@ done:
close(fd);
DBG(dbgprint("[tiocgdev rc=%d]", rc));
return rc;
-#endif
- return 2;
}
+#endif /* TIOCGDEV */
#endif /* __linux__ */
/*
@@ -704,12 +703,13 @@ console:
* Detection of the device used for Linux system console using
* the ioctl TIOCGDEV if available (e.g. official 2.6.38).
*/
+#ifdef TIOCGDEV
rc = detect_consoles_from_tiocgdev(consoles, fallback, device);
if (rc == 0)
return reconnect; /* success */
if (rc < 0)
return rc; /* fatal error */
-
+#endif
if (!list_empty(consoles)) {
DBG(dbgprint("detection success [rc=%d]", reconnect));
return reconnect;