From 4912f94d4a7e2b653e74201ac73923335fd298aa Mon Sep 17 00:00:00 2001 From: jsg Date: Sat, 15 Oct 2022 10:12:12 +0000 Subject: [PATCH] ansi --- sys/arch/alpha/alpha/conf.c | 10 ++++------ sys/arch/hppa/hppa/conf.c | 10 ++++------ sys/arch/landisk/landisk/conf.c | 8 +++----- sys/arch/loongson/loongson/conf.c | 10 ++++------ sys/arch/luna88k/luna88k/conf.c | 10 ++++------ sys/arch/octeon/octeon/conf.c | 10 ++++------ sys/arch/sparc64/sparc64/conf.c | 8 +++----- 7 files changed, 26 insertions(+), 40 deletions(-) diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c index b13a46e703c..c8ee409f250 100644 --- a/sys/arch/alpha/alpha/conf.c +++ b/sys/arch/alpha/alpha/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.91 2022/09/02 20:06:55 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.92 2022/10/15 10:12:12 jsg Exp $ */ /* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */ /*- @@ -228,8 +228,7 @@ dev_t swapdev = makedev(1, 0); * Returns true if dev is /dev/mem or /dev/kmem. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { return (major(dev) == mem_no && minor(dev) < 2); @@ -239,15 +238,14 @@ iskmemdev(dev) * Returns true if dev is /dev/zero. */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == mem_no && minor(dev) == 12); } dev_t -getnulldev() +getnulldev(void) { return makedev(mem_no, 2); } diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index 4e62dd5079f..51e9a283774 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.74 2022/09/02 20:06:55 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.75 2022/10/15 10:12:13 jsg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -257,14 +257,13 @@ const int nchrtoblktbl = nitems(chrtoblktbl); * Returns true if dev is /dev/zero. */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == mem_no && minor(dev) == 12); } dev_t -getnulldev() +getnulldev(void) { return makedev(mem_no, 2); } @@ -273,8 +272,7 @@ getnulldev() * Returns true if dev is /dev/mem or /dev/kmem. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { return (major(dev) == mem_no && minor(dev) < 2); } diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c index d20bd3ca471..f49455d43e6 100644 --- a/sys/arch/landisk/landisk/conf.c +++ b/sys/arch/landisk/landisk/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.45 2022/09/02 20:06:56 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.46 2022/10/15 10:12:13 jsg Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -380,8 +380,7 @@ dev_t swapdev = makedev(1, 0); * Returns true if dev is /dev/mem or /dev/kmem. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { return (major(dev) == mem_no && minor(dev) < 2); } @@ -390,8 +389,7 @@ iskmemdev(dev) * Returns true if dev is /dev/zero. */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == mem_no && minor(dev) == 3); } diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c index a7dea856e54..a4005114904 100644 --- a/sys/arch/loongson/loongson/conf.c +++ b/sys/arch/loongson/loongson/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.32 2022/09/02 20:06:56 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.33 2022/10/15 10:12:13 jsg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -250,8 +250,7 @@ dev_t swapdev = makedev(1, 0); * A minimal stub routine can always return 0. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { if (major(dev) == 3 && (minor(dev) == 0 || minor(dev) == 1)) @@ -263,14 +262,13 @@ iskmemdev(dev) * Returns true if def is /dev/zero */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == 3 && minor(dev) == 12); } dev_t -getnulldev() +getnulldev(void) { return(makedev(3, 2)); } diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c index 9c51bfbaa43..d4726291402 100644 --- a/sys/arch/luna88k/luna88k/conf.c +++ b/sys/arch/luna88k/luna88k/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.36 2022/09/02 20:06:56 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.37 2022/10/15 10:12:13 jsg Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -181,8 +181,7 @@ dev_t swapdev = makedev(3, 0); * Returns true if dev is /dev/mem or /dev/kmem. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { return (major(dev) == mem_no && minor(dev) < 2); @@ -192,15 +191,14 @@ iskmemdev(dev) * Returns true if dev is /dev/zero. */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == mem_no && minor(dev) == 12); } dev_t -getnulldev() +getnulldev(void) { return makedev(mem_no, 2); } diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c index 126723050c1..e90e5988188 100644 --- a/sys/arch/octeon/octeon/conf.c +++ b/sys/arch/octeon/octeon/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.28 2022/09/02 20:06:56 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.29 2022/10/15 10:12:13 jsg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -257,8 +257,7 @@ dev_t swapdev = makedev(1, 0); * A minimal stub routine can always return 0. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { if (major(dev) == 3 && (minor(dev) == 0 || minor(dev) == 1)) @@ -270,14 +269,13 @@ iskmemdev(dev) * Returns true if def is /dev/zero */ int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == 3 && minor(dev) == 12); } dev_t -getnulldev() +getnulldev(void) { return(makedev(3, 2)); } diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c index 497db445498..294b02bf3d8 100644 --- a/sys/arch/sparc64/sparc64/conf.c +++ b/sys/arch/sparc64/sparc64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.87 2022/09/02 20:06:56 miod Exp $ */ +/* $OpenBSD: conf.c,v 1.88 2022/10/15 10:12:13 jsg Exp $ */ /* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */ /* @@ -320,16 +320,14 @@ dev_t swapdev = makedev(4, 0); * A minimal stub routine can always return 0. */ int -iskmemdev(dev) - dev_t dev; +iskmemdev(dev_t dev) { return (major(dev) == mem_no && minor(dev) < 2); } int -iszerodev(dev) - dev_t dev; +iszerodev(dev_t dev) { return (major(dev) == mem_no && minor(dev) == 12); } -- 2.20.1