ansi. No binary change.

4 files changed, 20 insertions, 45 deletions

diff --git a/sys/kern/exec_aout.c b/sys/kern/exec_aout.c
index d385246e109..b830657c847 100644
--- a/sys/kern/exec_aout.c
+++ b/sys/kern/exec_aout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_aout.c,v 1.9 2003/06/24 22:45:33 espie Exp $	*/
+/*	$OpenBSD: exec_aout.c,v 1.10 2005/11/12 04:31:24 jsg Exp $	*/
 /*	$NetBSD: exec_aout.c,v 1.14 1996/02/04 02:15:01 christos Exp $	*/
 
 /*
@@ -58,9 +58,7 @@ void aout_compat_setup(struct exec_package *epp);
  */
 
 int
-exec_aout_makecmds(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_aout_makecmds(struct proc *p, struct exec_package *epp)
 {
 	u_long midmag, magic;
 	u_short mid;
@@ -110,9 +108,7 @@ exec_aout_makecmds(p, epp)
  */
 
 int
-exec_aout_prep_zmagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_aout_prep_zmagic(struct proc *p, struct exec_package *epp)
 {
 	struct exec *execp = epp->ep_hdr;
 
@@ -159,9 +155,7 @@ exec_aout_prep_zmagic(p, epp)
  */
 
 int
-exec_aout_prep_nmagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_aout_prep_nmagic(struct proc *p, struct exec_package *epp)
 {
 	struct exec *execp = epp->ep_hdr;
 	long bsize, baddr;
@@ -197,9 +191,7 @@ exec_aout_prep_nmagic(p, epp)
  */
 
 int
-exec_aout_prep_omagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_aout_prep_omagic(struct proc *p, struct exec_package *epp)
 {
 	struct exec *execp = epp->ep_hdr;
 	long dsize, bsize, baddr;
diff --git a/sys/kern/exec_ecoff.c b/sys/kern/exec_ecoff.c
index d7f7dac6115..4fe1bbbb513 100644
--- a/sys/kern/exec_ecoff.c
+++ b/sys/kern/exec_ecoff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_ecoff.c,v 1.9 2001/11/15 06:22:30 art Exp $	*/
+/*	$OpenBSD: exec_ecoff.c,v 1.10 2005/11/12 04:31:24 jsg Exp $	*/
 /*	$NetBSD: exec_ecoff.c,v 1.8 1996/05/19 20:36:06 jonathan Exp $	*/
 
 /*
@@ -57,9 +57,7 @@
  * package.
  */
 int
-exec_ecoff_makecmds(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_ecoff_makecmds(struct proc *p, struct exec_package *epp)
 {
 	int error;
 	struct ecoff_exechdr *execp = epp->ep_hdr;
@@ -97,9 +95,7 @@ exec_ecoff_makecmds(p, epp)
  * exec_ecoff_prep_omagic(): Prepare a ECOFF OMAGIC binary's exec package
  */
 int
-exec_ecoff_prep_omagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_ecoff_prep_omagic(struct proc *p, struct exec_package *epp)
 {
 	struct ecoff_exechdr *execp = epp->ep_hdr;
 	struct ecoff_aouthdr *eap = &execp->a;
@@ -130,9 +126,7 @@ exec_ecoff_prep_omagic(p, epp)
  *                           package.
  */
 int
-exec_ecoff_prep_nmagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_ecoff_prep_nmagic(struct proc *p, struct exec_package *epp)
 {
 	struct ecoff_exechdr *execp = epp->ep_hdr;
 	struct ecoff_aouthdr *eap = &execp->a;
@@ -172,9 +166,7 @@ exec_ecoff_prep_nmagic(p, epp)
  * text, data, bss, and stack segments.
  */
 int
-exec_ecoff_prep_zmagic(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_ecoff_prep_zmagic(struct proc *p, struct exec_package *epp)
 {
 	struct ecoff_exechdr *execp = epp->ep_hdr;
 	struct ecoff_aouthdr *eap = &execp->a;
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index 929982fa393..97535cecc50 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_script.c,v 1.22 2005/08/01 07:02:39 art Exp $	*/
+/*	$OpenBSD: exec_script.c,v 1.23 2005/11/12 04:31:24 jsg Exp $	*/
 /*	$NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $	*/
 
 /*
@@ -69,9 +69,7 @@
  * into the exec package.
  */
 int
-exec_script_makecmds(p, epp)
-	struct proc *p;
-	struct exec_package *epp;
+exec_script_makecmds(struct proc *p, struct exec_package *epp)
 {
 	int error, hdrlinelen, shellnamelen, shellarglen;
 	char *hdrstr = epp->ep_hdr;
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index dd66f7368a2..fa07ab9941a 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.124 2005/07/18 11:43:14 tom Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.125 2005/11/12 04:31:24 jsg Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -178,8 +178,7 @@ struct emul emul_native = {
  */
 /* XXX return int, so gcc -Werror won't complain */
 int
-main(framep)
-	void *framep;				/* XXX should go away */
+main(void *framep)
 {
 	struct proc *p;
 	struct pdevinit *pdev;
@@ -538,8 +537,7 @@ static char *initpaths[] = {
 };
 
 void
-check_console(p)
-	struct proc *p;
+check_console(struct proc *p)
 {
 	struct nameidata nd;
 	int error;
@@ -560,8 +558,7 @@ check_console(p)
  * The program is invoked with one argument containing the boot flags.
  */
 void
-start_init(arg)
-	void *arg;
+start_init(void *arg)
 {
 	struct proc *p = arg;
 	vaddr_t addr;
@@ -697,24 +694,21 @@ start_init(arg)
 }
 
 void
-start_update(arg)
-	void *arg;
+start_update(void *arg)
 {
 	sched_sync(curproc);
 	/* NOTREACHED */
 }
 
 void
-start_cleaner(arg)
-	void *arg;
+start_cleaner(void *arg)
 {
 	buf_daemon(curproc);
 	/* NOTREACHED */
 }
 
 void
-start_reaper(arg)
-	void *arg;
+start_reaper(void *arg)
 {
 	reaper();
 	/* NOTREACHED */
@@ -722,8 +716,7 @@ start_reaper(arg)
 
 #ifdef CRYPTO
 void
-start_crypto(arg)
-	void *arg;
+start_crypto(void *arg)
 {
 	crypto_thread();
 	/* NOTREACHED */