From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 14 Nov 2003 03:54:33 +0000 (+0000)
Subject: __P removal.
X-Git-Tag: v2.0.1~12638
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/3eefb6963724cecec5c687e82223530f1e82130e

__P removal.

Submitted-by: Craig Dooley <craig@xlnx-x.net>
---

diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index d15579a2f7..eee7bef998 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -26,7 +26,7 @@
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
  * $FreeBSD: src/bin/ed/ed.h,v 1.13.2.1 2001/08/01 02:36:03 obrien Exp $
- * $DragonFly: src/bin/ed/ed.h,v 1.3 2003/09/21 04:21:35 drhodus Exp $
+ * $DragonFly: src/bin/ed/ed.h,v 1.4 2003/11/14 03:54:26 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -180,14 +180,6 @@ if ((i) > (n)) { \
 # define strerror(n) sys_errlist[n]
 #endif
 
-#ifndef __P
-# ifndef __STDC__
-#  define __P(proto) ()
-# else
-#  define __P(proto) proto
-# endif
-#endif
-
 /* Local Function Declarations */
 void add_line_node (line_t *);
 int append_lines (long);
diff --git a/crypto/heimdal/cf/make-proto.pl b/crypto/heimdal/cf/make-proto.pl
index dd386e43b8..ad4dcd00da 100644
--- a/crypto/heimdal/cf/make-proto.pl
+++ b/crypto/heimdal/cf/make-proto.pl
@@ -1,5 +1,6 @@
 # Make prototypes from .c files
 # $Id: make-proto.pl,v 1.15 2002/08/12 16:23:58 joda Exp $
+# $DragonFly: src/crypto/heimdal/cf/Attic/make-proto.pl,v 1.2 2003/11/14 03:54:29 dillon Exp $
 
 ##use Getopt::Std;
 require 'getopts.pl';
@@ -7,7 +8,7 @@ require 'getopts.pl';
 $brace = 0;
 $line = "";
 $debug = 0;
-$oproto = 1;
+$oproto = 0;
 $private_func_re = "^_";
 
 do Getopts('o:p:dqR:P:') || die "foo";
diff --git a/crypto/heimdal/lib/com_err/com_err.h b/crypto/heimdal/lib/com_err/com_err.h
index a76214bdc5..17aac124b7 100644
--- a/crypto/heimdal/lib/com_err/com_err.h
+++ b/crypto/heimdal/lib/com_err/com_err.h
@@ -29,9 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
+ *
+ * $Id: com_err.h,v 1.9 2001/05/11 20:03:36 assar Exp $
+ * $DragonFly: src/crypto/heimdal/lib/com_err/Attic/com_err.h,v 1.2 2003/11/14 03:54:29 dillon Exp $
  */
 
-/* $Id: com_err.h,v 1.9 2001/05/11 20:03:36 assar Exp $ */
 
 /* MIT compatible com_err library */
 
@@ -44,22 +46,22 @@
 #define __attribute__(X)
 #endif
 
-typedef void (*errf) __P((const char *, long, const char *, va_list));
+typedef void (*errf) (const char *, long, const char *, va_list);
 
-const char * error_message __P((long));
-int init_error_table __P((const char**, long, int));
+const char * error_message (long);
+int init_error_table (const char**, long, int);
 
-void com_err_va __P((const char *, long, const char *, va_list))
+void com_err_va (const char *, long, const char *, va_list)
     __attribute__((format(printf, 3, 0)));
 
-void com_err __P((const char *, long, const char *, ...))
+void com_err (const char *, long, const char *, ...)
     __attribute__((format(printf, 3, 4)));
 
-errf set_com_err_hook __P((errf));
-errf reset_com_err_hook __P((void));
+errf set_com_err_hook (errf);
+errf reset_com_err_hook (void);
 
-const char *error_table_name  __P((int num));
+const char *error_table_name  (int num);
 
-void add_to_error_table __P((struct et_list *new_table));
+void add_to_error_table (struct et_list *new_table);
 
 #endif /* __COM_ERR_H__ */
diff --git a/crypto/heimdal/lib/com_err/com_right.h b/crypto/heimdal/lib/com_err/com_right.h
index c87bb0d1de..801cb29e29 100644
--- a/crypto/heimdal/lib/com_err/com_right.h
+++ b/crypto/heimdal/lib/com_err/com_right.h
@@ -29,10 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
  * SUCH DAMAGE. 
+ *
+ * $Id: com_right.h,v 1.11 2000/07/31 01:11:08 assar Exp $
+ * $DragonFly: src/crypto/heimdal/lib/com_err/Attic/com_right.h,v 1.2 2003/11/14 03:54:29 dillon Exp $
  */
 
-/* $Id: com_right.h,v 1.11 2000/07/31 01:11:08 assar Exp $ */
-
 #ifndef __COM_RIGHT_H__
 #define __COM_RIGHT_H__
 
@@ -59,8 +60,8 @@ struct et_list {
 };
 extern struct et_list *_et_list;
 
-const char *com_right __P((struct et_list *list, long code));
-void initialize_error_table_r __P((struct et_list **, const char **, int, long));
-void free_error_table __P((struct et_list *));
+const char *com_right (struct et_list *list, long code);
+void initialize_error_table_r (struct et_list **, const char **, int, long);
+void free_error_table (struct et_list *);
 
 #endif /* __COM_RIGHT_H__ */
diff --git a/crypto/heimdal/lib/kafs/kafs.h b/crypto/heimdal/lib/kafs/kafs.h
index b929121353..23612b9d3b 100644
--- a/crypto/heimdal/lib/kafs/kafs.h
+++ b/crypto/heimdal/lib/kafs/kafs.h
@@ -29,9 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
+ * $Id: kafs.h,v 1.35 2001/09/10 16:05:31 assar Exp $
+ * $DragonFly: src/crypto/heimdal/lib/kafs/Attic/kafs.h,v 1.2 2003/11/14 03:54:29 dillon Exp $
  */
 
-/* $Id: kafs.h,v 1.35 2001/09/10 16:05:31 assar Exp $ */
 
 #ifndef __KAFS_H
 #define __KAFS_H
@@ -97,41 +99,31 @@ struct ClearToken {
   int32_t EndTimestamp;
 };
 
-#ifdef __STDC__
-#ifndef __P
-#define __P(x) x
-#endif
-#else
-#ifndef __P
-#define __P(x) ()
-#endif
-#endif
-
 /* Use k_hasafs() to probe if the machine supports AFS syscalls.
    The other functions will generate a SIGSYS if AFS is not supported */
 
-int k_hasafs __P((void));
+int k_hasafs (void);
 
-int krb_afslog __P((const char *cell, const char *realm));
-int krb_afslog_uid __P((const char *cell, const char *realm, uid_t uid));
-int krb_afslog_home __P((const char *cell, const char *realm,
-			 const char *homedir));
-int krb_afslog_uid_home __P((const char *cell, const char *realm, uid_t uid,
-			     const char *homedir));
+int krb_afslog (const char *cell, const char *realm);
+int krb_afslog_uid (const char *cell, const char *realm, uid_t uid);
+int krb_afslog_home (const char *cell, const char *realm,
+			 const char *homedir);
+int krb_afslog_uid_home (const char *cell, const char *realm, uid_t uid,
+			     const char *homedir);
 
-int krb_realm_of_cell __P((const char *cell, char **realm));
+int krb_realm_of_cell (const char *cell, char **realm);
 
 /* compat */
 #define k_afsklog krb_afslog
 #define k_afsklog_uid krb_afslog_uid
 
-int k_pioctl __P((char *a_path,
+int k_pioctl (char *a_path,
 		  int o_opcode,
 		  struct ViceIoctl *a_paramsP,
-		  int a_followSymlinks));
-int k_unlog __P((void));
-int k_setpag __P((void));
-int k_afs_cell_of_file __P((const char *path, char *cell, int len));
+		  int a_followSymlinks);
+int k_unlog (void);
+int k_setpag (void);
+int k_afs_cell_of_file (const char *path, char *cell, int len);
 
 
 
@@ -145,33 +137,33 @@ int k_afs_cell_of_file __P((const char *path, char *cell, int len));
 #endif
 
 #ifdef KRB_H_INCLUDED
-int kafs_settoken __P((const char*, uid_t, CREDENTIALS*));
+int kafs_settoken (const char*, uid_t, CREDENTIALS*);
 #endif
 
 #ifdef KRB5_H_INCLUDED
-krb5_error_code krb5_afslog_uid __P((krb5_context context,
+krb5_error_code krb5_afslog_uid (krb5_context context,
 				     krb5_ccache id,
 				     const char *cell,
 				     krb5_const_realm realm,
-				     uid_t uid));
-krb5_error_code krb5_afslog __P((krb5_context context,
+				     uid_t uid);
+krb5_error_code krb5_afslog (krb5_context context,
 				 krb5_ccache id, 
 				 const char *cell,
-				 krb5_const_realm realm));
-krb5_error_code krb5_afslog_uid_home __P((krb5_context context,
+				 krb5_const_realm realm);
+krb5_error_code krb5_afslog_uid_home (krb5_context context,
 					  krb5_ccache id,
 					  const char *cell,
 					  krb5_const_realm realm,
 					  uid_t uid,
-					  const char *homedir));
+					  const char *homedir);
 
-krb5_error_code krb5_afslog_home __P((krb5_context context,
+krb5_error_code krb5_afslog_home (krb5_context context,
 				      krb5_ccache id,
 				      const char *cell,
 				      krb5_const_realm realm,
-				      const char *homedir));
+				      const char *homedir);
 
-krb5_error_code krb5_realm_of_cell __P((const char *cell, char **realm));
+krb5_error_code krb5_realm_of_cell (const char *cell, char **realm);
 
 #endif
 
diff --git a/crypto/openssh/defines.h b/crypto/openssh/defines.h
index ab19a077cc..91631284a2 100644
--- a/crypto/openssh/defines.h
+++ b/crypto/openssh/defines.h
@@ -2,6 +2,7 @@
 #define _DEFINES_H
 
 /* $Id: defines.h,v 1.96 2002/09/26 00:38:48 tim Exp $ */
+/* $DragonFly: src/crypto/openssh/Attic/defines.h,v 1.2 2003/11/14 03:54:29 dillon Exp $ */
 
 
 /* Constants */
@@ -370,10 +371,6 @@ struct winsize {
    } while (0)
 #endif
 
-#ifndef __P
-# define __P(x) x
-#endif
-
 #if !defined(IN6_IS_ADDR_V4MAPPED)
 # define IN6_IS_ADDR_V4MAPPED(a) \
 	((((u_int32_t *) (a))[0] == 0) && (((u_int32_t *) (a))[1] == 0) && \
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index afed610756..a78001ea18 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/atrun/atrun.c,v 1.14.2.1 2001/03/05 10:53:23 kris Exp $
- * $DragonFly: src/libexec/atrun/atrun.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/atrun/atrun.c,v 1.3 2003/11/14 03:54:29 dillon Exp $
  */
 
 /* System Headers */
@@ -84,7 +84,7 @@
 static debug = 0;
 
 void perr(const char *a);
-static void usage __P((void));
+static void usage (void);
 
 /* Local functions */
 static int
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index 5c0b25bf50..1854924191 100644
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -3,7 +3,7 @@
  * (i.e. Ethernet)
  *
  * $FreeBSD: src/libexec/bootpd/hwaddr.c,v 1.7.2.1 2003/02/15 05:36:01 kris Exp $
- * $DragonFly: src/libexec/bootpd/hwaddr.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/bootpd/hwaddr.c,v 1.3 2003/11/14 03:54:29 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -54,7 +54,7 @@
 /* For BSD 4.4, set arp entry by writing to routing socket */
 #if defined(BSD)
 #if BSD >= 199306
-extern int bsd_arp_set __P((struct in_addr *, char *, int));
+extern int bsd_arp_set (struct in_addr *, char *, int);
 #endif
 #endif
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 10f1d2154d..546786b49e 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -40,7 +40,7 @@
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
  * $FreeBSD: src/libexec/bootpd/rtmsg.c,v 1.10 1999/08/28 00:09:19 peter Exp $
- * $DragonFly: src/libexec/bootpd/rtmsg.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/bootpd/rtmsg.c,v 1.3 2003/11/14 03:54:29 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -73,7 +73,7 @@
 #include "report.h"
 
 
-static int rtmsg __P((int));
+static int rtmsg (int);
 
 static int s = -1; 	/* routing socket */
 
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index 43ff7d7a41..76da658bd4 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)comsat.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/comsat/comsat.c,v 1.13.2.1 2002/08/09 02:56:30 johan Exp $
- * $DragonFly: src/libexec/comsat/comsat.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/comsat/comsat.c,v 1.3 2003/11/14 03:54:29 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -69,11 +69,11 @@ struct	utmp *utmp = NULL;
 time_t	lastmsgtime;
 int	nutmp, uf;
 
-void jkfprintf __P((FILE *, char[], char[], off_t));
-void mailfor __P((char *));
-void notify __P((struct utmp *, char[], off_t, int));
-void onalrm __P((int));
-void reapchildren __P((int));
+void jkfprintf (FILE *, char[], char[], off_t);
+void mailfor (char *);
+void notify (struct utmp *, char[], off_t, int);
+void onalrm (int);
+void reapchildren (int);
 
 int
 main(argc, argv)
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index a36d46275c..e45cd8b2e3 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)fingerd.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/fingerd/fingerd.c,v 1.16.2.3 2002/04/03 09:05:23 mike Exp $
- * $DragonFly: src/libexec/fingerd/fingerd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/fingerd/fingerd.c,v 1.3 2003/11/14 03:54:29 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -53,7 +53,7 @@
 #include <strings.h>
 #include "pathnames.h"
 
-void logerr __P((const char *, ...));
+void logerr (const char *, ...);
 
 int
 main(argc, argv)
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 340f09a143..739068d365 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -32,50 +32,50 @@
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
  * $FreeBSD: src/libexec/ftpd/extern.h,v 1.14.2.2 2002/02/16 14:02:00 dwmalone Exp $
- * $DragonFly: src/libexec/ftpd/extern.h,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/ftpd/extern.h,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-void	blkfree __P((char **));
-char  **copyblk __P((char **));
-void	cwd __P((char *));
-void	delete __P((char *));
-void	dologout __P((int));
-void	fatalerror __P((char *));
-void    ftpd_logwtmp __P((char *, char *, struct sockaddr *addr));
-int	ftpd_pclose __P((FILE *));
-FILE   *ftpd_popen __P((char *, char *));
-char   *getline __P((char *, int, FILE *));
-void	lreply __P((int, const char *, ...));
-void	makedir __P((char *));
-void	nack __P((char *));
-void	pass __P((char *));
-void	passive __P((void));
-void	long_passive __P((char *, int));
-void	perror_reply __P((int, char *));
-void	pwd __P((void));
-void	removedir __P((char *));
-void	renamecmd __P((char *, char *));
-char   *renamefrom __P((char *));
-void	reply __P((int, const char *, ...));
-void	retrieve __P((char *, char *));
-void	send_file_list __P((char *));
+void	blkfree (char **);
+char  **copyblk (char **);
+void	cwd (char *);
+void	delete (char *);
+void	dologout (int);
+void	fatalerror (char *);
+void    ftpd_logwtmp (char *, char *, struct sockaddr *addr);
+int	ftpd_pclose (FILE *);
+FILE   *ftpd_popen (char *, char *);
+char   *getline (char *, int, FILE *);
+void	lreply (int, const char *, ...);
+void	makedir (char *);
+void	nack (char *);
+void	pass (char *);
+void	passive (void);
+void	long_passive (char *, int);
+void	perror_reply (int, char *);
+void	pwd (void);
+void	removedir (char *);
+void	renamecmd (char *, char *);
+char   *renamefrom (char *);
+void	reply (int, const char *, ...);
+void	retrieve (char *, char *);
+void	send_file_list (char *);
 #ifdef OLD_SETPROCTITLE
-void	setproctitle __P((const char *, ...));
+void	setproctitle (const char *, ...);
 #endif
-void	statcmd __P((void));
-void	statfilecmd __P((char *));
-void	store __P((char *, char *, int));
-void	upper __P((char *));
-void	user __P((char *));
-void	yyerror __P((char *));
-int	yyparse __P((void));
+void	statcmd (void);
+void	statfilecmd (char *);
+void	store (char *, char *, int);
+void	upper (char *);
+void	user (char *);
+void	yyerror (char *);
+int	yyparse (void);
 #if defined(SKEY) && defined(_PWD_H_) /* XXX evil */
-char   *skey_challenge __P((char *, struct passwd *, int));
+char   *skey_challenge (char *, struct passwd *, int);
 #endif
-int	ls_main __P((int, char **));
+int	ls_main (int, char **);
 
 struct sockaddr_in;
 struct sockaddr_in6;
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 218e24ae9d..3457208eb0 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -34,7 +34,7 @@
  *
  * @(#)ftpcmd.y	8.3 (Berkeley) 4/6/94
  * $FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.16.2.19 2003/02/11 14:28:28 yar Exp $
- * $DragonFly: src/libexec/ftpd/ftpcmd.y,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/ftpd/ftpcmd.y,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 /*
@@ -1153,16 +1153,16 @@ struct tab sitetab[] = {
 	{ NULL,   0,    0,    0,	0 }
 };
 
-static char	*copy __P((char *));
-static void	 help __P((struct tab *, char *));
+static char	*copy (char *);
+static void	 help (struct tab *, char *);
 static struct tab *
-		 lookup __P((struct tab *, char *));
-static int	 port_check __P((const char *));
-static int	 port_check_v6 __P((const char *));
-static void	 sizecmd __P((char *));
-static void	 toolong __P((int));
-static void	 v4map_data_dest __P((void));
-static int	 yylex __P((void));
+		 lookup (struct tab *, char *);
+static int	 port_check (const char *);
+static int	 port_check_v6 (const char *);
+static void	 sizecmd (char *);
+static void	 toolong (int);
+static void	 v4map_data_dest (void);
+static int	 yylex (void);
 
 static struct tab *
 lookup(p, cmd)
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 832574e145..d16e825ecc 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -37,7 +37,7 @@
 #if 0
 static const char rcsid[] =
   "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.62.2.48 2003/02/14 12:42:42 yar Exp $";
-  "$DragonFly: src/libexec/ftpd/ftpd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $";
+  "$DragonFly: src/libexec/ftpd/ftpd.c,v 1.3 2003/11/14 03:54:30 dillon Exp $";
 #endif /* not lint */
 
 /*
@@ -179,7 +179,7 @@ static char ttyline[20];
 char	*tty = ttyline;		/* for klogin */
 
 #if !defined(NOPAM)
-static int	auth_pam __P((struct passwd**, const char*));
+static int	auth_pam (struct passwd**, const char*);
 #endif
 
 char	*pid_file = NULL;
@@ -234,29 +234,29 @@ int	pwok = 0;
 	}
 
 #ifdef VIRTUAL_HOSTING
-static void	 inithosts __P((void));
-static void	selecthost __P((union sockunion *));
+static void	 inithosts (void);
+static void	selecthost (union sockunion *);
 #endif
-static void	 ack __P((char *));
-static void	 sigurg __P((int));
-static void	 myoob __P((void));
-static int	 checkuser __P((char *, char *, int, char **));
-static FILE	*dataconn __P((char *, off_t, char *));
-static void	 dolog __P((struct sockaddr *));
-static char	*curdir __P((void));
-static void	 end_login __P((void));
-static FILE	*getdatasock __P((char *));
-static int	 guniquefd __P((char *, char **));
-static void	 lostconn __P((int));
-static void	 sigquit __P((int));
-static int	 receive_data __P((FILE *, FILE *));
-static int	 send_data __P((FILE *, FILE *, off_t, off_t, int));
+static void	 ack (char *);
+static void	 sigurg (int);
+static void	 myoob (void);
+static int	 checkuser (char *, char *, int, char **);
+static FILE	*dataconn (char *, off_t, char *);
+static void	 dolog (struct sockaddr *);
+static char	*curdir (void);
+static void	 end_login (void);
+static FILE	*getdatasock (char *);
+static int	 guniquefd (char *, char **);
+static void	 lostconn (int);
+static void	 sigquit (int);
+static int	 receive_data (FILE *, FILE *);
+static int	 send_data (FILE *, FILE *, off_t, off_t, int);
 static struct passwd *
-		 sgetpwnam __P((char *));
-static char	*sgetsave __P((char *));
-static void	 reapchild __P((int));
-static void      logxfer __P((char *, off_t, time_t));
-static char	*doublequote __P((char *));
+		 sgetpwnam (char *);
+static char	*sgetsave (char *);
+static void	 reapchild (int);
+static void      logxfer (char *, off_t, time_t);
+static char	*doublequote (char *);
 
 static char *
 curdir()
@@ -1604,7 +1604,7 @@ retrieve(cmd, name)
 {
 	FILE *fin, *dout;
 	struct stat st;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc) (FILE *);
 	time_t start;
 
 	if (cmd == 0) {
@@ -1686,7 +1686,7 @@ store(name, mode, unique)
 {
 	int fd;
 	FILE *fout, *din;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc) (FILE *);
 
 	if (*mode == 'a') {		/* APPE */
 		if (unique) {
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 80038f52d8..50e35e495a 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)getNAME.c	8.1 (Berkeley) 6/30/93
  * $FreeBSD: src/libexec/getNAME/getNAME.c,v 1.7 1999/08/28 00:09:33 peter Exp $
- * $DragonFly: src/libexec/getNAME/Attic/getNAME.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/getNAME/Attic/getNAME.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 /*
@@ -52,12 +52,12 @@ int tocrc;
 int intro;
 int typeflag;
 
-void doname __P((char *));
-void dorefname __P((char *));
-void getfrom __P((char *));
-void split __P((char *, char *));
-void trimln __P((char *));
-static void usage __P((void));
+void doname (char *);
+void dorefname (char *);
+void getfrom (char *);
+void split (char *, char *);
+void trimln (char *);
+static void usage (void);
 
 int
 main(argc, argv)
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index 9ddbdbd6c8..5a70e69c15 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -23,7 +23,7 @@
  * For semi-intelligent modem handling.
  *
  * $FreeBSD: src/libexec/getty/chat.c,v 1.6 1999/08/28 00:09:34 peter Exp $
- * $DragonFly: src/libexec/getty/chat.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/getty/chat.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -66,15 +66,15 @@ static int chat_alarm = CHAT_DEFAULT_TIMEOUT; /* Default */
 static volatile int alarmed = 0;
 
 
-static void   chat_alrm __P((int));
-static int    chat_unalarm __P((void));
-static int    getdigit __P((unsigned char **, int, int));
-static char   **read_chat __P((char **));
-static char   *cleanchr __P((char **, unsigned char));
-static char   *cleanstr __P((const unsigned char *, int));
-static const char *result __P((int));
-static int    chat_expect __P((const char *));
-static int    chat_send __P((char const *));
+static void   chat_alrm (int);
+static int    chat_unalarm (void);
+static int    getdigit (unsigned char **, int, int);
+static char   **read_chat (char **);
+static char   *cleanchr (char **, unsigned char);
+static char   *cleanstr (const unsigned char *, int);
+static const char *result (int);
+static int    chat_expect (const char *);
+static int    chat_send (char const *);
 
 
 /*
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 133880dfcb..839fff38cc 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -32,7 +32,7 @@
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/getty/extern.h,v 1.7 2000/01/28 07:12:02 bde Exp $
- * $DragonFly: src/libexec/getty/extern.h,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/getty/extern.h,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 struct delayval;
@@ -48,17 +48,17 @@ extern	struct gettyflags gettyflags[];
 extern	struct gettynums gettynums[];
 extern	struct gettystrs gettystrs[];
 
-int	 adelay __P((int, struct delayval *));
-const char *autobaud __P((void));
-int	 delaybits __P((void));
-void	 edithost __P((const char *));
-void	 gendefaults __P((void));
-void	 gettable __P((const char *, char *));
-void	 makeenv __P((char *[]));
-const char *portselector __P((void));
-void	 set_ttydefaults __P((int));
-void	 setchars __P((void));
-void	 setdefaults __P((void));
-void	 set_flags __P((int));
-int	 speed __P((int));
-int	 getty_chat __P((char *, int, int));
+int	 adelay (int, struct delayval *);
+const char *autobaud (void);
+int	 delaybits (void);
+void	 edithost (const char *);
+void	 gendefaults (void);
+void	 gettable (const char *, char *);
+void	 makeenv (char *[]);
+const char *portselector (void);
+void	 set_ttydefaults (int);
+void	 setchars (void);
+void	 setdefaults (void);
+void	 set_flags (int);
+int	 speed (int);
+int	 getty_chat (char *, int, int);
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index 376a641517..ca5e033a23 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)from: main.c	8.1 (Berkeley) 6/20/93
  * $FreeBSD: src/libexec/getty/main.c,v 1.28.2.4 2003/02/06 11:45:31 sobomax Exp $
- * $DragonFly: src/libexec/getty/main.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/getty/main.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -122,22 +122,22 @@ char partab[] = {
 
 #define	puts	Gputs
 
-static void	dingdong __P((int));
-static int	getname __P((void));
-static void	interrupt __P((int));
-static void	oflush __P((void));
-static void	prompt __P((void));
-static void	putchr __P((int));
-static void	putf __P((const char *));
-static void	putpad __P((const char *));
-static void	puts __P((const char *));
-static void	timeoverrun __P((int));
-static char	*getline __P((int));
-static void	setttymode __P((const char *, int));
-static void	setdefttymode __P((const char *));
-static int	opentty __P((const char *, int));
-
-int		main __P((int, char **));
+static void	dingdong (int);
+static int	getname (void);
+static void	interrupt (int);
+static void	oflush (void);
+static void	prompt (void);
+static void	putchr (int);
+static void	putf (const char *);
+static void	putpad (const char *);
+static void	puts (const char *);
+static void	timeoverrun (int);
+static char	*getline (int);
+static void	setttymode (const char *, int);
+static void	setdefttymode (const char *);
+static int	opentty (const char *, int);
+
+int		main (int, char **);
 
 jmp_buf timeout;
 
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index bfe5d05e11..5371edf03a 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -32,7 +32,7 @@
  *
  * @(#)from: subr.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/getty/subr.c,v 1.16.2.1 2001/05/12 10:16:51 kris Exp $
- * $DragonFly: src/libexec/getty/subr.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/getty/subr.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 /*
@@ -57,7 +57,7 @@
 
 
 #ifdef COMPAT_43
-static void	compatflags __P((long));
+static void	compatflags (long);
 #endif
 
 /*
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index 7a5db9cb94..3ffd937071 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1990, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)makekey.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/makekey/makekey.c,v 1.8 1999/08/28 00:09:39 peter Exp $
- * $DragonFly: src/libexec/makekey/makekey.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/makekey/makekey.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 
-static void get __P((char *, int));
+static void get (char *, int);
 
 int
 main()
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 0fadb58e5f..2121ff90c1 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/mknetid/hash.h,v 1.5 1999/08/28 00:09:41 peter Exp $
- * $DragonFly: src/libexec/mknetid/hash.h,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/mknetid/hash.h,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 /* Groupid entry hung off a member_entry node. */
@@ -50,6 +50,6 @@ struct member_entry {
 #define TABLESIZE 1024
 #define HASH_MASK 0x000003FF
 
-extern void mstore __P(( struct member_entry ** , char *, int, int ));
-extern struct grouplist *lookup __P(( struct member_entry **, char * ));
+extern void mstore ( struct member_entry ** , char *, int, int );
+extern struct grouplist *lookup ( struct member_entry **, char * );
 
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index ad3268212a..d37e659e19 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -36,7 +36,7 @@
  * Columbia University, New York City
  *
  * $FreeBSD: src/libexec/mknetid/mknetid.c,v 1.11.2.1 2002/11/27 11:03:02 maxim Exp $
- * $DragonFly: src/libexec/mknetid/mknetid.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/mknetid/mknetid.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -80,9 +80,9 @@ struct member_entry *mtable[TABLESIZE];
  */
 struct member_entry *dtable[TABLESIZE];
 
-extern struct group *_getgrent __P(( void ));
-extern int _setgrent __P(( void ));
-extern void _endgrent __P(( void ));
+extern struct group *_getgrent ( void );
+extern int _setgrent ( void );
+extern void _endgrent ( void );
 
 static void
 usage()
diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h
index 7971f53b70..6656b184cf 100644
--- a/libexec/rbootd/defs.h
+++ b/libexec/rbootd/defs.h
@@ -44,7 +44,7 @@
  * Author: Jeff Forys, University of Utah CSS
  *
  * $FreeBSD: src/libexec/rbootd/defs.h,v 1.2.6.1 2001/02/18 02:54:11 kris Exp $
- * $DragonFly: src/libexec/rbootd/defs.h,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rbootd/defs.h,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include "rmp.h"
@@ -152,36 +152,36 @@ extern	RMPCONN	*RmpConns;		/* list of active connections */
 
 extern	u_int8_t RmpMcastAddr[];	/* RMP multicast address */
 
-void	 AddConn __P((RMPCONN *));
-int	 BootDone __P((RMPCONN *));
-void	 BpfClose __P((void));
-char	*BpfGetIntfName __P((char **));
-int	 BpfOpen __P((void));
-int	 BpfRead __P((RMPCONN *, int));
-int	 BpfWrite __P((RMPCONN *));
-void	 DebugOff __P((int));
-void	 DebugOn __P((int));
-void	 DispPkt __P((RMPCONN *, int));
-void	 DoTimeout __P((void));
-void	 DspFlnm __P((u_int, char *));
-void	 Exit __P((int));
-CLIENT	*FindClient __P((RMPCONN *));
-RMPCONN	*FindConn __P((RMPCONN *));
-void	 FreeClients __P((void));
-void	 FreeConn __P((RMPCONN *));
-void	 FreeConns __P((void));
-int	 GetBootFiles __P((void));
-char	*GetEtherAddr __P((u_int8_t *));
-CLIENT	*NewClient __P((u_int8_t *));
-RMPCONN	*NewConn __P((RMPCONN *));
-char	*NewStr __P((char *));
-u_int8_t *ParseAddr __P((char *));
-int	 ParseConfig __P((void));
-void	 ProcessPacket __P((RMPCONN *, CLIENT *));
-void	 ReConfig __P((int));
-void	 RemoveConn __P((RMPCONN *));
-int	 SendBootRepl __P((struct rmp_packet *, RMPCONN *, char *[]));
-int	 SendFileNo __P((struct rmp_packet *, RMPCONN *, char *[]));
-int	 SendPacket __P((RMPCONN *));
-int	 SendReadRepl __P((RMPCONN *));
-int	 SendServerID __P((RMPCONN *));
+void	 AddConn (RMPCONN *);
+int	 BootDone (RMPCONN *);
+void	 BpfClose (void);
+char	*BpfGetIntfName (char **);
+int	 BpfOpen (void);
+int	 BpfRead (RMPCONN *, int);
+int	 BpfWrite (RMPCONN *);
+void	 DebugOff (int);
+void	 DebugOn (int);
+void	 DispPkt (RMPCONN *, int);
+void	 DoTimeout (void);
+void	 DspFlnm (u_int, char *);
+void	 Exit (int);
+CLIENT	*FindClient (RMPCONN *);
+RMPCONN	*FindConn (RMPCONN *);
+void	 FreeClients (void);
+void	 FreeConn (RMPCONN *);
+void	 FreeConns (void);
+int	 GetBootFiles (void);
+char	*GetEtherAddr (u_int8_t *);
+CLIENT	*NewClient (u_int8_t *);
+RMPCONN	*NewConn (RMPCONN *);
+char	*NewStr (char *);
+u_int8_t *ParseAddr (char *);
+int	 ParseConfig (void);
+void	 ProcessPacket (RMPCONN *, CLIENT *);
+void	 ReConfig (int);
+void	 RemoveConn (RMPCONN *);
+int	 SendBootRepl (struct rmp_packet *, RMPCONN *, char *[]);
+int	 SendFileNo (struct rmp_packet *, RMPCONN *, char *[]);
+int	 SendPacket (RMPCONN *);
+int	 SendReadRepl (RMPCONN *);
+int	 SendServerID (RMPCONN *);
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index f3205b39ec..60705a0d18 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -46,7 +46,7 @@
  * @(#) Copyright (c) 1992, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)rbootd.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/rbootd/rbootd.c,v 1.11.2.1 2001/02/18 02:54:11 kris Exp $
- * $DragonFly: src/libexec/rbootd/rbootd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rbootd/rbootd.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +63,7 @@
 #include <unistd.h>
 #include "defs.h"
 
-static void usage __P((void));
+static void usage (void);
 
 int
 main(argc, argv)
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index f0f3cdd388..bea57416af 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/revnetgroup/hash.h,v 1.6 1999/08/28 00:09:48 peter Exp $
- * $DragonFly: src/libexec/revnetgroup/hash.h,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/revnetgroup/hash.h,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 /* Groupname entry hung off a member_entry node. */
@@ -60,9 +60,9 @@ struct group_entry {
 
 #define LINSIZ 1024 * 10
 
-extern void store __P(( struct group_entry ** , char *, char * ));
-extern void mstore __P(( struct member_entry ** , char *, char *, char * ));
-extern char *lookup __P(( struct group_entry **, char * ));
-extern void __endnetgrent __P(( void ));
-extern void __setnetgrent __P(( char * ));
-extern int __getnetgrent __P(( char **, char **, char ** ));
+extern void store ( struct group_entry ** , char *, char * );
+extern void mstore ( struct member_entry ** , char *, char *, char * );
+extern char *lookup ( struct group_entry **, char * );
+extern void __endnetgrent ( void );
+extern void __setnetgrent ( char * );
+extern int __getnetgrent ( char **, char **, char ** );
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 02a28d6633..847d42b41f 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)rexecd.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/rexecd/rexecd.c,v 1.18.2.3 2002/05/14 22:27:21 des Exp $
- * $DragonFly: src/libexec/rexecd/rexecd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rexecd/rexecd.c,v 1.3 2003/11/14 03:54:30 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -66,10 +66,10 @@ char	remote[MAXHOSTNAMELEN];
 
 struct	sockaddr_in asin = { AF_INET };
 
-void doit __P((int, struct sockaddr_in *));
-void getstr __P((char *, int, char *));
+void doit (int, struct sockaddr_in *);
+void getstr (char *, int, char *);
 /*VARARGS1*/
-void error __P(());
+void error ();
 
 int no_uid_0 = 1;
 
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index ad31332ae7..e441075653 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1988, 1989, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)rlogind.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/rlogind/rlogind.c,v 1.29.2.5 2000/12/07 15:02:31 ru Exp $
- * $DragonFly: src/libexec/rlogind/rlogind.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rlogind/rlogind.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -107,16 +107,16 @@ union sockunion {
 #define su_family	su_si.si_family
 #define su_port		su_si.si_port
 
-void	doit __P((int, union sockunion *));
-int	control __P((int, char *, int));
-void	protocol __P((int, int));
-void	cleanup __P((int));
-void	fatal __P((int, char *, int));
-int	do_rlogin __P((union sockunion *));
-void	getstr __P((char *, int, char *));
-void	setup_term __P((int));
-int	do_krb_login __P((struct sockaddr_in *));
-void	usage __P((void));
+void	doit (int, union sockunion *);
+int	control (int, char *, int);
+void	protocol (int, int);
+void	cleanup (int);
+void	fatal (int, char *, int);
+int	do_rlogin (union sockunion *);
+void	getstr (char *, int, char *);
+void	setup_term (int);
+int	do_krb_login (struct sockaddr_in *);
+void	usage (void);
 
 
 int
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index a63920f915..1f5bebb132 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -4,7 +4,7 @@
  * There is no copyright, you can use it as you want.
  *
  * $FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.3.2.1 2001/07/02 23:46:27 mikeh Exp $
- * $DragonFly: src/libexec/rpc.rquotad/rquotad.c,v 1.3 2003/08/08 04:18:36 dillon Exp $
+ * $DragonFly: src/libexec/rpc.rquotad/rquotad.c,v 1.4 2003/11/14 03:54:31 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -34,12 +34,12 @@
 #include <rpcsvc/rquota.h>
 #include <arpa/inet.h>
 
-void rquota_service __P((struct svc_req *request, SVCXPRT *transp));
-void sendquota __P((struct svc_req *request, SVCXPRT *transp));
-void printerr_reply __P((SVCXPRT *transp));
-void initfs __P((void));
-int getfsquota __P((long id, char *path, struct dqblk *dqblk));
-int hasquota __P((struct fstab *fs, char **qfnamep));
+void rquota_service (struct svc_req *request, SVCXPRT *transp);
+void sendquota (struct svc_req *request, SVCXPRT *transp);
+void printerr_reply (SVCXPRT *transp);
+void initfs (void);
+int getfsquota (long id, char *path, struct dqblk *dqblk);
+int hasquota (struct fstab *fs, char **qfnamep);
 
 /*
  * structure containing informations about ufs filesystems
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index ec588ba3f3..3c55782629 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -29,7 +29,7 @@
  * @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
  * @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC
  * $FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.14.2.1 2002/07/11 17:17:56 alfred Exp $
- * $DragonFly: src/libexec/rpc.rstatd/rstat_proc.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rpc.rstatd/rstat_proc.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -78,9 +78,9 @@ struct nlist nl[] = {
 	{ "" },
 };
 
-int havedisk __P((void));
-void updatexfers __P((int, int *));
-void setup __P((void));
+int havedisk (void);
+void updatexfers (int, int *);
+void setup (void);
 int stats_service();
 
 extern int from_inetd;
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index c3ff66c439..46b49cb121 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rpc.rwalld/rwalld.c,v 1.8 1999/08/28 00:09:57 peter Exp $
- * $DragonFly: src/libexec/rpc.rwalld/rwalld.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rpc.rwalld/rwalld.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #include <err.h>
@@ -54,7 +54,7 @@
 void wallprog_1();
 void possess();
 void killkids();
-static void usage __P((void));
+static void usage (void);
 
 int nodaemon = 0;
 int from_inetd = 1;
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index c642f1f182..b770206dda 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rpc.sprayd/sprayd.c,v 1.5 1999/08/28 00:09:59 peter Exp $
- * $DragonFly: src/libexec/rpc.sprayd/sprayd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rpc.sprayd/sprayd.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #include <rpc/rpc.h>
@@ -42,7 +42,7 @@
 #include <syslog.h>
 #include <unistd.h>
 
-static void spray_service __P((struct svc_req *, SVCXPRT *));
+static void spray_service (struct svc_req *, SVCXPRT *);
 
 static int from_inetd = 1;
 
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index e2b621bbaf..d9be82e7d1 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1988, 1989, 1992, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)rshd.c	8.2 (Berkeley) 4/6/94
  * $FreeBSD: src/libexec/rshd/rshd.c,v 1.30.2.5 2002/05/14 22:27:21 des Exp $
- * $DragonFly: src/libexec/rshd/rshd.c,v 1.2 2003/06/17 04:27:07 dillon Exp $
+ * $DragonFly: src/libexec/rshd/rshd.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -97,12 +97,12 @@ union sockunion {
 #define su_family	su_si.si_family
 #define su_port		su_si.si_port
 
-void	 doit __P((union sockunion *));
-void	 error __P((const char *, ...));
-void	 getstr __P((char *, int, char *));
-int	 local_domain __P((char *));
-char	*topdomain __P((char *));
-void	 usage __P((void));
+void	 doit (union sockunion *);
+void	 error (const char *, ...);
+void	 getstr (char *, int, char *);
+int	 local_domain (char *);
+char	*topdomain (char *);
+void	 usage (void);
 
 #define	OPTIONS	"alnDL"
 
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index 70c1edd2d5..283f9716dd 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.h
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rtld-aout/dynamic.h,v 1.5 1999/08/28 00:10:05 peter Exp $
- * $DragonFly: src/libexec/rtld-aout/Attic/dynamic.h,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/rtld-aout/Attic/dynamic.h,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #ifndef __DYNAMIC_H__
@@ -294,88 +294,88 @@ extern int		pic_type;
 #define PIC_TYPE_SMALL	1
 #define PIC_TYPE_LARGE	2
 
-void	read_header __P((int, struct file_entry *));
-void	read_entry_symbols __P((int, struct file_entry *));
-void	read_entry_strings __P((int, struct file_entry *));
-void	read_entry_relocation __P((int, struct file_entry *));
-void	enter_file_symbols __P((struct file_entry *));
-void	read_file_symbols __P((struct file_entry *));
-int	set_element_prefixed_p __P((char *));
-int	text_offset __P((struct file_entry *));
-int	file_open __P((struct file_entry *));
-void	each_file __P((void (*)(), void *));
-void	each_full_file __P((void (*)(), void *));
-unsigned long	check_each_file __P((unsigned long (*)(), void *));
-void	mywrite __P((void *, int, int, FILE *));
-void	padfile __P((int, FILE *));
+void	read_header (int, struct file_entry *);
+void	read_entry_symbols (int, struct file_entry *);
+void	read_entry_strings (int, struct file_entry *);
+void	read_entry_relocation (int, struct file_entry *);
+void	enter_file_symbols (struct file_entry *);
+void	read_file_symbols (struct file_entry *);
+int	set_element_prefixed_p (char *);
+int	text_offset (struct file_entry *);
+int	file_open (struct file_entry *);
+void	each_file (void (*)(), void *);
+void	each_full_file (void (*)(), void *);
+unsigned long	check_each_file (unsigned long (*)(), void *);
+void	mywrite (void *, int, int, FILE *);
+void	padfile (int, FILE *);
 
 /* In warnings.c: */
-void	perror_name __P((char *));
-void	perror_file __P((struct file_entry *));
-void	print_symbols __P((FILE *));
-char	*get_file_name __P((struct file_entry *));
-void	print_file_name __P((struct file_entry *, FILE *));
-void	prline_file_name __P((struct file_entry *, FILE *));
-int	do_warnings __P((FILE *));
+void	perror_name (char *);
+void	perror_file (struct file_entry *);
+void	print_symbols (FILE *);
+char	*get_file_name (struct file_entry *);
+void	print_file_name (struct file_entry *, FILE *);
+void	prline_file_name (struct file_entry *, FILE *);
+int	do_warnings (FILE *);
 
 /* In etc.c: */
 #include "support.h"
 
 /* In symbol.c: */
-void	symtab_init __P((int));
-symbol	*getsym __P((char *)), *getsym_soft __P((char *));
+void	symtab_init (int);
+symbol	*getsym (char *), *getsym_soft (char *);
 
 /* In lib.c: */
-void	search_library __P((int, struct file_entry *));
-void	read_shared_object __P((int, struct file_entry *));
-int	findlib __P((struct file_entry *));
+void	search_library (int, struct file_entry *);
+void	read_shared_object (int, struct file_entry *);
+int	findlib (struct file_entry *);
 
 /* In shlib.c: */
 #include "shlib.h"
 
 /* In rrs.c: */
-void	init_rrs __P((void));
-int	rrs_add_shobj __P((struct file_entry *));
-void	alloc_rrs_reloc __P((struct file_entry *, symbol *));
-void	alloc_rrs_segment_reloc __P((struct file_entry *, struct relocation_info  *));
-void	alloc_rrs_jmpslot __P((struct file_entry *, symbol *));
-void	alloc_rrs_gotslot __P((struct file_entry *, struct relocation_info  *, localsymbol_t *));
-void	alloc_rrs_cpy_reloc __P((struct file_entry *, symbol *));
-
-int	claim_rrs_reloc __P((struct file_entry *, struct relocation_info *, symbol *, long *));
-long	claim_rrs_jmpslot __P((struct file_entry *, struct relocation_info *, symbol *, long));
-long	claim_rrs_gotslot __P((struct file_entry *, struct relocation_info *, struct localsymbol *, long));
-long	claim_rrs_internal_gotslot __P((struct file_entry *, struct relocation_info *, struct localsymbol *, long));
-void	claim_rrs_cpy_reloc __P((struct file_entry *, struct relocation_info *, symbol *));
-void	claim_rrs_segment_reloc __P((struct file_entry *, struct relocation_info *));
-void	consider_rrs_section_lengths __P((void));
-void	relocate_rrs_addresses __P((void));
-void	write_rrs __P((void));
+void	init_rrs (void);
+int	rrs_add_shobj (struct file_entry *);
+void	alloc_rrs_reloc (struct file_entry *, symbol *);
+void	alloc_rrs_segment_reloc (struct file_entry *, struct relocation_info  *);
+void	alloc_rrs_jmpslot (struct file_entry *, symbol *);
+void	alloc_rrs_gotslot (struct file_entry *, struct relocation_info  *, localsymbol_t *);
+void	alloc_rrs_cpy_reloc (struct file_entry *, symbol *);
+
+int	claim_rrs_reloc (struct file_entry *, struct relocation_info *, symbol *, long *);
+long	claim_rrs_jmpslot (struct file_entry *, struct relocation_info *, symbol *, long);
+long	claim_rrs_gotslot (struct file_entry *, struct relocation_info *, struct localsymbol *, long);
+long	claim_rrs_internal_gotslot (struct file_entry *, struct relocation_info *, struct localsymbol *, long);
+void	claim_rrs_cpy_reloc (struct file_entry *, struct relocation_info *, symbol *);
+void	claim_rrs_segment_reloc (struct file_entry *, struct relocation_info *);
+void	consider_rrs_section_lengths (void);
+void	relocate_rrs_addresses (void);
+void	write_rrs (void);
 
 /* In <md>.c */
-void	md_init_header __P((struct exec *, int, int));
-long	md_get_addend __P((struct relocation_info *, unsigned char *));
-void	md_relocate __P((struct relocation_info *, long, unsigned char *, int));
-void	md_make_jmpslot __P((jmpslot_t *, long, long));
-void	md_fix_jmpslot __P((jmpslot_t *, long, u_long));
-int	md_make_reloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_jmpreloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_gotreloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_copyreloc __P((struct relocation_info *, struct relocation_info *));
-void	md_set_breakpoint __P((long, long *));
+void	md_init_header (struct exec *, int, int);
+long	md_get_addend (struct relocation_info *, unsigned char *);
+void	md_relocate (struct relocation_info *, long, unsigned char *, int);
+void	md_make_jmpslot (jmpslot_t *, long, long);
+void	md_fix_jmpslot (jmpslot_t *, long, u_long);
+int	md_make_reloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_jmpreloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_gotreloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_copyreloc (struct relocation_info *, struct relocation_info *);
+void	md_set_breakpoint (long, long *);
 
 #ifdef NEED_SWAP
 /* In xbits.c: */
-void	swap_longs __P((long *, int));
-void	swap_symbols __P((struct nlist *, int));
-void	swap_zsymbols __P((struct nzlist *, int));
-void	swap_ranlib_hdr __P((struct ranlib *, int));
-void	swap__dynamic __P((struct link_dynamic *));
-void	swap_section_dispatch_table __P((struct section_dispatch_table *));
-void	swap_so_debug __P((struct so_debug *));
-void	swapin_sod __P((struct sod *, int));
-void	swapout_sod __P((struct sod *, int));
-void	swapout_fshash __P((struct fshash *, int));
+void	swap_longs (long *, int);
+void	swap_symbols (struct nlist *, int);
+void	swap_zsymbols (struct nzlist *, int);
+void	swap_ranlib_hdr (struct ranlib *, int);
+void	swap__dynamic (struct link_dynamic *);
+void	swap_section_dispatch_table (struct section_dispatch_table *);
+void	swap_so_debug (struct so_debug *);
+void	swapin_sod (struct sod *, int);
+void	swapout_sod (struct sod *, int);
+void	swapout_fshash (struct fshash *, int);
 #endif
 
 #endif /* __DYNAMIC_H__ */
diff --git a/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index 432d62f84a..53b238e8dc 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/md.h
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rtld-aout/i386/md.h,v 1.18 1999/08/28 00:10:08 peter Exp $
- * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.h,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/rtld-aout/i386/Attic/md.h,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #ifndef __MD_H__
@@ -179,11 +179,11 @@ typedef struct jmpslot {
 
 /* Define IO byte swapping routines */
 
-void	md_swapin_exec_hdr __P((struct exec *));
-void	md_swapout_exec_hdr __P((struct exec *));
-void	md_swapin_reloc __P((struct relocation_info *, int));
-void	md_swapout_reloc __P((struct relocation_info *, int));
-void	md_swapout_jmpslot __P((jmpslot_t *, int));
+void	md_swapin_exec_hdr (struct exec *);
+void	md_swapout_exec_hdr (struct exec *);
+void	md_swapin_reloc (struct relocation_info *, int);
+void	md_swapout_reloc (struct relocation_info *, int);
+void	md_swapout_jmpslot (jmpslot_t *, int);
 
 #define md_swapin_symbols(s,n)			swap_symbols(s,n)
 #define md_swapout_symbols(s,n)			swap_symbols(s,n)
@@ -230,17 +230,17 @@ void	md_swapout_jmpslot __P((jmpslot_t *, int));
 
 #endif /* CROSS_LINKER */
 
-void	md_init_header __P((struct exec *, int, int));
-long	md_get_addend __P((struct relocation_info *, unsigned char *));
-void	md_relocate __P((struct relocation_info *, long, unsigned char *, int));
-void	md_make_jmpslot __P((jmpslot_t *, long, long));
-void	md_fix_jmpslot __P((jmpslot_t *, long, u_long));
-void	md_bind_jmpslot __P((u_long, caddr_t));
-int	md_make_reloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_jmpreloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_gotreloc __P((struct relocation_info *, struct relocation_info *, int));
-void	md_make_copyreloc __P((struct relocation_info *, struct relocation_info *));
-void	md_set_breakpoint __P((long, long *));
+void	md_init_header (struct exec *, int, int);
+long	md_get_addend (struct relocation_info *, unsigned char *);
+void	md_relocate (struct relocation_info *, long, unsigned char *, int);
+void	md_make_jmpslot (jmpslot_t *, long, long);
+void	md_fix_jmpslot (jmpslot_t *, long, u_long);
+void	md_bind_jmpslot (u_long, caddr_t);
+int	md_make_reloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_jmpreloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_gotreloc (struct relocation_info *, struct relocation_info *, int);
+void	md_make_copyreloc (struct relocation_info *, struct relocation_info *);
+void	md_set_breakpoint (long, long *);
 
 
 #endif /* __MD_H__ */
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index 498d39d591..f105c8e1cd 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/rtld-aout/rtld.c,v 1.58.2.2 2002/03/04 12:00:31 dwmalone Exp $
- * $DragonFly: src/libexec/rtld-aout/Attic/rtld.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/rtld-aout/Attic/rtld.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -203,66 +203,66 @@ struct so_map		*link_map_head;
 struct so_map		*link_map_tail;
 struct rt_symbol	*rt_symbol_head;
 
-static void		*__dlopen __P((const char *, int));
-static int		__dlclose __P((void *));
-static void		*__dlsym __P((void *, const char *));
-static const char	*__dlerror __P((void));
-static void		__dlexit __P((void));
-static void		*__dlsym3 __P((void *, const char *, void *));
-static int		__dladdr __P((const void *, Dl_info *));
+static void		*__dlopen (const char *, int);
+static int		__dlclose (void *);
+static void		*__dlsym (void *, const char *);
+static const char	*__dlerror (void);
+static void		__dlexit (void);
+static void		*__dlsym3 (void *, const char *, void *);
+static int		__dladdr (const void *, Dl_info *);
 
 static struct ld_entry	ld_entry = {
 	__dlopen, __dlclose, __dlsym, __dlerror, __dlexit, __dlsym3, __dladdr
 };
 
-       void		xprintf __P((char *, ...));
-static struct so_map	*map_object __P((	const char *,
+       void		xprintf (char *, ...);
+static struct so_map	*map_object (	const char *,
 						struct sod *,
-						struct so_map *));
-static int		map_preload __P((void));
-static int		map_sods __P((struct so_map *));
-static int		reloc_dag __P((struct so_map *, int));
-static void		unmap_object __P((struct so_map	*, int));
-static struct so_map	*alloc_link_map __P((	const char *, struct sod *,
+						struct so_map *);
+static int		map_preload (void);
+static int		map_sods (struct so_map *);
+static int		reloc_dag (struct so_map *, int);
+static void		unmap_object (struct so_map	*, int);
+static struct so_map	*alloc_link_map (	const char *, struct sod *,
 						struct so_map *, caddr_t,
-						struct _dynamic *));
-static void		init_link_map __P((	struct so_map *,
+						struct _dynamic *);
+static void		init_link_map (	struct so_map *,
 						struct somap_private *,
 						const char *, struct sod *,
 						struct so_map *, caddr_t,
-						struct _dynamic *));
-static void		free_link_map __P((struct so_map *));
-static inline int	check_text_reloc __P((	struct relocation_info *,
+						struct _dynamic *);
+static void		free_link_map (struct so_map *);
+static inline int	check_text_reloc (	struct relocation_info *,
 						struct so_map *,
-						caddr_t));
-static int		reloc_map __P((struct so_map *, int));
-static void		reloc_copy __P((struct so_map *));
-static void		init_dag __P((struct so_map *));
-static void		init_sods __P((struct so_list *));
-static void		init_internal_malloc __P((void));
-static void		init_external_malloc __P((void));
-static int		call_map __P((struct so_map *, char *));
-static char		*findhint __P((char *, int, int *));
-static char		*rtfindlib __P((char *, int, int, int));
-static char		*rtfindfile __P((const char *));
-void			binder_entry __P((void));
-long			binder __P((jmpslot_t *));
-static struct nzlist	*lookup __P((char *, struct so_map **, int));
-static inline struct rt_symbol	*lookup_rts __P((char *, unsigned long));
-static struct nzlist	*lookup_in_obj __P((char *, unsigned long,
-    struct so_map *, int));
-static struct rt_symbol	*enter_rts __P((char *, unsigned long, long, int,
-    caddr_t, long, struct so_map *));
-static void		*sym_addr __P((char *));
+						caddr_t);
+static int		reloc_map (struct so_map *, int);
+static void		reloc_copy (struct so_map *);
+static void		init_dag (struct so_map *);
+static void		init_sods (struct so_list *);
+static void		init_internal_malloc (void);
+static void		init_external_malloc (void);
+static int		call_map (struct so_map *, char *);
+static char		*findhint (char *, int, int *);
+static char		*rtfindlib (char *, int, int, int);
+static char		*rtfindfile (const char *);
+void			binder_entry (void);
+long			binder (jmpslot_t *);
+static struct nzlist	*lookup (char *, struct so_map **, int);
+static inline struct rt_symbol	*lookup_rts (char *, unsigned long);
+static struct nzlist	*lookup_in_obj (char *, unsigned long,
+    struct so_map *, int);
+static struct rt_symbol	*enter_rts (char *, unsigned long, long, int,
+    caddr_t, long, struct so_map *);
+static void		*sym_addr (char *);
 static struct nzlist *	lookup_errno_hack(char *, struct so_map	**, int);
-static void		die __P((void));
-static void		generror __P((char *, ...));
-static int		maphints __P((void));
-static void		unmaphints __P((void));
-static void		ld_trace __P((struct so_map *));
-static void		rt_readenv __P((void));
-static int		hinthash __P((char *, int));
-int			rtld __P((int, struct crt_ldso *, struct _dynamic *));
+static void		die (void);
+static void		generror (char *, ...);
+static int		maphints (void);
+static void		unmaphints (void);
+static void		ld_trace (struct so_map *);
+static void		rt_readenv (void);
+static int		hinthash (char *, int);
+int			rtld (int, struct crt_ldso *, struct _dynamic *);
 
 /*
  * Compute a hash value for symbol tables.  Don't change this -- the
@@ -833,7 +833,7 @@ map_object(path, sodp, parent)
  * be gotten via dlerror().
  */
         static int
-map_preload __P((void)) {
+map_preload (void) {
 	char    *ld_name = ld_preload;
 	char	*name;
 
@@ -1754,7 +1754,7 @@ static char			*hstrtab;
  * 0 on success, or -1 on failure.
  */
 static int
-maphints __P((void))
+maphints (void)
 {
 	static int		hints_bad;	/* TRUE if hints are unusable */
 	static int		paths_added;
@@ -2254,7 +2254,7 @@ __dlsym3(fd, sym, retaddr)
 }
 
 static const char *
-__dlerror __P((void))
+__dlerror (void)
 {
         const char	*err;
 
@@ -2265,7 +2265,7 @@ __dlerror __P((void))
 }
 
 static void
-__dlexit __P((void))
+__dlexit (void)
 {
 #ifdef DEBUG
 xprintf("__dlexit called\n");
@@ -2278,7 +2278,7 @@ xprintf("__dlexit called\n");
  * Print the current error message and exit with failure status.
  */
 static void
-die __P((void))
+die (void)
 {
 	const char	*msg;
 
@@ -2419,9 +2419,9 @@ extern char *curbrk __asm__(CURBRK_SYM);
 extern char *minbrk __asm__(MINBRK_SYM);
 
 /* Pointers to the user program's malloc functions. */
-static void	*(*p_malloc) __P((size_t));
-static void	*(*p_realloc) __P((void *, size_t));
-static void	 (*p_free) __P((void *));
+static void	*(*p_malloc) (size_t);
+static void	*(*p_realloc) (void *, size_t);
+static void	 (*p_free) (void *);
 
 /* Upper limit of the memory allocated by our internal malloc. */
 static char	*rtld_alloc_lev;
@@ -2431,7 +2431,7 @@ static char	*rtld_alloc_lev;
  * main program's sbrk arena.
  */
 static void
-init_internal_malloc __P((void))
+init_internal_malloc (void)
 {
 	const struct exec *hdr;
 
@@ -2466,7 +2466,7 @@ init_internal_malloc __P((void))
  * malloc functions.
  */
 static void
-init_external_malloc __P((void))
+init_external_malloc (void)
 {
 	/*
          * Patch the program's idea of the current break address to
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index a6d05c4c09..3a8a042367 100644
--- a/libexec/rtld-aout/shlib.h
+++ b/libexec/rtld-aout/shlib.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *-
  * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $
- * $DragonFly: src/libexec/rtld-aout/Attic/shlib.h,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/rtld-aout/Attic/shlib.h,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -34,11 +34,11 @@
 extern char	**search_dirs;
 extern int	n_search_dirs;
 
-void	add_search_dir __P((char *));
-void	add_search_path __P((char *));
-void	std_search_path __P((void));
-int	getdewey __P((int[], char *));
-int	cmpndewey __P((int[], int, int[], int));
-char	*findshlib __P((char *, int *, int *, int));
-char	*find_lib_file __P((const char *));
-char	*search_lib_dir __P((char *, char *, int *, int *, int));
+void	add_search_dir (char *);
+void	add_search_path (char *);
+void	std_search_path (void);
+int	getdewey (int[], char *);
+int	cmpndewey (int[], int, int[], int);
+char	*findshlib (char *, int *, int *, int);
+char	*find_lib_file (const char *);
+char	*search_lib_dir (char *, char *, int *, int *, int);
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index 5839c7f059..74fc88777d 100644
--- a/libexec/rtld-aout/support.h
+++ b/libexec/rtld-aout/support.h
@@ -24,13 +24,13 @@
  * SUCH DAMAGE.
  *-
  * $FreeBSD: src/libexec/rtld-aout/support.h,v 1.4 1999/08/28 00:10:06 peter Exp $
- * $DragonFly: src/libexec/rtld-aout/Attic/support.h,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/rtld-aout/Attic/support.h,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
  * prototypes for support.c.  Big deal.
  */
 
-void	*xmalloc __P((size_t));
-void	*xrealloc __P((void *, size_t));
-char	*concat __P((const char *, const char *, const char *));
+void	*xmalloc (size_t);
+void	*xrealloc (void *, size_t);
+char	*concat (const char *, const char *, const char *);
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index 4d0683bfb4..5093e73fcf 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -32,7 +32,7 @@
  *
  * @(#)announce.c	8.3 (Berkeley) 4/28/95
  * $FreeBSD: src/libexec/talkd/announce.c,v 1.11.2.3 2001/10/18 12:30:42 des Exp $
- * $DragonFly: src/libexec/talkd/announce.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/talkd/announce.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 #include <sys/types.h>
@@ -57,7 +57,7 @@
 
 extern char hostname[];
 
-int print_mesg __P((char *, FILE *, CTL_MSG *, char *));
+int print_mesg (char *, FILE *, CTL_MSG *, char *);
 
 /*
  * Announce an invitation to talk.
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index c6beb45a07..ca57d11b43 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -32,7 +32,7 @@
  *
  * @(#)process.c	8.2 (Berkeley) 11/16/93
  * $FreeBSD: src/libexec/talkd/process.c,v 1.9 1999/08/28 00:10:16 peter Exp $
- * $DragonFly: src/libexec/talkd/process.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/talkd/process.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -56,16 +56,16 @@
 #include <string.h>
 #include <syslog.h>
 
-int announce __P((CTL_MSG *, char *));
-int delete_invite __P((int));
-void do_announce __P((CTL_MSG *, CTL_RESPONSE *));
+int announce (CTL_MSG *, char *);
+int delete_invite (int);
+void do_announce (CTL_MSG *, CTL_RESPONSE *);
 CTL_MSG *find_request();
 CTL_MSG *find_match();
-int find_user __P((char *, char *));
-void insert_table __P((CTL_MSG *, CTL_RESPONSE *));
-int new_id __P((void));
-void print_request __P((char *, CTL_MSG *));
-void print_response __P((char *, CTL_RESPONSE *));
+int find_user (char *, char *);
+void insert_table (CTL_MSG *, CTL_RESPONSE *);
+int new_id (void);
+void print_request (char *, CTL_MSG *);
+void print_response (char *, CTL_RESPONSE *);
 
 void
 process_request(mp, rp)
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index 8142e6fd7a..5fea450bdc 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -32,7 +32,7 @@
  *
  * @(#)table.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/talkd/table.c,v 1.7 1999/08/28 00:10:17 peter Exp $
- * $DragonFly: src/libexec/talkd/table.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/talkd/table.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -72,11 +72,11 @@ struct table_entry {
 
 TABLE_ENTRY *table = NIL;
 
-void delete __P((TABLE_ENTRY *));
+void delete (TABLE_ENTRY *);
 CTL_MSG *find_request();
 CTL_MSG *find_match();
-int new_id __P((void));
-void print_request __P((char *, CTL_MSG *));
+int new_id (void);
+void print_request (char *, CTL_MSG *);
 
 /*
  * Look in the table for an invitation that matches the current
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 4bfe14df2f..112f0ca736 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)talkd.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/libexec/talkd/talkd.c,v 1.11.2.1 2001/10/18 12:30:42 des Exp $
- * $DragonFly: src/libexec/talkd/talkd.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/talkd/talkd.c,v 1.3 2003/11/14 03:54:31 dillon Exp $
  */
 
 /*
@@ -69,7 +69,7 @@ char    hostname[MAXHOSTNAMELEN];
 #define TIMEOUT 30
 #define MAXIDLE 120
 
-void process_request __P((CTL_MSG *, CTL_RESPONSE *));
+void process_request (CTL_MSG *, CTL_RESPONSE *);
 void timeout();
 
 int
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index 03c6fc4411..d28df434ae 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/xtend/status.c,v 1.8 1999/08/28 00:10:30 peter Exp $
- * $DragonFly: src/libexec/xtend/status.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/xtend/status.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 #include <stdio.h>
@@ -40,7 +40,7 @@
 #include "xten.h"
 #include "paths.h"
 
-void printstatus __P((FILE *, STATUS *));
+void printstatus (FILE *, STATUS *);
 
 /*
  * Initialize the status table from the status files
diff --git a/libexec/xtend/user.c b/libexec/xtend/user.c
index bd1c306f22..cc8cd1ebe8 100644
--- a/libexec/xtend/user.c
+++ b/libexec/xtend/user.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/xtend/user.c,v 1.9 1999/08/28 00:10:30 peter Exp $
- * $DragonFly: src/libexec/xtend/user.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/xtend/user.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 #include <ctype.h>
@@ -44,8 +44,8 @@
 
 MONENTRY Monitor[MAXMON];
 
-int find __P((char *, char *[]));
-void printstatus __P((FILE *, STATUS *));
+int find (char *, char *[]);
+void printstatus (FILE *, STATUS *);
 
 /*
  * Process a user command
diff --git a/libexec/xtend/xtend.c b/libexec/xtend/xtend.c
index bfc44a690b..70ba91c101 100644
--- a/libexec/xtend/xtend.c
+++ b/libexec/xtend/xtend.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/libexec/xtend/xtend.c,v 1.9 1999/08/28 00:10:31 peter Exp $
- * $DragonFly: src/libexec/xtend/xtend.c,v 1.2 2003/06/17 04:27:08 dillon Exp $
+ * $DragonFly: src/libexec/xtend/xtend.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 /*
@@ -73,11 +73,11 @@ void onhup();			/* SIGHUP handler */
 void onterm();			/* SIGTERM handler */
 void onpipe();			/* SIGPIPE handler */
 
-void checkpoint_status __P((void));
-void initstatus __P((void));
-void logpacket __P((unsigned char *));
-void processpacket __P((unsigned char *));
-int user_command __P((void));
+void checkpoint_status (void);
+void initstatus (void);
+void logpacket (unsigned char *);
+void processpacket (unsigned char *);
+int user_command (void);
 
 int
 main(argc, argv)
diff --git a/release/picobsd/tinyware/oinit/oinit.c b/release/picobsd/tinyware/oinit/oinit.c
index 81f284da29..97a00f0f27 100644
--- a/release/picobsd/tinyware/oinit/oinit.c
+++ b/release/picobsd/tinyware/oinit/oinit.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/release/picobsd/tinyware/oinit/oinit.c,v 1.4.2.2 2001/07/25 15:57:43 dd Exp $
- * $DragonFly: src/release/picobsd/tinyware/oinit/Attic/oinit.c,v 1.2 2003/06/17 04:27:20 dillon Exp $
+ * $DragonFly: src/release/picobsd/tinyware/oinit/Attic/oinit.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 /*
@@ -100,17 +100,17 @@ struct command {
 };
 
 /* Prototypes */
-int cd __P((char *));
-int pwd __P((char *));
-int echo __P((char *));
-int xit __P((char *));
-int set __P((char *));
-int unset __P((char *));
-int env __P((char *));
-int help __P((char *));
-int sourcer __P((char *));
-void do_command __P((int shell, char *cmdline));
-void transition_handler __P((int));
+int cd (char *);
+int pwd (char *);
+int echo (char *);
+int xit (char *);
+int set (char *);
+int unset (char *);
+int env (char *);
+int help (char *);
+int sourcer (char *);
+void do_command (int shell, char *cmdline);
+void transition_handler (int);
 
 /* Table of built-in functions */
 struct command bltins[]={
diff --git a/release/picobsd/tinyware/view/view.c b/release/picobsd/tinyware/view/view.c
index 8cab4ebf11..5319fbc44d 100644
--- a/release/picobsd/tinyware/view/view.c
+++ b/release/picobsd/tinyware/view/view.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/release/picobsd/tinyware/view/view.c,v 1.4 1999/08/28 01:34:02 peter Exp $
- * $DragonFly: src/release/picobsd/tinyware/view/Attic/view.c,v 1.2 2003/06/17 04:27:21 dillon Exp $
+ * $DragonFly: src/release/picobsd/tinyware/view/Attic/view.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 /*
@@ -48,7 +48,7 @@ extern char *optarg;
 extern int optind;
 
 /* Prototypes */
-int kbd_action __P((int x, int y, char hotkey));
+int kbd_action (int x, int y, char hotkey);
 
 struct action {
 	int zoom;
diff --git a/secure/lib/libcrypt/blowfish.h b/secure/lib/libcrypt/blowfish.h
index a27e7c0e27..fac6cb992b 100644
--- a/secure/lib/libcrypt/blowfish.h
+++ b/secure/lib/libcrypt/blowfish.h
@@ -30,7 +30,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/secure/lib/libcrypt/blowfish.h,v 1.1.2.1 2001/05/24 12:20:03 markm Exp $
- * $DragonFly: src/secure/lib/libcrypt/blowfish.h,v 1.2 2003/06/17 04:27:48 dillon Exp $
+ * $DragonFly: src/secure/lib/libcrypt/blowfish.h,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 /*
@@ -62,26 +62,26 @@ typedef struct BlowfishContext {
  *	Blowfish_expand0state( state, key, keylen )
  */
 
-void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *));
-void Blowfish_initstate __P((blf_ctx *));
-void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t));
+void Blowfish_encipher (blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_decipher (blf_ctx *, u_int32_t *, u_int32_t *);
+void Blowfish_initstate (blf_ctx *);
+void Blowfish_expand0state (blf_ctx *, const u_int8_t *, u_int16_t);
 void Blowfish_expandstate
-    __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t));
+    (blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t);
 
 /* Standard Blowfish */
 
-void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t));
-void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t));
-void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t));
+void blf_key (blf_ctx *, const u_int8_t *, u_int16_t);
+void blf_enc (blf_ctx *, u_int32_t *, u_int16_t);
+void blf_dec (blf_ctx *, u_int32_t *, u_int16_t);
 
-void blf_ecb_encrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
-void blf_ecb_decrypt __P((blf_ctx *, u_int8_t *, u_int32_t));
+void blf_ecb_encrypt (blf_ctx *, u_int8_t *, u_int32_t);
+void blf_ecb_decrypt (blf_ctx *, u_int8_t *, u_int32_t);
 
-void blf_cbc_encrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
-void blf_cbc_decrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t));
+void blf_cbc_encrypt (blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
+void blf_cbc_decrypt (blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t);
 
 /* Converts u_int8_t to u_int32_t */
-u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *));
+u_int32_t Blowfish_stream2word (const u_int8_t *, u_int16_t , u_int16_t *);
 
 #endif
diff --git a/secure/lib/libcrypt/crypt-blowfish.c b/secure/lib/libcrypt/crypt-blowfish.c
index 03aaa7520e..f1d6753527 100644
--- a/secure/lib/libcrypt/crypt-blowfish.c
+++ b/secure/lib/libcrypt/crypt-blowfish.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/secure/lib/libcrypt/crypt-blowfish.c,v 1.1.2.1 2001/05/24 12:20:03 markm Exp $
- * $DragonFly: src/secure/lib/libcrypt/crypt-blowfish.c,v 1.2 2003/06/17 04:27:48 dillon Exp $
+ * $DragonFly: src/secure/lib/libcrypt/crypt-blowfish.c,v 1.3 2003/11/14 03:54:32 dillon Exp $
  */
 
 /* This password hashing algorithm was designed by David Mazieres
@@ -71,11 +71,11 @@
 #define BCRYPT_BLOCKS 6		/* Ciphertext blocks */
 #define BCRYPT_MINROUNDS 16	/* we have log2(rounds) in salt */
 
-char   *bcrypt_gensalt __P((u_int8_t));
+char   *bcrypt_gensalt (u_int8_t);
 
-static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t));
-static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t));
-static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *));
+static void encode_salt (char *, u_int8_t *, u_int16_t, u_int8_t);
+static void encode_base64 (u_int8_t *, u_int8_t *, u_int16_t);
+static void decode_base64 (u_int8_t *, u_int16_t, u_int8_t *);
 
 static char    encrypted[_PASSWORD_LEN];
 static char    gsalt[BCRYPT_MAXSALT * 4 / 3 + 1];
diff --git a/share/examples/ses/srcs/getencstat.c b/share/examples/ses/srcs/getencstat.c
index feb452a4b0..9b19a2c262 100644
--- a/share/examples/ses/srcs/getencstat.c
+++ b/share/examples/ses/srcs/getencstat.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/share/examples/ses/srcs/getencstat.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
-/* $DragonFly: src/share/examples/ses/srcs/getencstat.c,v 1.2 2003/06/17 04:36:58 dillon Exp $ */
+/* $DragonFly: src/share/examples/ses/srcs/getencstat.c,v 1.3 2003/11/14 03:54:32 dillon Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -40,8 +40,8 @@
 #include <fcntl.h>
 #include SESINC
 
-extern char *geteltnm __P((int));
-extern char *stat2ascii __P((int, u_char *));
+extern char *geteltnm (int);
+extern char *stat2ascii (int, u_char *);
 
 int
 main(a, v)
diff --git a/share/examples/ses/srcs/getobjmap.c b/share/examples/ses/srcs/getobjmap.c
index 8cdd9fa212..3b1b1161fc 100644
--- a/share/examples/ses/srcs/getobjmap.c
+++ b/share/examples/ses/srcs/getobjmap.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/share/examples/ses/srcs/getobjmap.c,v 1.1 2000/02/29 05:44:17 mjacob Exp $ */
-/* $DragonFly: src/share/examples/ses/srcs/getobjmap.c,v 1.2 2003/06/17 04:36:58 dillon Exp $ */
+/* $DragonFly: src/share/examples/ses/srcs/getobjmap.c,v 1.3 2003/11/14 03:54:32 dillon Exp $ */
 /*
  * Copyright (c) 2000 by Matthew Jacob
  * All rights reserved.
@@ -40,7 +40,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-extern char *geteltnm __P((int));
+extern char *geteltnm (int);
 
 int
 main(a, v)
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index a2e699a849..c7a7597cb1 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)types.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man5/types.5,v 1.10.2.2 2001/12/17 11:30:15 ru Exp $
-.\" $DragonFly: src/share/man/man5/Attic/types.5,v 1.4 2003/11/09 02:34:03 dillon Exp $
+.\" $DragonFly: src/share/man/man5/Attic/types.5,v 1.5 2003/11/14 03:54:32 dillon Exp $
 .\"
 .Dd June 5, 1993
 .Dt TYPES 5
@@ -202,19 +202,19 @@ typedef	struct fd_set {
 __BEGIN_DECLS
 #ifndef _FTRUNCATE_DECLARED
 #define	_FTRUNCATE_DECLARED
-int	 ftruncate __P((int, off_t));
+int	 ftruncate (int, off_t);
 #endif
 #ifndef _LSEEK_DECLARED
 #define	_LSEEK_DECLARED
-off_t	 lseek __P((int, off_t, int));
+off_t	 lseek (int, off_t, int);
 #endif
 #ifndef _MMAP_DECLARED
 #define	_MMAP_DECLARED
-void *	 mmap __P((void *, size_t, int, int, int, off_t));
+void *	 mmap (void *, size_t, int, int, int, off_t);
 #endif
 #ifndef _TRUNCATE_DECLARED
 #define	_TRUNCATE_DECLARED
-int	 truncate __P((const char *, off_t));
+int	 truncate (const char *, off_t);
 #endif
 __END_DECLS
 #endif /* !_KERNEL */
diff --git a/share/man/man9/accept_filter.9 b/share/man/man9/accept_filter.9
index 81229a92a3..74581be4a9 100644
--- a/share/man/man9/accept_filter.9
+++ b/share/man/man9/accept_filter.9
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/accept_filter.9,v 1.2.2.6 2002/12/29 16:35:39 schweikh Exp $
-.\" $DragonFly: src/share/man/man9/accept_filter.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/accept_filter.9,v 1.3 2003/11/14 03:54:32 dillon Exp $
 .\" "
 .Dd June 25, 2000
 .Os
@@ -64,11 +64,11 @@ must provide a struct accept_filter to the system:
 struct accept_filter {
 	char	accf_name[16];
 	void	(*accf_callback)
-		__P((struct socket *so, void *arg, int waitflag));
+		(struct socket *so, void *arg, int waitflag);
 	void *	(*accf_create)
-		__P((struct socket *so, char *arg));
+		(struct socket *so, char *arg);
 	void	(*accf_destroy)
-		__P((struct socket *so));
+		(struct socket *so);
 	SLIST_ENTRY(accept_filter) accf_next;	/* next on the list */
 };
 .Ed
diff --git a/tools/regression/sysvshm/shmtest.c b/tools/regression/sysvshm/shmtest.c
index fc6c0276ae..65c73193d1 100644
--- a/tools/regression/sysvshm/shmtest.c
+++ b/tools/regression/sysvshm/shmtest.c
@@ -35,7 +35,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * Obtained from: $NetBSD: shmtest.c,v 1.3 2002/07/20 08:36:26 grant Exp $
- * $DragonFly: src/tools/regression/sysvshm/shmtest.c,v 1.1 2003/10/18 12:13:01 hmp Exp $
+ * $DragonFly: src/tools/regression/sysvshm/shmtest.c,v 1.2 2003/11/14 03:54:33 dillon Exp $
  */
 
 /*
@@ -56,13 +56,13 @@
 #include <time.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	print_shmid_ds __P((struct shmid_ds *, mode_t));
-void	sigsys_handler __P((int));
-void	sigchld_handler __P((int));
-void	cleanup __P((void));
-void	receiver __P((void));
-void	usage __P((void));
+int	main (int, char *[]);
+void	print_shmid_ds (struct shmid_ds *, mode_t);
+void	sigsys_handler (int);
+void	sigchld_handler (int);
+void	cleanup (void);
+void	receiver (void);
+void	usage (void);
 
 const char *m_str = "The quick brown fox jumped over the lazy dog.";