o __P has been reoved

o Old-style K&R declarations have been converted to new C89 style
o register has been removed
o prototype for main() has been removed (gcc3 makes it an error)
o int main(int argc, char *argv[]) is the preferred main definition.
o Attempt to not break style(9) conformance for declarations more than
  they already are.

8 files changed, 109 insertions, 184 deletions

diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 42977e8..f1e7f28 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -46,41 +46,41 @@ extern VAR var[];
 extern VARENT *vhead;
 
 __BEGIN_DECLS
-void	 command __P((KINFO *, VARENT *));
-void	 cputime __P((KINFO *, VARENT *));
-int	 donlist __P((void));
-char	*fmt_argv __P((char **, char *, int));
-double	 getpcpu __P((KINFO *));
-double	 getpmem __P((KINFO *));
-void	 kvar __P((KINFO *, VARENT *));
-void	 logname __P((KINFO *, VARENT *));
-void	 longtname __P((KINFO *, VARENT *));
-void	 lstarted __P((KINFO *, VARENT *));
-void	 maxrss __P((KINFO *, VARENT *));
-void	 mtxname __P((KINFO *, VARENT *));
-void	 nlisterr __P((struct nlist *));
-void	 p_rssize __P((KINFO *, VARENT *));
-void	 pagein __P((KINFO *, VARENT *));
-void	 parsefmt __P((char *));
-void	 pcpu __P((KINFO *, VARENT *));
-void	 pmem __P((KINFO *, VARENT *));
-void	 pri __P((KINFO *, VARENT *));
-void	 priorityr __P((KINFO *, VARENT *));
-void	 printheader __P((void));
-void	 rssize __P((KINFO *, VARENT *));
-void	 runame __P((KINFO *, VARENT *));
-int	 s_runame __P((KINFO *));
-void	 rvar __P((KINFO *, VARENT *));
-void	 showkey __P((void));
-void	 started __P((KINFO *, VARENT *));
-void	 state __P((KINFO *, VARENT *));
-void	 tdev __P((KINFO *, VARENT *));
-void	 tname __P((KINFO *, VARENT *));
-void	 tsize __P((KINFO *, VARENT *));
-void	 ucomm __P((KINFO *, VARENT *));
-void	 uname __P((KINFO *, VARENT *));
-int	 s_uname __P((KINFO *));
-void	 vsize __P((KINFO *, VARENT *));
-void	 wchan __P((KINFO *, VARENT *));
-void	 lattr __P((KINFO *, VARENT *));
+void	 command(KINFO *, VARENT *);
+void	 cputime(KINFO *, VARENT *);
+int	 donlist(void);
+char	*fmt_argv(char **, char *, int);
+double	 getpcpu(KINFO *);
+double	 getpmem(KINFO *);
+void	 kvar(KINFO *, VARENT *);
+void	 logname(KINFO *, VARENT *);
+void	 longtname(KINFO *, VARENT *);
+void	 lstarted(KINFO *, VARENT *);
+void	 maxrss(KINFO *, VARENT *);
+void	 mtxname(KINFO *, VARENT *);
+void	 nlisterr(struct nlist *);
+void	 p_rssize(KINFO *, VARENT *);
+void	 pagein(KINFO *, VARENT *);
+void	 parsefmt(char *);
+void	 pcpu(KINFO *, VARENT *);
+void	 pmem(KINFO *, VARENT *);
+void	 pri(KINFO *, VARENT *);
+void	 priorityr(KINFO *, VARENT *);
+void	 printheader(void);
+void	 rssize(KINFO *, VARENT *);
+void	 runame(KINFO *, VARENT *);
+int	 s_runame(KINFO *);
+void	 rvar(KINFO *, VARENT *);
+void	 showkey(void);
+void	 started(KINFO *, VARENT *);
+void	 state(KINFO *, VARENT *);
+void	 tdev(KINFO *, VARENT *);
+void	 tname(KINFO *, VARENT *);
+void	 tsize(KINFO *, VARENT *);
+void	 ucomm(KINFO *, VARENT *);
+void	 uname(KINFO *, VARENT *);
+int	 s_uname(KINFO *);
+void	 vsize(KINFO *, VARENT *);
+void	 wchan(KINFO *, VARENT *);
+void	 lattr(KINFO *, VARENT *);
 __END_DECLS
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index ff29af6..ef95810 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -50,16 +50,15 @@ static const char rcsid[] =
 #include <vis.h>
 #include "ps.h"
 
-static char *cmdpart __P((char *));
-static char *shquote __P((char **));
+static char *cmdpart(char *);
+static char *shquote(char **);
 
 /*
  * XXX
  * This is a stub until marc does the real one.
  */
 static char *
-shquote(argv)
-	char **argv;
+shquote(char **argv)
 {
 	static long arg_max = -1;
 	long len;
@@ -97,8 +96,7 @@ shquote(argv)
 }
 
 static char *
-cmdpart(arg0)
-	char *arg0;
+cmdpart(char *arg0)
 {
 	char *cp;
 
@@ -106,10 +104,7 @@ cmdpart(arg0)
 }
 
 char *
-fmt_argv(argv, cmd, maxlen)
-	char **argv;
-	char *cmd;
-	int maxlen;
+fmt_argv(char **argv, char *cmd, int maxlen)
 {
 	int len;
 	char *ap, *cp;
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 11a897f..10f3b04 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -58,8 +58,8 @@ static const char rcsid[] =
 
 #include "ps.h"
 
-static VAR *findvar __P((char *));
-static int  vcmp __P((const void *, const void *));
+static VAR *findvar(char *);
+static int  vcmp(const void *, const void *);
 
 #ifdef NOTINUSE
 int	utime(), stime(), ixrss(), idrss(), isrss();
@@ -190,7 +190,7 @@ VAR var[] = {
 };
 
 void
-showkey()
+showkey(void)
 {
 	VAR *v;
 	int i;
@@ -211,8 +211,7 @@ showkey()
 }
 
 void
-parsefmt(p)
-	char *p;
+parsefmt(char *p)
 {
 	static struct varent *vtail;
 
@@ -242,8 +241,7 @@ parsefmt(p)
 }
 
 static VAR *
-findvar(p)
-	char *p;
+findvar(char *p)
 {
 	VAR *v, key;
 	char *hp;
@@ -273,8 +271,7 @@ findvar(p)
 }
 
 static int
-vcmp(a, b)
-        const void *a, *b;
+vcmp(const void *a, const void *b)
 {
         return (strcmp(((VAR *)a)->name, ((VAR *)b)->name));
 }
diff --git a/bin/ps/lomac.c b/bin/ps/lomac.c
index 754c964..4ba5ee5 100644
--- a/bin/ps/lomac.c
+++ b/bin/ps/lomac.c
@@ -67,8 +67,8 @@ static int devlomac = -1;		/* file descriptor for LOMAC_DEVICE */
  */
 
 void 
-lomac_start(void) {
-
+lomac_start(void)
+{
 	if ((devlomac = open(LOMAC_DEVICE, O_RDWR)) == -1)
 		err(1, "cannot open %s", LOMAC_DEVICE);
 }
@@ -83,7 +83,8 @@ lomac_start(void) {
  */
 
 void 
-lomac_stop(void) {
+lomac_stop(void)
+{
 
 	if (devlomac != -1 && close(devlomac) == -1)
 		err(1, "cannot close %s", LOMAC_DEVICE);
@@ -104,7 +105,8 @@ lomac_stop(void) {
  */
 
 int
-get_lattr(int pid) {
+get_lattr(int pid)
+{
 
 	if (devlomac == -1)
 		lomac_start();
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index f07ae90..de91ba3 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -50,7 +50,7 @@ int	mempages;			/* number of pages of phys. memory */
 int	fscale;				/* kernel _fscale variable */
 
 int
-donlist()
+donlist(void)
 {
 	size_t oldlen;
 
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 4399029..7b80f03 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -66,7 +66,7 @@ static const char rcsid[] =
 #include "ps.h"
 
 void
-printheader()
+printheader(void)
 {
 	VAR *v;
 	struct varent *vent;
@@ -87,9 +87,7 @@ printheader()
 }
 
 void
-command(k, ve)
-	KINFO *k;
-	VARENT *ve;
+command(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	int left;
@@ -143,9 +141,7 @@ command(k, ve)
 }
 
 void
-ucomm(k, ve)
-	KINFO *k;
-	VARENT *ve;
+ucomm(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -154,9 +150,7 @@ ucomm(k, ve)
 }
 
 void
-logname(k, ve)
-	KINFO *k;
-	VARENT *ve;
+logname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	char *s;
@@ -166,9 +160,7 @@ logname(k, ve)
 }
 
 void
-state(k, ve)
-	KINFO *k;
-	VARENT *ve;
+state(KINFO *k, VARENT *ve)
 {
 	int flag, sflag, tdflags;
 	char *cp;
@@ -240,9 +232,7 @@ state(k, ve)
 }
 
 void
-pri(k, ve)
-	KINFO *k;
-	VARENT *ve;
+pri(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -251,9 +241,7 @@ pri(k, ve)
 }
 
 void
-uname(k, ve)
-	KINFO *k;
-	VARENT *ve;
+uname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -263,16 +251,13 @@ uname(k, ve)
 }
 
 int
-s_uname(k)
-	KINFO *k;
+s_uname(KINFO *k)
 {
 	    return (strlen(user_from_uid(k->ki_p->ki_uid, 0)));
 }
 
 void
-runame(k, ve)
-	KINFO *k;
-	VARENT *ve;
+runame(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -282,16 +267,13 @@ runame(k, ve)
 }
 
 int
-s_runame(k)
-	KINFO *k;
+s_runame(KINFO *k)
 {
 	    return (strlen(user_from_uid(k->ki_p->ki_ruid, 0)));
 }
 
 void
-tdev(k, ve)
-	KINFO *k;
-	VARENT *ve;
+tdev(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	dev_t dev;
@@ -309,9 +291,7 @@ tdev(k, ve)
 }
 
 void
-tname(k, ve)
-	KINFO *k;
-	VARENT *ve;
+tname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	dev_t dev;
@@ -331,9 +311,7 @@ tname(k, ve)
 }
 
 void
-longtname(k, ve)
-	KINFO *k;
-	VARENT *ve;
+longtname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	dev_t dev;
@@ -348,9 +326,7 @@ longtname(k, ve)
 }
 
 void
-started(k, ve)
-	KINFO *k;
-	VARENT *ve;
+started(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	static time_t now;
@@ -384,9 +360,7 @@ started(k, ve)
 }
 
 void
-lstarted(k, ve)
-	KINFO *k;
-	VARENT *ve;
+lstarted(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	time_t then;
@@ -403,9 +377,7 @@ lstarted(k, ve)
 }
 
 void
-mtxname(k, ve)
-	KINFO *k;
-	VARENT *ve;
+mtxname(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -421,9 +393,7 @@ mtxname(k, ve)
 }
 
 void
-wchan(k, ve)
-	KINFO *k;
-	VARENT *ve;
+wchan(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -444,9 +414,7 @@ wchan(k, ve)
 #endif
 
 void
-vsize(k, ve)
-	KINFO *k;
-	VARENT *ve;
+vsize(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -456,9 +424,7 @@ vsize(k, ve)
 }
 
 void
-rssize(k, ve)
-	KINFO *k;
-	VARENT *ve;
+rssize(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -469,9 +435,7 @@ rssize(k, ve)
 }
 
 void
-p_rssize(k, ve)		/* doesn't account for text */
-	KINFO *k;
-	VARENT *ve;
+p_rssize(KINFO *k, VARENT *ve)		/* doesn't account for text */
 {
 	VAR *v;
 
@@ -480,9 +444,7 @@ p_rssize(k, ve)		/* doesn't account for text */
 }
 
 void
-cputime(k, ve)
-	KINFO *k;
-	VARENT *ve;
+cputime(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	long secs;
@@ -521,8 +483,7 @@ cputime(k, ve)
 }
 
 double
-getpcpu(k)
-	KINFO *k;
+getpcpu(KINFO *k)
 {
 	static int failure;
 
@@ -543,9 +504,7 @@ getpcpu(k)
 }
 
 void
-pcpu(k, ve)
-	KINFO *k;
-	VARENT *ve;
+pcpu(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -554,8 +513,7 @@ pcpu(k, ve)
 }
 
 double
-getpmem(k)
-	KINFO *k;
+getpmem(KINFO *k)
 {
 	static int failure;
 	double fracmem;
@@ -574,9 +532,7 @@ getpmem(k)
 }
 
 void
-pmem(k, ve)
-	KINFO *k;
-	VARENT *ve;
+pmem(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -585,9 +541,7 @@ pmem(k, ve)
 }
 
 void
-pagein(k, ve)
-	KINFO *k;
-	VARENT *ve;
+pagein(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -597,9 +551,7 @@ pagein(k, ve)
 }
 
 void
-maxrss(k, ve)
-	KINFO *k;
-	VARENT *ve;
+maxrss(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -609,9 +561,7 @@ maxrss(k, ve)
 }
 
 void
-tsize(k, ve)
-	KINFO *k;
-	VARENT *ve;
+tsize(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -620,9 +570,7 @@ tsize(k, ve)
 }
 
 void
-priorityr(k, ve)
-	KINFO *k;
-	VARENT *ve;
+priorityr(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 	struct priority *pri;
@@ -656,9 +604,7 @@ priorityr(k, ve)
  * structures.
  */
 static void
-printval(bp, v)
-	char *bp;
-	VAR *v;
+printval(char *bp, VAR *v)
 {
 	static char ofmt[32] = "%";
 	char *fcp, *cp;
@@ -704,9 +650,7 @@ printval(bp, v)
 }
 
 void
-kvar(k, ve)
-	KINFO *k;
-	VARENT *ve;
+kvar(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -715,9 +659,7 @@ kvar(k, ve)
 }
 
 void
-rvar(k, ve)
-	KINFO *k;
-	VARENT *ve;
+rvar(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
@@ -729,9 +671,7 @@ rvar(k, ve)
 }
 
 void
-lattr(k, ve)
-	KINFO *k;
-	VARENT *ve;
+lattr(KINFO *k, VARENT *ve)
 {
 	VAR *v;
 
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index fc08a69..8b38928 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -93,15 +93,15 @@ static int forceuread=1;
 
 enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
 
-static char	*fmt __P((char **(*)(kvm_t *, const struct kinfo_proc *, int),
-		    KINFO *, char *, int));
-static char	*kludge_oldps_options __P((char *));
-static int	 pscomp __P((const void *, const void *));
-static void	 saveuser __P((KINFO *));
-static void	 scanvars __P((void));
-static void	 dynsizevars __P((KINFO *));
-static void	 sizevars __P((void));
-static void	 usage __P((void));
+static char	*fmt(char **(*)(kvm_t *, const struct kinfo_proc *, int),
+		    KINFO *, char *, int);
+static char	*kludge_oldps_options(char *);
+static int	 pscomp(const void *, const void *);
+static void	 saveuser(KINFO *);
+static void	 scanvars(void);
+static void	 dynsizevars(KINFO *);
+static void	 sizevars(void);
+static void	 usage(void);
 static uid_t	*getuids(const char *, int *);
 
 char dfmt[] = "pid tt state time command";
@@ -116,9 +116,7 @@ char Zfmt[] = "lvl";
 kvm_t *kd;
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
 	struct kinfo_proc *kp;
 	struct varent *vent;
@@ -439,7 +437,7 @@ getuids(const char *arg, int *nuids)
 }
 
 static void
-scanvars()
+scanvars(void)
 {
 	struct varent *vent;
 	VAR *v;
@@ -458,8 +456,7 @@ scanvars()
 }
 
 static void
-dynsizevars(ki)
-	KINFO *ki;
+dynsizevars(KINFO *ki)
 {
 	struct varent *vent;
 	VAR *v;
@@ -478,7 +475,7 @@ dynsizevars(ki)
 }
 
 static void
-sizevars()
+sizevars(void)
 {
 	struct varent *vent;
 	VAR *v;
@@ -495,11 +492,8 @@ sizevars()
 }
 
 static char *
-fmt(fn, ki, comm, maxlen)
-	char **(*fn) __P((kvm_t *, const struct kinfo_proc *, int));
-	KINFO *ki;
-	char *comm;
-	int maxlen;
+fmt(char **(*fn)(kvm_t *, const struct kinfo_proc *, int), KINFO *ki,
+  char *comm, int maxlen)
 {
 	char *s;
 
@@ -512,8 +506,7 @@ fmt(fn, ki, comm, maxlen)
 #define UREADOK(ki)	(forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
 
 static void
-saveuser(ki)
-	KINFO *ki;
+saveuser(KINFO *ki)
 {
 
 	if (ki->ki_p->ki_sflag & PS_INMEM) {
@@ -549,8 +542,7 @@ saveuser(ki)
 }
 
 static int
-pscomp(a, b)
-	const void *a, *b;
+pscomp(const void *a, const void *b)
 {
 	int i;
 #define VSIZE(k) ((k)->ki_p->ki_dsize + (k)->ki_p->ki_ssize + \
@@ -578,8 +570,7 @@ pscomp(a, b)
  * feature is available with the option 'T', which takes no argument.
  */
 static char *
-kludge_oldps_options(s)
-	char *s;
+kludge_oldps_options(char *s)
 {
 	size_t len;
 	char *newopts, *ns, *cp;
@@ -632,7 +623,7 @@ kludge_oldps_options(s)
 }
 
 static void
-usage()
+usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n%s\n",
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index c7769eb..723c21e 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -60,9 +60,9 @@ typedef struct var {
 #define	DSIZ	0x08		/* field size is dynamic*/
 	u_int	flag;
 				/* output routine */
-	void	(*oproc) __P((struct kinfo *, struct varent *));
+	void	(*oproc)(struct kinfo *, struct varent *);
 				/* sizing routine*/
-	int	(*sproc) __P((struct kinfo *));
+	int	(*sproc)(struct kinfo *);
 	short	width;		/* printing width */
 	/*
 	 * The following (optional) elements are hooks for passing information