Style police catches up with rev 1.26 of src/sys/sys/sysctl.h:

Sanitize SYSCTL_HANDLER_ARGS so that simplistic tools can grog our
sources:

        -sysctl_vm_zone SYSCTL_HANDLER_ARGS
        +sysctl_vm_zone (SYSCTL_HANDLER_ARGS)

20 files changed, 39 insertions, 39 deletions

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 791100bde396..b0524ab16472 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -413,7 +413,7 @@ statclock(frame)
  * Return information about system clocks.
  */
 static int
-sysctl_kern_clockrate SYSCTL_HANDLER_ARGS
+sysctl_kern_clockrate (SYSCTL_HANDLER_ARGS)
 {
 	struct clockinfo clkinfo;
 	/*
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 89121ac2fdd9..6c4ea412f18c 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1269,7 +1269,7 @@ dupfdopen(fdp, indx, dfd, mode, error)
  * Get file structures.
  */
 static int
-sysctl_kern_file SYSCTL_HANDLER_ARGS
+sysctl_kern_file (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	struct file *fp;
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 404aaa3cada4..a00a20b1c28e 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -102,7 +102,7 @@ getenv_quad(char *name, quad_t *data)
 }
 
 static int
-sysctl_kernenv SYSCTL_HANDLER_ARGS
+sysctl_kernenv (SYSCTL_HANDLER_ARGS)
 {
     int		*name = (int *)arg1;
     u_int	namelen = arg2;
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 35aa1135042f..a83b7659cd08 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -154,7 +154,7 @@ static int nextpid = 0;
 static int randompid = 0;
 
 static int
-sysctl_kern_randompid SYSCTL_HANDLER_ARGS
+sysctl_kern_randompid (SYSCTL_HANDLER_ARGS)
 {
 		int error, pid;
 
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index 35c70fb19b17..8f7dd0c41d85 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -142,7 +142,7 @@ SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD,
 char hostname[MAXHOSTNAMELEN];
 
 static int
-sysctl_hostname SYSCTL_HANDLER_ARGS
+sysctl_hostname (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 
@@ -165,7 +165,7 @@ SYSCTL_PROC(_kern, KERN_HOSTNAME, hostname,
 int securelevel = -1;
 
 static int
-sysctl_kern_securelvl SYSCTL_HANDLER_ARGS
+sysctl_kern_securelvl (SYSCTL_HANDLER_ARGS)
 {
 		int error, level;
 
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index bfec5380d76e..c0163c0975df 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -198,7 +198,7 @@ static void hardupdate(long offset);
  * See the timex.h header file for synopsis and API description.
  */
 static int
-ntp_sysctl SYSCTL_HANDLER_ARGS
+ntp_sysctl (SYSCTL_HANDLER_ARGS)
 {
 	struct ntptimeval ntv;	/* temporary structure */
 	struct timespec atv;	/* nanosecond time */
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 6cb35729b6f9..581aab791600 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -560,7 +560,7 @@ sysctl_out_proc(struct proc *p, struct sysctl_req *req, int doingzomb)
 }
 
 static int
-sysctl_kern_proc SYSCTL_HANDLER_ARGS
+sysctl_kern_proc (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int*) arg1;
 	u_int namelen = arg2;
@@ -656,7 +656,7 @@ sysctl_kern_proc SYSCTL_HANDLER_ARGS
  * title to a string of its own choice.
  */
 static int
-sysctl_kern_proc_args SYSCTL_HANDLER_ARGS
+sysctl_kern_proc_args (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int*) arg1;
 	u_int namelen = arg2;
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 18cd1a4fde7b..5057c3fa698f 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -437,7 +437,7 @@ dump_conf(dummy)
 SYSINIT(dump_conf, SI_SUB_DUMP_CONF, SI_ORDER_FIRST, dump_conf, NULL)
 
 static int
-sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS
+sysctl_kern_dumpdev (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	udev_t ndumpdev;
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 0a8e17678a77..2d9ad3c7f6a7 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -76,7 +76,7 @@ static void	schedcpu __P((void *arg));
 static void	updatepri __P((struct proc *p));
 
 static int
-sysctl_kern_quantum SYSCTL_HANDLER_ARGS
+sysctl_kern_quantum (SYSCTL_HANDLER_ARGS)
 {
 	int error, new_val;
 
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 1da9a0b71c35..1ff0218fd543 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -63,7 +63,7 @@ static struct sysctl_lock {
 	int	sl_locked;
 } memlock;
 
-static int sysctl_root SYSCTL_HANDLER_ARGS;
+static int sysctl_root (SYSCTL_HANDLER_ARGS);
 
 struct sysctl_oid_list sysctl__children; /* root list */
 
@@ -203,7 +203,7 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list *l, int i)
 }
 
 static int
-sysctl_sysctl_debug SYSCTL_HANDLER_ARGS
+sysctl_sysctl_debug (SYSCTL_HANDLER_ARGS)
 {
 	sysctl_sysctl_debug_dump_node(&sysctl__children, 0);
 	return ENOENT;
@@ -213,7 +213,7 @@ SYSCTL_PROC(_sysctl, 0, debug, CTLTYPE_STRING|CTLFLAG_RD,
 	0, 0, sysctl_sysctl_debug, "-", "");
 
 static int
-sysctl_sysctl_name SYSCTL_HANDLER_ARGS
+sysctl_sysctl_name (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int *) arg1;
 	u_int namelen = arg2;
@@ -323,7 +323,7 @@ sysctl_sysctl_next_ls (struct sysctl_oid_list *lsp, int *name, u_int namelen,
 }
 
 static int
-sysctl_sysctl_next SYSCTL_HANDLER_ARGS
+sysctl_sysctl_next (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int *) arg1;
 	u_int namelen = arg2;
@@ -399,7 +399,7 @@ name2oid (char *name, int *oid, int *len, struct sysctl_oid **oidpp)
 }
 
 static int
-sysctl_sysctl_name2oid SYSCTL_HANDLER_ARGS
+sysctl_sysctl_name2oid (SYSCTL_HANDLER_ARGS)
 {
 	char *p;
 	int error, oid[CTL_MAXNAME], len;
@@ -435,7 +435,7 @@ SYSCTL_PROC(_sysctl, 3, name2oid, CTLFLAG_RW|CTLFLAG_ANYBODY, 0, 0,
 	sysctl_sysctl_name2oid, "I", "");
 
 static int
-sysctl_sysctl_oidfmt SYSCTL_HANDLER_ARGS
+sysctl_sysctl_oidfmt (SYSCTL_HANDLER_ARGS)
 {
 	struct sysctl_oid *oid;
 	int error;
@@ -468,7 +468,7 @@ SYSCTL_NODE(_sysctl, 4, oidfmt, CTLFLAG_RD, sysctl_sysctl_oidfmt, "");
  */
 
 int
-sysctl_handle_int SYSCTL_HANDLER_ARGS
+sysctl_handle_int (SYSCTL_HANDLER_ARGS)
 {
 	int error = 0;
 
@@ -492,7 +492,7 @@ sysctl_handle_int SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_long SYSCTL_HANDLER_ARGS
+sysctl_handle_long (SYSCTL_HANDLER_ARGS)
 {
 	int error = 0;
 
@@ -515,7 +515,7 @@ sysctl_handle_long SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_string SYSCTL_HANDLER_ARGS
+sysctl_handle_string (SYSCTL_HANDLER_ARGS)
 {
 	int error=0;
 
@@ -541,7 +541,7 @@ sysctl_handle_string SYSCTL_HANDLER_ARGS
  */
 
 int
-sysctl_handle_opaque SYSCTL_HANDLER_ARGS
+sysctl_handle_opaque (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 
@@ -736,7 +736,7 @@ sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
  */
 
 int
-sysctl_root SYSCTL_HANDLER_ARGS
+sysctl_root (SYSCTL_HANDLER_ARGS)
 {
 	struct sysctl_oid *oid;
 	int error, indx;
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 23a6606b8d63..020e02304c18 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -402,7 +402,7 @@ tc_windup(void)
 }
 
 static int
-sysctl_kern_timecounter_hardware SYSCTL_HANDLER_ARGS
+sysctl_kern_timecounter_hardware (SYSCTL_HANDLER_ARGS)
 {
 	char newname[32];
 	struct timecounter *newtc, *tc;
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index e6c6bcfeaa79..ec91ca92c40b 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -1097,7 +1097,7 @@ device_set_unit(device_t dev, int unit)
 SYSCTL_NODE(_hw, OID_AUTO, devices, CTLFLAG_RW, 0, "A list of all devices");
 
 static int
-sysctl_handle_children SYSCTL_HANDLER_ARGS
+sysctl_handle_children (SYSCTL_HANDLER_ARGS)
 {
     device_t dev = arg1;
     device_t child;
@@ -1123,7 +1123,7 @@ sysctl_handle_children SYSCTL_HANDLER_ARGS
 }
 
 static int
-sysctl_handle_state SYSCTL_HANDLER_ARGS
+sysctl_handle_state (SYSCTL_HANDLER_ARGS)
 {
     device_t dev = arg1;
 
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index fe14002aa0c0..921aabe1055b 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -261,7 +261,7 @@ devstat_end_transaction_bio(struct devstat *ds, struct bio *bp)
  * guarantee that the generation number and the statistics match up.
  */
 static int
-sysctl_devstat SYSCTL_HANDLER_ARGS
+sysctl_devstat (SYSCTL_HANDLER_ARGS)
 {
 	int error, i;
 	struct devstat *nds;
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 01cfcf26b1c5..0dcf2654d2b5 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -116,7 +116,7 @@ disk_enumerate(struct disk *disk)
 }
 
 static int
-sysctl_disks SYSCTL_HANDLER_ARGS
+sysctl_disks (SYSCTL_HANDLER_ARGS)
 {
 	struct disk *disk;
 	int error, first;
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index 117f0309981a..e3fe859ec2e7 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -276,7 +276,7 @@ kmstartup(dummy)
  * Return kernel profiling information.
  */
 static int
-sysctl_kern_prof SYSCTL_HANDLER_ARGS
+sysctl_kern_prof (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int *) arg1;
 	u_int namelen = arg2;
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index d69ae8394d15..5c6ecf3c6f76 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -2429,7 +2429,7 @@ ttyregister(tp)
 }
 
 static int
-sysctl_kern_ttys SYSCTL_HANDLER_ARGS
+sysctl_kern_ttys (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	struct tty *tp, t;
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 080e1aa00fe7..7f9520034ef3 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -202,7 +202,7 @@ cnuninit(void)
  * This may require us to open or close the device in question.
  */
 static int
-sysctl_kern_consmute SYSCTL_HANDLER_ARGS
+sysctl_kern_consmute (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	int ocn_mute;
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 38ac3b0d3ae3..9766c322762c 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -723,7 +723,7 @@ prison_unpcb(struct proc *p, struct unpcb *unp)
 }
 
 static int
-unp_pcblist SYSCTL_HANDLER_ARGS
+unp_pcblist (SYSCTL_HANDLER_ARGS)
 {
 	int error, i, n;
 	struct unpcb *unp, **unp_list;
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 2588464434e5..eaec53b5f2c9 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -2028,10 +2028,10 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes)
 /*
  * Top level filesystem related information gathering.
  */
-static int	sysctl_ovfs_conf __P(SYSCTL_HANDLER_ARGS);
+static int	sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS));
 
 static int
-vfs_sysctl SYSCTL_HANDLER_ARGS
+vfs_sysctl (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int *)arg1 - 1;	/* XXX */
 	u_int namelen = arg2 + 1;	/* XXX */
@@ -2081,7 +2081,7 @@ SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
 #if 1 || defined(COMPAT_PRELITE2)
 
 static int
-sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
+sysctl_ovfs_conf (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	struct vfsconf *vfsp;
@@ -2110,7 +2110,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
  */
 /* ARGSUSED */
 static int
-sysctl_vnode SYSCTL_HANDLER_ARGS
+sysctl_vnode (SYSCTL_HANDLER_ARGS)
 {
 	struct proc *p = curproc;	/* XXX */
 	struct mount *mp, *nmp;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 2588464434e5..eaec53b5f2c9 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -2028,10 +2028,10 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes)
 /*
  * Top level filesystem related information gathering.
  */
-static int	sysctl_ovfs_conf __P(SYSCTL_HANDLER_ARGS);
+static int	sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS));
 
 static int
-vfs_sysctl SYSCTL_HANDLER_ARGS
+vfs_sysctl (SYSCTL_HANDLER_ARGS)
 {
 	int *name = (int *)arg1 - 1;	/* XXX */
 	u_int namelen = arg2 + 1;	/* XXX */
@@ -2081,7 +2081,7 @@ SYSCTL_NODE(_vfs, VFS_GENERIC, generic, CTLFLAG_RD, vfs_sysctl,
 #if 1 || defined(COMPAT_PRELITE2)
 
 static int
-sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
+sysctl_ovfs_conf (SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	struct vfsconf *vfsp;
@@ -2110,7 +2110,7 @@ sysctl_ovfs_conf SYSCTL_HANDLER_ARGS
  */
 /* ARGSUSED */
 static int
-sysctl_vnode SYSCTL_HANDLER_ARGS
+sysctl_vnode (SYSCTL_HANDLER_ARGS)
 {
 	struct proc *p = curproc;	/* XXX */
 	struct mount *mp, *nmp;