3 files changed, 10 insertions, 18 deletions
diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c
index 78f84b4737b..4e248a71907 100644
--- a/lib/libcompat/4.3/regex.c
+++ b/lib/libcompat/4.3/regex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regex.c,v 1.5 2003/06/02 20:18:40 millert Exp $	*/
+/*	$OpenBSD: regex.c,v 1.6 2003/06/26 23:19:32 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
@@ -41,7 +41,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char sccsid[] = "from: @(#)regex.c	5.1 (Berkeley) 3/29/92";*/
-static char rcsid[] = "$OpenBSD: regex.c,v 1.5 2003/06/02 20:18:40 millert Exp $";
+static char rcsid[] = "$OpenBSD: regex.c,v 1.6 2003/06/26 23:19:32 deraadt Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -57,8 +57,7 @@ static char *re_errstr;
 static void re_error(const char *);
 
 char *
-re_comp(s)
-	const char *s;
+re_comp(const char *s)
 {
 	if (s == NULL)
 		return (NULL);
@@ -78,8 +77,7 @@ re_comp(s)
 }
 
 int
-re_exec(s)
-	const char *s;
+re_exec(const char *s)
 {
 	int rc;
 
diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c
index 0500604d1bd..7de879c3ecf 100644
--- a/lib/libcompat/4.3/rexec.c
+++ b/lib/libcompat/4.3/rexec.c
@@ -47,11 +47,7 @@ int	rexecoptions;
 void ruserpass(const char *, char **, char **);
 
 int
-rexec(ahost, rport, name, pass, cmd, fd2p)
-	char **ahost;
-	int rport;
-	char *name, *pass, *cmd;
-	int *fd2p;
+rexec(char **ahost, int rport, char *name, char *pass, char *cmd, int *fd2p)
 {
 	struct sockaddr_in sin, sin2, from;
 	struct hostent *hp;
diff --git a/lib/libcompat/regexp/regerror.c b/lib/libcompat/regexp/regerror.c
index 3f129ea329b..c98b8a3d4f7 100644
--- a/lib/libcompat/regexp/regerror.c
+++ b/lib/libcompat/regexp/regerror.c
@@ -1,16 +1,15 @@
-/*	$OpenBSD: regerror.c,v 1.4 2000/06/30 16:00:06 millert Exp $	*/
+/*	$OpenBSD: regerror.c,v 1.5 2003/06/26 23:19:32 deraadt Exp $	*/
 #ifndef lint
-static char *rcsid = "$OpenBSD: regerror.c,v 1.4 2000/06/30 16:00:06 millert Exp $";
+static char *rcsid = "$OpenBSD: regerror.c,v 1.5 2003/06/26 23:19:32 deraadt Exp $";
 #endif /* not lint */
 
 #include <regexp.h>
 #include <stdio.h>
 
-static void (*_new_regerror)() = NULL;
+static void (*_new_regerror)(const char *) = NULL;
 
 void
-v8_regerror(s)
-	const char *s;
+v8_regerror(const char *s)
 {
 	if (_new_regerror != NULL)
 		_new_regerror(s);
@@ -20,8 +19,7 @@ v8_regerror(s)
 }
 
 void
-v8_setregerror(f)
-	void (*f)();
+v8_setregerror(void (*f)(const char *))
 {
 	_new_regerror = f;
 }