From 052e020be6be85be6238c44b8386a61f8db7b6a4 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Sat, 16 Feb 2002 21:27:50 +0000
Subject: 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.

---
 src/regress/lib/libc/db/dbtest.c    | 36 ++++++++++++++++++------------------
 src/regress/lib/libc/regex/debug.ih |  8 ++++----
 src/regress/lib/libc/regex/main.ih  | 18 +++++++++---------
 3 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'src/regress/lib/libc')

diff --git a/src/regress/lib/libc/db/dbtest.c b/src/regress/lib/libc/db/dbtest.c
index 63e80524ec..9f4da58800 100644
--- a/src/regress/lib/libc/db/dbtest.c
+++ b/src/regress/lib/libc/db/dbtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $	*/
+/*	$OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
 #else
-static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $";
+static char rcsid[] = "$OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,22 +64,22 @@ static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $
 
 enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
 
-void	 compare __P((DBT *, DBT *));
-DBTYPE	 dbtype __P((char *));
-void	 dump __P((DB *, int));
-void	 err __P((const char *, ...));
-void	 get __P((DB *, DBT *));
-void	 getdata __P((DB *, DBT *, DBT *));
-void	 put __P((DB *, DBT *, DBT *));
-void	 rem __P((DB *, DBT *));
-char	*sflags __P((int));
-void	 synk __P((DB *));
-void	*rfile __P((char *, size_t *));
-void	 seq __P((DB *, DBT *));
-u_int	 setflags __P((char *));
-void	*setinfo __P((DBTYPE, char *));
-void	 usage __P((void));
-void	*xmalloc __P((char *, size_t));
+void	 compare(DBT *, DBT *);
+DBTYPE	 dbtype(char *);
+void	 dump(DB *, int);
+void	 err(const char *, ...);
+void	 get(DB *, DBT *);
+void	 getdata(DB *, DBT *, DBT *);
+void	 put(DB *, DBT *, DBT *);
+void	 rem(DB *, DBT *);
+char	*sflags(int);
+void	 synk(DB *);
+void	*rfile(char *, size_t *);
+void	 seq(DB *, DBT *);
+u_int	 setflags(char *);
+void	*setinfo(DBTYPE, char *);
+void	 usage(void);
+void	*xmalloc(char *, size_t);
 
 DBTYPE type;				/* Database type. */
 void *infop;				/* Iflags. */
diff --git a/src/regress/lib/libc/regex/debug.ih b/src/regress/lib/libc/regex/debug.ih
index 2aa0449038..9eb313af23 100644
--- a/src/regress/lib/libc/regex/debug.ih
+++ b/src/regress/lib/libc/regex/debug.ih
@@ -1,4 +1,4 @@
-/*	$OpenBSD: debug.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $	*/
+/*	$OpenBSD: debug.ih,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: debug.ih,v 1.2 1995/04/20 22:39:47 cgd Exp $	*/
 
 /* ========= begin header generated by ./mkh ========= */
@@ -7,9 +7,9 @@ extern "C" {
 #endif
 
 /* === debug.c === */
-void regprint __P((regex_t *r, FILE *d));
-static void s_print __P((register struct re_guts *g, FILE *d));
-static char *regchar __P((int ch));
+void regprint(regex_t *r, FILE *d);
+static void s_print(register struct re_guts *g, FILE *d);
+static char *regchar(int ch);
 
 #ifdef __cplusplus
 }
diff --git a/src/regress/lib/libc/regex/main.ih b/src/regress/lib/libc/regex/main.ih
index 9e3246889e..0860e26333 100644
--- a/src/regress/lib/libc/regex/main.ih
+++ b/src/regress/lib/libc/regex/main.ih
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $	*/
+/*	$OpenBSD: main.ih,v 1.3 2002/02/16 21:27:32 millert Exp $	*/
 /*	$NetBSD: main.ih,v 1.2 1995/04/20 22:39:55 cgd Exp $	*/
 
 /* ========= begin header generated by ./mkh ========= */
@@ -7,14 +7,14 @@ extern "C" {
 #endif
 
 /* === main.c === */
-void regress __P((FILE *in));
-void try __P((char *f0, char *f1, char *f2, char *f3, char *f4, int opts));
-int options __P((int type, char *s));
-int opt __P((int c, char *s));
-void fixstr __P((register char *p));
-char *check __P((char *str, regmatch_t sub, char *should));
-static char *eprint __P((int err));
-static int efind __P((char *name));
+void regress(FILE *in);
+void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
+int options(int type, char *s);
+int opt(int c, char *s);
+void fixstr(register char *p);
+char *check(char *str, regmatch_t sub, char *should);
+static char *eprint(int err);
+static int efind(char *name);
 
 #ifdef __cplusplus
 }
-- 
cgit v1.2.3-55-g6feb