From cd5332df96523d4fc3e7d827e405c06f719a37a6 Mon Sep 17 00:00:00 2001
From: Eirik Nygaard <eirikn@dragonflybsd.org>
Date: Mon, 3 Nov 2003 19:51:05 +0000
Subject: [PATCH] Remove some __P macros in sbin that my script missed.

Reviewed by: Matthew Dillon <dillon@apollo.backplane.com>
---
 sbin/atm/atm/atm.h          | 10 +++++-----
 sbin/atm/ilmid/ilmid.c      |  8 ++++----
 sbin/disklabel/disklabel.5  | 28 ++++++++++++++--------------
 sbin/dump/dump.h            |  6 +-----
 sbin/dump/traverse.c        | 10 +++++-----
 sbin/fsck/fsck.h            |  6 +++---
 sbin/fsck/main.c            |  6 +++---
 sbin/fsck/preen.c           |  6 +++---
 sbin/fsck_msdosfs/dir.c     | 18 +++++++++---------
 sbin/ifconfig/ifconfig.c    |  6 +++---
 sbin/ifconfig/ifmedia.c     |  6 +++---
 sbin/mount/mount.c          |  6 +++---
 sbin/mount_portal/portald.h | 22 +++++++++++-----------
 sbin/mountd/mountd.c        | 18 +++++++++---------
 sbin/ping6/ping6.c          |  6 +++---
 sbin/routed/radix.h         | 22 +++++++++++-----------
 16 files changed, 90 insertions(+), 94 deletions(-)

diff --git a/sbin/atm/atm/atm.h b/sbin/atm/atm/atm.h
index 9becab8513..f91348a0b9 100644
--- a/sbin/atm/atm/atm.h
+++ b/sbin/atm/atm/atm.h
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sbin/atm/atm/atm.h,v 1.4 1999/08/28 00:12:17 peter Exp $
- *	@(#) $DragonFly: src/sbin/atm/atm/atm.h,v 1.3 2003/11/01 17:15:57 drhodus Exp $
+ *	@(#) $DragonFly: src/sbin/atm/atm/atm.h,v 1.4 2003/11/03 19:51:04 eirikn Exp $
  *
  */
 
@@ -96,8 +96,8 @@ struct owner {
 	char	*o_name;		/* Owner name */
 	u_int	o_sap;			/* Owner's SAP */
 	void	(*o_pvcadd)		/* PVC ADD processing function */
-			__P((int, char **, struct cmd *, struct atmaddreq *,
-			     struct air_int_rsp *));
+			(int, char **, struct cmd *, struct atmaddreq *,
+			     struct air_int_rsp *);
 };
 
 
@@ -161,8 +161,8 @@ void		print_fore200_aal5(struct air_vinfo_rsp *);
 void		print_fore200_driver(struct air_vinfo_rsp *);
 
 	/* atm_inet.c */
-void		ip_pvcadd __P((int, char **, struct cmd *, struct atmaddreq *,
-			struct air_int_rsp *));
+void		ip_pvcadd (int, char **, struct cmd *, struct atmaddreq *,
+			struct air_int_rsp *);
 
 	/* atm_print.c */
 void		print_arp_info(struct air_arp_rsp *);
diff --git a/sbin/atm/ilmid/ilmid.c b/sbin/atm/ilmid/ilmid.c
index f5726e8914..68746ef082 100644
--- a/sbin/atm/ilmid/ilmid.c
+++ b/sbin/atm/ilmid/ilmid.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *      @(#) $FreeBSD: src/sbin/atm/ilmid/ilmid.c,v 1.6.2.2 2001/03/04 07:15:30 kris Exp $
- *      @(#) $DragonFly: src/sbin/atm/ilmid/ilmid.c,v 1.4 2003/09/28 14:39:16 hmp Exp $
+ *      @(#) $DragonFly: src/sbin/atm/ilmid/ilmid.c,v 1.5 2003/11/03 19:51:04 eirikn Exp $
  */
 
 /*
@@ -330,9 +330,9 @@ char	hostname[80];
 #define	LOG_FILE	"/var/log/ilmid"
 FILE	*Log;			/* File descriptor for log messages */
 
-void	set_reqid __P ( ( u_char *, int ) );
-void	Increment_DL __P ( ( int ) );
-void	Decrement_DL __P ( ( int ) );
+void	set_reqid ( u_char *, int );
+void	Increment_DL ( int );
+void	Decrement_DL ( int );
 
 static char	*Months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
 			     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 8d16792660..e1621f6c30 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/sbin/disklabel/disklabel.5,v 1.7.2.4 2002/08/21 18:58:16 trhodes Exp $
-.\" $DragonFly: src/sbin/disklabel/disklabel.5,v 1.2 2003/06/17 04:27:32 dillon Exp $
+.\" $DragonFly: src/sbin/disklabel/disklabel.5,v 1.3 2003/11/03 19:51:04 eirikn Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
@@ -512,19 +512,19 @@ dkunit(dev_t dev)
 struct	buf;
 struct	buf_queue_head;
 
-int	bounds_check_with_label __P((struct buf *bp, struct disklabel *lp,
-				     int wlabel));
-void	diskerr __P((struct buf *bp, char *what, int pri, int blkdone,
-		     struct disklabel *lp));
-void	disksort __P((struct buf *ap, struct buf *bp));
-u_int	dkcksum __P((struct disklabel *lp));
-char	*readdisklabel __P((dev_t dev, struct disklabel *lp));
-void	bufqdisksort __P((struct buf_queue_head *ap, struct buf *bp));
-int	setdisklabel __P((struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask));
-int	writedisklabel __P((dev_t dev, struct disklabel *lp));
+int	bounds_check_with_label(struct buf *bp, struct disklabel *lp,
+				     int wlabel);
+void	diskerr(struct buf *bp, char *what, int pri, int blkdone,
+		     struct disklabel *lp);
+void	disksort(struct buf *ap, struct buf *bp));
+u_int	dkcksum(struct disklabel *lp);
+char	*readdisklabel(dev_t dev, struct disklabel *lp);
+void	bufqdisksort(struct buf_queue_head *ap, struct buf *bp);
+int	setdisklabel(struct disklabel *olp, struct disklabel *nlp,
+			  u_long openmask);
+int	writedisklabel((dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
-void	alpha_fix_srm_checksum __P((struct buf *bp));
+void	alpha_fix_srm_checksum(struct buf *bp);
 #endif
 
 #endif /* _KERNEL */
@@ -533,7 +533,7 @@ void	alpha_fix_srm_checksum __P((struct buf *bp));
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-struct disklabel *getdiskbyname __P((const char *));
+struct disklabel *getdiskbyname(const char *);
 __END_DECLS
 #endif
 
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 6ce00dfb47..dcc17d8db8 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -33,7 +33,7 @@
  *	@(#)dump.h	8.2 (Berkeley) 4/28/95
  *
  * $FreeBSD: src/sbin/dump/dump.h,v 1.7.6.4 2003/01/25 18:54:59 dillon Exp $
- * $DragonFly: src/sbin/dump/dump.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/dump/dump.h,v 1.4 2003/11/03 19:51:04 eirikn Exp $
  */
 
 #define MAXINOPB	(MAXBSIZE / sizeof(struct dinode))
@@ -92,10 +92,6 @@ long	dev_bsize;	/* block size of underlying disk device */
 int	dev_bshift;	/* log2(dev_bsize) */
 int	tp_bshift;	/* log2(TP_BSIZE) */
 
-#ifndef __P
-#include <sys/cdefs.h>
-#endif
-
 /* operator interface functions */
 void	broadcast(char *message);
 void	infosch(int);
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 8732ca7d70..ee709ab04e 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -32,7 +32,7 @@
  *
  * @(#)traverse.c	8.7 (Berkeley) 6/15/95
  * $FreeBSD: src/sbin/dump/traverse.c,v 1.10.2.6 2003/04/14 20:10:35 johan Exp $
- * $DragonFly: src/sbin/dump/traverse.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/dump/traverse.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -70,11 +70,11 @@ typedef	quad_t fsizeT;
 typedef	long fsizeT;
 #endif
 
-static	int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size,
-    long *tapesize, int nodump));
+static	int dirindir(ino_t ino, daddr_t blkno, int level, long *size,
+    long *tapesize, int nodump);
 static	void dmpindir(ino_t ino, daddr_t blk, int level, fsizeT *size);
-static	int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize,
-    long *tapesize, int nodump));
+static	int searchdir(ino_t ino, daddr_t blkno, long size, long filesize,
+    long *tapesize, int nodump);
 
 /*
  * This is an estimation of the number of TP_BSIZE blocks in the file.
diff --git a/sbin/fsck/fsck.h b/sbin/fsck/fsck.h
index 0547aab05e..f58f52ec87 100644
--- a/sbin/fsck/fsck.h
+++ b/sbin/fsck/fsck.h
@@ -32,7 +32,7 @@
  *
  *	@(#)fsck.h	8.4 (Berkeley) 5/9/95
  * $FreeBSD: src/sbin/fsck/fsck.h,v 1.12.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/fsck.h,v 1.3 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck/fsck.h,v 1.4 2003/11/03 19:51:04 eirikn Exp $
  */
 
 #include <unistd.h>
@@ -252,9 +252,9 @@ void		cacheino(struct dinode *dp, ino_t inumber);
 void		catch(int);
 void		catchquit(int);
 int		changeino(ino_t dir, char *name, ino_t newnum);
-int		checkfstab __P((int preen, int maxrun,
+int		checkfstab(int preen, int maxrun,
 			int (*docheck)(struct fstab *),
-			int (*chkit)(char *, char *, long, int)));
+			int (*chkit)(char *, char *, long, int));
 int		chkrange(ufs_daddr_t blk, int cnt);
 void		ckfini(int markclean);
 int		ckinode(struct dinode *dp, struct inodesc *);
diff --git a/sbin/fsck/main.c b/sbin/fsck/main.c
index a8aca59c62..0b8ace6b17 100644
--- a/sbin/fsck/main.c
+++ b/sbin/fsck/main.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1986, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)main.c	8.6 (Berkeley) 5/14/95
  * $FreeBSD: src/sbin/fsck/main.c,v 1.21.2.1 2001/01/23 23:11:07 iedowse Exp $
- * $DragonFly: src/sbin/fsck/main.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck/main.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -55,8 +55,8 @@
 
 static int argtoi(int flag, char *req, char *str, int base);
 static int docheck(struct fstab *fsp);
-static int checkfilesys __P((char *filesys, char *mntpt, long auxdata,
-		int child));
+static int checkfilesys(char *filesys, char *mntpt, long auxdata,
+		int child);
 static struct statfs *getmntpt(const char *);
 int main(int argc, char *argv[]);
 
diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c
index b4d970cb1c..9c245c5dc6 100644
--- a/sbin/fsck/preen.c
+++ b/sbin/fsck/preen.c
@@ -32,7 +32,7 @@
  *
  * @(#)preen.c	8.5 (Berkeley) 4/28/95
  * $FreeBSD: src/sbin/fsck/preen.c,v 1.16 1999/12/30 16:32:40 peter Exp $
- * $DragonFly: src/sbin/fsck/preen.c,v 1.5 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck/preen.c,v 1.6 2003/11/03 19:51:04 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -66,8 +66,8 @@ int	nrun, ndisks;
 
 static void addpart(char *name, char *fsname, long auxdata);
 static struct disk *finddisk(char *name);
-static int startdisk __P((struct disk *dk,
-		int (*checkit)(char *, char *, long, int)));
+static int startdisk(struct disk *dk,
+		int (*checkit)(char *, char *, long, int));
 
 int
 checkfstab(int preen, int maxrun, int (*docheck)(struct fstab *),
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 33088770fc..1d465b26e7 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -33,7 +33,7 @@
  *
  * $NetBSD: dir.c,v 1.14 1998/08/25 19:18:15 ross Exp $
  * $FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.1.2.1 2001/08/01 05:47:55 obrien Exp $
- * $DragonFly: src/sbin/fsck_msdosfs/dir.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $
+ * $DragonFly: src/sbin/fsck_msdosfs/dir.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $
  */
 
 
@@ -98,14 +98,14 @@ static struct dirTodoNode *newDirTodo(void);
 static void freeDirTodo(struct dirTodoNode *);
 static char *fullpath(struct dosDirEntry *);
 static u_char calcShortSum(u_char *);
-static int delete __P((int, struct bootblock *, struct fatEntry *, cl_t, int,
-    cl_t, int, int));
-static int removede __P((int, struct bootblock *, struct fatEntry *, u_char *,
-    u_char *, cl_t, cl_t, cl_t, char *, int));
-static int checksize __P((struct bootblock *, struct fatEntry *, u_char *,
-    struct dosDirEntry *));
-static int readDosDirSection __P((int, struct bootblock *, struct fatEntry *,
-    struct dosDirEntry *));
+static int delete(int, struct bootblock *, struct fatEntry *, cl_t, int,
+    cl_t, int, int);
+static int removede(int, struct bootblock *, struct fatEntry *, u_char *,
+    u_char *, cl_t, cl_t, cl_t, char *, int);
+static int checksize(struct bootblock *, struct fatEntry *, u_char *,
+    struct dosDirEntry *);
+static int readDosDirSection(int, struct bootblock *, struct fatEntry *,
+    struct dosDirEntry *);
 
 /*
  * Manage free dosDirEntry structures.
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index cf9c7d561c..abd7f93b74 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1983, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)ifconfig.c	8.2 (Berkeley) 2/16/94
  * $FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.51.2.19 2003/01/28 11:02:56 fjoe Exp $
- * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.4 2003/11/01 17:15:59 drhodus Exp $
+ * $DragonFly: src/sbin/ifconfig/ifconfig.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -141,9 +141,9 @@ void	notealias(const char *, int, int, const struct afswtch *afp);
 void	list_cloners(void);
 void	printb(const char *s, unsigned value, const char *bits);
 void	rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *);
-void	status __P((const struct afswtch *afp, int addrcount,
+void	status(const struct afswtch *afp, int addrcount,
 		    struct sockaddr_dl *sdl, struct if_msghdr *ifm,
-		    struct ifa_msghdr *ifam));
+		    struct ifa_msghdr *ifam);
 void	tunnel_status(int s);
 void	usage(void);
 void	ifmaybeload(char *name);
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index ac7bcbc332..46dfae034d 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
 /* $FreeBSD: src/sbin/ifconfig/ifmedia.c,v 1.6.2.3 2001/11/14 04:35:07 yar Exp $ */
-/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.4 2003/11/01 17:15:59 drhodus Exp $ */
+/* $DragonFly: src/sbin/ifconfig/ifmedia.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
@@ -99,8 +99,8 @@ static void	print_media_word_ifconfig(int);
 
 static struct ifmedia_description *get_toptype_desc(int);
 static struct ifmedia_type_to_subtype *get_toptype_ttos(int);
-static struct ifmedia_description *get_subtype_desc __P((int,
-    struct ifmedia_type_to_subtype *ttos));
+static struct ifmedia_description *get_subtype_desc(int,
+    struct ifmedia_type_to_subtype *ttos);
 
 void
 media_status(int s, struct rt_addrinfo *info __unused)
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index c66ab5b012..b6383a8e35 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1989, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)mount.c	8.25 (Berkeley) 5/8/95
  * $FreeBSD: src/sbin/mount/mount.c,v 1.39.2.3 2001/08/01 08:26:23 obrien Exp $
- * $DragonFly: src/sbin/mount/mount.c,v 1.4 2003/11/01 17:16:00 drhodus Exp $
+ * $DragonFly: src/sbin/mount/mount.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -69,8 +69,8 @@ int	ismounted(struct fstab *, struct statfs *, int);
 int	isremountable(const char *);
 void	mangle(char *, int *, const char **);
 char   *update_options(char *, char *, int);
-int	mountfs __P((const char *, const char *, const char *,
-			int, const char *, const char *));
+int	mountfs(const char *, const char *, const char *,
+			int, const char *, const char *);
 void	remopt(char *, const char *);
 void	prmount(struct statfs *);
 void	putfsent(const struct statfs *);
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index e3b7056b03..646d212d05 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -37,7 +37,7 @@
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
  * $FreeBSD: src/sbin/mount_portal/portald.h,v 1.5 1999/08/28 00:13:37 peter Exp $
- * $DragonFly: src/sbin/mount_portal/portald.h,v 1.4 2003/11/01 17:16:00 drhodus Exp $
+ * $DragonFly: src/sbin/mount_portal/portald.h,v 1.5 2003/11/03 19:51:05 eirikn Exp $
  */
 
 #include <sys/cdefs.h>
@@ -60,22 +60,22 @@ struct qelem {
 typedef struct provider provider;
 struct provider {
 	char *pr_match;
-	int (*pr_func) __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
+	int (*pr_func)(struct portal_cred *,
+				char *key, char **v, int so, int *fdp);
 };
 extern provider providers[];
 
 /*
  * Portal providers
  */
-extern int portal_exec __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
-extern int portal_file __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
-extern int portal_tcp __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
-extern int portal_tcplisten __P((struct portal_cred *,
-				char *key, char **v, int so, int *fdp));
+extern int portal_exec(struct portal_cred *,
+				char *key, char **v, int so, int *fdp);
+extern int portal_file(struct portal_cred *,
+				char *key, char **v, int so, int *fdp);
+extern int portal_tcp(struct portal_cred *,
+				char *key, char **v, int so, int *fdp);
+extern int portal_tcplisten(struct portal_cred *,
+				char *key, char **v, int so, int *fdp);
 
 /*
  * Global functions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 9ad6621ef6..4ff98200e7 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -36,7 +36,7 @@
  * @(#) Copyright (c) 1989, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)mountd.c	8.15 (Berkeley) 5/1/95
  * $FreeBSD: src/sbin/mountd/mountd.c,v 1.39.2.5 2002/09/13 15:57:43 joerg Exp $
- * $DragonFly: src/sbin/mountd/mountd.c,v 1.5 2003/11/01 17:16:01 drhodus Exp $
+ * $DragonFly: src/sbin/mountd/mountd.c,v 1.6 2003/11/03 19:51:05 eirikn Exp $
  */
 
 #include <sys/param.h>
@@ -143,18 +143,18 @@ struct fhreturn {
 
 /* Global defs */
 char	*add_expdir(struct dirlist **, char *, int);
-void	add_dlist __P((struct dirlist **, struct dirlist *,
-				struct grouplist *, int));
+void	add_dlist(struct dirlist **, struct dirlist *,
+				struct grouplist *, int);
 void	add_mlist(char *, char *);
 int	check_dirpath(char *);
 int	check_options(struct dirlist *);
 int	chk_host(struct dirlist *, u_int32_t, int *, int *);
 void	del_mlist(char *, char *);
 struct dirlist *dirp_search(struct dirlist *, char *);
-int	do_mount __P((struct exportlist *, struct grouplist *, int,
-		struct ucred *, char *, int, struct statfs *));
-int	do_opt __P((char **, char **, struct exportlist *, struct grouplist *,
-				int *, int *, struct ucred *));
+int	do_mount(struct exportlist *, struct grouplist *, int,
+		struct ucred *, char *, int, struct statfs *);
+int	do_opt(char **, char **, struct exportlist *, struct grouplist *,
+				int *, int *, struct ucred *);
 struct	exportlist *ex_search(fsid_t *);
 struct	exportlist *get_exp(void);
 void	free_dir(struct dirlist *);
@@ -170,8 +170,8 @@ void	get_mountlist(void);
 int	get_net(char *, struct netmsk *, int);
 void	getexp_err(struct exportlist *, struct grouplist *);
 struct grouplist *get_grp(void);
-void	hang_dirp __P((struct dirlist *, struct grouplist *,
-				struct exportlist *, int));
+void	hang_dirp(struct dirlist *, struct grouplist *,
+				struct exportlist *, int);
 void	mntsrv(struct svc_req *, SVCXPRT *);
 void	nextfield(char **, char **);
 void	out_of_mem(void);
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 967d5e083e..4b33d1aae6 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -31,7 +31,7 @@
  * @(#) Copyright (c) 1989, 1993 The Regents of the University of California.  All rights reserved.
  * @(#)ping.c	8.1 (Berkeley) 6/5/93
  * $FreeBSD: src/sbin/ping6/ping6.c,v 1.4.2.10 2002/12/09 03:04:44 suz Exp $
- * $DragonFly: src/sbin/ping6/ping6.c,v 1.4 2003/11/01 17:16:01 drhodus Exp $
+ * $DragonFly: src/sbin/ping6/ping6.c,v 1.5 2003/11/03 19:51:05 eirikn Exp $
  */
 
 /*	BSDI	ping.c,v 2.3 1996/01/21 17:56:50 jch Exp	*/
@@ -261,8 +261,8 @@ void	 pr_suptypes(struct icmp6_nodeinfo *, size_t);
 void	 pr_nodeaddr(struct icmp6_nodeinfo *, int);
 int	 myechoreply(const struct icmp6_hdr *);
 int	 mynireply(const struct icmp6_nodeinfo *);
-char *dnsdecode __P((const u_char **, const u_char *, const u_char *,
-	u_char *, size_t));
+char *dnsdecode(const u_char **, const u_char *, const u_char *,
+	u_char *, size_t);
 void	 pr_pack(u_char *, int, struct msghdr *);
 void	 pr_exthdrs(struct msghdr *);
 void	 pr_ip6opt(void *);
diff --git a/sbin/routed/radix.h b/sbin/routed/radix.h
index 75294c93c3..0bc584cc51 100644
--- a/sbin/routed/radix.h
+++ b/sbin/routed/radix.h
@@ -33,7 +33,7 @@
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
  *
  * $FreeBSD: src/sbin/routed/radix.h,v 1.4 1999/08/28 00:14:17 peter Exp $
- * $DragonFly: src/sbin/routed/radix.h,v 1.3 2003/11/01 17:16:02 drhodus Exp $
+ * $DragonFly: src/sbin/routed/radix.h,v 1.4 2003/11/03 19:51:05 eirikn Exp $
  */
 
 #ifndef __RADIX_H_
@@ -114,11 +114,11 @@ struct radix_node_head {
 	int	rnh_addrsize;		/* permit, but not require fixed keys */
 	int	rnh_pktsize;		/* permit, but not require fixed keys */
 	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
+		(void *v, void *mask,
+		     struct radix_node_head *head, struct radix_node nodes[]);
 	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		__P((void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]));
+		(void *v, void *mask,
+		     struct radix_node_head *head, struct radix_node nodes[]);
 	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
 	(void *v, void *mask, struct radix_node_head *head);
 	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
@@ -145,17 +145,17 @@ struct radix_node_head {
 void	 rn_init(void);
 int	 rn_inithead(void **, int);
 int	 rn_refines(void *, void *);
-int	 rn_walktree __P((struct radix_node_head *,
+int	 rn_walktree(struct radix_node_head *,
 		     int (*)(struct radix_node *, struct walkarg *),
-		     struct walkarg *));
+		     struct walkarg *);
 
 struct radix_node
 	 *rn_addmask(void *, int, int),
-	 *rn_addroute __P((void *, void *, struct radix_node_head *,
-			struct radix_node [2])),
+	 *rn_addroute(void *, void *, struct radix_node_head *,
+			struct radix_node [2]),
 	 *rn_delete(void *, void *, struct radix_node_head *),
-	 *rn_insert __P((void *, struct radix_node_head *, int *,
-			struct radix_node [2])),
+	 *rn_insert(void *, struct radix_node_head *, int *,
+			struct radix_node [2]),
 	 *rn_match(void *, struct radix_node_head *),
 	 *rn_newpair(void *, int, struct radix_node[2]),
 	 *rn_search(void *, struct radix_node *),
-- 
2.41.0