Get rid of remaining __P usage (except for imported code);

ok millert@, rogue ok pjanzen@

10 files changed, 52 insertions, 52 deletions

diff --git a/games/rogue/score.c b/games/rogue/score.c
index e99f9ab2ab0..d4febaaf46e 100644
--- a/games/rogue/score.c
+++ b/games/rogue/score.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: score.c,v 1.8 2002/07/18 07:13:57 pjanzen Exp $	*/
+/*	$OpenBSD: score.c,v 1.9 2002/08/09 20:26:44 jsyn Exp $	*/
 /*	$NetBSD: score.c,v 1.5 1995/04/22 10:28:26 cgd Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
 #else
-static const char rcsid[] = "$OpenBSD: score.c,v 1.8 2002/07/18 07:13:57 pjanzen Exp $";
+static const char rcsid[] = "$OpenBSD: score.c,v 1.9 2002/08/09 20:26:44 jsyn Exp $";
 #endif
 #endif /* not lint */
 
@@ -229,11 +229,11 @@ struct score_entry {
 	char nickname[MAX_OPT_LEN + 1];
 };
 
-static void pad_spaces __P((char *, size_t));
+static void pad_spaces(char *, size_t);
 static void unpad_spaces(char *);
-static int read_score_entry __P((struct score_entry *, FILE *));
-static void write_score_entry __P((const struct score_entry *, int, FILE *));
-static void make_score __P((struct score_entry *, const object *, int));
+static int read_score_entry(struct score_entry *, FILE *);
+static void write_score_entry(const struct score_entry *, int, FILE *);
+static void make_score(struct score_entry *, const object *, int);
 
 
 static void
diff --git a/regress/lib/libc/getaddrinfo/gaitest.c b/regress/lib/libc/getaddrinfo/gaitest.c
index 380b7098283..edd56288f5b 100644
--- a/regress/lib/libc/getaddrinfo/gaitest.c
+++ b/regress/lib/libc/getaddrinfo/gaitest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gaitest.c,v 1.1 2002/07/05 15:54:30 itojun Exp $	*/
+/*	$OpenBSD: gaitest.c,v 1.2 2002/08/09 20:26:44 jsyn Exp $	*/
 /*	$NetBSD: gaitest.c,v 1.3 2002/07/05 15:47:43 itojun Exp $	*/
 
 /*
@@ -45,9 +45,9 @@ char host[NI_MAXHOST];
 char serv[NI_MAXSERV];
 int vflag = 0;
 
-static void usage __P((void));
-static void print1 __P((const char *, const struct addrinfo *, char *, char *));
-int main __P((int, char *[]));
+static void usage(void);
+static void print1(const char *, const struct addrinfo *, char *, char *);
+int main(int, char *[]);
 
 static void
 usage()
diff --git a/sys/arch/vax/bi/bi.c b/sys/arch/vax/bi/bi.c
index 8c49ceaf503..be59e866278 100644
--- a/sys/arch/vax/bi/bi.c
+++ b/sys/arch/vax/bi/bi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bi.c,v 1.5 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: bi.c,v 1.6 2002/08/09 20:26:44 jsyn Exp $ */
 /*	$NetBSD: bi.c,v 1.17 2001/11/13 12:51:34 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.17 2001/11/13 12:51:34 lukem Exp $");
 #include <dev/bi/bireg.h>
 #include <dev/bi/bivar.h>
 
-static int bi_print __P((void *, const char *));
+static int bi_print(void *, const char *);
 
 struct bi_list bi_list[] = {
 	{BIDT_MS820, DT_HAVDRV, "ms820"},
diff --git a/sys/arch/vax/bi/if_ni.c b/sys/arch/vax/bi/if_ni.c
index 414d84968b0..a6ce9058c53 100644
--- a/sys/arch/vax/bi/if_ni.c
+++ b/sys/arch/vax/bi/if_ni.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ni.c,v 1.1 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_ni.c,v 1.2 2002/08/09 20:26:44 jsyn Exp $ */
 /*	$NetBSD: if_ni.c,v 1.15 2002/05/22 16:03:14 wiz Exp $ */
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -139,15 +139,15 @@ struct	ni_softc {
 	u_int8_t	sc_enaddr[ETHER_ADDR_LEN];
 };
 
-static	int	nimatch __P((struct device *, struct cfdata *, void *));
-static	void	niattach __P((struct device *, struct device *, void *));
-static	void	niinit __P((struct ni_softc *));
-static	void	nistart __P((struct ifnet *));
-static	void	niintr __P((void *));
-static	int	niioctl __P((struct ifnet *, u_long, caddr_t));
+static	int	nimatch(struct device *, struct cfdata *, void *);
+static	void	niattach(struct device *, struct device *, void *);
+static	void	niinit(struct ni_softc *);
+static	void	nistart(struct ifnet *);
+static	void	niintr(void *);
+static	int	niioctl(struct ifnet *, u_long, caddr_t);
 static	int	ni_add_rxbuf(struct ni_softc *, struct ni_dg *, int);
-static	void	ni_setup __P((struct ni_softc *));
-static	void	nitimeout __P((struct ifnet *));
+static	void	ni_setup(struct ni_softc *);
+static	void	nitimeout(struct ifnet *);
 static	void	ni_shutdown(void *);
 static	void ni_getpgs(struct ni_softc *sc, int size, caddr_t *v, paddr_t *p);
 static	int failtest(struct ni_softc *, int, int, int, char *);
diff --git a/sys/arch/vax/bi/kdb.c b/sys/arch/vax/bi/kdb.c
index f03de356ff1..9e17fb99efb 100644
--- a/sys/arch/vax/bi/kdb.c
+++ b/sys/arch/vax/bi/kdb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kdb.c,v 1.7 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: kdb.c,v 1.8 2002/08/09 20:26:44 jsyn Exp $ */
 /*	$NetBSD: kdb.c,v 1.26 2001/11/13 12:51:34 lukem Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -90,14 +90,14 @@ struct	kdb_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-int	kdbmatch __P((struct device *, struct cfdata *, void *));
-void	kdbattach __P((struct device *, struct device *, void *));
-void	kdbreset __P((int));
-void	kdbintr __P((void *));
-void	kdbctlrdone __P((struct device *));
-int	kdbprint __P((void *, const char *));
-void	kdbsaerror __P((struct device *, int));
-void	kdbgo __P((struct device *, struct mscp_xi *));
+int	kdbmatch(struct device *, struct cfdata *, void *);
+void	kdbattach(struct device *, struct device *, void *);
+void	kdbreset(int);
+void	kdbintr(void *);
+void	kdbctlrdone(struct device *);
+int	kdbprint(void *, const char *);
+void	kdbsaerror(struct device *, int);
+void	kdbgo(struct device *, struct mscp_xi *);
 
 struct	cfattach kdb_ca = {
 	sizeof(struct kdb_softc), kdbmatch, kdbattach
diff --git a/sys/arch/vax/boot/boot/consio.c b/sys/arch/vax/boot/boot/consio.c
index ddfb19c8c5b..6ff171106be 100644
--- a/sys/arch/vax/boot/boot/consio.c
+++ b/sys/arch/vax/boot/boot/consio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: consio.c,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: consio.c,v 1.5 2002/08/09 20:26:45 jsyn Exp $ */
 /*	$NetBSD: consio.c,v 1.13 2002/05/24 21:40:59 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -66,12 +66,12 @@ int rom_getc;		/* ROM-address of get-routine */
 unsigned char	*ka630_conspage;
 
 /* Function that initializes things for KA630 ROM console I/O */
-void ka630_consinit __P((void));
+void ka630_consinit(void);
 
 /* Functions that use KA630 ROM for console I/O */
-void ka630_rom_putchar __P((int c));
-int ka630_rom_getchar __P((void));
-int ka630_rom_testchar __P((void));
+void ka630_rom_putchar(int c);
+int ka630_rom_getchar(void);
+int ka630_rom_testchar(void);
 
 /* Also added such a thing for KA53 - MK-991208 */
 unsigned char  *ka53_conspage;
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index 533935fd42b..a29bf8aa81b 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macros.h,v 1.10 2002/06/11 09:36:24 hugh Exp $ */
+/*	$OpenBSD: macros.h,v 1.11 2002/08/09 20:26:45 jsyn Exp $ */
 /*	$NetBSD: macros.h,v 1.20 2000/07/19 01:02:52 matt Exp $	*/
 
 /*
@@ -100,7 +100,7 @@ bcopy(const void *from, void *toe, size_t len)
 }
 #endif
 
-void	blkclr __P((void *, size_t));
+void	blkclr(void *, size_t);
 
 static __inline__ void *
 memset(void *block, int c, size_t len)
diff --git a/sys/arch/vax/stand/boot/consio.c b/sys/arch/vax/stand/boot/consio.c
index ddfb19c8c5b..6ff171106be 100644
--- a/sys/arch/vax/stand/boot/consio.c
+++ b/sys/arch/vax/stand/boot/consio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: consio.c,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: consio.c,v 1.5 2002/08/09 20:26:45 jsyn Exp $ */
 /*	$NetBSD: consio.c,v 1.13 2002/05/24 21:40:59 ragge Exp $ */
 /*
  * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
@@ -66,12 +66,12 @@ int rom_getc;		/* ROM-address of get-routine */
 unsigned char	*ka630_conspage;
 
 /* Function that initializes things for KA630 ROM console I/O */
-void ka630_consinit __P((void));
+void ka630_consinit(void);
 
 /* Functions that use KA630 ROM for console I/O */
-void ka630_rom_putchar __P((int c));
-int ka630_rom_getchar __P((void));
-int ka630_rom_testchar __P((void));
+void ka630_rom_putchar(int c);
+int ka630_rom_getchar(void);
+int ka630_rom_testchar(void);
 
 /* Also added such a thing for KA53 - MK-991208 */
 unsigned char  *ka53_conspage;
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index ae7057cb354..c733b9741ac 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.88 2002/07/29 22:19:39 mickey Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.89 2002/08/09 20:26:45 jsyn Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -243,9 +243,9 @@ void acard_chip_map(struct pciide_softc*, struct pci_attach_args*);
 void acard_setup_channel(struct channel_softc*);
 int  acard_pci_intr(void *);
 
-void serverworks_chip_map __P((struct pciide_softc*, struct pci_attach_args*));
-void serverworks_setup_channel __P((struct channel_softc*));
-int  serverworks_pci_intr __P((void *));
+void serverworks_chip_map(struct pciide_softc*, struct pci_attach_args*);
+void serverworks_setup_channel(struct channel_softc*);
+int  serverworks_pci_intr(void *);
  
 void pciide_channel_dma_setup(struct pciide_channel *);
 int  pciide_dma_table_setup(struct pciide_softc*, int, int);
diff --git a/usr.bin/pmdb/arch/alpha/alpha_trace.c b/usr.bin/pmdb/arch/alpha/alpha_trace.c
index e50cb74a76a..2521de52d36 100644
--- a/usr.bin/pmdb/arch/alpha/alpha_trace.c
+++ b/usr.bin/pmdb/arch/alpha/alpha_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: alpha_trace.c,v 1.4 2002/07/22 02:54:23 art Exp $	*/
+/*	$OpenBSD: alpha_trace.c,v 1.5 2002/08/09 20:26:44 jsyn Exp $	*/
 /*
  * Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
  * All rights reserved. 
@@ -172,11 +172,11 @@ inst_load(int ins)
 	return (0);
 }
 
-static __inline int sext __P((u_int));
-static __inline int rega __P((u_int));
-static __inline int regb __P((u_int));
-static __inline int regc __P((u_int));
-static __inline int disp __P((u_int));
+static __inline int sext(u_int);
+static __inline int rega(u_int);
+static __inline int regb(u_int);
+static __inline int regc(u_int);
+static __inline int disp(u_int);
 
 static __inline int
 sext(x)