diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-02-23 17:40:59 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-02-23 17:40:59 +0000 |
| commit | 1d65a0a62ac7f83bc84077a5079d7c7220b245ac (patch) | |
| tree | 30ae01c6a68d5ee2ad3f652c5ad7528f8e5490c8 | |
| parent | f19257666fc51681717bff37f503fe61205a297a (diff) | |
Please GCC 2.8 -Wall + some KNF
| -rw-r--r-- | sys/kern/spec_vnops.c | 11 | ||||
| -rw-r--r-- | sys/miscfs/specfs/spec_vnops.c | 11 |
2 files changed, 8 insertions, 14 deletions
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index 9302a8520ef..ca03010b899 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.14 1997/12/28 19:34:49 csapuntz Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.15 1998/02/23 17:40:58 niklas Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -435,13 +435,10 @@ spec_ioctl(v) ap->a_fflag, ap->a_p)); case VBLK: - if (ap->a_command == 0 && (long)ap->a_data == B_TAPE) - if (bdevsw[maj].d_type == D_TAPE) - return (0); - else - return (1); + if (ap->a_command == 0 && (long)ap->a_data == B_TAPE) + return ((bdevsw[maj].d_type == D_TAPE) ? 0 : 1); return ((*bdevsw[maj].d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); + ap->a_fflag, ap->a_p)); default: panic("spec_ioctl"); diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c index 9302a8520ef..ca03010b899 100644 --- a/sys/miscfs/specfs/spec_vnops.c +++ b/sys/miscfs/specfs/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.14 1997/12/28 19:34:49 csapuntz Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.15 1998/02/23 17:40:58 niklas Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -435,13 +435,10 @@ spec_ioctl(v) ap->a_fflag, ap->a_p)); case VBLK: - if (ap->a_command == 0 && (long)ap->a_data == B_TAPE) - if (bdevsw[maj].d_type == D_TAPE) - return (0); - else - return (1); + if (ap->a_command == 0 && (long)ap->a_data == B_TAPE) + return ((bdevsw[maj].d_type == D_TAPE) ? 0 : 1); return ((*bdevsw[maj].d_ioctl)(dev, ap->a_command, ap->a_data, - ap->a_fflag, ap->a_p)); + ap->a_fflag, ap->a_p)); default: panic("spec_ioctl"); |