Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

5 files changed, 55 insertions, 55 deletions

diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 428381e3030..d1c60e97cca 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.6 2001/12/05 02:23:59 art Exp $	*/
+/*	$OpenBSD: extern.h,v 1.7 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $	*/
 
 /*-
@@ -48,42 +48,42 @@ extern VAR var[];
 extern VARENT *vhead;
 
 __BEGIN_DECLS
-void	 command __P((KINFO *, VARENT *));
-void	 cputime __P((KINFO *, VARENT *));
-int	 donlist __P((void));
-void	 evar __P((KINFO *, VARENT *));
-void	 emulname  __P((KINFO *, VARENT *));
-void	 fmt_puts __P((char *, int *));
-void	 fmt_putc __P((int, int *));
-double	 getpcpu __P((KINFO *));
-double	 getpmem __P((KINFO *));
-void	 gname __P((KINFO *, VARENT *));
-void	 logname __P((KINFO *, VARENT *));
-void	 longtname __P((KINFO *, VARENT *));
-void	 lstarted __P((KINFO *, VARENT *));
-void	 maxrss __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	 printheader __P((void));
-void	 pvar __P((KINFO *, VARENT *));
-void	 rgname __P((KINFO *, VARENT *));
-void	 rssize __P((KINFO *, VARENT *));
-void	 runame __P((KINFO *, VARENT *));
-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 *));
-void	 uvar __P((KINFO *, VARENT *));
-void	 vsize __P((KINFO *, VARENT *));
-void	 wchan __P((KINFO *, VARENT *));
+void	 command(KINFO *, VARENT *);
+void	 cputime(KINFO *, VARENT *);
+int	 donlist(void);
+void	 evar(KINFO *, VARENT *);
+void	 emulname(KINFO *, VARENT *);
+void	 fmt_puts(char *, int *);
+void	 fmt_putc(int, int *);
+double	 getpcpu(KINFO *);
+double	 getpmem(KINFO *);
+void	 gname(KINFO *, VARENT *);
+void	 logname(KINFO *, VARENT *);
+void	 longtname(KINFO *, VARENT *);
+void	 lstarted(KINFO *, VARENT *);
+void	 maxrss(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	 printheader(void);
+void	 pvar(KINFO *, VARENT *);
+void	 rgname(KINFO *, VARENT *);
+void	 rssize(KINFO *, VARENT *);
+void	 runame(KINFO *, VARENT *);
+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 *);
+void	 uvar(KINFO *, VARENT *);
+void	 vsize(KINFO *, VARENT *);
+void	 wchan(KINFO *, VARENT *);
 __END_DECLS
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index a1543a515fd..3bebf9813c6 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $	*/
+/*	$OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $";
+static char rcsid[] = "$OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp
 #include <sys/ucred.h>
 #include <sys/sysctl.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();
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 32e31296841..435ad6d7e90 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $	*/
+/*	$OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #else
-static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $"
 extern kvm_t *kd;
 extern int needenv, needcomm, commandonly;
 
-static char *cmdpart __P((char *));
+static char *cmdpart(char *);
 
 #define	min(a,b)	((a) < (b) ? (a) : (b))
 
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index 16cea0d3162..0de41a6d90f 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $	*/
+/*	$OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $";
+static char rcsid[] = "$OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -89,11 +89,11 @@ int	needcomm, needenv, commandonly;
 
 enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
 
-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	 usage __P((void));
+static char	*kludge_oldps_options(char *);
+static int	 pscomp(const void *, const void *);
+static void	 saveuser(KINFO *);
+static void	 scanvars(void);
+static void	 usage(void);
 
 char dfmt[] = "pid tt state time command";
 char jfmt[] = "user pid ppid pgid sess jobc state tt time command";
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 0e72896a5f9..6cb0ab8814b 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ps.h,v 1.3 1997/08/08 19:30:10 millert Exp $	*/
+/*	$OpenBSD: ps.h,v 1.4 2002/02/16 21:27:07 millert Exp $	*/
 /*	$NetBSD: ps.h,v 1.11 1995/09/29 21:57:03 cgd Exp $	*/
 
 /*-
@@ -74,7 +74,7 @@ typedef struct var {
 #define	INF127	0x08		/* 127 = infinity: if > 127, print 127. */
 	u_int	flag;
 				/* output routine */
-	void	(*oproc) __P((struct kinfo *, struct varent *));
+	void	(*oproc)(struct kinfo *, struct varent *);
 	short	width;		/* printing width */
 	char	parsed;		/* have we been parsed yet? (avoid dupes) */
 	/*