diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-07-07 06:56:16 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-07-07 06:56:16 +0000 |
commit | 8a836816791cedf4b8b9c0387db0bbbffa977a86 (patch) | |
tree | 837cfa550b94a1b7830156e4a8434e148624271a /sys/arch | |
parent | e4ca8552c1797108085b6d7f15e770c7686da261 (diff) |
oops, i did not handle nchrdev correctly
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/alpha/alpha/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/amiga/amiga/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/arc/arc/conf.c | 9 | ||||
-rw-r--r-- | sys/arch/arm32/arm32/conf.c | 2 | ||||
-rw-r--r-- | sys/arch/atari/atari/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/hp300/hp300/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/i386/i386/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/kbus/kbus/conf.c | 2 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/pc532/pc532/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/sun3/sun3/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/vax/vax/conf.c | 4 | ||||
-rw-r--r-- | sys/arch/wgrisc/wgrisc/conf.c | 9 |
15 files changed, 32 insertions, 34 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index d8f6c833243..47ea92a1da5 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 1998/07/07 03:02:29 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.16 1998/07/07 06:55:54 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -256,7 +256,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c index 6b29db09211..495ed3a2c7b 100644 --- a/sys/arch/amiga/amiga/conf.c +++ b/sys/arch/amiga/amiga/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 1998/07/07 03:02:30 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.22 1998/07/07 06:55:56 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */ /*- @@ -263,7 +263,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/arc/arc/conf.c b/sys/arch/arc/arc/conf.c index 7be82736197..4d51304eace 100644 --- a/sys/arch/arc/arc/conf.c +++ b/sys/arch/arc/arc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 1998/07/07 03:02:32 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.22 1998/07/07 06:55:57 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 8.2 (Berkeley) 11/14/93 - * $Id: conf.c,v 1.21 1998/07/07 03:02:32 deraadt Exp $ + * $Id: conf.c,v 1.22 1998/07/07 06:55:57 deraadt Exp $ */ #include <sys/param.h> @@ -256,8 +256,7 @@ iszerodev(dev) } -#define MAXDEV 57 -static int chrtoblktbl[MAXDEV] = { +static int chrtoblktbl[] = { /* VCHR */ /* VBLK */ /* 0 */ NODEV, /* 1 */ NODEV, @@ -293,7 +292,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/arm32/arm32/conf.c b/sys/arch/arm32/arm32/conf.c index d6403058df2..4c7959ad525 100644 --- a/sys/arch/arm32/arm32/conf.c +++ b/sys/arch/arm32/arm32/conf.c @@ -366,7 +366,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c index f982504898c..a04ce8240ba 100644 --- a/sys/arch/atari/atari/conf.c +++ b/sys/arch/atari/atari/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.11 1998/07/07 03:02:35 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.12 1998/07/07 06:56:00 deraadt Exp $ */ /* * Copyright (c) 1991 The Regents of the University of California. @@ -270,7 +270,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c index cebfe9c4d9b..b444fba002c 100644 --- a/sys/arch/hp300/hp300/conf.c +++ b/sys/arch/hp300/hp300/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.19 1998/07/07 03:02:36 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.20 1998/07/07 06:56:02 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */ /*- @@ -277,7 +277,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 3d3bba2c83b..1d9758731a5 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.44 1998/07/07 03:02:38 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.45 1998/07/07 06:56:03 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -340,7 +340,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/kbus/kbus/conf.c b/sys/arch/kbus/kbus/conf.c index 00a833e13de..861c80ca782 100644 --- a/sys/arch/kbus/kbus/conf.c +++ b/sys/arch/kbus/kbus/conf.c @@ -400,7 +400,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c index a929252f44b..644ec3b9c71 100644 --- a/sys/arch/mac68k/mac68k/conf.c +++ b/sys/arch/mac68k/mac68k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.17 1998/07/07 03:02:41 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.18 1998/07/07 06:56:06 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */ /* @@ -228,7 +228,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/pc532/pc532/conf.c b/sys/arch/pc532/pc532/conf.c index 44dd560c008..da135e5c7fc 100644 --- a/sys/arch/pc532/pc532/conf.c +++ b/sys/arch/pc532/pc532/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 1998/07/07 03:02:42 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.10 1998/07/07 06:56:08 deraadt Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -188,7 +188,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c index 105d405cff9..8e0917cf252 100644 --- a/sys/arch/powerpc/powerpc/conf.c +++ b/sys/arch/powerpc/powerpc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.8 1998/07/07 03:02:45 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.9 1998/07/07 06:56:09 deraadt Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -243,7 +243,7 @@ chrtoblk(dev) { int major; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c index cc81ccc73fb..86e2b8d0be6 100644 --- a/sys/arch/sparc/sparc/conf.c +++ b/sys/arch/sparc/sparc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.16 1998/07/07 03:02:47 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.17 1998/07/07 06:56:11 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */ /* @@ -398,7 +398,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c index dba0177af94..9a021640ec9 100644 --- a/sys/arch/sun3/sun3/conf.c +++ b/sys/arch/sun3/sun3/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 1998/07/07 03:02:48 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.22 1998/07/07 06:56:12 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.51 1996/11/04 16:16:09 gwr Exp $ */ /*- @@ -284,7 +284,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c index 9b206a7e1f6..b2f44ed602a 100644 --- a/sys/arch/vax/vax/conf.c +++ b/sys/arch/vax/vax/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 1998/07/07 03:02:50 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.16 1998/07/07 06:56:14 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.28 1997/02/04 19:13:17 ragge Exp $ */ /*- @@ -521,7 +521,7 @@ int chrtoblk(dev) dev_t dev; { - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; diff --git a/sys/arch/wgrisc/wgrisc/conf.c b/sys/arch/wgrisc/wgrisc/conf.c index 7df87ae56f4..44d3f3a3c2c 100644 --- a/sys/arch/wgrisc/wgrisc/conf.c +++ b/sys/arch/wgrisc/wgrisc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 1998/07/07 03:02:51 deraadt Exp $ */ +/* $OpenBSD: conf.c,v 1.6 1998/07/07 06:56:15 deraadt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 8.2 (Berkeley) 11/14/93 - * $Id: conf.c,v 1.5 1998/07/07 03:02:51 deraadt Exp $ + * $Id: conf.c,v 1.6 1998/07/07 06:56:15 deraadt Exp $ */ #include <sys/param.h> @@ -223,8 +223,7 @@ iszerodev(dev) } -#define MAXDEV 57 -static int chrtoblktbl[MAXDEV] = { +static int chrtoblktbl[] = { /* VCHR */ /* VBLK */ /* 0 */ NODEV, /* 1 */ NODEV, @@ -261,7 +260,7 @@ chrtoblk(dev) { int blkmaj; - if (major(dev) >= MAXDEV || + if (major(dev) >= nchrdev || major(dev) > sizeof(chrtoblktbl)/sizeof(chrtoblktbl[0])) return (NODEV); blkmaj = chrtoblktbl[major(dev)]; |