diff options
| -rw-r--r-- | sys/kern/kern_time.c | 8 | ||||
| -rw-r--r-- | sys/kern/subr_autoconf.c | 5 | ||||
| -rw-r--r-- | sys/kern/tty.c | 9 | ||||
| -rw-r--r-- | sys/kern/vfs_cluster.c | 8 | ||||
| -rw-r--r-- | sys/kern/vfs_init.c | 4 |
5 files changed, 20 insertions, 14 deletions
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index 264ff8a758a..a8eea50fd48 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_time.c,v 1.11 1998/02/08 22:41:35 tholo Exp $ */ +/* $OpenBSD: kern_time.c,v 1.12 1998/02/20 14:51:56 niklas Exp $ */ /* $NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $ */ /* @@ -420,11 +420,13 @@ sys_getitimer(p, v, retval) * current time and time for the timer to go off. */ aitv = p->p_realtimer; - if (timerisset(&aitv.it_value)) + if (timerisset(&aitv.it_value)) { if (timercmp(&aitv.it_value, &time, <)) timerclear(&aitv.it_value); else - timersub(&aitv.it_value, &time, &aitv.it_value); + timersub(&aitv.it_value, &time, + &aitv.it_value); + } } else aitv = p->p_stats->p_timer[SCARG(uap, which)]; splx(s); diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 13c6e0f6fcc..1e005392b27 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.19 1998/01/21 12:23:45 niklas Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.20 1998/02/20 14:51:57 niklas Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -200,13 +200,14 @@ config_search(fn, parent, aux) mapply(&m, cf); } } - if (autoconf_verbose) + if (autoconf_verbose) { if (m.match) printf(">>> probe for %s%d won\n", ((struct cfdata *)m.match)->cf_driver->cd_name, ((struct cfdata *)m.match)->cf_unit); else printf(">>> no winning probe\n"); + } return (m.match); } 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; diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 924b11f1403..6ed498fc751 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cluster.c,v 1.12 1998/01/08 15:51:56 csapuntz Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.13 1998/02/20 14:51:58 niklas Exp $ */ /* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /*- @@ -239,18 +239,20 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp) /* XXX Kirk, do we need to make sure the bp has creds? */ skip_readahead: - if (bp) + if (bp) { if (bp->b_flags & (B_DONE | B_DELWRI)) panic("cluster_read: DONE bp"); else error = VOP_STRATEGY(bp); + } - if (rbp) + if (rbp) { if (error || rbp->b_flags & (B_DONE | B_DELWRI)) { rbp->b_flags &= ~(B_ASYNC | B_READ); brelse(rbp); } else (void) VOP_STRATEGY(rbp); + } /* * Recalculate our maximum readahead diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index b91958464e8..44ee11dc760 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_init.c,v 1.7 1997/11/06 05:58:27 csapuntz Exp $ */ +/* $OpenBSD: vfs_init.c,v 1.8 1998/02/20 14:51:59 niklas Exp $ */ /* $NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $ */ /* @@ -75,7 +75,7 @@ extern struct vnodeop_desc *vfs_op_descs[]; */ int vfs_opv_numops; -typedef (*PFI) __P((void *)); +typedef int (*PFI) __P((void *)); /* * A miscellaneous routine. |