Fixed gratuitous ANSIisms.

21 files changed, 105 insertions, 63 deletions

diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 9dbb3ea..42f23f3 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -519,8 +519,10 @@ static	void	*snp_devfs_token[NSNP];
 #endif
 static snp_devsw_installed = 0;
 
+static void snp_drvinit __P((void *unused));
 static void
-snp_drvinit(void *unused)
+snp_drvinit(unused)
+	void *unused;
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 13807bf..490c602 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.22 1997/03/24 11:52:25 bde Exp $
+ * $Id: subr_log.c,v 1.23 1997/09/14 02:46:44 peter Exp $
  */
 
 /*
@@ -247,8 +247,10 @@ static log_devsw_installed = 0;
 static	void	*log_devfs_token;
 #endif
 
+static void log_drvinit __P((void *unused));
 static void
-log_drvinit(void *unused)
+log_drvinit(unused)
+	void *unused;
 {
 	dev_t dev;
 
diff --git a/sys/kern/subr_rlist.c b/sys/kern/subr_rlist.c
index dead1a6..3a61deb 100644
--- a/sys/kern/subr_rlist.c
+++ b/sys/kern/subr_rlist.c
@@ -54,7 +54,7 @@
  * functioning of this software, nor does the author assume any responsibility
  * for damages incurred with its use.
  *
- *	$Id: subr_rlist.c,v 1.21 1997/02/22 09:39:18 peter Exp $
+ *	$Id: subr_rlist.c,v 1.22 1997/09/02 20:05:51 bde Exp $
  */
 
 #include <sys/param.h>
@@ -73,6 +73,7 @@ static int rlist_count=0;
 static struct rlist *rlfree;
 
 static struct rlist	*rlist_malloc __P((void));
+static inline void	rlist_mfree __P((struct rlist *rl));
 
 static struct rlist *
 rlist_malloc()
@@ -102,8 +103,9 @@ rlist_malloc()
 	return rl;
 }
 
-inline static void
-rlist_mfree( struct rlist *rl)
+static inline void
+rlist_mfree(rl)
+	struct rlist *rl;
 {
 	rl->rl_next = rlfree;
 	rlfree = rl;
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 34e1029..db06962 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.45 1997/09/02 20:05:55 bde Exp $
+ * $Id: tty_pty.c,v 1.46 1997/09/14 02:40:45 peter Exp $
  */
 
 /*
@@ -790,8 +790,10 @@ ptyioctl(dev, cmd, data, flag, p)
 
 static ptc_devsw_installed = 0;
 
+static void ptc_drvinit __P((void *unused));
 static void
-ptc_drvinit(void *unused)
+ptc_drvinit(unused)
+	void *unused;
 {
 #ifdef DEVFS
 	int i,j,k;
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 9dbb3ea..42f23f3 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -519,8 +519,10 @@ static	void	*snp_devfs_token[NSNP];
 #endif
 static snp_devsw_installed = 0;
 
+static void snp_drvinit __P((void *unused));
 static void
-snp_drvinit(void *unused)
+snp_drvinit(unused)
+	void *unused;
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index fb648b1..ee6172e 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.17 1997/09/02 20:05:56 bde Exp $
+ * $Id: tty_tty.c,v 1.18 1997/09/14 02:40:46 peter Exp $
  */
 
 /*
@@ -179,8 +179,10 @@ static ctty_devsw_installed = 0;
 static 	void	*ctty_devfs_token;
 #endif
 
+static void ctty_drvinit __P((void *unused));
 static void
-ctty_drvinit(void *unused)
+ctty_drvinit(unused)
+	void *unused;
 {
 	dev_t dev;
 
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index c2ec35f..69d6bf8 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- * $Id: uipc_domain.c,v 1.16 1997/02/22 09:39:27 peter Exp $
+ * $Id: uipc_domain.c,v 1.17 1997/04/27 20:00:42 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -157,7 +157,9 @@ kludge_splx(udata)
 
 
 struct protosw *
-pffindtype(int family, int type)
+pffindtype(family, type)
+	int family;
+	int type;
 {
 	register struct domain *dp;
 	register struct protosw *pr;
@@ -174,7 +176,10 @@ found:
 }
 
 struct protosw *
-pffindproto(int family, int protocol, int type)
+pffindproto(family, protocol, type)
+	int family;
+	int protocol;
+	int type;
 {
 	register struct domain *dp;
 	register struct protosw *pr;
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 8a2d1b5..810cc59 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.102 1997/09/13 15:02:28 peter Exp $
+ * $Id: vfs_subr.c,v 1.103 1997/09/14 02:49:06 peter Exp $
  */
 
 /*
@@ -231,10 +231,10 @@ vfs_rootmountalloc(fstypename, devname, mpp)
  */
 #ifdef notdef	/* XXX JH */
 int
-lite2_vfs_mountroot(void)
+lite2_vfs_mountroot()
 {
 	struct vfsconf *vfsp;
-	extern int (*lite2_mountroot)(void);
+	extern int (*lite2_mountroot) __P((void));
 	int error;
 
 	if (lite2_mountroot != NULL)
@@ -1281,7 +1281,10 @@ loop:
  * Disassociate the underlying file system from a vnode.
  */
 static void
-vclean(struct vnode *vp, int flags, struct proc *p)
+vclean(vp, flags, p)
+	struct vnode *vp;
+	int flags;
+	struct proc *p;
 {
 	int active, irefed;
 	vm_object_t object;
@@ -1940,8 +1943,10 @@ vfs_unmountall()
  * Called by ufs_mount() to set up the lists of export addresses.
  */
 static int
-vfs_hang_addrlist(struct mount *mp, struct netexport *nep, 
-	struct export_args *argp)
+vfs_hang_addrlist(mp, nep, argp)
+	struct mount *mp;
+	struct netexport *nep;
+	struct export_args *argp;
 {
 	register struct netcred *np;
 	register struct radix_node_head *rnh;
@@ -2011,7 +2016,9 @@ out:
 
 /* ARGSUSED */
 static int
-vfs_free_netcred(struct radix_node *rn, void *w)
+vfs_free_netcred(rn, w)
+	struct radix_node *rn;
+	void *w;
 {
 	register struct radix_node_head *rnh = (struct radix_node_head *) w;
 
@@ -2024,7 +2031,8 @@ vfs_free_netcred(struct radix_node *rn, void *w)
  * Free the net address hash lists that are hanging off the mount points.
  */
 static void
-vfs_free_addrlist(struct netexport *nep)
+vfs_free_addrlist(nep)
+	struct netexport *nep;
 {
 	register int i;
 	register struct radix_node_head *rnh;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 8a2d1b5..810cc59 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.102 1997/09/13 15:02:28 peter Exp $
+ * $Id: vfs_subr.c,v 1.103 1997/09/14 02:49:06 peter Exp $
  */
 
 /*
@@ -231,10 +231,10 @@ vfs_rootmountalloc(fstypename, devname, mpp)
  */
 #ifdef notdef	/* XXX JH */
 int
-lite2_vfs_mountroot(void)
+lite2_vfs_mountroot()
 {
 	struct vfsconf *vfsp;
-	extern int (*lite2_mountroot)(void);
+	extern int (*lite2_mountroot) __P((void));
 	int error;
 
 	if (lite2_mountroot != NULL)
@@ -1281,7 +1281,10 @@ loop:
  * Disassociate the underlying file system from a vnode.
  */
 static void
-vclean(struct vnode *vp, int flags, struct proc *p)
+vclean(vp, flags, p)
+	struct vnode *vp;
+	int flags;
+	struct proc *p;
 {
 	int active, irefed;
 	vm_object_t object;
@@ -1940,8 +1943,10 @@ vfs_unmountall()
  * Called by ufs_mount() to set up the lists of export addresses.
  */
 static int
-vfs_hang_addrlist(struct mount *mp, struct netexport *nep, 
-	struct export_args *argp)
+vfs_hang_addrlist(mp, nep, argp)
+	struct mount *mp;
+	struct netexport *nep;
+	struct export_args *argp;
 {
 	register struct netcred *np;
 	register struct radix_node_head *rnh;
@@ -2011,7 +2016,9 @@ out:
 
 /* ARGSUSED */
 static int
-vfs_free_netcred(struct radix_node *rn, void *w)
+vfs_free_netcred(rn, w)
+	struct radix_node *rn;
+	void *w;
 {
 	register struct radix_node_head *rnh = (struct radix_node_head *) w;
 
@@ -2024,7 +2031,8 @@ vfs_free_netcred(struct radix_node *rn, void *w)
  * Free the net address hash lists that are hanging off the mount points.
  */
 static void
-vfs_free_addrlist(struct netexport *nep)
+vfs_free_addrlist(nep)
+	struct netexport *nep;
 {
 	register int i;
 	register struct radix_node_head *rnh;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 3429d9e..2afc666 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.32 1997/09/02 01:18:28 bde Exp $
+ * $Id: bpf.c,v 1.33 1997/09/14 03:03:05 peter Exp $
  */
 
 #include "bpfilter.h"
@@ -1117,7 +1117,7 @@ catchpacket(d, pkt, pktlen, snaplen, cpfn)
 	register struct bpf_d *d;
 	register u_char *pkt;
 	register u_int pktlen, snaplen;
-	register void (*cpfn)(const void *, void *, u_int);
+	register void (*cpfn) __P((const void *, void *, u_int));
 {
 	register struct bpf_hdr *hp;
 	register int totlen, curlen;
@@ -1278,7 +1278,10 @@ static	void *bpf_devfs_token[NBPFILTER];
 
 static bpf_devsw_installed = 0;
 
-static void 	bpf_drvinit(void *unused)
+static void bpf_drvinit __P((void *unused));
+static void
+bpf_drvinit(unused)
+	void *unused;
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 8496542..09590e2 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id: netisr.h,v 1.11 1997/02/22 09:41:10 peter Exp $
+ * $Id: netisr.h,v 1.12 1997/05/09 12:19:05 kjc Exp $
  */
 
 #ifndef _NET_NETISR_H_
@@ -74,7 +74,7 @@
 #ifdef KERNEL
 extern volatile unsigned int	netisr;	/* scheduling bits for network */
 
-typedef void netisr_t(void);
+typedef void netisr_t __P((void));
 
 struct netisrtab {
 	int nit_num;
diff --git a/sys/net/route.c b/sys/net/route.c
index ca24a30..3abe57c 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.42 1997/03/24 11:24:47 bde Exp $
+ *	$Id: route.c,v 1.43 1997/09/02 01:18:46 bde Exp $
  */
 
 #include "opt_mrouting.h"
@@ -440,8 +440,8 @@ ifa_ifwithroute(flags, dst, gateway)
 
 #define ROUNDUP(a) (a>0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 
-static int rt_fixdelete(struct radix_node *, void *);
-static int rt_fixchange(struct radix_node *, void *);
+static int rt_fixdelete __P((struct radix_node *, void *));
+static int rt_fixchange __P((struct radix_node *, void *));
 
 struct rtfc_arg {
 	struct rtentry *rt0;
@@ -699,7 +699,9 @@ bad:
  * the late parent (passed in as VP here) are themselves deleted.
  */
 static int
-rt_fixdelete(struct radix_node *rn, void *vp)
+rt_fixdelete(rn, vp)
+	struct radix_node *rn;
+	void *vp;
 {
 	struct rtentry *rt = (struct rtentry *)rn;
 	struct rtentry *rt0 = vp;
@@ -732,7 +734,9 @@ int rtfcdebug = 0;
 #endif
 
 static int
-rt_fixchange(struct radix_node *rn, void *vp)
+rt_fixchange(rn, vp)
+	struct radix_node *rn;
+	void *vp;
 {
 	struct rtentry *rt = (struct rtentry *)rn;
 	struct rtfc_arg *ap = vp;
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 73ac845..41ea050 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.21 1997/02/22 09:41:26 peter Exp $
+ * $Id: igmp.c,v 1.22 1997/09/02 01:19:05 bde Exp $
  */
 
 /*
@@ -83,7 +83,7 @@ static u_long igmp_all_rtrs_group;
 static struct mbuf *router_alert;
 static struct router_info *Head;
 
-static void igmp_sendpkt(struct in_multi *, int, unsigned long);
+static void igmp_sendpkt __P((struct in_multi *, int, unsigned long));
 
 void
 igmp_init()
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 9ba86a0..cf2cba6 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.39 1997/04/27 20:01:05 wollman Exp $
+ *	$Id: in_proto.c,v 1.40 1997/05/25 06:09:23 peter Exp $
  */
 
 #include <sys/param.h>
@@ -196,7 +196,7 @@ struct protosw inetsw[] = {
 },
 };
 
-extern int in_inithead(void **, int);
+extern int in_inithead __P((void **, int));
 
 struct domain inetdomain =
     { AF_INET, "internet", 0, 0, 0, 
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index d45be58..78f8c56 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -11,7 +11,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.h,v 1.27 1997/06/02 05:02:36 julian Exp $
+ *	$Id: ip_fw.h,v 1.28 1997/08/08 14:36:29 alex Exp $
  */
 
 #ifndef _IP_FW_H
@@ -176,7 +176,7 @@ struct ip_fw_chain {
 /*
  * Function definitions.
  */
-void ip_fw_init(void);
+void ip_fw_init __P((void));
 
 #endif /* KERNEL */
 
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 7987789..4d82dd2 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.35 1997/03/03 09:23:36 davidg Exp $
+ *	$Id: tcp_subr.c,v 1.36 1997/04/03 05:14:44 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ static int	tcp_do_rfc1644 = 1;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
 	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
 
-static void	tcp_cleartaocache(void);
+static void	tcp_cleartaocache __P((void));
 static void	tcp_notify __P((struct inpcb *, int));
 
 /*
@@ -641,5 +641,6 @@ tcp_gettaocache(inp)
  * nothing in the cache left over.
  */
 static void
-tcp_cleartaocache(void)
-{ }
+tcp_cleartaocache()
+{
+}
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 7987789..4d82dd2 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.35 1997/03/03 09:23:36 davidg Exp $
+ *	$Id: tcp_subr.c,v 1.36 1997/04/03 05:14:44 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ static int	tcp_do_rfc1644 = 1;
 SYSCTL_INT(_net_inet_tcp, TCPCTL_DO_RFC1644, rfc1644,
 	CTLFLAG_RW, &tcp_do_rfc1644 , 0, "");
 
-static void	tcp_cleartaocache(void);
+static void	tcp_cleartaocache __P((void));
 static void	tcp_notify __P((struct inpcb *, int));
 
 /*
@@ -641,5 +641,6 @@ tcp_gettaocache(inp)
  * nothing in the cache left over.
  */
 static void
-tcp_cleartaocache(void)
-{ }
+tcp_cleartaocache()
+{
+}
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 19ec0d5..5191aa9 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.39 1997/06/15 17:56:53 dyson Exp $
+ * $Id: buf.h,v 1.40 1997/09/07 16:56:34 bde Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -227,7 +227,7 @@ int	physio __P((void (*)(struct buf *), struct buf *, dev_t,
 u_int	minphys __P((struct buf *));
 void	vfs_bio_clrbuf __P((struct buf *));
 void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages(struct buf *);
+void	vfs_unbusy_pages __P((struct buf *));
 void	vwakeup __P((struct buf *));
 void	vmapbuf __P((struct buf *));
 void	vunmapbuf __P((struct buf *));
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 19ec0d5..5191aa9 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.39 1997/06/15 17:56:53 dyson Exp $
+ * $Id: buf.h,v 1.40 1997/09/07 16:56:34 bde Exp $
  */
 
 #ifndef _SYS_BUF_H_
@@ -227,7 +227,7 @@ int	physio __P((void (*)(struct buf *), struct buf *, dev_t,
 u_int	minphys __P((struct buf *));
 void	vfs_bio_clrbuf __P((struct buf *));
 void	vfs_busy_pages __P((struct buf *, int clear_modify));
-void	vfs_unbusy_pages(struct buf *);
+void	vfs_unbusy_pages __P((struct buf *));
 void	vwakeup __P((struct buf *));
 void	vmapbuf __P((struct buf *));
 void	vunmapbuf __P((struct buf *));
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index d980951..86af01e 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.15 1997/02/22 09:45:11 peter Exp $
+ * $Id: exec.h,v 1.16 1997/09/07 05:27:08 bde Exp $
  */
 
 #ifndef _SYS_EXEC_H_
@@ -67,7 +67,7 @@ struct ps_strings {
 struct image_params;
 
 struct execsw {
-	int (*ex_imgact)(struct image_params *);
+	int (*ex_imgact) __P((struct image_params *));
 	const char *ex_name;
 };
 
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index 11d7508..73d9175 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $Id: inflate.h,v 1.8 1997/02/22 09:45:20 peter Exp $
  *
  */
 #ifndef	_SYS_INFLATE_H_
@@ -29,10 +29,10 @@ struct inflate {
 	void           *gz_private;
 
 	/* Fetch next character to be uncompressed */
-	int             (*gz_input) (void *);
+	int             (*gz_input) __P((void *));
 
 	/* Dispose of uncompressed characters */
-	int             (*gz_output) (void *, u_char *, u_long);
+	int             (*gz_output) __P((void *, u_char *, u_long));
 
 	/* Private part */
 	u_long          gz_bb;	/* bit buffer */