a sprinkling of function ansification

11 files changed, 43 insertions, 46 deletions

diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 6b094bbd431..c3eda64bcc1 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.41 2016/03/14 23:08:05 krw Exp $	*/
+/*	$OpenBSD: adb.c,v 1.42 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
@@ -252,8 +252,7 @@ void 	adb_cuda_fileserver_mode(void);
  * is in [0].
  */
 void
-print_single(str)
-	u_char *str;
+print_single(u_char *str)
 {
 	int x;
 
@@ -533,8 +532,8 @@ switch_start:
 
 
 int
-send_adb_cuda(u_char * in, u_char * buffer, void *compRout, void *data, int
-	command)
+send_adb_cuda(u_char * in, u_char * buffer, void *compRout, void *data,
+    int command)
 {
 	int s, len;
 
@@ -1476,7 +1475,7 @@ adb_poweroff(void)
 }
 
 void
-setsoftadb()
+setsoftadb(void)
 {
 	if (!timeout_initialized(&adb_softintr_timeout))
 		timeout_set(&adb_softintr_timeout, (void *)adb_soft_intr, NULL);
@@ -1484,7 +1483,7 @@ setsoftadb()
 }
 
 void
-adb_cuda_autopoll()
+adb_cuda_autopoll(void)
 {
 	volatile int flag = 0;
 	int result;
@@ -1503,7 +1502,7 @@ adb_cuda_autopoll()
 }
 
 void
-adb_cuda_fileserver_mode()
+adb_cuda_fileserver_mode(void)
 {
 	volatile int flag = 0;
 	int result;
@@ -1523,7 +1522,7 @@ adb_cuda_fileserver_mode()
 }
 
 void
-adb_restart()
+adb_restart(void)
 {
 	int result;
 	u_char output[16];
diff --git a/sys/arch/macppc/dev/akbd_machdep.c b/sys/arch/macppc/dev/akbd_machdep.c
index cd963894856..c63777c302a 100644
--- a/sys/arch/macppc/dev/akbd_machdep.c
+++ b/sys/arch/macppc/dev/akbd_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbd_machdep.c,v 1.1 2006/01/18 23:21:17 miod Exp $	*/
+/*	$OpenBSD: akbd_machdep.c,v 1.2 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $	*/
 
 /*
@@ -60,13 +60,13 @@ struct wskbd_consops akbd_consops = {
 static int _akbd_is_console;
 
 int
-akbd_is_console()
+akbd_is_console(void)
 {
 	return (_akbd_is_console);
 }
 
 int
-akbd_cnattach()
+akbd_cnattach(void)
 {
 	_akbd_is_console = 1;
 	wskbd_cnattach(&akbd_consops, NULL, &akbd_keymapdata);
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 135221ccfe1..82bea50cae8 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.54 2017/04/30 16:45:45 mpi Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.55 2019/09/03 17:51:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
@@ -216,7 +216,7 @@ macintr_attach(struct device *parent, struct device *self, void *aux)
 }
 
 void
-macintr_collect_preconf_intr()
+macintr_collect_preconf_intr(void)
 {
 	int i;
 	for (i = 0; i < ppc_configed_intr_cnt; i++) {
@@ -381,7 +381,7 @@ macintr_disestablish(void *lcp, void *arg)
  * happen very much anyway.
  */
 void
-macintr_calc_mask()
+macintr_calc_mask(void)
 {
 	int irq;
 	struct intrhand *ih;
@@ -439,7 +439,7 @@ macintr_calc_mask()
  * external interrupt handler
  */
 void
-mac_ext_intr()
+mac_ext_intr(void)
 {
 	int irq = 0;
 	int pcpl, ret;
@@ -492,7 +492,7 @@ macintr_eoi(int irq)
 }
 
 int
-macintr_read_irq()
+macintr_read_irq(void)
 {
 	struct cpu_info *ci = curcpu();
 	u_int32_t state0, state1, irq_mask;
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 474a4ba9e79..4817bf3f111 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.85 2018/01/22 09:08:43 mpi Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.86 2019/09/03 17:51:52 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
@@ -391,7 +391,7 @@ openpic_splx(int newcpl)
 }
 
 void
-openpic_collect_preconf_intr()
+openpic_collect_preconf_intr(void)
 {
 	int i;
 	for (i = 0; i < ppc_configed_intr_cnt; i++) {
@@ -513,7 +513,7 @@ openpic_intr_disestablish(void *lcp, void *arg)
  */
 
 void
-openpic_calc_mask()
+openpic_calc_mask(void)
 {
 	struct cpu_info *ci = curcpu();
 	int irq;
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 10f342647c0..3fe5b6c67b6 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.29 2019/09/03 14:35:23 deraadt Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.30 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -418,7 +418,7 @@ pmgrop(PMData *pmdata)
  * My PM interrupt routine for the PB Duo series and the PB 5XX series
  */
 void
-pm_intr()
+pm_intr(void)
 {
 	int s;
 	int rval;
@@ -664,7 +664,7 @@ pm_adb_get_ADB_data(PMData *pmdata)
 }
 
 void
-pm_adb_restart()
+pm_adb_restart(void)
 {
 	PMData p;
 
@@ -676,7 +676,7 @@ pm_adb_restart()
 }
 
 void
-pm_adb_poweroff()
+pm_adb_poweroff(void)
 {
 	PMData p;
 
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index 6d887b9ee42..935231faee0 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.45 2018/01/27 22:55:23 naddy Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.46 2019/09/03 17:51:52 deraadt Exp $	*/
 /*
  * Copyright (c) 1996, 1997 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,7 +37,7 @@
  * from: Utah Hdr: autoconf.c 1.31 91/01/21
  *
  *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.45 2018/01/27 22:55:23 naddy Exp $
+ *      $Id: autoconf.c,v 1.46 2019/09/03 17:51:52 deraadt Exp $
  */
 
 /*
@@ -93,7 +93,7 @@ int	bootdev_unit = 0;
  *  This is done at boot time.
  */
 void
-cpu_configure()
+cpu_configure(void)
 {
 	(void)splhigh();	/* To be really sure.. */
 
diff --git a/sys/arch/macppc/macppc/clock.c b/sys/arch/macppc/macppc/clock.c
index 91b63c3d232..d76cc9c5927 100644
--- a/sys/arch/macppc/macppc/clock.c
+++ b/sys/arch/macppc/macppc/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.41 2019/08/21 20:44:09 cheloha Exp $	*/
+/*	$OpenBSD: clock.c,v 1.42 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: clock.c,v 1.1 1996/09/30 16:34:40 ws Exp $	*/
 
 /*
@@ -254,7 +254,7 @@ decr_intr(struct clockframe *frame)
 void cpu_startclock(void);
 
 void
-cpu_initclocks()
+cpu_initclocks(void)
 {
 	int intrstate;
 	int minint;
@@ -317,7 +317,7 @@ cpu_initclocks()
 }
 
 void
-cpu_startclock()
+cpu_startclock(void)
 {
 	struct cpu_info *ci = curcpu();
 	u_int64_t nextevent;
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index fc5f2073a96..97491cbf275 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.67 2016/09/04 10:51:24 naddy Exp $ */
+/*	$OpenBSD: conf.c,v 1.68 2019/09/03 17:51:52 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -256,7 +256,7 @@ iszerodev(dev_t dev)
 }
 
 dev_t
-getnulldev()
+getnulldev(void)
 {
 	return makedev(mem_no, 2);
 }
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 41bd8bed371..513d577c724 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.185 2019/04/01 07:00:52 tedu Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.186 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -134,9 +134,7 @@ struct extent *devio_ex;
 void initppc(u_int startkernel, u_int endkernel, char *args);
 
 void
-initppc(startkernel, endkernel, args)
-	u_int startkernel, endkernel;
-	char *args;
+initppc(u_int startkernel, u_int endkernel, char *args)
 {
 	extern void *trapcode; extern int trapsize;
 	extern void *dsitrap; extern int dsisize;
@@ -359,7 +357,7 @@ int   safepri = 0;
  * Machine dependent startup code.
  */
 void
-cpu_startup()
+cpu_startup(void)
 {
 	vaddr_t minaddr, maxaddr;
 
@@ -400,7 +398,7 @@ cpu_startup()
  * Initialize system console.
  */
 void
-consinit()
+consinit(void)
 {
 	static int cons_initted = 0;
 
@@ -622,7 +620,7 @@ reserve_dumppages(caddr_t p)
  */
 int cpu_dump(void);
 int
-cpu_dump()
+cpu_dump(void)
 {
 	int (*dump) (dev_t, daddr_t, caddr_t, size_t);
 	long buf[dbtob(1) / sizeof (long)];
@@ -642,7 +640,7 @@ cpu_dump()
 }
 
 void
-dumpsys()
+dumpsys(void)
 {
 #if 0
 	u_int npg;
@@ -801,7 +799,7 @@ void_f *pending_int_f = NULL;
  * instead of being in each of the specific handler code
  */
 void
-do_pending_int()
+do_pending_int(void)
 {
 	if (pending_int_f != NULL) {
 		(*pending_int_f)();
diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c
index e36ec542159..ed9232f80c8 100644
--- a/sys/arch/macppc/macppc/ofw_machdep.c
+++ b/sys/arch/macppc/macppc/ofw_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofw_machdep.c,v 1.56 2017/07/22 18:33:38 anton Exp $	*/
+/*	$OpenBSD: ofw_machdep.c,v 1.57 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $	*/
 
 /*
@@ -274,7 +274,7 @@ int fbnode;
 void of_display_console(void);
 
 void
-ofwconprobe()
+ofwconprobe(void)
 {
 	char type[32];
 	int stdout_node;
@@ -361,7 +361,7 @@ ofw_recurse_keyboard(int pnode)
 }
 
 void
-ofw_find_keyboard()
+ofw_find_keyboard(void)
 {
 	int stdin_node;
 	char iname[32];
diff --git a/sys/arch/macppc/macppc/openfirm.c b/sys/arch/macppc/macppc/openfirm.c
index 1b41704435c..f891aa4c10a 100644
--- a/sys/arch/macppc/macppc/openfirm.c
+++ b/sys/arch/macppc/macppc/openfirm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openfirm.c,v 1.11 2015/03/31 10:36:52 mpi Exp $	*/
+/*	$OpenBSD: openfirm.c,v 1.12 2019/09/03 17:51:52 deraadt Exp $	*/
 /*	$NetBSD: openfirm.c,v 1.1 1996/09/30 16:34:52 ws Exp $	*/
 
 /*
@@ -313,7 +313,7 @@ OF_boot(char *bootspec)
 }
 
 void
-OF_exit()
+OF_exit(void)
 {
 	static struct {
 		char *name;