-Wall & -Wstrict-prototype fixes

5 files changed, 17 insertions, 15 deletions

diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 14534e36dd3..dca32291ee0 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_lkm.c,v 1.5 1996/06/21 17:03:26 mickey Exp $	*/
+/*	$OpenBSD: kern_lkm.c,v 1.6 1996/07/02 06:51:56 niklas Exp $	*/
 /*	$NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ static TAILQ_HEAD(, lkm_table)	lkmods;	/* table of loaded modules */
 static struct lkm_table	*curp;		/* global for in-progress ops */
 static size_t		nlkms = 0;	/* number of loaded lkms */
 
-static struct lkm_table *lkmalloc __P(());  /* allocate new lkm table entry */
+static struct lkm_table *lkmalloc __P((void));  /* allocate new lkm table entry */
 static void lkmfree __P((struct lkm_table *)); /* free it */
 static struct lkm_table *lkmlookup __P((int, char *, int *));
 static void lkmunreserve __P((void));
@@ -91,6 +91,7 @@ static int _lkm_strmod __P((struct lkm_table *, int));
 #endif
 static int _lkm_exec __P((struct lkm_table *, int));
 
+void lkminit __P((void));
 int lkmexists __P((struct lkm_table *));
 int lkmdispatch __P((struct lkm_table *, int));
 
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 3ba36c02b75..62f0da22a53 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_autoconf.c,v 1.8 1996/06/23 19:34:30 maja Exp $	*/
+/*	$OpenBSD: subr_autoconf.c,v 1.9 1996/07/02 06:51:59 niklas Exp $	*/
 /*	$NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $	*/
 
 /*
@@ -179,7 +179,7 @@ config_search(fn, parent, aux)
 	     */
 	    if (cf->cf_fstate == FSTATE_FOUND)
 	      continue;
-	    if (cf->cf_fstate == FSTATE_DNOTFOUND |
+	    if (cf->cf_fstate == FSTATE_DNOTFOUND ||
 		cf->cf_fstate == FSTATE_DSTAR)
 	      continue;
 	    for (p = cf->cf_parents; *p >= 0; p++)
@@ -218,7 +218,7 @@ config_scan(fn, parent)
 	     */
 	    if (cf->cf_fstate == FSTATE_FOUND)
 	      continue;
-	    if (cf->cf_fstate == FSTATE_DNOTFOUND |
+	    if (cf->cf_fstate == FSTATE_DNOTFOUND ||
 		cf->cf_fstate == FSTATE_DSTAR)
 	      continue;
 	    for (p = cf->cf_parents; *p >= 0; p++)
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 2f70620a321..46e68bf8633 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prf.c,v 1.6 1996/06/26 20:39:21 dm Exp $	*/
+/*	$OpenBSD: subr_prf.c,v 1.7 1996/07/02 06:51:59 niklas Exp $	*/
 /*	$NetBSD: subr_prf.c,v 1.25 1996/04/22 01:38:46 christos Exp $	*/
 
 /*-
@@ -114,7 +114,7 @@ panic(fmt, va_alist)
 	if (panicstr)
 		bootopt |= RB_NOSYNC;
 	else {
-		vsprintf (panicbuf, fmt, ap);
+		vsprintf(panicbuf, fmt, ap);
 		panicstr = panicbuf;
 	}
 
@@ -638,10 +638,10 @@ sprintf(buf, cfmt, va_alist)
 	va_list ap;
 	int ret;
 
-	va_start (ap, cfmt);
-	ret = vsprintf (buf, cfmt, ap);
-	va_end (ap);
-	return (ret);
+	va_start(ap, cfmt);
+	ret = vsprintf(buf, cfmt, ap);
+	va_end(ap);
+	return(ret);
 }
 
 /*
diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c
index 6d8512b6288..efac403ac75 100644
--- a/sys/kern/subr_userconf.c
+++ b/sys/kern/subr_userconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_userconf.c,v 1.3 1996/06/27 08:43:06 maja Exp $	*/
+/*	$OpenBSD: subr_userconf.c,v 1.4 1996/07/02 06:52:00 niklas Exp $	*/
 
 /*
  * Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -34,6 +34,7 @@
 
 #ifdef BOOT_CONFIG
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
@@ -821,6 +822,7 @@ char *cmd;
 	return(0);
 }
 
+void
 user_config()
 {
 	char prompt[] = "UKC> ";
@@ -837,6 +839,7 @@ user_config()
 	printf("Continuing...\n");
 }
 #else BOOT_CONFIG
+void
 user_config()
 {
 	printf("User Kernel Config isn't supported in this kernel\n");
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index f2db58ffa1d..9c84cc77e60 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.8 1996/06/26 19:44:59 tholo Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.9 1996/07/02 06:52:01 niklas Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*-
@@ -380,8 +380,6 @@ void
 bdwrite(bp)
 	struct buf *bp;
 {
-	int setit;
-
 	/*
 	 * If the block hasn't been seen before:
 	 *	(1) Mark it as having been seen,