summaryrefslogtreecommitdiff
path: root/sys/kern/tty.c
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1998-02-20 14:52:00 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1998-02-20 14:52:00 +0000
commitb804ea90ea89990f37f2f428d8e8ebb54d53b701 (patch)
tree40a2e6ddd489b8516b6f437805b05ae3f9efae6a /sys/kern/tty.c
parent1a702a374be862f6571bc88af23c8d4ff720a125 (diff)
Please GCC 2.8's harsher view of good style
Diffstat (limited to 'sys/kern/tty.c')
-rw-r--r--sys/kern/tty.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index a4242bcc78b..eaa7bc736d3 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.34 1998/02/03 19:06:26 deraadt Exp $ */
+/* $OpenBSD: tty.c,v 1.35 1998/02/20 14:51:58 niklas Exp $ */
/* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */
/*-
@@ -900,7 +900,7 @@ ttioctl(tp, cmd, data, flag, p)
}
if (cmd != TIOCSETAF) {
if (ISSET(t->c_lflag, ICANON) !=
- ISSET(tp->t_lflag, ICANON))
+ ISSET(tp->t_lflag, ICANON)) {
if (ISSET(t->c_lflag, ICANON)) {
SET(tp->t_lflag, PENDIN);
ttwakeup(tp);
@@ -913,6 +913,7 @@ ttioctl(tp, cmd, data, flag, p)
tp->t_canq = tq;
CLR(tp->t_lflag, PENDIN);
}
+ }
}
tp->t_iflag = t->c_iflag;
tp->t_oflag = t->c_oflag;
@@ -1469,8 +1470,8 @@ read:
ISSET(lflag, IEXTEN | ISIG) == (IEXTEN | ISIG)) {
pgsignal(tp->t_pgrp, SIGTSTP, 1);
if (first) {
- error = ttysleep(tp, &lbolt,
- TTIPRI | PCATCH, ttybg, 0);
+ error = ttysleep(tp, &lbolt, TTIPRI | PCATCH,
+ ttybg, 0);
if (error)
break;
goto loop;