Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys Convert the macros for setting and unsetting a...
details: https://anonhg.NetBSD.org/src/rev/4c8028b86913
branches: pgoyette-compat
changeset: 447760:4c8028b86913
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Wed Jan 23 03:34:14 2019 +0000
description:
Convert the macros for setting and unsetting a hook to generate
in-line code rather than using an intermediary hook##set routine.
Hooks are set and unset only in one place, so the intermediary
routine provides no benefit. IMHO using the macro at the point-
of-call is more readable than using it elsewhere in the code and
then calling the generated intermediary routine (for which you
won't even find its declaration or definition unless you remember
to search for the HOOK_SET macro instead).
NFC intended, will verify with a bulk build and an atf test run.
diffstat:
sys/arch/amd64/amd64/netbsd32_machdep_16.c | 11 +---
sys/arch/mips/mips/netbsd32_machdep_16.c | 11 +---
sys/arch/sparc64/sparc64/netbsd32_machdep_16.c | 11 +---
sys/compat/common/bio_30.c | 11 +---
sys/compat/common/ccd_60.c | 11 +---
sys/compat/common/clockctl_50.c | 12 ++---
sys/compat/common/compat_sysv_50_mod.c | 12 ++---
sys/compat/common/ieee80211_20.c | 12 ++---
sys/compat/common/if43_20.c | 11 +---
sys/compat/common/if_43.c | 17 ++----
sys/compat/common/if_spppsubr50.c | 11 +---
sys/compat/common/kern_mod_80.c | 11 +---
sys/compat/common/rndpseudo_50.c | 9 +--
sys/compat/common/rtsock_14.c | 17 ++----
sys/compat/common/rtsock_50.c | 60 ++++++++-----------------
sys/compat/common/rtsock_70.c | 18 +++----
sys/compat/common/sysmon_power_40.c | 12 ++---
sys/compat/common/tty_60.c | 21 ++------
sys/compat/common/uipc_syscalls_40.c | 11 +---
sys/compat/common/uipc_syscalls_50.c | 9 +--
sys/compat/common/uipc_usrreq_70.c | 12 ++---
sys/compat/common/usb_subr_30.c | 18 +++----
sys/compat/common/vfs_syscalls_10.c | 11 +---
sys/compat/common/vnd_30.c | 11 +---
sys/compat/common/vnd_50.c | 11 +---
sys/compat/netbsd32/netbsd32_compat_50.c | 12 ++---
sys/compat/netbsd32/netbsd32_compat_80.c | 12 ++---
sys/compat/netbsd32/netbsd32_kern_proc.c | 20 +++-----
sys/compat/sunos/sunos_mod.c | 12 ++---
sys/compat/sunos32/sunos32_mod.c | 12 ++---
sys/dev/raidframe/rf_compat50.c | 9 +--
sys/dev/raidframe/rf_compat80.c | 10 +---
sys/dev/wscons/wsevent_50.c | 13 ++---
sys/fs/puffs/puffs_compat.c | 17 ++----
sys/opencrypto/ocryptodev.c | 11 +---
sys/sys/module_hook.h | 16 ++----
36 files changed, 185 insertions(+), 320 deletions(-)
diffs (truncated from 1551 to 300 lines):
diff -r f6253d341dcc -r 4c8028b86913 sys/arch/amd64/amd64/netbsd32_machdep_16.c
--- a/sys/arch/amd64/amd64/netbsd32_machdep_16.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.11 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.12 2019/01/23 03:34:14 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.11 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.12 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -247,19 +247,16 @@
return (EJUSTRETURN);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/arch/mips/mips/netbsd32_machdep_16.c
--- a/sys/arch/mips/mips/netbsd32_machdep_16.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/arch/mips/mips/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.9 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.10 2019/01/23 03:34:14 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -95,19 +95,16 @@
netbsd32_sendsig_siginfo(ksi, mask);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2019/01/14 13:34:26 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.5 2019/01/14 13:34:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.6 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -348,19 +348,16 @@
return (EJUSTRETURN);
}
-MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
-MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
-
void
netbsd32_machdep_md_16_init(void)
{
- netbsd32_sendsig_hook_set();
+ MODULE_SET_HOOK(netbsd32_sendsig_hook, "nb32_16", netbsd32_sendsig_16);
}
void
netbsd32_machdep_md_16_fini(void)
{
- netbsd32_sendsig_hook_unset();
+ MODULE_UNSET_HOOK(netbsd32_sendsig_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/compat/common/bio_30.c
--- a/sys/compat/common/bio_30.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/compat/common/bio_30.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bio_30.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: bio_30.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio_30.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -92,19 +92,16 @@
}
}
-MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
-MODULE_UNSET_HOOK(compat_bio_30_hook);
-
void
bio_30_init(void)
{
- compat_bio_30_hook_set();
+ MODULE_SET_HOOK(compat_bio_30_hook, "bio_30", compat_30_bio);
}
void
bio_30_fini(void)
{
- compat_bio_30_hook_unset();
+ MODULE_UNSET_HOOK(compat_bio_30_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/compat/common/ccd_60.c
--- a/sys/compat/common/ccd_60.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/compat/common/ccd_60.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: ccd_60.c,v 1.1.2.9 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.8 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.9 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -91,19 +91,16 @@
}
}
-MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
-MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
-
void
ccd_60_init(void)
{
- ccd_ioctl_60_hook_set();
+ MODULE_SET_HOOK(ccd_ioctl_60_hook, "ccd_60", compat_60_ccdioctl);
}
void
ccd_60_fini(void)
{
- ccd_ioctl_60_hook_unset();
+ MODULE_UNSET_HOOK(ccd_ioctl_60_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/compat/common/clockctl_50.c
--- a/sys/compat/common/clockctl_50.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/compat/common/clockctl_50.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl_50.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $ */
+/* $NetBSD: clockctl_50.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.4 2018/09/22 04:56:28 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl_50.c,v 1.1.2.5 2019/01/23 03:34:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -126,19 +126,17 @@
return (error);
}
-MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50", compat50_clockctlioctl);
-MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
-
void
clockctl_50_init(void)
{
- clockctl_ioctl_50_hook_set();
+ MODULE_SET_HOOK(clockctl_ioctl_50_hook, "clk_50",
+ compat50_clockctlioctl);
}
void
clockctl_50_fini(void)
{
- clockctl_ioctl_50_hook_unset();
+ MODULE_UNSET_HOOK(clockctl_ioctl_50_hook);
}
diff -r f6253d341dcc -r 4c8028b86913 sys/compat/common/compat_sysv_50_mod.c
--- a/sys/compat/common/compat_sysv_50_mod.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/compat/common/compat_sysv_50_mod.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sysv_50_mod.c,v 1.1.2.2 2018/10/15 22:06:16 pgoyette Exp $ */
+/* $NetBSD: compat_sysv_50_mod.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.1.2.2 2018/10/15 22:06:16 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -64,9 +64,6 @@
{ 0, 0, NULL }
};
-MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50", sysctl_kern_sysvipc50);
-MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
-
static int
compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
{
@@ -78,7 +75,8 @@
if (error != 0) {
break;
}
- sysvipc50_sysctl_hook_set();
+ MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50",
+ sysctl_kern_sysvipc50);
break;
case MODULE_CMD_FINI:
@@ -86,7 +84,7 @@
if (error != 0) {
break;
}
- sysvipc50_sysctl_hook_unset();
+ MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
break;
default:
diff -r f6253d341dcc -r 4c8028b86913 sys/compat/common/ieee80211_20.c
--- a/sys/compat/common/ieee80211_20.c Wed Jan 23 02:55:09 2019 +0000
+++ b/sys/compat/common/ieee80211_20.c Wed Jan 23 03:34:14 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_20.c,v 1.1.2.2 2018/09/21 03:42:20 pgoyette Exp $ */
+/* $NetBSD: ieee80211_20.c,v 1.1.2.3 2019/01/23 03:34:14 pgoyette Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
#endif
Home |
Main Index |
Thread Index |
Old Index