remove __P

7 files changed, 111 insertions, 111 deletions

diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index d47d843..3c924bb 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -70,83 +70,83 @@ extern long			select_generation;
 
 extern struct nlist		namelist[];
 
-int	 checkhost __P((struct inpcb *));
-int	 checkport __P((struct inpcb *));
-void	 closeiostat __P((WINDOW *));
-void	 closeicmp __P((WINDOW *));
-void	 closeip __P((WINDOW *));
-void	 closekre __P((WINDOW *));
-void	 closembufs __P((WINDOW *));
-void	 closenetstat __P((WINDOW *));
-void	 closepigs __P((WINDOW *));
-void	 closeswap __P((WINDOW *));
-void	 closetcp __P((WINDOW *));
-int	 cmdiostat __P((const char *, const char *));
-int	 cmdkre __P((const char *, const char *));
-int	 cmdnetstat __P((const char *, const char *));
-struct	 cmdtab *lookup __P((const char *));
-void	 command __P((const char *));
-void	 die __P((int));
-void	 display __P((int));
-int	 dkinit __P((void));
-int	 dkcmd __P((char *, char *));
-void	 error __P((const char *fmt, ...)) __printflike(1, 2);
-void	 fetchicmp __P((void));
-void	 fetchip __P((void));
-void	 fetchiostat __P((void));
-void	 fetchkre __P((void));
-void	 fetchmbufs __P((void));
-void	 fetchnetstat __P((void));
-void	 fetchpigs __P((void));
-void	 fetchswap __P((void));
-void	 fetchtcp __P((void));
-void	 getsysctl __P((const char *, void *, size_t));
-int	 initicmp __P((void));
-int	 initip __P((void));
-int	 initiostat __P((void));
-int	 initkre __P((void));
-int	 initmbufs __P((void));
-int	 initnetstat __P((void));
-int	 initpigs __P((void));
-int	 initswap __P((void));
-int	 inittcp __P((void));
-int	 keyboard __P((void));
-int	 kvm_ckread __P((void *, void *, int));
-void	 labelicmp __P((void));
-void	 labelip __P((void));
-void	 labeliostat __P((void));
-void	 labelkre __P((void));
-void	 labelmbufs __P((void));
-void	 labelnetstat __P((void));
-void	 labelpigs __P((void));
-void	 labels __P((void));
-void	 labelswap __P((void));
-void	 labeltcp __P((void));
-void	 load __P((void));
-int	 netcmd __P((const char *, const char *));
-void	 nlisterr __P((struct nlist []));
-WINDOW	*openicmp __P((void));
-WINDOW	*openip __P((void));
-WINDOW	*openiostat __P((void));
-WINDOW	*openkre __P((void));
-WINDOW	*openmbufs __P((void));
-WINDOW	*opennetstat __P((void));
-WINDOW	*openpigs __P((void));
-WINDOW	*openswap __P((void));
-WINDOW	*opentcp __P((void));
-int	 prefix __P((const char *, const char *));
-void	 reseticmp __P((void));
-void	 resetip __P((void));
-void	 resettcp __P((void));
-void	 showicmp __P((void));
-void	 showip __P((void));
-void	 showiostat __P((void));
-void	 showkre __P((void));
-void	 showmbufs __P((void));
-void	 shownetstat __P((void));
-void	 showpigs __P((void));
-void	 showswap __P((void));
-void	 showtcp __P((void));
-void	 status __P((void));
-void	 suspend __P((int));
-char	*sysctl_dynread __P((const char *, size_t *));
+int	 checkhost(struct inpcb *);
+int	 checkport(struct inpcb *);
+void	 closeiostat(WINDOW *);
+void	 closeicmp(WINDOW *);
+void	 closeip(WINDOW *);
+void	 closekre(WINDOW *);
+void	 closembufs(WINDOW *);
+void	 closenetstat(WINDOW *);
+void	 closepigs(WINDOW *);
+void	 closeswap(WINDOW *);
+void	 closetcp(WINDOW *);
+int	 cmdiostat(const char *, const char *);
+int	 cmdkre(const char *, const char *);
+int	 cmdnetstat(const char *, const char *);
+struct	 cmdtab *lookup(const char *);
+void	 command(const char *);
+void	 die(int);
+void	 display(int);
+int	 dkinit(void);
+int	 dkcmd(char *, char *);
+void	 error(const char *fmt, ...) __printflike(1, 2);
+void	 fetchicmp(void);
+void	 fetchip(void);
+void	 fetchiostat(void);
+void	 fetchkre(void);
+void	 fetchmbufs(void);
+void	 fetchnetstat(void);
+void	 fetchpigs(void);
+void	 fetchswap(void);
+void	 fetchtcp(void);
+void	 getsysctl(const char *, void *, size_t);
+int	 initicmp(void);
+int	 initip(void);
+int	 initiostat(void);
+int	 initkre(void);
+int	 initmbufs(void);
+int	 initnetstat(void);
+int	 initpigs(void);
+int	 initswap(void);
+int	 inittcp(void);
+int	 keyboard(void);
+int	 kvm_ckread(void *, void *, int);
+void	 labelicmp(void);
+void	 labelip(void);
+void	 labeliostat(void);
+void	 labelkre(void);
+void	 labelmbufs(void);
+void	 labelnetstat(void);
+void	 labelpigs(void);
+void	 labels(void);
+void	 labelswap(void);
+void	 labeltcp(void);
+void	 load(void);
+int	 netcmd(const char *, const char *);
+void	 nlisterr(struct nlist []);
+WINDOW	*openicmp(void);
+WINDOW	*openip(void);
+WINDOW	*openiostat(void);
+WINDOW	*openkre(void);
+WINDOW	*openmbufs(void);
+WINDOW	*opennetstat(void);
+WINDOW	*openpigs(void);
+WINDOW	*openswap(void);
+WINDOW	*opentcp(void);
+int	 prefix(const char *, const char *);
+void	 reseticmp(void);
+void	 resetip(void);
+void	 resettcp(void);
+void	 showicmp(void);
+void	 showip(void);
+void	 showiostat(void);
+void	 showkre(void);
+void	 showmbufs(void);
+void	 shownetstat(void);
+void	 showpigs(void);
+void	 showswap(void);
+void	 showtcp(void);
+void	 status(void);
+void	 suspend(int);
+char	*sysctl_dynread(const char *, size_t *);
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index b9acec1..0235bcb 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -88,11 +88,11 @@ static  double etime;
 static  int numbers = 0;		/* default display bar graphs */
 static  int kbpt = 0;			/* default ms/seek shown */
 
-static int barlabels __P((int));
-static void histogram __P((long double, int, double));
-static int numlabels __P((int));
-static int devstats __P((int, int, int));
-static void stat1 __P((int, int));
+static int barlabels(int);
+static void histogram(long double, int, double);
+static int numlabels(int);
+static int devstats(int, int, int);
+static void stat1(int, int);
 
 WINDOW *
 openiostat()
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index e0df715..c78f6fe 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -72,13 +72,13 @@ static	struct hitem {
 
 int nports, nhosts, protos;
 
-static void changeitems __P((const char *, int));
-static int selectproto __P((const char *));
-static void showprotos __P((void));
-static int selectport __P((long, int));
-static void showports __P((void));
-static int selecthost __P((struct in_addr *, int));
-static void showhosts __P((void));
+static void changeitems(const char *, int);
+static int selectproto(const char *);
+static void showprotos(void);
+static int selectport(long, int);
+static void showports(void);
+static int selecthost(struct in_addr *, int);
+static void showhosts(void);
 
 int
 netcmd(cmd, args)
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 3d01502..2c552ca 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -78,13 +78,13 @@ static const char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 #include "systat.h"
 #include "extern.h"
 
-static struct netinfo *enter __P((struct inpcb *, int, const char *));
-static void enter_kvm __P((struct inpcb *, struct socket *, int, const char *));
-static void enter_sysctl __P((struct inpcb *, struct xsocket *, int, const char *));
-static void fetchnetstat_kvm __P((void));
-static void fetchnetstat_sysctl __P((void));
-static char *inetname __P((struct in_addr));
-static void inetprint __P((struct in_addr *, int, const char *));
+static struct netinfo *enter(struct inpcb *, int, const char *);
+static void enter_kvm(struct inpcb *, struct socket *, int, const char *);
+static void enter_sysctl(struct inpcb *, struct xsocket *, int, const char *);
+static void fetchnetstat_kvm(void);
+static void fetchnetstat_sysctl(void);
+static char *inetname(struct in_addr);
+static void inetprint(struct in_addr *, int, const char *);
 
 #define	streq(a,b)	(strcmp(a,b)==0)
 #define	YMAX(w)		((w)->_maxy-1)
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 491d3d3..053ac53 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -58,7 +58,7 @@ static const char sccsid[] = "@(#)pigs.c	8.2 (Berkeley) 9/23/93";
 #include "extern.h"
 #include "systat.h"
 
-int compar __P((const void *, const void *));
+int compar(const void *, const void *);
 
 static int nproc;
 static struct p_times {
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 6ba1bf4..0af0988 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -58,8 +58,8 @@ static const char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #include "systat.h"
 #include "extern.h"
 
-extern char *getbsize __P((int *headerlenp, long *blocksizep));
-void showspace __P((char *header, int hlen, long blocksize));
+extern char *getbsize(int *headerlenp, long *blocksizep);
+void showspace(char *header, int hlen, long blocksize);
 
 kvm_t	*kd;
 
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 2242fd7..7518b8b 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -130,15 +130,15 @@ struct statinfo cur, last, run;
 
 static	enum state { BOOT, TIME, RUN } state = TIME;
 
-static void allocinfo __P((struct Info *));
-static void copyinfo __P((struct Info *, struct Info *));
-static float cputime __P((int));
-static void dinfo __P((int, int, struct statinfo *, struct statinfo *));
-static void getinfo __P((struct Info *));
-static void putint __P((int, int, int, int));
-static void putfloat __P((double, int, int, int, int, int));
-static void putlongdouble __P((long double, int, int, int, int, int));
-static int ucount __P((void));
+static void allocinfo(struct Info *);
+static void copyinfo(struct Info *, struct Info *);
+static float cputime(int);
+static void dinfo(int, int, struct statinfo *, struct statinfo *);
+static void getinfo(struct Info *);
+static void putint(int, int, int, int);
+static void putfloat(double, int, int, int, int, int);
+static void putlongdouble(long double, int, int, int, int, int);
+static int ucount(void);
 
 static	int ncpu;
 static	int ut;