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.

4 files changed, 26 insertions, 26 deletions

diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index de636e7c136..73865047e5f 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $ */
+/*	$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $ */
 /*	$NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
 #else
-static char *rcsid = "$OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $";
+static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -72,11 +72,11 @@ static char *rcsid = "$OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $";
 
 #include "kvm_private.h"
 
-static int	kvm_dbopen __P((kvm_t *, const char *));
-static int	_kvm_get_header __P((kvm_t *));
+static int	kvm_dbopen(kvm_t *, const char *);
+static int	_kvm_get_header(kvm_t *);
 static kvm_t	*_kvm_open __P((kvm_t *, const char *, const char *,
 		    const char *, int, char *));
-static int	clear_gap __P((kvm_t *, FILE *, int));
+static int	clear_gap(kvm_t *, FILE *, int);
 
 char *
 kvm_geterr(kd)
diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h
index 5f0808a546b..2b88a2e8977 100644
--- a/lib/libkvm/kvm_private.h
+++ b/lib/libkvm/kvm_private.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_private.h,v 1.5 2001/05/18 09:08:38 art Exp $ */
+/*	$OpenBSD: kvm_private.h,v 1.6 2002/02/16 21:27:26 millert Exp $ */
 /*	$NetBSD: kvm_private.h,v 1.7 1996/05/05 04:32:15 gwr Exp $	*/
 
 /*-
@@ -90,18 +90,18 @@ struct __kvm {
 /*
  * Functions used internally by kvm, but across kvm modules.
  */
-void	 _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...));
-int	 _kvm_dump_mkheader __P((kvm_t *kd_live, kvm_t *kd_dump));
-void	 _kvm_freeprocs __P((kvm_t *kd));
-void	 _kvm_freevtop __P((kvm_t *));
-int	 _kvm_initvtop __P((kvm_t *));
-int	 _kvm_kvatop __P((kvm_t *, u_long, u_long *));
-void	*_kvm_malloc __P((kvm_t *kd, size_t));
-off_t	 _kvm_pa2off __P((kvm_t *, u_long));
-void	*_kvm_realloc __P((kvm_t *kd, void *, size_t));
+void	 _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...);
+int	 _kvm_dump_mkheader(kvm_t *kd_live, kvm_t *kd_dump);
+void	 _kvm_freeprocs(kvm_t *kd);
+void	 _kvm_freevtop(kvm_t *);
+int	 _kvm_initvtop(kvm_t *);
+int	 _kvm_kvatop(kvm_t *, u_long, u_long *);
+void	*_kvm_malloc(kvm_t *kd, size_t);
+off_t	 _kvm_pa2off(kvm_t *, u_long);
+void	*_kvm_realloc(kvm_t *kd, void *, size_t);
 void	 _kvm_syserr
-	    __P((kvm_t *kd, const char *program, const char *fmt, ...));
+(kvm_t *kd, const char *program, const char *fmt, ...);
 ssize_t	_kvm_pread
-		__P((kvm_t *, int, void *, size_t, off_t));
+(kvm_t *, int, void *, size_t, off_t);
 ssize_t	_kvm_pwrite
-		__P((kvm_t *, int, void *, size_t, off_t));
+(kvm_t *, int, void *, size_t, off_t);
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index 6b6bbc7a9cc..40f055fd658 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.12 2001/12/13 08:16:00 hugh Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
 #else
-static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.12 2001/12/13 08:16:00 hugh Exp $";
+static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -122,14 +122,14 @@ ssize_t		kvm_uread __P((kvm_t *, const struct proc *, u_long, char *,
 
 static char	**kvm_argv __P((kvm_t *, const struct proc *, u_long, int,
 		    int));
-static int	kvm_deadprocs __P((kvm_t *, int, int, u_long, u_long, int));
+static int	kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int);
 static char	**kvm_doargv __P((kvm_t *, const struct kinfo_proc *, int,
 		    void (*)(struct ps_strings *, u_long *, int *)));
 static int	kvm_proclist __P((kvm_t *, int, int, struct proc *,
 		    struct kinfo_proc *, int));
-static int	proc_verify __P((kvm_t *, u_long, const struct proc *));
-static void	ps_str_a __P((struct ps_strings *, u_long *, int *));
-static void	ps_str_e __P((struct ps_strings *, u_long *, int *));
+static int	proc_verify(kvm_t *, u_long, const struct proc *);
+static void	ps_str_a(struct ps_strings *, u_long *, int *);
+static void	ps_str_e(struct ps_strings *, u_long *, int *);
 
 char *
 _kvm_uread(kd, p, va, cnt)
diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c
index b844204ad53..85a061575d4 100644
--- a/lib/libkvm/kvm_sparc64.c
+++ b/lib/libkvm/kvm_sparc64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_sparc64.c,v 1.2 2001/12/05 02:23:11 art Exp $	*/
+/*	$OpenBSD: kvm_sparc64.c,v 1.3 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $	*/
 
 /*-
@@ -67,7 +67,7 @@
 
 #include "kvm_private.h"
 
-int _kvm_kvatop __P((kvm_t *, u_long, u_long *));
+int _kvm_kvatop(kvm_t *, u_long, u_long *);
 
 void
 _kvm_freevtop(kd)