Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

16 files changed, 88 insertions, 88 deletions

diff --git a/usr.sbin/mopd/common/cmp.h b/usr.sbin/mopd/common/cmp.h
index ceca08b87bb..dda18aa514c 100644
--- a/usr.sbin/mopd/common/cmp.h
+++ b/usr.sbin/mopd/common/cmp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 int	mopCmpEAddr (/* u_char *,u_char * */);
 #else
 __BEGIN_DECLS
-int	mopCmpEAddr __P((u_char *,u_char *));
+int	mopCmpEAddr(u_char *,u_char *);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/device.h b/usr.sbin/mopd/common/device.h
index a981cbedb9d..b305a83eb18 100644
--- a/usr.sbin/mopd/common/device.h
+++ b/usr.sbin/mopd/common/device.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $ */
+/*	$OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $
+ *	$OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -44,10 +44,10 @@ void	deviceInitAll (/* void */);
 #else
 __BEGIN_DECLS
 #ifdef	DEV_NEW_CONF
-void	deviceEthAddr __P((char *,u_char *));
+void	deviceEthAddr(char *,u_char *);
 #endif
-void	deviceInitOne __P((char *));
-void	deviceInitAll __P((void));
+void	deviceInitOne(char *);
+void	deviceInitAll(void);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/dl.h b/usr.sbin/mopd/common/dl.h
index 8e01586efad..99a3bd79e0b 100644
--- a/usr.sbin/mopd/common/dl.h
+++ b/usr.sbin/mopd/common/dl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 void	mopDumpDL       (/* FILE *, u_char *, int */);
 #else
 __BEGIN_DECLS
-void	mopDumpDL       __P((FILE *, u_char *, int));
+void	mopDumpDL(FILE *, u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h
index 3db49491dc0..076e31b8e50 100644
--- a/usr.sbin/mopd/common/file.h
+++ b/usr.sbin/mopd/common/file.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -50,14 +50,14 @@ int	GetFileInfo    (/* int, u_long *, u_long *, int *, u_long *, u_long *,
 			   u_long *, u_long *, u_long *, u_long * */);
 #else
 __BEGIN_DECLS
-void	mopFilePutLX    __P((u_char *, int, u_long, int));
-void	mopFilePutBX    __P((u_char *, int, u_long, int));
-u_long	mopFileGetLX    __P((u_char *, int, int));
-u_long	mopFileGetBX    __P((u_char *, int, int));
-void	mopFileSwapX    __P((u_char *, int, int));
-int	CheckMopFile    __P((int));
-int	GetMopFileInfo  __P((int, u_long *, u_long *));
-int	CheckAOutFile   __P((int));
+void	mopFilePutLX(u_char *, int, u_long, int);
+void	mopFilePutBX(u_char *, int, u_long, int);
+u_long	mopFileGetLX(u_char *, int, int);
+u_long	mopFileGetBX(u_char *, int, int);
+void	mopFileSwapX(u_char *, int, int);
+int	CheckMopFile(int);
+int	GetMopFileInfo(int, u_long *, u_long *);
+int	CheckAOutFile(int);
 int	GetAOutFileInfo __P((int, u_long *, u_long *, u_long *, u_long *,
 			     u_long *, u_long *, u_long *, u_long *, int *));
 int	GetFileInfo     __P((int, u_long *, u_long *, int *,
diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h
index 7af425ae5e4..03c32018325 100644
--- a/usr.sbin/mopd/common/get.h
+++ b/usr.sbin/mopd/common/get.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -46,14 +46,14 @@ void	mopGetHeader (/* u_char *, int *, u_char **, u_char **, u_short *,
 u_short	mopGetLength (/* u_char *, int */);
 #else
 __BEGIN_DECLS
-u_char	mopGetChar   __P((u_char *,int *));
-u_short	mopGetShort  __P((u_char *,int *));
-u_long	mopGetLong   __P((u_char *,int *));
-void	mopGetMulti  __P((u_char *,int *,u_char *,int));
-int	mopGetTrans  __P((u_char *, int));
+u_char	mopGetChar(u_char *,int *);
+u_short	mopGetShort(u_char *,int *);
+u_long	mopGetLong(u_char *,int *);
+void	mopGetMulti(u_char *,int *,u_char *,int);
+int	mopGetTrans(u_char *, int);
 void	mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *,
 			  int *, int));
-u_short	mopGetLength __P((u_char *, int));
+u_short	mopGetLength(u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c
index b85f38633d6..7e308d774dc 100644
--- a/usr.sbin/mopd/common/loop-bsd.c
+++ b/usr.sbin/mopd/common/loop-bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $ */
+/*	$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $";
+static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 #include <stdlib.h>
@@ -93,7 +93,7 @@ mopReadDL()
  */
 struct if_info *iflist;
 
-void   mopProcess    __P((struct if_info *, u_char *));
+void   mopProcess(struct if_info *, u_char *);
 
 /*
  * Loop indefinitely listening for MOP requests on the
diff --git a/usr.sbin/mopd/common/nma.h b/usr.sbin/mopd/common/nma.h
index 5694dda2857..1ead51b5007 100644
--- a/usr.sbin/mopd/common/nma.h
+++ b/usr.sbin/mopd/common/nma.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -40,8 +40,8 @@ char	*nmaGetShort  (/* int */);
 char	*nmaGetDevice (/* int */);
 #else
 __BEGIN_DECLS
-char	*nmaGetShort  __P((int));
-char	*nmaGetDevice __P((int));
+char	*nmaGetShort(int);
+char	*nmaGetDevice(int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/pf.h b/usr.sbin/mopd/common/pf.h
index 3277d98e940..fcec3fbecec 100644
--- a/usr.sbin/mopd/common/pf.h
+++ b/usr.sbin/mopd/common/pf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -45,13 +45,13 @@ int	pfRead     (/* int, u_char *, int */);
 int	pfWrite    (/* int, u_char *, int, int  */);
 #else
 __BEGIN_DECLS
-int	pfTrans	   __P((char *));
-int	pfInit     __P((char *, int, u_short, int));
-int	pfEthAddr  __P((int, u_char *));
-int	pfAddMulti __P((int, char *, char *));
-int	pfDelMulti __P((int, char *, char *));
-int	pfRead     __P((int, u_char *, int));
-int	pfWrite    __P((int, u_char *, int, int));
+int	pfTrans(char *);
+int	pfInit(char *, int, u_short, int);
+int	pfEthAddr(int, u_char *);
+int	pfAddMulti(int, char *, char *);
+int	pfDelMulti(int, char *, char *);
+int	pfRead(int, u_char *, int);
+int	pfWrite(int, u_char *, int, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h
index b7fa4d3af13..d79f58e27c2 100644
--- a/usr.sbin/mopd/common/print.h
+++ b/usr.sbin/mopd/common/print.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -48,14 +48,14 @@ void	mopPrintInfo      (/* FILE *, u_char *, int *, u_short,
 			      u_char, int */);
 #else
 __BEGIN_DECLS
-void	mopPrintHWA	  __P((FILE *, u_char *));
-void	mopPrintBPTY	  __P((FILE *, u_char));
-void	mopPrintPGTY      __P((FILE *, u_char));
-void	mopPrintOneline   __P((FILE *, u_char *, int));
-void	mopPrintHeader    __P((FILE *, u_char *, int));
-void	mopPrintMopHeader __P((FILE *, u_char *, int));
-void	mopPrintDevice    __P((FILE *, u_char));
-void	mopPrintTime      __P((FILE *, u_char *));
+void	mopPrintHWA(FILE *, u_char *);
+void	mopPrintBPTY(FILE *, u_char);
+void	mopPrintPGTY(FILE *, u_char);
+void	mopPrintOneline(FILE *, u_char *, int);
+void	mopPrintHeader(FILE *, u_char *, int);
+void	mopPrintMopHeader(FILE *, u_char *, int);
+void	mopPrintDevice(FILE *, u_char);
+void	mopPrintTime(FILE *, u_char *);
 void	mopPrintInfo      __P((FILE *, u_char *, int *, u_short,
 			       u_char, int));
 __END_DECLS
diff --git a/usr.sbin/mopd/common/put.h b/usr.sbin/mopd/common/put.h
index 4d3a08c0186..34d9b34e9ab 100644
--- a/usr.sbin/mopd/common/put.h
+++ b/usr.sbin/mopd/common/put.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -45,13 +45,13 @@ void	mopPutHeader (/* u_char *, int *, u_char *, u_char *, u_short, int */);
 void	mopPutLength (/* u_char *, int, u_short */);
 #else
 __BEGIN_DECLS
-void	mopPutChar   __P((u_char *, int *, u_char));
-void	mopPutShort  __P((u_char *, int *, u_short));
-void	mopPutLong   __P((u_char *, int *, u_long));
-void	mopPutMulti  __P((u_char *, int *, u_char *, int));
-void	mopPutTime   __P((u_char *, int *, time_t));
-void	mopPutHeader __P((u_char *, int *, u_char *, u_char *, u_short, int));
-void	mopPutLength __P((u_char *, int, u_short));
+void	mopPutChar(u_char *, int *, u_char);
+void	mopPutShort(u_char *, int *, u_short);
+void	mopPutLong(u_char *, int *, u_long);
+void	mopPutMulti(u_char *, int *, u_char *, int);
+void	mopPutTime(u_char *, int *, time_t);
+void	mopPutHeader(u_char *, int *, u_char *, u_char *, u_short, int);
+void	mopPutLength(u_char *, int, u_short);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/common/rc.h b/usr.sbin/mopd/common/rc.h
index 4a0cf294e89..e168d7dc44a 100644
--- a/usr.sbin/mopd/common/rc.h
+++ b/usr.sbin/mopd/common/rc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */
+/*	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$OpenBSD: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $
+ *	$OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $
  *
  */
 
@@ -39,7 +39,7 @@
 void	mopDumpRC        (/* FILE *, u_char *, int */);
 #else
 __BEGIN_DECLS
-void	mopDumpRC        __P((FILE *, u_char *, int));
+void	mopDumpRC(FILE *, u_char *, int);
 __END_DECLS
 #endif
 
diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c
index 0c1bb020131..f26f19afd59 100644
--- a/usr.sbin/mopd/mopchk/mopchk.c
+++ b/usr.sbin/mopd/mopchk/mopchk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $	*/
+/*	$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $	*/
 
 /*
  * Copyright (c) 1995-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $";
+static char rcsid[] = "$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -56,8 +56,8 @@ struct if_info *iflist;
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c
index 4fd2af0baeb..1988707b45a 100644
--- a/usr.sbin/mopd/mopd/mopd.c
+++ b/usr.sbin/mopd/mopd/mopd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $ */
+/*	$OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -63,9 +63,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces */
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c
index ae3b6430705..1f0c020dd85 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.c
+++ b/usr.sbin/mopd/mopprobe/mopprobe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $ */
+/*	$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $";
+static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -61,9 +61,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 struct once {
diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c
index 880ceef3dd4..bd394e154ba 100644
--- a/usr.sbin/mopd/moptrace/moptrace.c
+++ b/usr.sbin/mopd/moptrace/moptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $ */
+/*	$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */
 
 /*
  * Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 /*
@@ -61,9 +61,9 @@ void   Loop	     (/* void */);
 void   Usage         (/* void */);
 void   mopProcess    (/* struct if_info *, u_char * */);
 #else
-void   Loop	     __P((void));
-void   Usage         __P((void));
-void   mopProcess    __P((struct if_info *, u_char *));
+void   Loop(void);
+void   Usage(void);
+void   mopProcess(struct if_info *, u_char *);
 #endif
 
 int     AllFlag = 0;		/* listen on "all" interfaces  */
diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c
index d726211726b..62b500f71ea 100644
--- a/usr.sbin/mopd/otherOS/loop-linux2.c
+++ b/usr.sbin/mopd/otherOS/loop-linux2.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef LINT
-static char rcsid[] = "$Id: loop-linux2.c,v 1.1 1999/03/27 14:31:22 maja Exp $";
+static char rcsid[] = "$Id: loop-linux2.c,v 1.2 2002/02/16 21:28:04 millert Exp $";
 #endif
 
 #include <stdlib.h>
@@ -90,7 +90,7 @@ mopReadDL()
  */
 struct if_info *iflist;
 
-void   mopProcess    __P((struct if_info *, u_char *));
+void   mopProcess(struct if_info *, u_char *);
 
 /*
  * Loop indefinitely listening for MOP requests on the