DragonFly BSD
DragonFly submit List (threaded) for 2003-11
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Last __P removal patch


From: Craig Dooley <craig@xxxxxxxxxx>
Date: Thu, 13 Nov 2003 19:10:36 -0500

Heres the final patch.  This removes about all the __P() usage we can safely 
get rid of.  Any other uses are in contrib code, and Im not gonna touch that.

-Craig
-- 
------------------------------------------------------------------------
Craig Dooley						craig@xxxxxxxxxx
------------------------------------------------------------------------
Index: bin/ed/ed.h
===================================================================
RCS file: /home/dcvs/src/bin/ed/ed.h,v
retrieving revision 1.3
diff -u -r1.3 ed.h
--- bin/ed/ed.h	21 Sep 2003 04:21:35 -0000	1.3
+++ bin/ed/ed.h	13 Nov 2003 17:54:44 -0000
@@ -180,14 +180,6 @@
 # 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);
Index: crypto/heimdal/cf/make-proto.pl
===================================================================
RCS file: /home/dcvs/src/crypto/heimdal/cf/make-proto.pl,v
retrieving revision 1.1
diff -u -r1.1 make-proto.pl
--- crypto/heimdal/cf/make-proto.pl	17 Jun 2003 02:47:28 -0000	1.1
+++ crypto/heimdal/cf/make-proto.pl	13 Nov 2003 17:59:14 -0000
@@ -7,19 +7,14 @@
 $brace = 0;
 $line = "";
 $debug = 0;
-$oproto = 1;
 $private_func_re = "^_";
 
-do Getopts('o:p:dqR:P:') || die "foo";
+do Getopts('o:p:dR:P:') || die "foo";
 
 if($opt_d) {
     $debug = 1;
 }
 
-if($opt_q) {
-    $oproto = 0;
-}
-
 if($opt_R) {
     $private_func_re = $opt_R;
 }
@@ -81,13 +76,8 @@
 		# match function name
 		/([a-zA-Z0-9_]+)\s*\</;
 		$f = $1;
-		if($oproto) {
-		    $LP = "__P((";
-		    $RP = "))";
-		} else {
-		    $LP = "(";
-		    $RP = ")";
-		}
+		$LP = "(";
+		$RP = ")";
 		# only add newline if more than one parameter
                 if(/,/){ 
 		    s/\</ $LP\n\t/;
@@ -147,48 +137,19 @@
 #define $block
 
 ";
-if ($oproto) {
-$public_h_header .= "#ifdef __STDC__
-#include <stdarg.h>
-#ifndef __P
-#define __P(x) x
-#endif
-#else
-#ifndef __P
-#define __P(x) ()
-#endif
-#endif
+$public_h_header .= "#include <stdarg.h>
 
 ";
-} else {
-    $public_h_header .= "#include <stdarg.h>
-
-";
-}
 
 $private_h_header = "/* This is a generated file */
 #ifndef $private
 #define $private
 
 ";
-if($oproto) {
-$private_h_header .= "#ifdef __STDC__
-#include <stdarg.h>
-#ifndef __P
-#define __P(x) x
-#endif
-#else
-#ifndef __P
-#define __P(x) ()
-#endif
-#endif
+$private_h_header .= "#include <stdarg.h>
 
 ";
-} else {
-    $private_h_header .= "#include <stdarg.h>
 
-";
-}
 foreach(sort keys %funcs){
     if(/^(main)$/) { next }
     if(/$private_func_re/) {
Index: crypto/heimdal/lib/com_err/com_err.h
===================================================================
RCS file: /home/dcvs/src/crypto/heimdal/lib/com_err/com_err.h,v
retrieving revision 1.1
diff -u -r1.1 com_err.h
--- crypto/heimdal/lib/com_err/com_err.h	17 Jun 2003 02:47:37 -0000	1.1
+++ crypto/heimdal/lib/com_err/com_err.h	13 Nov 2003 17:47:42 -0000
@@ -44,22 +44,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__ */
Index: crypto/heimdal/lib/com_err/com_right.h
===================================================================
RCS file: /home/dcvs/src/crypto/heimdal/lib/com_err/com_right.h,v
retrieving revision 1.1
diff -u -r1.1 com_right.h
--- crypto/heimdal/lib/com_err/com_right.h	17 Jun 2003 02:47:37 -0000	1.1
+++ crypto/heimdal/lib/com_err/com_right.h	13 Nov 2003 18:27:36 -0000
@@ -59,8 +59,8 @@
 };
 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__ */
Index: crypto/heimdal/lib/kafs/kafs.h
===================================================================
RCS file: /home/dcvs/src/crypto/heimdal/lib/kafs/kafs.h,v
retrieving revision 1.1
diff -u -r1.1 kafs.h
--- crypto/heimdal/lib/kafs/kafs.h	17 Jun 2003 02:47:41 -0000	1.1
+++ crypto/heimdal/lib/kafs/kafs.h	13 Nov 2003 17:53:53 -0000
@@ -97,41 +97,31 @@
   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 +135,33 @@
 #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
 
Index: crypto/openssh/defines.h
===================================================================
RCS file: /home/dcvs/src/crypto/openssh/defines.h,v
retrieving revision 1.1
diff -u -r1.1 defines.h
--- crypto/openssh/defines.h	17 Jun 2003 02:48:15 -0000	1.1
+++ crypto/openssh/defines.h	13 Nov 2003 18:03:57 -0000
@@ -370,10 +370,6 @@
    } 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) && \
Index: gnu/usr.bin/as/config/ho-sysv.h
===================================================================
RCS file: /home/dcvs/src/gnu/usr.bin/as/config/ho-sysv.h,v
retrieving revision 1.1
diff -u -r1.1 ho-sysv.h
--- gnu/usr.bin/as/config/ho-sysv.h	17 Jun 2003 02:49:55 -0000	1.1
+++ gnu/usr.bin/as/config/ho-sysv.h	13 Nov 2003 13:44:15 -0000
@@ -19,7 +19,9 @@
 
 #define HO_USG
 
-#define setbuffer(stream, buf, size) setvbuf((stream), (buf), _IOLBF, (size))
+/*
+ * #define setbuffer(stream, buf, size) setvbuf((stream), (buf), _IOLBF, (size))
+ */
 
 extern int free();
 extern char *malloc();
Index: include/assert.h
===================================================================
RCS file: /home/dcvs/src/include/assert.h,v
retrieving revision 1.1
diff -u -r1.1 assert.h
--- include/assert.h	17 Jun 2003 02:50:23 -0000	1.1
+++ include/assert.h	13 Nov 2003 02:00:44 -0000
@@ -61,5 +61,5 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void __assert __P((const char *, int, const char *));
+void __assert (const char *, int, const char *);
 __END_DECLS
Index: include/complex.h
===================================================================
RCS file: /home/dcvs/src/include/complex.h,v
retrieving revision 1.2
diff -u -r1.2 complex.h
--- include/complex.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/complex.h	13 Nov 2003 02:00:44 -0000
@@ -42,12 +42,12 @@
 
 __BEGIN_DECLS
 
-double	cabs __P((double complex));
-float	cabsf __P((float complex));
-double	cimag __P((double complex));
-float	cimagf __P((float complex));
-double	creal __P((double complex));
-float	crealf __P((float complex));
+double	cabs (double complex);
+float	cabsf (float complex);
+double	cimag (double complex);
+float	cimagf (float complex);
+double	creal (double complex);
+float	crealf (float complex);
 
 __END_DECLS
 
Index: include/ctype.h
===================================================================
RCS file: /home/dcvs/src/include/ctype.h,v
retrieving revision 1.3
diff -u -r1.3 ctype.h
--- include/ctype.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/ctype.h	13 Nov 2003 02:00:44 -0000
@@ -72,31 +72,31 @@
 #define	_CTYPE_Q	0x00200000L		/* Phonogram */
 
 __BEGIN_DECLS
-int	isalnum __P((int));
-int	isalpha __P((int));
-int	iscntrl __P((int));
-int	isdigit __P((int));
-int	isgraph __P((int));
-int	islower __P((int));
-int	isprint __P((int));
-int	ispunct __P((int));
-int	isspace __P((int));
-int	isupper __P((int));
-int	isxdigit __P((int));
-int	tolower __P((int));
-int	toupper __P((int));
+int	isalnum (int);
+int	isalpha (int);
+int	iscntrl (int);
+int	isdigit (int);
+int	isgraph (int);
+int	islower (int);
+int	isprint (int);
+int	ispunct (int);
+int	isspace (int);
+int	isupper (int);
+int	isxdigit (int);
+int	tolower (int);
+int	toupper (int);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	digittoint __P((int));
-int	isascii __P((int));
-int	isblank __P((int));
-int	ishexnumber __P((int));
-int	isideogram __P((int));
-int	isnumber __P((int));
-int	isphonogram __P((int));
-int	isrune __P((int));
-int	isspecial __P((int));
-int	toascii __P((int));
+int	digittoint (int);
+int	isascii (int);
+int	isblank (int);
+int	ishexnumber (int);
+int	isideogram (int);
+int	isnumber (int);
+int	isphonogram (int);
+int	isrune (int);
+int	isspecial (int);
+int	toascii (int);
 #endif
 __END_DECLS
 
@@ -130,9 +130,9 @@
 #endif
 
 __BEGIN_DECLS
-unsigned long	___runetype __P((__ct_rune_t));
-__ct_rune_t	___tolower __P((__ct_rune_t));
-__ct_rune_t	___toupper __P((__ct_rune_t));
+unsigned long	___runetype (__ct_rune_t);
+__ct_rune_t	___tolower (__ct_rune_t);
+__ct_rune_t	___toupper (__ct_rune_t);
 __END_DECLS
 
 /*
@@ -181,10 +181,10 @@
 #else /* not using inlines */
 
 __BEGIN_DECLS
-int		__maskrune __P((__ct_rune_t, unsigned long));
-int		__isctype __P((__ct_rune_t, unsigned long));
-__ct_rune_t	__toupper __P((__ct_rune_t));
-__ct_rune_t	__tolower __P((__ct_rune_t));
+int		__maskrune (__ct_rune_t, unsigned long);
+int		__isctype (__ct_rune_t, unsigned long);
+__ct_rune_t	__toupper (__ct_rune_t);
+__ct_rune_t	__tolower (__ct_rune_t);
 __END_DECLS
 #endif /* using inlines */
 
Index: include/db.h
===================================================================
RCS file: /home/dcvs/src/include/db.h,v
retrieving revision 1.1
diff -u -r1.1 db.h
--- include/db.h	17 Jun 2003 02:50:23 -0000	1.1
+++ include/db.h	13 Nov 2003 02:00:44 -0000
@@ -99,14 +99,14 @@
 /* Access method description structure. */
 typedef struct __db {
 	DBTYPE type;			/* Underlying db type. */
-	int (*close)	__P((struct __db *));
-	int (*del)	__P((const struct __db *, const DBT *, u_int));
-	int (*get)	__P((const struct __db *, const DBT *, DBT *, u_int));
-	int (*put)	__P((const struct __db *, DBT *, const DBT *, u_int));
-	int (*seq)	__P((const struct __db *, DBT *, DBT *, u_int));
-	int (*sync)	__P((const struct __db *, u_int));
+	int (*close)	(struct __db *);
+	int (*del)	(const struct __db *, const DBT *, u_int);
+	int (*get)	(const struct __db *, const DBT *, DBT *, u_int);
+	int (*put)	(const struct __db *, DBT *, const DBT *, u_int);
+	int (*seq)	(const struct __db *, DBT *, DBT *, u_int);
+	int (*sync)	(const struct __db *, u_int);
 	void *internal;			/* Access method private. */
-	int (*fd)	__P((const struct __db *));
+	int (*fd)	(const struct __db *);
 } DB;
 
 #define	BTREEMAGIC	0x053162
@@ -121,9 +121,9 @@
 	int	minkeypage;	/* minimum keys per page */
 	u_int	psize;		/* page size */
 	int	(*compare)	/* comparison function */
-	    __P((const DBT *, const DBT *));
+	    (const DBT *, const DBT *);
 	size_t	(*prefix)	/* prefix function */
-	    __P((const DBT *, const DBT *));
+	    (const DBT *, const DBT *);
 	int	lorder;		/* byte order */
 } BTREEINFO;
 
@@ -137,7 +137,7 @@
 	u_int	nelem;		/* number of elements */
 	u_int	cachesize;	/* bytes to cache */
 	u_int32_t		/* hash function */
-		(*hash) __P((const void *, size_t));
+		(*hash) (const void *, size_t);
 	int	lorder;		/* byte order */
 } HASHINFO;
 
@@ -151,7 +151,7 @@
 	u_int	psize;		/* page size */
 	int	lorder;		/* byte order */
 	size_t	reclen;		/* record length (fixed-length records) */
-	u_char	bval;		/* delimiting byte (variable-length records */
+	u_char	bval;		/* delimiting byte (variable-length records) */
 	char	*bfname;	/* btree file name */ 
 } RECNOINFO;
 
@@ -206,13 +206,13 @@
 #endif
 
 __BEGIN_DECLS
-DB *dbopen __P((const char *, int, int, DBTYPE, const void *));
+DB *dbopen (const char *, int, int, DBTYPE, const void *);
 
 #ifdef __DBINTERFACE_PRIVATE
-DB	*__bt_open __P((const char *, int, int, const BTREEINFO *, int));
-DB	*__hash_open __P((const char *, int, int, const HASHINFO *, int));
-DB	*__rec_open __P((const char *, int, int, const RECNOINFO *, int));
-void	 __dbpanic __P((DB *dbp));
+DB	*__bt_open (const char *, int, int, const BTREEINFO *, int);
+DB	*__hash_open (const char *, int, int, const HASHINFO *, int);
+DB	*__rec_open (const char *, int, int, const RECNOINFO *, int);
+void	 __dbpanic (DB *dbp);
 #endif
 __END_DECLS
 #endif /* !_DB_H_ */
Index: include/dirent.h
===================================================================
RCS file: /home/dcvs/src/include/dirent.h,v
retrieving revision 1.2
diff -u -r1.2 dirent.h
--- include/dirent.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/dirent.h	13 Nov 2003 02:00:44 -0000
@@ -84,20 +84,20 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-DIR *opendir __P((const char *));
-struct dirent *readdir __P((DIR *));
-void rewinddir __P((DIR *));
-int closedir __P((DIR *));
+DIR *opendir (const char *);
+struct dirent *readdir (DIR *);
+void rewinddir (DIR *);
+int closedir (DIR *);
 #ifndef _POSIX_SOURCE
-DIR *__opendir2 __P((const char *, int));
-long telldir __P((const DIR *));
-void seekdir __P((DIR *, long));
-int scandir __P((const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(const void *, const void *)));
-int alphasort __P((const void *, const void *));
-int getdents __P((int, char *, int));
-int getdirentries __P((int, char *, int, long *));
-int readdir_r __P((DIR *, struct dirent *, struct dirent **));
+DIR *__opendir2 (const char *, int);
+long telldir (const DIR *);
+void seekdir (DIR *, long);
+int scandir (const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(const void *, const void *));
+int alphasort (const void *, const void *);
+int getdents (int, char *, int);
+int getdirentries (int, char *, int, long *);
+int readdir_r (DIR *, struct dirent *, struct dirent **);
 #endif /* not POSIX */
 __END_DECLS
 
Index: include/dlfcn.h
===================================================================
RCS file: /home/dcvs/src/include/dlfcn.h,v
retrieving revision 1.3
diff -u -r1.3 dlfcn.h
--- include/dlfcn.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/dlfcn.h	13 Nov 2003 02:00:44 -0000
@@ -94,19 +94,19 @@
 } Dl_serinfo;
 
 __BEGIN_DECLS
-int dladdr __P((const void *, Dl_info *));
-int dlclose __P((void *));
-const char *dlerror __P((void));
-int dlinfo __P((void *, int, void *));
-void dllockinit __P((void *_context,
+int dladdr (const void *, Dl_info *);
+int dlclose (void *);
+const char *dlerror (void);
+int dlinfo (void *, int, void *);
+void dllockinit (void *_context,
 		     void *(*_lock_create)(void *_context),
 		     void (*_rlock_acquire)(void *_lock),
 		     void (*_wlock_acquire)(void *_lock),
 		     void (*_lock_release)(void *_lock),
 		     void (*_lock_destroy)(void *_lock),
-		     void (*_context_destroy)(void *_context)));
-void *dlopen __P((const char *, int));
-void *dlsym __P((void *, const char *));
+		     void (*_context_destroy)(void *_context));
+void *dlopen (const char *, int);
+void *dlsym (void *, const char *);
 __END_DECLS
 
 #endif /* !_DLFCN_H_ */
Index: include/err.h
===================================================================
RCS file: /home/dcvs/src/include/err.h,v
retrieving revision 1.3
diff -u -r1.3 err.h
--- include/err.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/err.h	13 Nov 2003 02:00:44 -0000
@@ -54,23 +54,23 @@
 #endif
 
 __BEGIN_DECLS
-void	err __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void	verr __P((int, const char *, __va_list)) __dead2
+void	err (int, const char *, ...) __dead2 __printf0like(2, 3);
+void	verr (int, const char *, __va_list) __dead2
 	    __printf0like(2, 0);
-void	errc __P((int, int, const char *, ...)) __dead2 __printf0like(3, 4);
-void	verrc __P((int, int, const char *, __va_list)) __dead2
+void	errc (int, int, const char *, ...) __dead2 __printf0like(3, 4);
+void	verrc (int, int, const char *, __va_list) __dead2
 	    __printf0like(3, 0);
-void	errx __P((int, const char *, ...)) __dead2 __printf0like(2, 3);
-void	verrx __P((int, const char *, __va_list)) __dead2
+void	errx (int, const char *, ...) __dead2 __printf0like(2, 3);
+void	verrx (int, const char *, __va_list) __dead2
 	    __printf0like(2, 0);
-void	warn __P((const char *, ...)) __printf0like(1, 2);
-void	vwarn __P((const char *, __va_list)) __printf0like(1, 0);
-void	warnc __P((int, const char *, ...)) __printf0like(2, 3);
-void	vwarnc __P((int, const char *, __va_list)) __printf0like(2, 0);
-void	warnx __P((const char *, ...)) __printflike(1, 2);
-void	vwarnx __P((const char *, __va_list)) __printflike(1, 0);
-void	err_set_file __P((void *));
-void	err_set_exit __P((void (*)(int)));
+void	warn (const char *, ...) __printf0like(1, 2);
+void	vwarn (const char *, __va_list) __printf0like(1, 0);
+void	warnc (int, const char *, ...) __printf0like(2, 3);
+void	vwarnc (int, const char *, __va_list) __printf0like(2, 0);
+void	warnx (const char *, ...) __printflike(1, 2);
+void	vwarnx (const char *, __va_list) __printflike(1, 0);
+void	err_set_file (void *);
+void	err_set_exit (void (*)(int));
 __END_DECLS
 
 #endif /* !_ERR_H_ */
Index: include/fnmatch.h
===================================================================
RCS file: /home/dcvs/src/include/fnmatch.h,v
retrieving revision 1.2
diff -u -r1.2 fnmatch.h
--- include/fnmatch.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/fnmatch.h	13 Nov 2003 02:00:44 -0000
@@ -54,7 +54,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	 fnmatch __P((const char *, const char *, int));
+int	 fnmatch (const char *, const char *, int);
 __END_DECLS
 
 #endif /* !_FNMATCH_H_ */
Index: include/fstab.h
===================================================================
RCS file: /home/dcvs/src/include/fstab.h,v
retrieving revision 1.1
diff -u -r1.1 fstab.h
--- include/fstab.h	17 Jun 2003 02:50:23 -0000	1.1
+++ include/fstab.h	13 Nov 2003 02:00:44 -0000
@@ -69,11 +69,11 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct fstab *getfsent __P((void));
-struct fstab *getfsspec __P((const char *));
-struct fstab *getfsfile __P((const char *));
-int setfsent __P((void));
-void endfsent __P((void));
+struct fstab *getfsent (void);
+struct fstab *getfsspec (const char *);
+struct fstab *getfsfile (const char *);
+int setfsent (void);
+void endfsent (void);
 __END_DECLS
 
 #endif /* !_FSTAB_H_ */
Index: include/fts.h
===================================================================
RCS file: /home/dcvs/src/include/fts.h,v
retrieving revision 1.2
diff -u -r1.2 fts.h
--- include/fts.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/fts.h	13 Nov 2003 02:00:44 -0000
@@ -48,7 +48,7 @@
 	int fts_pathlen;		/* sizeof(path) */
 	int fts_nitems;			/* elements in the sort array */
 	int (*fts_compar)		/* compare function */
-	    __P((const struct _ftsent **, const struct _ftsent **));
+	    (const struct _ftsent **, const struct _ftsent **);
 
 #define	FTS_COMFOLLOW	0x001		/* follow command line symlinks */
 #define	FTS_LOGICAL	0x002		/* logical walk */
@@ -120,12 +120,12 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-FTSENT	*fts_children __P((FTS *, int));
-int	 fts_close __P((FTS *));
-FTS	*fts_open __P((char * const *, int,
-	    int (*)(const FTSENT **, const FTSENT **)));
-FTSENT	*fts_read __P((FTS *));
-int	 fts_set __P((FTS *, FTSENT *, int));
+FTSENT	*fts_children (FTS *, int);
+int	 fts_close (FTS *);
+FTS	*fts_open (char * const *, int,
+	    int (*)(const FTSENT **, const FTSENT **));
+FTSENT	*fts_read (FTS *);
+int	 fts_set (FTS *, FTSENT *, int);
 __END_DECLS
 
 #endif /* !_FTS_H_ */
Index: include/glob.h
===================================================================
RCS file: /home/dcvs/src/include/glob.h,v
retrieving revision 1.2
diff -u -r1.2 glob.h
--- include/glob.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/glob.h	13 Nov 2003 02:00:44 -0000
@@ -51,18 +51,18 @@
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
 				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc) __P((const char *, int));
+	int (*gl_errfunc) (const char *, int);
 
 	/*
 	 * Alternate filesystem access methods for glob; replacement
 	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
 	 * and lstat(2).
 	 */
-	void (*gl_closedir) __P((void *));
-	struct dirent *(*gl_readdir) __P((void *));
-	void *(*gl_opendir) __P((const char *));
-	int (*gl_lstat) __P((const char *, struct stat *));
-	int (*gl_stat) __P((const char *, struct stat *));
+	void (*gl_closedir) (void *);
+	struct dirent *(*gl_readdir) (void *);
+	void *(*gl_opendir) (const char *);
+	int (*gl_lstat) (const char *, struct stat *);
+	int (*gl_stat) (const char *, struct stat *);
 } glob_t;
 
 #if __POSIX_VISIBLE >= 199209
@@ -97,8 +97,8 @@
 #endif /* __BSD_VISIBLE */
 
 __BEGIN_DECLS
-int	glob __P((const char *, int, int (*)(const char *, int), glob_t *));
-void	globfree __P((glob_t *));
+int	glob (const char *, int, int (*)(const char *, int), glob_t *);
+void	globfree (glob_t *);
 __END_DECLS
 
 #endif /* !_GLOB_H_ */
Index: include/grp.h
===================================================================
RCS file: /home/dcvs/src/include/grp.h,v
retrieving revision 1.1
diff -u -r1.1 grp.h
--- include/grp.h	17 Jun 2003 02:50:23 -0000	1.1
+++ include/grp.h	13 Nov 2003 02:00:44 -0000
@@ -55,14 +55,14 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct group *getgrgid __P((gid_t));
-struct group *getgrnam __P((const char *));
+struct group *getgrgid (gid_t);
+struct group *getgrnam (const char *);
 #ifndef _POSIX_SOURCE
-struct group *getgrent __P((void));
-int setgrent __P((void));
-void endgrent __P((void));
-void setgrfile __P((const char *));
-int setgroupent __P((int));
+struct group *getgrent (void);
+int setgrent (void);
+void endgrent (void);
+void setgrfile (const char *);
+int setgroupent (int);
 #endif
 __END_DECLS
 
Index: include/histedit.h
===================================================================
RCS file: /home/dcvs/src/include/histedit.h,v
retrieving revision 1.2
diff -u -r1.2 histedit.h
--- include/histedit.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/histedit.h	13 Nov 2003 02:00:44 -0000
@@ -81,28 +81,28 @@
 /*
  * Initialization, cleanup, and resetting
  */
-EditLine	*el_init	__P((const char *, FILE *, FILE *));
-void		 el_reset	__P((EditLine *));
-void		 el_end		__P((EditLine *));
+EditLine	*el_init	(const char *, FILE *, FILE *);
+void		 el_reset	(EditLine *);
+void		 el_end		(EditLine *);
 
 
 /*
  * Get a line, a character or push a string back in the input queue
  */
-const char    *el_gets	__P((EditLine *, int *));
-int		 el_getc	__P((EditLine *, char *));
-void		 el_push	__P((EditLine *, const char *));
+const char    *el_gets	(EditLine *, int *);
+int		 el_getc	(EditLine *, char *);
+void		 el_push	(EditLine *, const char *);
 
 /*
  * High level function internals control
  * Parses argc, argv array and executes builtin editline commands
  */
-int		 el_parse	__P((EditLine *, int, char **)); 
+int		 el_parse	(EditLine *, int, char **); 
 
 /*
  * Low level editline access function
  */
-int 		 el_set		__P((EditLine *, int, ...));
+int 		 el_set		(EditLine *, int, ...);
 
 /*
  * el_set/el_get parameters
@@ -123,25 +123,25 @@
 /*
  * Source named file or $PWD/.editrc or $HOME/.editrc
  */
-int		el_source	__P((EditLine *, const char *));
+int		el_source	(EditLine *, const char *);
 
 /*
  * Must be called when the terminal changes size; If EL_SIGNAL
  * is set this is done automatically otherwise it is the responsibility
  * of the application
  */
-void		 el_resize	__P((EditLine *));
+void		 el_resize	(EditLine *);
 
-void		 el_data_set	__P((EditLine *, void *));
-void *		 el_data_get	__P((EditLine *));
+void		 el_data_set	(EditLine *, void *);
+void *		 el_data_get	(EditLine *);
 
 
 /*
  * User-defined function interface.
  */
-const LineInfo *el_line	__P((EditLine *));
-int   		  el_insertstr	__P((EditLine *, char *));
-void		  el_deletestr	__P((EditLine *, int));
+const LineInfo *el_line	(EditLine *);
+int   		  el_insertstr	(EditLine *, char *);
+void		  el_deletestr	(EditLine *, int);
 
 /*
  * ==== History ====
@@ -157,10 +157,10 @@
 /*
  * History access functions.
  */
-History *		history_init	__P((void));
-void 			history_end	__P((History *));
+History *		history_init	(void);
+void 			history_end	(History *);
 
-const HistEvent *	history		__P((History *, int, ...));
+const HistEvent *	history		(History *, int, ...);
 
 #define H_FUNC		 0	/* , UTSL		*/
 #define H_EVENT		 1	/* , const int);	*/
Index: include/ieeefp.h
===================================================================
RCS file: /home/dcvs/src/include/ieeefp.h,v
retrieving revision 1.2
diff -u -r1.2 ieeefp.h
--- include/ieeefp.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/ieeefp.h	13 Nov 2003 02:00:44 -0000
@@ -17,12 +17,12 @@
 #include <machine/floatingpoint.h>
 #else /* !__i386__ */
 __BEGIN_DECLS
-extern fp_rnd_t    fpgetround __P((void));
-extern fp_rnd_t    fpsetround __P((fp_rnd_t));
-extern fp_except_t fpgetmask __P((void));
-extern fp_except_t fpsetmask __P((fp_except_t));
-extern fp_except_t fpgetsticky __P((void));
-extern fp_except_t fpsetsticky __P((fp_except_t));
+extern fp_rnd_t    fpgetround (void);
+extern fp_rnd_t    fpsetround (fp_rnd_t);
+extern fp_except_t fpgetmask (void);
+extern fp_except_t fpsetmask (fp_except_t);
+extern fp_except_t fpgetsticky (void);
+extern fp_except_t fpsetsticky (fp_except_t);
 __END_DECLS
 #endif /* __i386__ */
 
Index: include/ifaddrs.h
===================================================================
RCS file: /home/dcvs/src/include/ifaddrs.h,v
retrieving revision 1.2
diff -u -r1.2 ifaddrs.h
--- include/ifaddrs.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/ifaddrs.h	13 Nov 2003 02:00:44 -0000
@@ -50,8 +50,8 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern int getifaddrs __P((struct ifaddrs **));
-extern void freeifaddrs __P((struct ifaddrs *));
+extern int getifaddrs (struct ifaddrs **);
+extern void freeifaddrs (struct ifaddrs *);
 __END_DECLS
 
 #endif
Index: include/langinfo.h
===================================================================
RCS file: /home/dcvs/src/include/langinfo.h,v
retrieving revision 1.2
diff -u -r1.2 langinfo.h
--- include/langinfo.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/langinfo.h	13 Nov 2003 02:00:44 -0000
@@ -106,7 +106,7 @@
 #define	D_MD_ORDER	57	/* month/day order (local extension) */
 
 __BEGIN_DECLS
-char	*nl_langinfo __P((nl_item));
+char	*nl_langinfo (nl_item);
 __END_DECLS
 
Index: include/libgen.h
===================================================================
RCS file: /home/dcvs/src/include/libgen.h,v
retrieving revision 1.2
diff -u -r1.2 libgen.h
--- include/libgen.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/libgen.h	13 Nov 2003 02:00:44 -0000
@@ -36,11 +36,11 @@
 
 __BEGIN_DECLS
 
-char	*basename __P((const char *));
-char	*dirname __P((const char *));
+char	*basename (const char *);
+char	*dirname (const char *);
 #if 0
-char	*regcmp __P((const char *, ...));
-char	*regex __P((const char *, const char *, ...));
+char	*regcmp (const char *, ...);
+char	*regex (const char *, const char *, ...);
 
 extern char *__loc1;
 #endif
Index: include/link.h
===================================================================
RCS file: /home/dcvs/src/include/link.h,v
retrieving revision 1.2
diff -u -r1.2 link.h
--- include/link.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/link.h	13 Nov 2003 02:00:44 -0000
@@ -208,14 +208,14 @@
  * to crt0.
  */
 struct ld_entry {
-	void	*(*dlopen) __P((const char *, int));	/* NONE */
-	int	(*dlclose) __P((void *));		/* NONE */
-	void	*(*dlsym) __P((void *, const char *));	/* NONE */
-	const char *(*dlerror) __P((void));		/* NONE */
-	void	(*dlexit) __P((void));			/* HAS_DLEXIT */
-	void	*(*dlsym3) __P((void *, const char *, void *)); /* HAS_DLSYM3 */
-	int	 (*dladdr) __P((const void *,
-			        struct dl_info *));	/* HAS_DLADDR */
+	void	*(*dlopen) (const char *, int);	/* NONE */
+	int	(*dlclose) (void *);		/* NONE */
+	void	*(*dlsym) (void *, const char *);	/* NONE */
+	const char *(*dlerror) (void);		/* NONE */
+	void	(*dlexit) (void);			/* HAS_DLEXIT */
+	void	*(*dlsym3) (void *, const char *, void *); /* HAS_DLSYM3 */
+	int	 (*dladdr) (const void *,
+			        struct dl_info *);	/* HAS_DLADDR */
 };
 
 /*
Index: include/locale.h
===================================================================
RCS file: /home/dcvs/src/include/locale.h,v
retrieving revision 1.1
diff -u -r1.1 locale.h
--- include/locale.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/locale.h	13 Nov 2003 02:00:44 -0000
@@ -74,8 +74,8 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct lconv	*localeconv __P((void));
-char		*setlocale __P((int, const char *));
+struct lconv	*localeconv (void);
+char		*setlocale (int, const char *);
 __END_DECLS
 
 #endif /* _LOCALE_H_ */
Index: include/math.h
===================================================================
RCS file: /home/dcvs/src/include/math.h,v
retrieving revision 1.1
diff -u -r1.1 math.h
--- include/math.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/math.h	13 Nov 2003 02:00:44 -0000
@@ -77,62 +77,62 @@
  * in the (broken) BSD libm, so they not declared as __pure2.
  */
 __BEGIN_DECLS
-double	acos __P((double));
-double	asin __P((double));
-double	atan __P((double));
-double	atan2 __P((double, double));
-double	ceil __P((double));
-double	cos __P((double));
-double	cosh __P((double));
-double	exp __P((double));
-double	fabs __P((double));
-double	floor __P((double));
-double	fmod __P((double, double));
-double	frexp __P((double, int *));	/* fundamentally !__pure2 */
-double	ldexp __P((double, int));
-double	log __P((double));
-double	log10 __P((double));
-double	modf __P((double, double *));	/* fundamentally !__pure2 */
-double	pow __P((double, double));
-double	sin __P((double));
-double	sinh __P((double));
-double	sqrt __P((double));
-double	tan __P((double));
-double	tanh __P((double));
+double	acos (double);
+double	asin (double);
+double	atan (double);
+double	atan2 (double, double);
+double	ceil (double);
+double	cos (double);
+double	cosh (double);
+double	exp (double);
+double	fabs (double);
+double	floor (double);
+double	fmod (double, double);
+double	frexp (double, int *);	/* fundamentally !__pure2 */
+double	ldexp (double, int);
+double	log (double);
+double	log10 (double);
+double	modf (double, double *);	/* fundamentally !__pure2 */
+double	pow (double, double);
+double	sin (double);
+double	sinh (double);
+double	sqrt (double);
+double	tan (double);
+double	tanh (double);
 
 /*
  * These functions are non-ANSI so they can be "right".  The ones that
  * don't set errno in [lib]msun are declared as __pure2.
  */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-double	acosh __P((double));
-double	asinh __P((double));
-double	atanh __P((double));
+double	acosh (double);
+double	asinh (double);
+double	atanh (double);
 double	cabs();		/* we can't describe cabs()'s argument properly */
-double	cbrt __P((double)) __pure2;
-double	copysign __P((double, double)) __pure2;
-double	drem __P((double, double));
-double	erf __P((double));
-double	erfc __P((double)) __pure2;
-double	expm1 __P((double)) __pure2;
-int	finite __P((double)) __pure2;
-double	hypot __P((double, double));
+double	cbrt (double) __pure2;
+double	copysign (double, double) __pure2;
+double	drem (double, double);
+double	erf (double);
+double	erfc (double) __pure2;
+double	expm1 (double) __pure2;
+int	finite (double) __pure2;
+double	hypot (double, double);
 #if defined(vax) || defined(tahoe)
-double	infnan __P((int));
+double	infnan (int);
 #endif
-int	isinf __P((double)) __pure2;
-int	isnan __P((double)) __pure2;
-double	j0 __P((double));
-double	j1 __P((double));
-double	jn __P((int, double));
-double	lgamma __P((double));
-double	log1p __P((double)) __pure2;
-double	logb __P((double)) __pure2;
-double	rint __P((double)) __pure2;
-double	scalb __P((double, int));
-double	y0 __P((double));
-double	y1 __P((double));
-double	yn __P((int, double));
+int	isinf (double) __pure2;
+int	isnan (double) __pure2;
+double	j0 (double);
+double	j1 (double);
+double	jn (int, double);
+double	lgamma (double);
+double	log1p (double) __pure2;
+double	logb (double) __pure2;
+double	rint (double) __pure2;
+double	scalb (double, int);
+double	y0 (double);
+double	y1 (double);
+double	yn (int, double);
 #endif
 
 __END_DECLS
Index: include/mpool.h
===================================================================
RCS file: /home/dcvs/src/include/mpool.h,v
retrieving revision 1.2
diff -u -r1.2 mpool.h
--- include/mpool.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/mpool.h	13 Nov 2003 02:00:44 -0000
@@ -72,9 +72,9 @@
 	u_long	pagesize;		/* file page size */
 	int	fd;			/* file descriptor */
 					/* page in conversion routine */
-	void    (*pgin) __P((void *, pgno_t, void *));
+	void    (*pgin) (void *, pgno_t, void *);
 					/* page out conversion routine */
-	void    (*pgout) __P((void *, pgno_t, void *));
+	void    (*pgout) (void *, pgno_t, void *);
 	void	*pgcookie;		/* cookie for page in/out routines */
 #ifdef STATISTICS
 	u_long	cachehit;
@@ -90,16 +90,16 @@
 } MPOOL;
 
 __BEGIN_DECLS
-MPOOL	*mpool_open __P((void *, int, pgno_t, pgno_t));
-void	 mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *),
-	    void (*)(void *, pgno_t, void *), void *));
-void	*mpool_new __P((MPOOL *, pgno_t *));
-void	*mpool_get __P((MPOOL *, pgno_t, u_int));
-int	 mpool_put __P((MPOOL *, void *, u_int));
-int	 mpool_sync __P((MPOOL *));
-int	 mpool_close __P((MPOOL *));
+MPOOL	*mpool_open (void *, int, pgno_t, pgno_t);
+void	 mpool_filter (MPOOL *, void (*)(void *, pgno_t, void *),
+	    void (*)(void *, pgno_t, void *), void *);
+void	*mpool_new (MPOOL *, pgno_t *);
+void	*mpool_get (MPOOL *, pgno_t, u_int);
+int	 mpool_put (MPOOL *, void *, u_int);
+int	 mpool_sync (MPOOL *);
+int	 mpool_close (MPOOL *);
 #ifdef STATISTICS
-void	 mpool_stat __P((MPOOL *));
+void	 mpool_stat (MPOOL *);
 #endif
 __END_DECLS
 
Index: include/ndbm.h
===================================================================
RCS file: /home/dcvs/src/include/ndbm.h,v
retrieving revision 1.1
diff -u -r1.1 ndbm.h
--- include/ndbm.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/ndbm.h	13 Nov 2003 02:00:44 -0000
@@ -63,17 +63,17 @@
 #define	dbm_pagfno(a)	DBM_PAGFNO_NOT_AVAILABLE
 
 __BEGIN_DECLS
-int	 dbm_clearerr __P((DBM *));
-void	 dbm_close __P((DBM *));
-int	 dbm_delete __P((DBM *, datum));
-int	 dbm_error __P((DBM *));
-datum	 dbm_fetch __P((DBM *, datum));
-datum	 dbm_firstkey __P((DBM *));
-long	 dbm_forder __P((DBM *, datum));
-datum	 dbm_nextkey __P((DBM *));
-DBM	*dbm_open __P((const char *, int, int));
-int	 dbm_store __P((DBM *, datum, datum, int));
-int	 dbm_dirfno __P((DBM *));
+int	 dbm_clearerr (DBM *);
+void	 dbm_close (DBM *);
+int	 dbm_delete (DBM *, datum);
+int	 dbm_error (DBM *);
+datum	 dbm_fetch (DBM *, datum);
+datum	 dbm_firstkey (DBM *);
+long	 dbm_forder (DBM *, datum);
+datum	 dbm_nextkey (DBM *);
+DBM	*dbm_open (const char *, int, int);
+int	 dbm_store (DBM *, datum, datum, int);
+int	 dbm_dirfno (DBM *);
 __END_DECLS
 
 #endif /* !_NDBM_H_ */
Index: include/netdb.h
===================================================================
RCS file: /home/dcvs/src/include/netdb.h,v
retrieving revision 1.3
diff -u -r1.3 netdb.h
--- include/netdb.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/netdb.h	13 Nov 2003 02:00:44 -0000
@@ -210,72 +210,72 @@
  */
 
 __BEGIN_DECLS
-void		endhostent __P((void));
-void		endnetent __P((void));
-void		endnetgrent __P((void));
-void		endprotoent __P((void));
-void		endservent __P((void));
-void		freehostent __P((struct hostent *));
-struct hostent	*gethostbyaddr __P((const char *, int, int));
-struct hostent	*gethostbyname __P((const char *));
-struct hostent	*gethostbyname2 __P((const char *, int));
-struct hostent	*gethostent __P((void));
-struct hostent	*getipnodebyaddr __P((const void *, size_t, int, int *));
-struct hostent	*getipnodebyname __P((const char *, int, int, int *));
-struct netent	*getnetbyaddr __P((unsigned long, int));
-struct netent	*getnetbyname __P((const char *));
-struct netent	*getnetent __P((void));
-int		getnetgrent __P((char **, char **, char **));
-struct protoent	*getprotobyname __P((const char *));
-struct protoent	*getprotobynumber __P((int));
-struct protoent	*getprotoent __P((void));
-struct servent	*getservbyname __P((const char *, const char *));
-struct servent	*getservbyport __P((int, const char *));
-struct servent	*getservent __P((void));
-void		herror __P((const char *));
-__const char	*hstrerror __P((int));
-int		innetgr __P((const char *, const char *, const char *,
-				const char *));
-void		sethostent __P((int));
-/* void		sethostfile __P((const char *)); */
-void		setnetent __P((int));
-void		setprotoent __P((int));
-int		getaddrinfo __P((const char *, const char *,
-				 const struct addrinfo *, struct addrinfo **));
-int		getnameinfo __P((const struct sockaddr *, socklen_t, char *,
-				 size_t, char *, size_t, int));
-void		freeaddrinfo __P((struct addrinfo *));
-char		*gai_strerror __P((int));
-void		setnetgrent __P((const char *));
-void		setservent __P((int));
+void		endhostent (void);
+void		endnetent (void);
+void		endnetgrent (void);
+void		endprotoent (void);
+void		endservent (void);
+void		freehostent (struct hostent *);
+struct hostent	*gethostbyaddr (const char *, int, int);
+struct hostent	*gethostbyname (const char *);
+struct hostent	*gethostbyname2 (const char *, int);
+struct hostent	*gethostent (void);
+struct hostent	*getipnodebyaddr (const void *, size_t, int, int *);
+struct hostent	*getipnodebyname (const char *, int, int, int *);
+struct netent	*getnetbyaddr (unsigned long, int);
+struct netent	*getnetbyname (const char *);
+struct netent	*getnetent (void);
+int		getnetgrent (char **, char **, char **);
+struct protoent	*getprotobyname (const char *);
+struct protoent	*getprotobynumber (int);
+struct protoent	*getprotoent (void);
+struct servent	*getservbyname (const char *, const char *);
+struct servent	*getservbyport (int, const char *);
+struct servent	*getservent (void);
+void		herror (const char *);
+__const char	*hstrerror (int);
+int		innetgr (const char *, const char *, const char *,
+				const char *);
+void		sethostent (int);
+/* void		sethostfile (const char *); */
+void		setnetent (int);
+void		setprotoent (int);
+int		getaddrinfo (const char *, const char *,
+				 const struct addrinfo *, struct addrinfo **);
+int		getnameinfo (const struct sockaddr *, socklen_t, char *,
+				 size_t, char *, size_t, int);
+void		freeaddrinfo (struct addrinfo *);
+char		*gai_strerror (int);
+void		setnetgrent (const char *);
+void		setservent (int);
 
 /*
  * PRIVATE functions specific to the FreeBSD implementation
  */
 
 /* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-void	_sethosthtent __P((int));
-void	_endhosthtent __P((void));
-void	_sethostdnsent __P((int));
-void	_endhostdnsent __P((void));
-void	_setnethtent __P((int));
-void	_endnethtent __P((void));
-void	_setnetdnsent __P((int));
-void	_endnetdnsent __P((void));
-struct hostent * _gethostbyhtname  __P((const char *, int));
-struct hostent * _gethostbydnsname __P((const char *, int));
-struct hostent * _gethostbynisname __P((const char *, int));
-struct hostent * _gethostbyhtaddr  __P((const char *, int, int));
-struct hostent * _gethostbydnsaddr __P((const char *, int, int));
-struct hostent * _gethostbynisaddr __P((const char *, int, int));
-struct netent *  _getnetbyhtname  __P((const char *));
-struct netent *  _getnetbydnsname __P((const char *));
-struct netent *  _getnetbynisname __P((const char *));
-struct netent *  _getnetbyhtaddr  __P((unsigned long, int));
-struct netent *  _getnetbydnsaddr __P((unsigned long, int));
-struct netent *  _getnetbynisaddr __P((unsigned long, int));
-void _map_v4v6_address __P((const char *, char *));
-void _map_v4v6_hostent __P((struct hostent *, char **, int *));
+void	_sethosthtent (int);
+void	_endhosthtent (void);
+void	_sethostdnsent (int);
+void	_endhostdnsent (void);
+void	_setnethtent (int);
+void	_endnethtent (void);
+void	_setnetdnsent (int);
+void	_endnetdnsent (void);
+struct hostent * _gethostbyhtname  (const char *, int);
+struct hostent * _gethostbydnsname (const char *, int);
+struct hostent * _gethostbynisname (const char *, int);
+struct hostent * _gethostbyhtaddr  (const char *, int, int);
+struct hostent * _gethostbydnsaddr (const char *, int, int);
+struct hostent * _gethostbynisaddr (const char *, int, int);
+struct netent *  _getnetbyhtname  (const char *);
+struct netent *  _getnetbydnsname (const char *);
+struct netent *  _getnetbynisname (const char *);
+struct netent *  _getnetbyhtaddr  (unsigned long, int);
+struct netent *  _getnetbydnsaddr (unsigned long, int);
+struct netent *  _getnetbynisaddr (unsigned long, int);
+void _map_v4v6_address (const char *, char *);
+void _map_v4v6_hostent (struct hostent *, char **, int *);
 __END_DECLS
 
 #endif /* !_NETDB_H_ */
Index: include/nl_types.h
===================================================================
RCS file: /home/dcvs/src/include/nl_types.h,v
retrieving revision 1.2
diff -u -r1.2 nl_types.h
--- include/nl_types.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/nl_types.h	13 Nov 2003 02:00:44 -0000
@@ -44,9 +44,9 @@
 typedef	void	*nl_catd;
 
 __BEGIN_DECLS
-extern nl_catd 	catopen __P((__const char *, int));
-extern char    *catgets	__P((nl_catd, int, int,	__const	char *));
-extern int	catclose __P((nl_catd));
+extern nl_catd 	catopen (__const char *, int);
+extern char    *catgets	(nl_catd, int, int,	__const	char *);
+extern int	catclose (nl_catd);
 __END_DECLS
 
 #endif	/* _NL_TYPES_H_ */
Index: include/nlist.h
===================================================================
RCS file: /home/dcvs/src/include/nlist.h,v
retrieving revision 1.2
diff -u -r1.2 nlist.h
--- include/nlist.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/nlist.h	13 Nov 2003 02:00:44 -0000
@@ -116,7 +116,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int nlist __P((const char *, struct nlist *));
+int nlist (const char *, struct nlist *);
 __END_DECLS
 
 #endif /* !_NLIST_H_ */
Index: include/pthread.h
===================================================================
RCS file: /home/dcvs/src/include/pthread.h,v
retrieving revision 1.2
diff -u -r1.2 pthread.h
--- include/pthread.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/pthread.h	13 Nov 2003 02:00:44 -0000
@@ -122,7 +122,7 @@
  * use in header symbols.
  */
 typedef void	*pthread_addr_t;
-typedef void	*(*pthread_startroutine_t) __P((void *));
+typedef void	*(*pthread_startroutine_t) (void *);
 
 /*
  * Once definitions.
@@ -190,130 +190,130 @@
  * Thread function prototype definitions:
  */
 __BEGIN_DECLS
-int		pthread_attr_destroy __P((pthread_attr_t *));
-int		pthread_attr_getstack __P((const pthread_attr_t * __restrict,
+int		pthread_attr_destroy (pthread_attr_t *);
+int		pthread_attr_getstack (const pthread_attr_t * __restrict,
 			void ** __restrict stackaddr,
-			size_t * __restrict stacksize));
-int		pthread_attr_getstacksize __P((const pthread_attr_t *,
-			size_t *));
-int		pthread_attr_getstackaddr __P((const pthread_attr_t *,
-			void **));
-int		pthread_attr_getdetachstate __P((const pthread_attr_t *,
-			int *));
-int		pthread_attr_init __P((pthread_attr_t *));
-int		pthread_attr_setstack __P((pthread_attr_t *, void *, size_t));
-int		pthread_attr_setstacksize __P((pthread_attr_t *, size_t));
-int		pthread_attr_setstackaddr __P((pthread_attr_t *, void *));
-int		pthread_attr_setdetachstate __P((pthread_attr_t *, int));
-void		pthread_cleanup_pop __P((int));
-void		pthread_cleanup_push __P((void (*) (void *),
-			void *routine_arg));
-int		pthread_condattr_destroy __P((pthread_condattr_t *));
-int		pthread_condattr_init __P((pthread_condattr_t *));
+			size_t * __restrict stacksize);
+int		pthread_attr_getstacksize (const pthread_attr_t *,
+			size_t *);
+int		pthread_attr_getstackaddr (const pthread_attr_t *,
+			void **);
+int		pthread_attr_getdetachstate (const pthread_attr_t *,
+			int *);
+int		pthread_attr_init (pthread_attr_t *);
+int		pthread_attr_setstack (pthread_attr_t *, void *, size_t);
+int		pthread_attr_setstacksize (pthread_attr_t *, size_t);
+int		pthread_attr_setstackaddr (pthread_attr_t *, void *);
+int		pthread_attr_setdetachstate (pthread_attr_t *, int);
+void		pthread_cleanup_pop (int);
+void		pthread_cleanup_push (void (*) (void *),
+			void *routine_arg);
+int		pthread_condattr_destroy (pthread_condattr_t *);
+int		pthread_condattr_init (pthread_condattr_t *);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_condattr_getpshared __P((pthread_condattr_t *,
-			int *));
-int		pthread_condattr_setpshared __P((pthread_condattr_t *,
-			int));
+int		pthread_condattr_getpshared (pthread_condattr_t *,
+			int *);
+int		pthread_condattr_setpshared (pthread_condattr_t *,
+			int);
 #endif
 
-int		pthread_cond_broadcast __P((pthread_cond_t *));
-int		pthread_cond_destroy __P((pthread_cond_t *));
-int		pthread_cond_init __P((pthread_cond_t *,
-			const pthread_condattr_t *));
-int		pthread_cond_signal __P((pthread_cond_t *));
-int		pthread_cond_timedwait __P((pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec *));
-int		pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *));
-int		pthread_create __P((pthread_t *, const pthread_attr_t *,
-			void *(*) (void *), void *));
-int		pthread_detach __P((pthread_t));
-int		pthread_equal __P((pthread_t, pthread_t));
-void		pthread_exit __P((void *)) __dead2;
-void		*pthread_getspecific __P((pthread_key_t));
-int		pthread_join __P((pthread_t, void **));
-int		pthread_key_create __P((pthread_key_t *,
-			void (*) (void *)));
-int		pthread_key_delete __P((pthread_key_t));
-int		pthread_kill __P((pthread_t, int));
-int		pthread_mutexattr_init __P((pthread_mutexattr_t *));
-int		pthread_mutexattr_destroy __P((pthread_mutexattr_t *));
-int		pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *));
-int		pthread_mutexattr_settype __P((pthread_mutexattr_t *, int));
-int		pthread_mutex_destroy __P((pthread_mutex_t *));
-int		pthread_mutex_init __P((pthread_mutex_t *,
-			const pthread_mutexattr_t *));
-int		pthread_mutex_lock __P((pthread_mutex_t *));
-int		pthread_mutex_trylock __P((pthread_mutex_t *));
-int		pthread_mutex_unlock __P((pthread_mutex_t *));
-int		pthread_once __P((pthread_once_t *,
-			void (*) (void)));
-int		pthread_rwlock_destroy __P((pthread_rwlock_t *));
-int		pthread_rwlock_init __P((pthread_rwlock_t *,
-			const pthread_rwlockattr_t *));
-int		pthread_rwlock_rdlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_tryrdlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_trywrlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_unlock __P((pthread_rwlock_t *));
-int		pthread_rwlock_wrlock __P((pthread_rwlock_t *));
-int		pthread_rwlockattr_init __P((pthread_rwlockattr_t *));
-int		pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *,
-			int *));
-int		pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *,
-			int));
-int		pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *));
-pthread_t	pthread_self __P((void));
-int		pthread_setspecific __P((pthread_key_t, const void *));
-int		pthread_sigmask __P((int, const sigset_t *, sigset_t *));
-
-int		pthread_cancel __P((pthread_t));
-int		pthread_setcancelstate __P((int, int *));
-int		pthread_setcanceltype __P((int, int *));
-void		pthread_testcancel __P((void));
-
-int		pthread_getprio __P((pthread_t));
-int		pthread_setprio __P((pthread_t, int));
-void		pthread_yield __P((void));
+int		pthread_cond_broadcast (pthread_cond_t *);
+int		pthread_cond_destroy (pthread_cond_t *);
+int		pthread_cond_init (pthread_cond_t *,
+			const pthread_condattr_t *);
+int		pthread_cond_signal (pthread_cond_t *);
+int		pthread_cond_timedwait (pthread_cond_t *,
+			pthread_mutex_t *, const struct timespec *);
+int		pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *);
+int		pthread_create (pthread_t *, const pthread_attr_t *,
+			void *(*) (void *), void *);
+int		pthread_detach (pthread_t);
+int		pthread_equal (pthread_t, pthread_t);
+void		pthread_exit (void *) __dead2;
+void		*pthread_getspecific (pthread_key_t);
+int		pthread_join (pthread_t, void **);
+int		pthread_key_create (pthread_key_t *,
+			void (*) (void *));
+int		pthread_key_delete (pthread_key_t);
+int		pthread_kill (pthread_t, int);
+int		pthread_mutexattr_init (pthread_mutexattr_t *);
+int		pthread_mutexattr_destroy (pthread_mutexattr_t *);
+int		pthread_mutexattr_gettype (pthread_mutexattr_t *, int *);
+int		pthread_mutexattr_settype (pthread_mutexattr_t *, int);
+int		pthread_mutex_destroy (pthread_mutex_t *);
+int		pthread_mutex_init (pthread_mutex_t *,
+			const pthread_mutexattr_t *);
+int		pthread_mutex_lock (pthread_mutex_t *);
+int		pthread_mutex_trylock (pthread_mutex_t *);
+int		pthread_mutex_unlock (pthread_mutex_t *);
+int		pthread_once (pthread_once_t *,
+			void (*) (void));
+int		pthread_rwlock_destroy (pthread_rwlock_t *);
+int		pthread_rwlock_init (pthread_rwlock_t *,
+			const pthread_rwlockattr_t *);
+int		pthread_rwlock_rdlock (pthread_rwlock_t *);
+int		pthread_rwlock_tryrdlock (pthread_rwlock_t *);
+int		pthread_rwlock_trywrlock (pthread_rwlock_t *);
+int		pthread_rwlock_unlock (pthread_rwlock_t *);
+int		pthread_rwlock_wrlock (pthread_rwlock_t *);
+int		pthread_rwlockattr_init (pthread_rwlockattr_t *);
+int		pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *,
+			int *);
+int		pthread_rwlockattr_setpshared (pthread_rwlockattr_t *,
+			int);
+int		pthread_rwlockattr_destroy (pthread_rwlockattr_t *);
+pthread_t	pthread_self (void);
+int		pthread_setspecific (pthread_key_t, const void *);
+int		pthread_sigmask (int, const sigset_t *, sigset_t *);
+
+int		pthread_cancel (pthread_t);
+int		pthread_setcancelstate (int, int *);
+int		pthread_setcanceltype (int, int *);
+void		pthread_testcancel (void);
+
+int		pthread_getprio (pthread_t);
+int		pthread_setprio (pthread_t, int);
+void		pthread_yield (void);
 
 #if defined(_POSIX_THREAD_PROCESS_SHARED)
-int		pthread_mutexattr_getpshared __P((pthread_mutexattr_t *,
-			int *pshared));
-int		pthread_mutexattr_setpshared __P((pthread_mutexattr_t *,
-			int pshared));
+int		pthread_mutexattr_getpshared (pthread_mutexattr_t *,
+			int *pshared);
+int		pthread_mutexattr_setpshared (pthread_mutexattr_t *,
+			int pshared);
 #endif
 
-int		pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *,
-			int *));
-int		pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *,
-			int));
-int		pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *));
-int		pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *));
-
-int		pthread_mutexattr_getprotocol __P((pthread_mutexattr_t *,
-			int *));
-int		pthread_mutexattr_setprotocol __P((pthread_mutexattr_t *,
-			int));
-
-int		pthread_attr_getinheritsched __P((const pthread_attr_t *, int *));
-int		pthread_attr_getschedparam __P((const pthread_attr_t *,
-			struct sched_param *));
-int		pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *));
-int		pthread_attr_getscope __P((const pthread_attr_t *, int *));
-int		pthread_attr_setinheritsched __P((pthread_attr_t *, int));
-int		pthread_attr_setschedparam __P((pthread_attr_t *,
-			const struct sched_param *));
-int		pthread_attr_setschedpolicy __P((pthread_attr_t *, int));
-int		pthread_attr_setscope __P((pthread_attr_t *, int));
-int		pthread_getschedparam __P((pthread_t pthread, int *,
-			struct sched_param *));
-int		pthread_setschedparam __P((pthread_t, int,
-			const struct sched_param *));
-int		pthread_getconcurrency __P((void));
-int		pthread_setconcurrency __P((int));
+int		pthread_mutexattr_getprioceiling (pthread_mutexattr_t *,
+			int *);
+int		pthread_mutexattr_setprioceiling (pthread_mutexattr_t *,
+			int);
+int		pthread_mutex_getprioceiling (pthread_mutex_t *, int *);
+int		pthread_mutex_setprioceiling (pthread_mutex_t *, int, int *);
+
+int		pthread_mutexattr_getprotocol (pthread_mutexattr_t *,
+			int *);
+int		pthread_mutexattr_setprotocol (pthread_mutexattr_t *,
+			int);
+
+int		pthread_attr_getinheritsched (const pthread_attr_t *, int *);
+int		pthread_attr_getschedparam (const pthread_attr_t *,
+			struct sched_param *);
+int		pthread_attr_getschedpolicy (const pthread_attr_t *, int *);
+int		pthread_attr_getscope (const pthread_attr_t *, int *);
+int		pthread_attr_setinheritsched (pthread_attr_t *, int);
+int		pthread_attr_setschedparam (pthread_attr_t *,
+			const struct sched_param *);
+int		pthread_attr_setschedpolicy (pthread_attr_t *, int);
+int		pthread_attr_setscope (pthread_attr_t *, int);
+int		pthread_getschedparam (pthread_t pthread, int *,
+			struct sched_param *);
+int		pthread_setschedparam (pthread_t, int,
+			const struct sched_param *);
+int		pthread_getconcurrency (void);
+int		pthread_setconcurrency (int);
 
-int		pthread_attr_setfloatstate __P((pthread_attr_t *, int));
-int		pthread_attr_getfloatstate __P((pthread_attr_t *, int *));
+int		pthread_attr_setfloatstate (pthread_attr_t *, int);
+int		pthread_attr_getfloatstate (pthread_attr_t *, int *);
 __END_DECLS
 
 #endif
Index: include/pthread_np.h
===================================================================
RCS file: /home/dcvs/src/include/pthread_np.h,v
retrieving revision 1.2
diff -u -r1.2 pthread_np.h
--- include/pthread_np.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/pthread_np.h	13 Nov 2003 02:00:44 -0000
@@ -38,26 +38,26 @@
 /*
  * Non-POSIX type definitions:
  */
-typedef void	(*pthread_switch_routine_t) __P((pthread_t, pthread_t));
+typedef void	(*pthread_switch_routine_t) (pthread_t, pthread_t);
 
 /*
  * Non-POSIX thread function prototype definitions:
  */
 __BEGIN_DECLS
-int pthread_attr_setcreatesuspend_np __P((pthread_attr_t *));
-int pthread_attr_get_np __P((pthread_t, pthread_attr_t *));
-int pthread_main_np __P((void));
-int pthread_multi_np __P((void));
-int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t));
-int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int));
-void pthread_resume_all_np __P((void));
-int pthread_resume_np __P((pthread_t));
-void pthread_set_name_np __P((pthread_t, const char *));
-int pthread_single_np __P((void));
-void pthread_suspend_all_np __P((void));
-int pthread_suspend_np __P((pthread_t));
-int pthread_switch_add_np __P((pthread_switch_routine_t));
-int pthread_switch_delete_np __P((pthread_switch_routine_t));
+int pthread_attr_setcreatesuspend_np (pthread_attr_t *);
+int pthread_attr_get_np (pthread_t, pthread_attr_t *);
+int pthread_main_np (void);
+int pthread_multi_np (void);
+int pthread_mutexattr_getkind_np (pthread_mutexattr_t);
+int pthread_mutexattr_setkind_np (pthread_mutexattr_t *, int);
+void pthread_resume_all_np (void);
+int pthread_resume_np (pthread_t);
+void pthread_set_name_np (pthread_t, const char *);
+int pthread_single_np (void);
+void pthread_suspend_all_np (void);
+int pthread_suspend_np (pthread_t);
+int pthread_switch_add_np (pthread_switch_routine_t);
+int pthread_switch_delete_np (pthread_switch_routine_t);
 __END_DECLS
 
 #endif
Index: include/pwd.h
===================================================================
RCS file: /home/dcvs/src/include/pwd.h,v
retrieving revision 1.1
diff -u -r1.1 pwd.h
--- include/pwd.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/pwd.h	13 Nov 2003 02:00:44 -0000
@@ -98,13 +98,13 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct passwd	*getpwuid __P((uid_t));
-struct passwd	*getpwnam __P((const char *));
+struct passwd	*getpwuid (uid_t);
+struct passwd	*getpwnam (const char *);
 #ifndef _POSIX_SOURCE
-struct passwd	*getpwent __P((void));
-int		 setpassent __P((int));
-void		 setpwent __P((void));
-void		 endpwent __P((void));
+struct passwd	*getpwent (void);
+int		 setpassent (int);
+void		 setpwent (void);
+void		 endpwent (void);
 #endif
 __END_DECLS
 
Index: include/regex.h
===================================================================
RCS file: /home/dcvs/src/include/regex.h,v
retrieving revision 1.1
diff -u -r1.1 regex.h
--- include/regex.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/regex.h	13 Nov 2003 02:00:44 -0000
@@ -96,11 +96,11 @@
 #define	REG_BACKR	02000	/* force use of backref code */
 
 __BEGIN_DECLS
-int	regcomp __P((regex_t *, const char *, int));
-size_t	regerror __P((int, const regex_t *, char *, size_t));
-int	regexec __P((const regex_t *,
-	    const char *, size_t, regmatch_t [], int));
-void	regfree __P((regex_t *));
+int	regcomp (regex_t *, const char *, int);
+size_t	regerror (int, const regex_t *, char *, size_t);
+int	regexec (const regex_t *,
+	    const char *, size_t, regmatch_t [], int);
+void	regfree (regex_t *);
 __END_DECLS
 
 #endif /* !_REGEX_H_ */
Index: include/regexp.h
===================================================================
RCS file: /home/dcvs/src/include/regexp.h,v
retrieving revision 1.1
diff -u -r1.1 regexp.h
--- include/regexp.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/regexp.h	13 Nov 2003 02:00:44 -0000
@@ -60,10 +60,10 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-regexp *regcomp __P((const char *));
-int regexec __P((const  regexp *, const char *));
-void regsub __P((const  regexp *, const char *, char *));
-void regerror __P((const char *));
+regexp *regcomp (const char *);
+int regexec (const  regexp *, const char *);
+void regsub (const  regexp *, const char *, char *);
+void regerror (const char *);
 __END_DECLS
 
 #endif /* !_REGEXP_H_ */
Index: include/resolv.h
===================================================================
RCS file: /home/dcvs/src/include/resolv.h,v
retrieving revision 1.2
diff -u -r1.2 resolv.h
--- include/resolv.h	17 Jun 2003 04:25:56 -0000	1.2
+++ include/resolv.h	13 Nov 2003 02:00:44 -0000
@@ -179,19 +179,19 @@
 typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
 	res_sendhookact;
 
-typedef res_sendhookact (*res_send_qhook)__P((struct sockaddr_in * const *ns,
+typedef res_sendhookact (*res_send_qhook)(struct sockaddr_in * const *ns,
 					      const u_char **query,
 					      int *querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
-typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
+typedef res_sendhookact (*res_send_rhook)(const struct sockaddr_in *ns,
 					      const u_char *query,
 					      int querylen,
 					      u_char *ans,
 					      int anssiz,
-					      int *resplen));
+					      int *resplen);
 
 struct res_sym {
 	int	number;		/* Identifying number, like T_MX */
@@ -258,63 +258,63 @@
 #define	res_freeupdrec	__res_freeupdrec
 
 __BEGIN_DECLS
-int		res_hnok __P((const char *));
-int		res_ownok __P((const char *));
-int		res_mailok __P((const char *));
-int		res_dnok __P((const char *));
-int		sym_ston __P((const struct res_sym *, const char *, int *));
-const char *	sym_ntos __P((const struct res_sym *, int, int *));
-const char *	sym_ntop __P((const struct res_sym *, int, int *));
-int		b64_ntop __P((u_char const *, size_t, char *, size_t));
-int		b64_pton __P((char const *, u_char *, size_t));
-int		loc_aton __P((const char *, u_char *));
-const char *	loc_ntoa __P((const u_char *, char *));
-int		dn_skipname __P((const u_char *, const u_char *));
-void		fp_resstat __P((struct __res_state *, FILE *));
-void		fp_query __P((const u_char *, FILE *));
-void		fp_nquery __P((const u_char *, int, FILE *));
-const char *	hostalias __P((const char *));
-void		putlong __P((u_int32_t, u_char *));
-void		putshort __P((u_int16_t, u_char *));
-const char *	p_class __P((int));
-const char *	p_time __P((u_int32_t));
-const char *	p_type __P((int));
-void		p_query __P((const u_char *));
-const u_char *	p_cdnname __P((const u_char *, const u_char *, int, FILE *));
-const u_char *	p_cdname __P((const u_char *, const u_char *, FILE *));
-const u_char *	p_fqnname __P((const u_char *, const u_char *,
-			       int, char *, int));
-const u_char *	p_fqname __P((const u_char *, const u_char *, FILE *));
-const char *	p_option __P((u_long));
-char *		p_secstodate __P((u_long));
-int		dn_count_labels __P((const char *));
-int		dn_comp __P((const char *, u_char *, int,
-			     u_char **, u_char **));
-int		dn_expand __P((const u_char *, const u_char *, const u_char *,
-			       char *, int));
-int		res_init __P((void));
-u_int		res_randomid __P((void));
-int		res_query __P((const char *, int, int, u_char *, int));
-int		res_search __P((const char *, int, int, u_char *, int));
-int		res_querydomain __P((const char *, const char *, int, int,
-				     u_char *, int));
-int		res_mkquery __P((int, const char *, int, int, const u_char *,
-				 int, const u_char *, u_char *, int));
-int		res_send __P((const u_char *, int, u_char *, int));
-int		res_isourserver __P((const struct sockaddr_in *));
-int		res_nameinquery __P((const char *, int, int,
-				     const u_char *, const u_char *));
-int		res_queriesmatch __P((const u_char *, const u_char *,
-				      const u_char *, const u_char *));
-void		res_close __P((void));
-int		res_opt __P((int, u_char *, int, int));
-const char *	p_section __P((int, int));
+int		res_hnok (const char *);
+int		res_ownok (const char *);
+int		res_mailok (const char *);
+int		res_dnok (const char *);
+int		sym_ston (const struct res_sym *, const char *, int *);
+const char *	sym_ntos (const struct res_sym *, int, int *);
+const char *	sym_ntop (const struct res_sym *, int, int *);
+int		b64_ntop (u_char const *, size_t, char *, size_t);
+int		b64_pton (char const *, u_char *, size_t);
+int		loc_aton (const char *, u_char *);
+const char *	loc_ntoa (const u_char *, char *);
+int		dn_skipname (const u_char *, const u_char *);
+void		fp_resstat (struct __res_state *, FILE *);
+void		fp_query (const u_char *, FILE *);
+void		fp_nquery (const u_char *, int, FILE *);
+const char *	hostalias (const char *);
+void		putlong (u_int32_t, u_char *);
+void		putshort (u_int16_t, u_char *);
+const char *	p_class (int);
+const char *	p_time (u_int32_t);
+const char *	p_type (int);
+void		p_query (const u_char *);
+const u_char *	p_cdnname (const u_char *, const u_char *, int, FILE *);
+const u_char *	p_cdname (const u_char *, const u_char *, FILE *);
+const u_char *	p_fqnname (const u_char *, const u_char *,
+			       int, char *, int);
+const u_char *	p_fqname (const u_char *, const u_char *, FILE *);
+const char *	p_option (u_long);
+char *		p_secstodate (u_long);
+int		dn_count_labels (const char *);
+int		dn_comp (const char *, u_char *, int,
+			     u_char **, u_char **);
+int		dn_expand (const u_char *, const u_char *, const u_char *,
+			       char *, int);
+int		res_init (void);
+u_int		res_randomid (void);
+int		res_query (const char *, int, int, u_char *, int);
+int		res_search (const char *, int, int, u_char *, int);
+int		res_querydomain (const char *, const char *, int, int,
+				     u_char *, int);
+int		res_mkquery (int, const char *, int, int, const u_char *,
+				 int, const u_char *, u_char *, int);
+int		res_send (const u_char *, int, u_char *, int);
+int		res_isourserver (const struct sockaddr_in *);
+int		res_nameinquery (const char *, int, int,
+				     const u_char *, const u_char *);
+int		res_queriesmatch (const u_char *, const u_char *,
+				      const u_char *, const u_char *);
+void		res_close (void);
+int		res_opt (int, u_char *, int, int);
+const char *	p_section (int, int);
 /* XXX The following depend on the ns_updrec typedef in arpa/nameser.h */
 #ifdef _ARPA_NAMESER_H_
-int		res_update __P((ns_updrec *));
-int		res_mkupdate __P((ns_updrec *, u_char *, int));
-ns_updrec *	res_mkupdrec __P((int, const char *, u_int, u_int, u_long));
-void		res_freeupdrec __P((ns_updrec *));
+int		res_update (ns_updrec *);
+int		res_mkupdate (ns_updrec *, u_char *, int);
+ns_updrec *	res_mkupdrec (int, const char *, u_int, u_int, u_long);
+void		res_freeupdrec (ns_updrec *);
 #endif
 __END_DECLS
 
Index: include/rune.h
===================================================================
RCS file: /home/dcvs/src/include/rune.h,v
retrieving revision 1.1
diff -u -r1.1 rune.h
--- include/rune.h	17 Jun 2003 02:50:24 -0000	1.1
+++ include/rune.h	13 Nov 2003 02:00:44 -0000
@@ -53,14 +53,14 @@
 #define sputrune(c, s, n, r)    (*__sputrune)((c), (s), (n), (r))
 
 __BEGIN_DECLS
-char	*mbrune __P((const char *, rune_t));
-char	*mbrrune __P((const char *, rune_t));
-char	*mbmb __P((const char *, char *));
-long	 fgetrune __P((FILE *));
-int	 fputrune __P((rune_t, FILE *));
-int	 fungetrune __P((rune_t, FILE *));
-int	 setrunelocale __P((char *));
-void	 setinvalidrune __P((rune_t));
+char	*mbrune (const char *, rune_t);
+char	*mbrrune (const char *, rune_t);
+long	 fgetrune (FILE *);
+int	 fputrune (rune_t, FILE *);
+int	 fungetrune (rune_t, FILE *);
+int	 setrunelocale (char *);
+void	 setinvalidrune (rune_t);
 __END_DECLS
 
 #endif	/*! _RUNE_H_ */
Index: include/runetype.h
===================================================================
RCS file: /home/dcvs/src/include/runetype.h,v
retrieving revision 1.3
diff -u -r1.3 runetype.h
--- include/runetype.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/runetype.h	13 Nov 2003 02:00:44 -0000
@@ -80,9 +80,9 @@
 	char		encoding[32];	/* ASCII name of this encoding */
 
 	rune_t		(*sgetrune)
-	    __P((const char *, __size_t, char const **));
+	    (const char *, __size_t, char const **);
 	int		(*sputrune)
-	    __P((rune_t, char *, __size_t, char **));
+	    (rune_t, char *, __size_t, char **);
 	rune_t		invalid_rune;
 
 	unsigned long	runetype[_CACHED_RUNES];
Index: include/search.h
===================================================================
RCS file: /home/dcvs/src/include/search.h,v
retrieving revision 1.3
diff -u -r1.3 search.h
--- include/search.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/search.h	13 Nov 2003 02:00:44 -0000
@@ -42,16 +42,16 @@
 #endif
 
 __BEGIN_DECLS
-int	 hcreate __P((size_t));
-void	 hdestroy __P((void));
-ENTRY	*hsearch __P((ENTRY, ACTION));
-void	*tdelete __P((const void *, void **,
-		      int (*)(const void *, const void *)));
-void	*tfind __P((const void *, void **,
-		      int (*)(const void *, const void *)));
-void	*tsearch __P((const void *, void **, 
-		      int (*)(const void *, const void *)));
-void      twalk __P((const void *, void (*)(const void *, VISIT, int)));
+int	 hcreate (size_t);
+void	 hdestroy (void);
+ENTRY	*hsearch (ENTRY, ACTION);
+void	*tdelete (const void *, void **,
+		      int (*)(const void *, const void *));
+void	*tfind (const void *, void **,
+		      int (*)(const void *, const void *));
+void	*tsearch (const void *, void **, 
+		      int (*)(const void *, const void *));
+void      twalk (const void *, void (*)(const void *, VISIT, int));
 __END_DECLS
 
 #endif /* !_SEARCH_H_ */
Index: include/setjmp.h
===================================================================
RCS file: /home/dcvs/src/include/setjmp.h,v
retrieving revision 1.1
diff -u -r1.1 setjmp.h
--- include/setjmp.h	17 Jun 2003 02:50:25 -0000	1.1
+++ include/setjmp.h	13 Nov 2003 02:00:44 -0000
@@ -47,18 +47,18 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	setjmp __P((jmp_buf));
-void	longjmp __P((jmp_buf, int)) __dead2;
+int	setjmp (jmp_buf);
+void	longjmp (jmp_buf, int) __dead2;
 
 #ifndef _ANSI_SOURCE
-int	sigsetjmp __P((sigjmp_buf, int));
-void	siglongjmp __P((sigjmp_buf, int)) __dead2;
+int	sigsetjmp (sigjmp_buf, int);
+void	siglongjmp (sigjmp_buf, int) __dead2;
 #endif /* not ANSI */
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	_setjmp __P((jmp_buf));
-void	_longjmp __P((jmp_buf, int)) __dead2;
-void	longjmperror __P((void));
+int	_setjmp (jmp_buf);
+void	_longjmp (jmp_buf, int) __dead2;
+void	longjmperror (void);
 #endif /* neither ANSI nor POSIX */
 __END_DECLS
 
Index: include/signal.h
===================================================================
RCS file: /home/dcvs/src/include/signal.h,v
retrieving revision 1.3
diff -u -r1.3 signal.h
--- include/signal.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/signal.h	13 Nov 2003 02:00:44 -0000
@@ -54,41 +54,41 @@
 #endif
 
 __BEGIN_DECLS
-int	raise __P((int));
+int	raise (int);
 #ifndef	_ANSI_SOURCE
-int	kill __P((__pid_t, int));
-int	sigaction __P((int, const struct sigaction *, struct sigaction *));
-int	sigaddset __P((sigset_t *, int));
-int	sigdelset __P((sigset_t *, int));
-int	sigemptyset __P((sigset_t *));
-int	sigfillset __P((sigset_t *));
-int	sigismember __P((const sigset_t *, int));
-int	sigpending __P((sigset_t *));
-int	sigprocmask __P((int, const sigset_t *, sigset_t *));
-int	sigsuspend __P((const sigset_t *));
-int	sigwait __P((const sigset_t *, int *));
+int	kill (__pid_t, int);
+int	sigaction (int, const struct sigaction *, struct sigaction *);
+int	sigaddset (sigset_t *, int);
+int	sigdelset (sigset_t *, int);
+int	sigemptyset (sigset_t *);
+int	sigfillset (sigset_t *);
+int	sigismember (const sigset_t *, int);
+int	sigpending (sigset_t *);
+int	sigprocmask (int, const sigset_t *, sigset_t *);
+int	sigsuspend (const sigset_t *);
+int	sigwait (const sigset_t *, int *);
 
 
 #ifdef _P1003_1B_VISIBLE
 
 __BEGIN_DECLS
-int sigqueue __P((__pid_t, int, const union sigval));
-int sigtimedwait __P((const sigset_t *, siginfo_t *, const struct timespec *));
-int sigwaitinfo __P((const sigset_t *, siginfo_t *));
+int sigqueue (__pid_t, int, const union sigval);
+int sigtimedwait (const sigset_t *, siginfo_t *, const struct timespec *);
+int sigwaitinfo (const sigset_t *, siginfo_t *);
 __END_DECLS
 
 #endif
 #ifndef _POSIX_SOURCE
-int	killpg __P((__pid_t, int));
-int	sigaltstack __P((const stack_t *, stack_t *)); 
-int	sigblock __P((int));
-int	siginterrupt __P((int, int));
-int	sigpause __P((int));
-int	sigreturn __P((ucontext_t *));
-int	sigsetmask __P((int));
-int	sigstack __P((const struct sigstack *, struct sigstack *));
-int	sigvec __P((int, struct sigvec *, struct sigvec *));
-void	psignal __P((unsigned int, const char *));
+int	killpg (__pid_t, int);
+int	sigaltstack (const stack_t *, stack_t *); 
+int	sigblock (int);
+int	siginterrupt (int, int);
+int	sigpause (int);
+int	sigreturn (ucontext_t *);
+int	sigsetmask (int);
+int	sigstack (const struct sigstack *, struct sigstack *);
+int	sigvec (int, struct sigvec *, struct sigvec *);
+void	psignal (unsigned int, const char *);
 #endif /* !_POSIX_SOURCE */
 #endif /* !_ANSI_SOURCE */
 __END_DECLS
Index: include/stdio.h
===================================================================
RCS file: /home/dcvs/src/include/stdio.h,v
retrieving revision 1.3
diff -u -r1.3 stdio.h
--- include/stdio.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/stdio.h	13 Nov 2003 02:00:44 -0000
@@ -111,10 +111,10 @@
 
 	/* operations */
 	void	*_cookie;	/* cookie passed to io functions */
-	int	(*_close) __P((void *));
-	int	(*_read)  __P((void *, char *, int));
-	fpos_t	(*_seek)  __P((void *, fpos_t, int));
-	int	(*_write) __P((void *, const char *, int));
+	int	(*_close) (void *);
+	int	(*_read)  (void *, char *, int);
+	fpos_t	(*_seek)  (void *, fpos_t, int);
+	int	(*_write) (void *, const char *, int);
 
 	/* separate buffer for long sequences of ungetc() */
 	struct	__sbuf _ub;	/* ungetc buffer */
@@ -204,51 +204,51 @@
  * Functions defined in ANSI C standard.
  */
 __BEGIN_DECLS
-void	 clearerr __P((FILE *));
-int	 fclose __P((FILE *));
-int	 feof __P((FILE *));
-int	 ferror __P((FILE *));
-int	 fflush __P((FILE *));
-int	 fgetc __P((FILE *));
-int	 fgetpos __P((FILE *, fpos_t *));
-char	*fgets __P((char *, int, FILE *));
-FILE	*fopen __P((const char *, const char *));
-int	 fprintf __P((FILE *, const char *, ...));
-int	 fputc __P((int, FILE *));
-int	 fputs __P((const char *, FILE *));
-size_t fread __P((void *, size_t, size_t, FILE *));
-FILE	*freopen __P((const char *, const char *, FILE *));
-int	 fscanf __P((FILE *, const char *, ...));
-int	 fseek __P((FILE *, long, int));
-int	 fsetpos __P((FILE *, const fpos_t *));
-long	 ftell __P((FILE *));
-size_t fwrite __P((const void *, size_t, size_t, FILE *));
-int	 getc __P((FILE *));
-int	 getchar __P((void));
-char	*gets __P((char *));
+void	 clearerr (FILE *);
+int	 fclose (FILE *);
+int	 feof (FILE *);
+int	 ferror (FILE *);
+int	 fflush (FILE *);
+int	 fgetc (FILE *);
+int	 fgetpos (FILE *, fpos_t *);
+char	*fgets (char *, int, FILE *);
+FILE	*fopen (const char *, const char *);
+int	 fprintf (FILE *, const char *, ...);
+int	 fputc (int, FILE *);
+int	 fputs (const char *, FILE *);
+size_t fread (void *, size_t, size_t, FILE *);
+FILE	*freopen (const char *, const char *, FILE *);
+int	 fscanf (FILE *, const char *, ...);
+int	 fseek (FILE *, long, int);
+int	 fsetpos (FILE *, const fpos_t *);
+long	 ftell (FILE *);
+size_t fwrite (const void *, size_t, size_t, FILE *);
+int	 getc (FILE *);
+int	 getchar (void);
+char	*gets (char *);
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern __const int sys_nerr;		/* perror(3) external variables */
 extern __const char *__const sys_errlist[];
 #endif
-void	 perror __P((const char *));
-int	 printf __P((const char *, ...));
-int	 putc __P((int, FILE *));
-int	 putchar __P((int));
-int	 puts __P((const char *));
-int	 remove __P((const char *));
-int	 rename  __P((const char *, const char *));
-void	 rewind __P((FILE *));
-int	 scanf __P((const char *, ...));
-void	 setbuf __P((FILE *, char *));
-int	 setvbuf __P((FILE *, char *, int, size_t));
-int	 sprintf __P((char *, const char *, ...));
-int	 sscanf __P((const char *, const char *, ...));
-FILE	*tmpfile __P((void));
-char	*tmpnam __P((char *));
-int	 ungetc __P((int, FILE *));
-int	 vfprintf __P((FILE *, const char *, __va_list));
-int	 vprintf __P((const char *, __va_list));
-int	 vsprintf __P((char *, const char *, __va_list));
+void	 perror (const char *);
+int	 printf (const char *, ...);
+int	 putc (int, FILE *);
+int	 putchar (int);
+int	 puts (const char *);
+int	 remove (const char *);
+int	 rename  (const char *, const char *);
+void	 rewind (FILE *);
+int	 scanf (const char *, ...);
+void	 setbuf (FILE *, char *);
+int	 setvbuf (FILE *, char *, int, size_t);
+int	 sprintf (char *, const char *, ...);
+int	 sscanf (const char *, const char *, ...);
+FILE	*tmpfile (void);
+char	*tmpnam (char *);
+int	 ungetc (int, FILE *);
+int	 vfprintf (FILE *, const char *, __va_list);
+int	 vprintf (const char *, __va_list);
+int	 vsprintf (char *, const char *, __va_list);
 __END_DECLS
 
 /*
@@ -261,12 +261,12 @@
 #define	L_ctermid	1024	/* size for ctermid(3); PATH_MAX */
 
 __BEGIN_DECLS
-char	*ctermid __P((char *));
-FILE	*fdopen __P((int, const char *));
-int	 fileno __P((FILE *));
-int	 ftrylockfile __P((FILE *));
-void	 flockfile __P((FILE *));
-void	 funlockfile __P((FILE *));
+char	*ctermid (char *);
+FILE	*fdopen (int, const char *);
+int	 fileno (FILE *);
+int	 ftrylockfile (FILE *);
+void	 flockfile (FILE *);
+void	 funlockfile (FILE *);
 __END_DECLS
 #endif /* not ANSI */
 
@@ -277,19 +277,19 @@
 __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 /* !_ANSI_SOURCE && !_POSIX_SOURCE */
@@ -299,32 +299,32 @@
  */
 #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 __BEGIN_DECLS
-int	 asprintf __P((char **, const char *, ...)) __printflike(2, 3);
-char	*ctermid_r __P((char *));
-char	*fgetln __P((FILE *, size_t *));
+int	 asprintf (char **, const char *, ...) __printflike(2, 3);
+char	*ctermid_r (char *);
+char	*fgetln (FILE *, size_t *);
 #if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
 #define	__ATTR_FORMAT_ARG	__attribute__((__format_arg__(2)))
 #else
 #define	__ATTR_FORMAT_ARG
 #endif
-__const char *fmtcheck __P((const char *, const char *)) __ATTR_FORMAT_ARG;
-int	 fpurge __P((FILE *));
-int	 fseeko __P((FILE *, __off_t, int));
-__off_t ftello __P((FILE *));
-int	 getw __P((FILE *));
-int	 pclose __P((FILE *));
-FILE	*popen __P((const char *, const char *));
-int	 putw __P((int, FILE *));
-void	 setbuffer __P((FILE *, char *, int));
-int	 setlinebuf __P((FILE *));
-char	*tempnam __P((const char *, const char *));
-int	 snprintf __P((char *, size_t, const char *, ...)) __printflike(3, 4);
-int	 vasprintf __P((char **, const char *, __va_list))
+__const char *fmtcheck (const char *, const char *) __ATTR_FORMAT_ARG;
+int	 fpurge (FILE *);
+int	 fseeko (FILE *, __off_t, int);
+__off_t ftello (FILE *);
+int	 getw (FILE *);
+int	 pclose (FILE *);
+FILE	*popen (const char *, const char *);
+int	 putw (int, FILE *);
+void	 setbuffer (FILE *, char *, int);
+int	 setlinebuf (FILE *);
+char	*tempnam (const char *, const char *);
+int	 snprintf (char *, size_t, const char *, ...) __printflike(3, 4);
+int	 vasprintf (char **, const char *, __va_list)
 	    __printflike(2, 0);
-int	 vsnprintf __P((char *, size_t, const char *, __va_list))
+int	 vsnprintf (char *, size_t, const char *, __va_list)
 	    __printflike(3, 0);
-int	 vscanf __P((const char *, __va_list)) __scanflike(1, 0);
-int	 vsscanf __P((const char *, const char *, __va_list))
+int	 vscanf (const char *, __va_list) __scanflike(1, 0);
+int	 vsscanf (const char *, const char *, __va_list)
 	    __scanflike(2, 0);
 __END_DECLS
 
@@ -339,11 +339,11 @@
  * Stdio function-access interface.
  */
 __BEGIN_DECLS
-FILE	*funopen __P((const void *,
+FILE	*funopen (const void *,
 		int (*)(void *, char *, int),
 		int (*)(void *, const char *, int),
 		fpos_t (*)(void *, fpos_t, int),
-		int (*)(void *)));
+		int (*)(void *));
 __END_DECLS
 #define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
 #define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
@@ -353,9 +353,9 @@
  * Functions internal to the implementation.
  */
 __BEGIN_DECLS
-int	__srget __P((FILE *));
-int	__svfscanf __P((FILE *, const char *, __va_list));
-int	__swbuf __P((int, FILE *));
+int	__srget (FILE *);
+int	__svfscanf (FILE *, const char *, __va_list);
+int	__swbuf (int, FILE *);
 __END_DECLS
 
 /*
@@ -415,7 +415,7 @@
 #define	getc_unlocked(fp)	__sgetc(fp)
 #define putc_unlocked(x, fp)	__sputc(x, fp)
 #ifdef	_THREAD_SAFE
-void	_flockfile_debug __P((FILE *, char *, int));
+void	_flockfile_debug (FILE *, char *, int);
 #ifdef	_FLOCK_DEBUG
 #define _FLOCKFILE(x)	_flockfile_debug(x, __FILE__, __LINE__)
 #else
Index: include/stdlib.h
===================================================================
RCS file: /home/dcvs/src/include/stdlib.h,v
retrieving revision 1.3
diff -u -r1.3 stdlib.h
--- include/stdlib.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/stdlib.h	13 Nov 2003 02:00:44 -0000
@@ -86,111 +86,111 @@
 #define	MB_CUR_MAX	__mb_cur_max
 
 __BEGIN_DECLS
-void	 abort __P((void)) __dead2;
-int	 abs __P((int)) __pure2;
-int	 atexit __P((void (*)(void)));
-double	 atof __P((const char *));
-int	 atoi __P((const char *));
-long	 atol __P((const char *));
-void	*bsearch __P((const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *)));
-void	*calloc __P((size_t, size_t));
-div_t	 div __P((int, int)) __pure2;
-void	 exit __P((int)) __dead2;
-void	 free __P((void *));
-char	*getenv __P((const char *));
-long	 labs __P((long)) __pure2;
-ldiv_t	 ldiv __P((long, long)) __pure2;
-void	*malloc __P((size_t));
-void	 qsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 rand __P((void));
-void	*realloc __P((void *, size_t));
-void	 srand __P((unsigned));
-double	 strtod __P((const char *, char **));
-long	 strtol __P((const char *, char **, int));
+void	 abort (void) __dead2;
+int	 abs (int) __pure2;
+int	 atexit (void (*)(void));
+double	 atof (const char *);
+int	 atoi (const char *);
+long	 atol (const char *);
+void	*bsearch (const void *, const void *, size_t,
+	    size_t, int (*)(const void *, const void *));
+void	*calloc (size_t, size_t);
+div_t	 div (int, int) __pure2;
+void	 exit (int) __dead2;
+void	 free (void *);
+char	*getenv (const char *);
+long	 labs (long) __pure2;
+ldiv_t	 ldiv (long, long) __pure2;
+void	*malloc (size_t);
+void	 qsort (void *, size_t, size_t,
+	    int (*)(const void *, const void *));
+int	 rand (void);
+void	*realloc (void *, size_t);
+void	 srand (unsigned);
+double	 strtod (const char *, char **);
+long	 strtol (const char *, char **, int);
 #ifdef __LONG_LONG_SUPPORTED
 long long	 
-	 strtoll __P((const char *, char **, int));
+	 strtoll (const char *, char **, int);
 #endif
 unsigned long
-	 strtoul __P((const char *, char **, int));
+	 strtoul (const char *, char **, int);
 #ifdef __LONG_LONG_SUPPORTED
 unsigned long long
-	 strtoull __P((const char *, char **, int));
+	 strtoull (const char *, char **, int);
 #endif
-int	 system __P((const char *));
+int	 system (const char *);
 
-int	 mblen __P((const char *, size_t));
-size_t	 mbstowcs __P((wchar_t *, const char *, size_t));
-int	 wctomb __P((char *, wchar_t));
-int	 mbtowc __P((wchar_t *, const char *, size_t));
-size_t	 wcstombs __P((char *, const wchar_t *, size_t));
+int	 mblen (const char *, size_t);
+size_t	 mbstowcs (wchar_t *, const char *, size_t);
+int	 wctomb (char *, wchar_t);
+int	 mbtowc (wchar_t *, const char *, size_t);
+size_t	 wcstombs (char *, const wchar_t *, size_t);
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	 putenv __P((const char *));
-int	 setenv __P((const char *, const char *, int));
+int	 putenv (const char *);
+int	 setenv (const char *, const char *, int);
 
-double	 drand48 __P((void));
-double	 erand48 __P((unsigned short[3]));
-long	 jrand48 __P((unsigned short[3]));
-void	 lcong48 __P((unsigned short[7]));
-long	 lrand48 __P((void));
-long	 mrand48 __P((void));
-long	 nrand48 __P((unsigned short[3]));
+double	 drand48 (void);
+double	 erand48 (unsigned short[3]);
+long	 jrand48 (unsigned short[3]);
+void	 lcong48 (unsigned short[7]);
+long	 lrand48 (void);
+long	 mrand48 (void);
+long	 nrand48 (unsigned short[3]);
 unsigned short
-	*seed48 __P((unsigned short[3]));
-void	 srand48 __P((long));
+	*seed48 (unsigned short[3]);
+void	 srand48 (long);
 
-void	*alloca __P((size_t));		/* built-in for gcc */
+void	*alloca (size_t);		/* built-in for gcc */
 					/* getcap(3) functions */
 __uint32_t
-	 arc4random __P((void));
-void	 arc4random_addrandom __P((unsigned char *dat, int datlen));
-void	 arc4random_stir __P((void));
-char	*getbsize __P((int *, long *));
-char	*cgetcap __P((char *, char *, int));
-int	 cgetclose __P((void));
-int	 cgetent __P((char **, char **, char *));
-int	 cgetfirst __P((char **, char **));
-int	 cgetmatch __P((char *, char *));
-int	 cgetnext __P((char **, char **));
-int	 cgetnum __P((char *, char *, long *));
-int	 cgetset __P((char *));
-int	 cgetstr __P((char *, char *, char **));
-int	 cgetustr __P((char *, char *, char **));
-
-int	 daemon __P((int, int));
-char	*devname __P((int, int));
-int	 getloadavg __P((double [], int));
+	 arc4random (void);
+void	 arc4random_addrandom (unsigned char *dat, int datlen);
+void	 arc4random_stir (void);
+char	*getbsize (int *, long *);
+char	*cgetcap (char *, char *, int);
+int	 cgetclose (void);
+int	 cgetent (char **, char **, char *);
+int	 cgetfirst (char **, char **);
+int	 cgetmatch (char *, char *);
+int	 cgetnext (char **, char **);
+int	 cgetnum (char *, char *, long *);
+int	 cgetset (char *);
+int	 cgetstr (char *, char *, char **);
+int	 cgetustr (char *, char *, char **);
+
+int	 daemon (int, int);
+char	*devname (int, int);
+int	 getloadavg (double [], int);
 __const char *
-	getprogname __P((void));
+	getprogname (void);
 
-char	*group_from_gid __P((unsigned long, int));
-int	 heapsort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-char	*initstate __P((unsigned long, char *, long));
-int	 mergesort __P((void *, size_t, size_t,
-	    int (*)(const void *, const void *)));
-int	 radixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
-int	 sradixsort __P((const unsigned char **, int, const unsigned char *,
-	    unsigned));
-int	 rand_r __P((unsigned *));
-long	 random __P((void));
-void    *reallocf __P((void *, size_t));
-char	*realpath __P((const char *, char resolved_path[]));
-void	 setprogname __P((const char *));
-char	*setstate __P((char *));
-void	 srandom __P((unsigned long));
-void	 srandomdev __P((void));
-char	*user_from_uid __P((unsigned long, int));
+char	*group_from_gid (unsigned long, int);
+int	 heapsort (void *, size_t, size_t,
+	    int (*)(const void *, const void *));
+char	*initstate (unsigned long, char *, long);
+int	 mergesort (void *, size_t, size_t,
+	    int (*)(const void *, const void *));
+int	 radixsort (const unsigned char **, int, const unsigned char *,
+	    unsigned);
+int	 sradixsort (const unsigned char **, int, const unsigned char *,
+	    unsigned);
+int	 rand_r (unsigned *);
+long	 random (void);
+void    *reallocf (void *, size_t);
+char	*realpath (const char *, char resolved_path[]);
+void	 setprogname (const char *);
+char	*setstate (char *);
+void	 srandom (unsigned long);
+void	 srandomdev (void);
+char	*user_from_uid (unsigned long, int);
 #ifndef __STRICT_ANSI__
-__int64_t	 strtoq __P((const char *, char **, int));
+__int64_t	 strtoq (const char *, char **, int);
 __uint64_t
-	 strtouq __P((const char *, char **, int));
+	 strtouq (const char *, char **, int);
 #endif
-void	 unsetenv __P((const char *));
+void	 unsetenv (const char *);
 #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
 __END_DECLS
 
Index: include/string.h
===================================================================
RCS file: /home/dcvs/src/include/string.h,v
retrieving revision 1.3
diff -u -r1.3 string.h
--- include/string.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/string.h	13 Nov 2003 02:00:44 -0000
@@ -54,51 +54,51 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-void	*memchr __P((const void *, int, size_t));
-int	 memcmp __P((const void *, const void *, size_t));
-void	*memcpy __P((void *, const void *, size_t));
-void	*memmove __P((void *, const void *, size_t));
-void	*memset __P((void *, int, size_t));
-char	*strcat __P((char *, const char *));
-char	*strchr __P((const char *, int));
-int	 strcmp __P((const char *, const char *));
-int	 strcoll __P((const char *, const char *));
-char	*strcpy __P((char *, const char *));
-size_t strcspn __P((const char *, const char *));
-char	*strerror __P((int));
-size_t strlen __P((const char *));
-char	*strncat __P((char *, const char *, size_t));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
-char	*strpbrk __P((const char *, const char *));
-char	*strrchr __P((const char *, int));
-size_t strspn __P((const char *, const char *));
-char	*strstr __P((const char *, const char *));
-char	*strtok __P((char *, const char *));
-size_t strxfrm __P((char *, const char *, size_t));
+void	*memchr (const void *, int, size_t);
+int	 memcmp (const void *, const void *, size_t);
+void	*memcpy (void *, const void *, size_t);
+void	*memmove (void *, const void *, size_t);
+void	*memset (void *, int, size_t);
+char	*strcat (char *, const char *);
+char	*strchr (const char *, int);
+int	 strcmp (const char *, const char *);
+int	 strcoll (const char *, const char *);
+char	*strcpy (char *, const char *);
+size_t strcspn (const char *, const char *);
+char	*strerror (int);
+size_t strlen (const char *);
+char	*strncat (char *, const char *, size_t);
+int	 strncmp (const char *, const char *, size_t);
+char	*strncpy (char *, const char *, size_t);
+char	*strpbrk (const char *, const char *);
+char	*strrchr (const char *, int);
+size_t strspn (const char *, const char *);
+char	*strstr (const char *, const char *);
+char	*strtok (char *, const char *);
+size_t strxfrm (char *, const char *, size_t);
 
 /* Nonstandard routines */
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-int	 bcmp __P((const void *, const void *, size_t));
-void	 bcopy __P((const void *, void *, size_t));
-void	 bzero __P((void *, size_t));
-int	 ffs __P((int));
-char	*index __P((const char *, int));
-void	*memccpy __P((void *, const void *, int, size_t));
-char	*rindex __P((const char *, int));
-int	 strcasecmp __P((const char *, const char *));
-char	*strcasestr __P((const char *, const char *));
-char	*strdup __P((const char *));
-int	 strerror_r __P((int, char *, size_t));
-size_t strlcat __P((char *, const char *, size_t));
-size_t strlcpy __P((char *, const char *, size_t));
-void	 strmode __P((int, char *));
-int	 strncasecmp __P((const char *, const char *, size_t));
-char	*strnstr __P((const char *, const char *, size_t));
-char	*strsep __P((char **, const char *));
-char	*strsignal __P((int));
-char	*strtok_r __P((char *, const char *, char **));
-void	 swab __P((const void *, void *, size_t));
+int	 bcmp (const void *, const void *, size_t);
+void	 bcopy (const void *, void *, size_t);
+void	 bzero (void *, size_t);
+int	 ffs (int);
+char	*index (const char *, int);
+void	*memccpy (void *, const void *, int, size_t);
+char	*rindex (const char *, int);
+int	 strcasecmp (const char *, const char *);
+char	*strcasestr (const char *, const char *);
+char	*strdup (const char *);
+int	 strerror_r (int, char *, size_t);
+size_t strlcat (char *, const char *, size_t);
+size_t strlcpy (char *, const char *, size_t);
+void	 strmode (int, char *);
+int	 strncasecmp (const char *, const char *, size_t);
+char	*strnstr (const char *, const char *, size_t);
+char	*strsep (char **, const char *);
+char	*strsignal (int);
+char	*strtok_r (char *, const char *, char **);
+void	 swab (const void *, void *, size_t);
 #endif
 __END_DECLS
 
Index: include/stringlist.h
===================================================================
RCS file: /home/dcvs/src/include/stringlist.h,v
retrieving revision 1.1
diff -u -r1.1 stringlist.h
--- include/stringlist.h	17 Jun 2003 02:50:25 -0000	1.1
+++ include/stringlist.h	13 Nov 2003 02:00:44 -0000
@@ -46,10 +46,10 @@
 } StringList;
 
 __BEGIN_DECLS
-StringList *sl_init	__P((void));
-void	 sl_add		__P((StringList *, char *));
-void	 sl_free	__P((StringList *, int));
-char	*sl_find	__P((StringList *, char *));
+StringList *sl_init	(void);
+void	 sl_add		(StringList *, char *);
+void	 sl_free	(StringList *, int);
+char	*sl_find	(StringList *, char *);
 __END_DECLS
 
 #endif /* _STRINGLIST_H */
Index: include/time.h
===================================================================
RCS file: /home/dcvs/src/include/time.h,v
retrieving revision 1.2
diff -u -r1.2 time.h
--- include/time.h	9 Nov 2003 02:22:28 -0000	1.2
+++ include/time.h	13 Nov 2003 02:00:44 -0000
@@ -120,38 +120,38 @@
 #endif
 
 __BEGIN_DECLS
-char *asctime __P((const struct tm *));
-clock_t clock __P((void));
-char *ctime __P((const time_t *));
-double difftime __P((time_t, time_t));
-struct tm *gmtime __P((const time_t *));
-struct tm *localtime __P((const time_t *));
-time_t mktime __P((struct tm *));
-__size_t strftime __P((char *, __size_t, const char *, const struct tm *));
-time_t time __P((time_t *));
+char *asctime (const struct tm *);
+clock_t clock (void);
+char *ctime (const time_t *);
+double difftime (time_t, time_t);
+struct tm *gmtime (const time_t *);
+struct tm *localtime (const time_t *);
+time_t mktime (struct tm *);
+__size_t strftime (char *, __size_t, const char *, const struct tm *);
+time_t time (time_t *);
 
 #ifndef _ANSI_SOURCE
-void tzset __P((void));
+void tzset (void);
 #endif /* not ANSI */
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-char *asctime_r __P((const struct tm *, char *));
-char *ctime_r __P((const time_t *, char *));
-struct tm *gmtime_r __P((const time_t *, struct tm *));
-struct tm *localtime_r __P((const time_t *, struct tm *));
-char *strptime __P((const char *, const char *, struct tm *));
-char *timezone __P((int, int));
-void tzsetwall __P((void));
-time_t timelocal __P((struct tm * const));
-time_t timegm __P((struct tm * const));
+char *asctime_r (const struct tm *, char *);
+char *ctime_r (const time_t *, char *);
+struct tm *gmtime_r (const time_t *, struct tm *);
+struct tm *localtime_r (const time_t *, struct tm *);
+char *strptime (const char *, const char *, struct tm *);
+char *timezone (int, int);
+void tzsetwall (void);
+time_t timelocal (struct tm * const);
+time_t timegm (struct tm * const);
 #endif /* neither ANSI nor POSIX */
 
 #if !defined(_ANSI_SOURCE) && defined(_P1003_1B_VISIBLE_HISTORICALLY)
 /* Introduced in POSIX 1003.1b-1993, not part of 1003.1-1990. */
-int clock_getres __P((clockid_t, struct timespec *));
-int clock_gettime __P((clockid_t, struct timespec *));
-int clock_settime __P((clockid_t, const struct timespec *));
-int nanosleep __P((const struct timespec *, struct timespec *));
+int clock_getres (clockid_t, struct timespec *);
+int clock_gettime (clockid_t, struct timespec *);
+int clock_settime (clockid_t, const struct timespec *);
+int nanosleep (const struct timespec *, struct timespec *);
 #endif /* neither ANSI nor POSIX */
 __END_DECLS
 
Index: include/ttyent.h
===================================================================
RCS file: /home/dcvs/src/include/ttyent.h,v
retrieving revision 1.1
diff -u -r1.1 ttyent.h
--- include/ttyent.h	17 Jun 2003 02:50:25 -0000	1.1
+++ include/ttyent.h	13 Nov 2003 02:00:44 -0000
@@ -65,12 +65,12 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-struct ttyent *getttyent __P((void));
-struct ttyent *getttynam __P((const char *));
-int setttyent __P((void));
-int endttyent __P((void));
-int isdialuptty __P((const char *));
-int isnettty __P((const char *));
+struct ttyent *getttyent (void);
+struct ttyent *getttynam (const char *);
+int setttyent (void);
+int endttyent (void);
+int isdialuptty (const char *);
+int isnettty (const char *);
 __END_DECLS
 
 #endif /* !_TTYENT_H_ */
Index: include/unistd.h
===================================================================
RCS file: /home/dcvs/src/include/unistd.h,v
retrieving revision 1.5
diff -u -r1.5 unistd.h
--- include/unistd.h	11 Nov 2003 00:04:17 -0000	1.5
+++ include/unistd.h	13 Nov 2003 02:10:48 -0000
@@ -58,176 +58,176 @@
 #endif
 
 __BEGIN_DECLS
-void	 _exit __P((int)) __dead2;
-int	 access __P((const char *, int));
-unsigned int	 alarm __P((unsigned int));
-int	 chdir __P((const char *));
-int	 chown __P((const char *, uid_t, gid_t));
-int	 close __P((int));
-int	 dup __P((int));
-int	 dup2 __P((int, int));
-int	 execl __P((const char *, const char *, ...));
-int	 execle __P((const char *, const char *, ...));
-int	 execlp __P((const char *, const char *, ...));
-int	 execv __P((const char *, char * const *));
-int	 execve __P((const char *, char * const *, char * const *));
-int	 execvp __P((const char *, char * const *));
-pid_t	 fork __P((void));
-long	 fpathconf __P((int, int));
-char	*getcwd __P((char *, size_t));
-gid_t	 getegid __P((void));
-uid_t	 geteuid __P((void));
-gid_t	 getgid __P((void));
-int	 getgroups __P((int, gid_t []));
-char	*getlogin __P((void));
-pid_t	 getpgrp __P((void));
-pid_t	 getpid __P((void));
-pid_t	 getppid __P((void));
-uid_t	 getuid __P((void));
-int	 isatty __P((int));
-int	 link __P((const char *, const char *));
+void	 _exit (int) __dead2;
+int	 access (const char *, int);
+unsigned int	 alarm (unsigned int);
+int	 chdir (const char *);
+int	 chown (const char *, uid_t, gid_t);
+int	 close (int);
+int	 dup (int);
+int	 dup2 (int, int);
+int	 execl (const char *, const char *, ...);
+int	 execle (const char *, const char *, ...);
+int	 execlp (const char *, const char *, ...);
+int	 execv (const char *, char * const *);
+int	 execve (const char *, char * const *, char * const *);
+int	 execvp (const char *, char * const *);
+pid_t	 fork (void);
+long	 fpathconf (int, int);
+char	*getcwd (char *, size_t);
+gid_t	 getegid (void);
+uid_t	 geteuid (void);
+gid_t	 getgid (void);
+int	 getgroups (int, gid_t []);
+char	*getlogin (void);
+pid_t	 getpgrp (void);
+pid_t	 getpid (void);
+pid_t	 getppid (void);
+uid_t	 getuid (void);
+int	 isatty (int);
+int	 link (const char *, const char *);
 #ifndef _LSEEK_DECLARED
 #define	_LSEEK_DECLARED
-off_t	 lseek __P((int, off_t, int));
+off_t	 lseek (int, off_t, int);
 #endif
-long	 pathconf __P((const char *, int));
-int	 pause __P((void));
-int	 pipe __P((int *));
-ssize_t	 read __P((int, void *, size_t));
-int	 rmdir __P((const char *));
-int	 setgid __P((gid_t));
-int	 setpgid __P((pid_t, pid_t));
-void	 setproctitle __P((const char *_fmt, ...)) __printf0like(1, 2);
-pid_t	 setsid __P((void));
-int	 setuid __P((uid_t));
-unsigned int	 sleep __P((unsigned int));
-long	 sysconf __P((int));
-pid_t	 tcgetpgrp __P((int));
-int	 tcsetpgrp __P((int, pid_t));
-char	*ttyname __P((int));
-int	 unlink __P((const char *));
-ssize_t	 write __P((int, const void *, size_t));
+long	 pathconf (const char *, int);
+int	 pause (void);
+int	 pipe (int *);
+ssize_t	 read (int, void *, size_t);
+int	 rmdir (const char *);
+int	 setgid (gid_t);
+int	 setpgid (pid_t, pid_t);
+void	 setproctitle (const char *_fmt, ...) __printf0like(1, 2);
+pid_t	 setsid (void);
+int	 setuid (uid_t);
+unsigned int	 sleep (unsigned int);
+long	 sysconf (int);
+pid_t	 tcgetpgrp (int);
+int	 tcsetpgrp (int, pid_t);
+char	*ttyname (int);
+int	 unlink (const char *);
+ssize_t	 write (int, const void *, size_t);
 
 extern char *optarg;			/* getopt(3) external variables */
 extern int optind, opterr, optopt;
-int	 getopt __P((int, char * const [], const char *));
+int	 getopt (int, char * const [], const char *);
 
 #ifndef	_POSIX_SOURCE
 #ifdef	__STDC__
 struct timeval;				/* select(2) */
 #endif
-int	 acct __P((const char *));
-int	 async_daemon __P((void));
-int	 brk __P((const void *));
-int	 chroot __P((const char *));
-size_t	 confstr __P((int, char *, size_t));
-char	*crypt __P((const char *, const char *));
+int	 acct (const char *);
+int	 async_daemon (void);
+int	 brk (const void *);
+int	 chroot (const char *);
+size_t	 confstr (int, char *, size_t);
+char	*crypt (const char *, const char *);
 __const char *
-	 crypt_get_format __P((void));
-int	 crypt_set_format __P((const char *));
-int	 des_cipher __P((const char *, char *, long, int));
-int	 des_setkey __P((const char *key));
-int	 encrypt __P((char *, int));
-void	 endusershell __P((void));
-int	 exect __P((const char *, char * const *, char * const *));
-int	 fchdir __P((int));
-int	 fchown __P((int, uid_t, gid_t));
-char	*fflagstostr __P((u_long));
-int	 fsync __P((int));
+	 crypt_get_format (void);
+int	 crypt_set_format (const char *);
+int	 des_cipher (const char *, char *, long, int);
+int	 des_setkey (const char *key);
+int	 encrypt (char *, int);
+void	 endusershell (void);
+int	 exect (const char *, char * const *, char * const *);
+int	 fchdir (int);
+int	 fchown (int, uid_t, gid_t);
+char	*fflagstostr (u_long);
+int	 fsync (int);
 #ifndef _FTRUNCATE_DECLARED
 #define	_FTRUNCATE_DECLARED
-int	 ftruncate __P((int, off_t));
+int	 ftruncate (int, off_t);
 #endif
-int	 getdomainname __P((char *, int));
-int	 getdtablesize __P((void));
-int	 getgrouplist __P((const char *, int, int *, int *));
-long	 gethostid __P((void));
-int	 gethostname __P((char *, int));
-int	 getlogin_r __P((char *, int));
-mode_t	 getmode __P((const void *, mode_t));
-char	*getpass __P((const char *));
-int	 getpeereid __P((int, uid_t *, gid_t *));
-int	 getpgid __P((pid_t _pid));
-int	 getresgid __P((gid_t *, gid_t *, gid_t *));
-int	 getresuid __P((uid_t *, uid_t *, uid_t *));
-int	 getsid __P((pid_t _pid));
-char	*getusershell __P((void));
-char	*getwd __P((char *));			/* obsoleted by getcwd() */
-int	 initgroups __P((const char *, int));
-int	 iruserok __P((unsigned long, int, const char *, const char *));
-int	 iruserok_sa __P((const void *, int, int, const char *, const char *));
-int	 issetugid __P((void));
-int	 lchown __P((const char *, uid_t, gid_t));
-int	 lockf __P((int, int, off_t));
-char	*mkdtemp __P((char *));
-int	 mknod __P((const char *, mode_t, dev_t));
-int	 mkstemp __P((char *));
-int	 mkstemps __P((char *, int));
-char	*mktemp __P((char *));
-int	 nfssvc __P((int, void *));
-int	 nice __P((int));
-ssize_t	 pread __P((int, void *, size_t, off_t));
-int	 profil __P((char *, size_t, vm_offset_t, int));
-ssize_t	 pwrite __P((int, const void *, size_t, off_t));
-int	 rcmd __P((char **, int, const char *,
-		const char *, const char *, int *));
-int	 rcmd_af __P((char **, int, const char *,
-		const char *, const char *, int *, int));
-int	 rcmdsh __P((char **, int, const char *,
-		const char *, const char *, const char *));
-char	*re_comp __P((const char *));
-int	 re_exec __P((const char *));
-int	 readlink __P((const char *, char *, int));
-int	 reboot __P((int));
-int	 revoke __P((const char *));
-pid_t	 rfork __P((int));
-pid_t	 rfork_thread __P((int, void *, int (*) __P((void *)), void *));
-int	 rresvport __P((int *));
-int	 rresvport_af __P((int *, int));
-int	 ruserok __P((const char *, int, const char *, const char *));
-void	*sbrk __P((intptr_t));
-int	 select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *));
-int	 setdomainname __P((const char *, int));
-int	 setegid __P((gid_t));
-int	 seteuid __P((uid_t));
-int	 setgroups __P((int, const gid_t *));
-void	 sethostid __P((long));
-int	 sethostname __P((const char *, int));
-int	 setkey __P((const char *));
-int	 setlogin __P((const char *));
-void	*setmode __P((const char *));
-int	 setpgrp __P((pid_t _pid, pid_t _pgrp)); /* obsoleted by setpgid() */
-int	 setregid __P((gid_t, gid_t));
-int	 setresgid __P((gid_t, gid_t, gid_t));
-int	 setresuid __P((uid_t, uid_t, uid_t));
-int	 setreuid __P((uid_t, uid_t));
-int	 setrgid __P((gid_t));
-int	 setruid __P((uid_t));
-void	 setusershell __P((void));
-int	 strtofflags __P((char **, u_long *, u_long *));
-int	 swapon __P((const char *));
-int	 symlink __P((const char *, const char *));
-void	 sync __P((void));
-int	 syscall __P((int, ...));
-off_t	 __syscall __P((quad_t, ...));
+int	 getdomainname (char *, int);
+int	 getdtablesize (void);
+int	 getgrouplist (const char *, int, int *, int *);
+long	 gethostid (void);
+int	 gethostname (char *, int);
+int	 getlogin_r (char *, int);
+mode_t	 getmode (const void *, mode_t);
+int	 getpagesize (void) __pure2;
+char	*getpass (const char *);
+int	 getpeereid (int, uid_t *, gid_t *);
+int	 getpgid (pid_t _pid);
+int	 getresgid (gid_t *, gid_t *, gid_t *);
+int	 getresuid (uid_t *, uid_t *, uid_t *);
+int	 getsid (pid_t _pid);
+char	*getusershell (void);
+char	*getwd (char *);			/* obsoleted by getcwd() */
+int	 initgroups (const char *, int);
+int	 iruserok (unsigned long, int, const char *, const char *);
+int	 iruserok_sa (const void *, int, int, const char *, const char *);
+int	 issetugid (void);
+int	 lchown (const char *, uid_t, gid_t);
+int	 lockf (int, int, off_t);
+char	*mkdtemp (char *);
+int	 mknod (const char *, mode_t, dev_t);
+int	 mkstemp (char *);
+int	 mkstemps (char *, int);
+char	*mktemp (char *);
+int	 nfssvc (int, void *);
+int	 nice (int);
+ssize_t	 pread (int, void *, size_t, off_t);
+int	 profil (char *, size_t, vm_offset_t, int);
+ssize_t	 pwrite (int, const void *, size_t, off_t);
+int	 rcmd (char **, int, const char *,
+		const char *, const char *, int *);
+int	 rcmd_af (char **, int, const char *,
+		const char *, const char *, int *, int);
+int	 rcmdsh (char **, int, const char *,
+		const char *, const char *, const char *);
+char	*re_comp (const char *);
+int	 re_exec (const char *);
+int	 readlink (const char *, char *, int);
+int	 reboot (int);
+int	 revoke (const char *);
+pid_t	 rfork (int);
+pid_t	 rfork_thread (int, void *, int (*) (void *), void *);
+int	 rresvport (int *);
+int	 rresvport_af (int *, int);
+int	 ruserok (const char *, int, const char *, const char *);
+void	*sbrk (intptr_t);
+int	 select (int, fd_set *, fd_set *, fd_set *, struct timeval *);
+int	 setdomainname (const char *, int);
+int	 setegid (gid_t);
+int	 seteuid (uid_t);
+int	 setgroups (int, const gid_t *);
+void	 sethostid (long);
+int	 sethostname (const char *, int);
+int	 setkey (const char *);
+int	 setlogin (const char *);
+void	*setmode (const char *);
+int	 setpgrp (pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */
+int	 setregid (gid_t, gid_t);
+int	 setresgid (gid_t, gid_t, gid_t);
+int	 setresuid (uid_t, uid_t, uid_t);
+int	 setreuid (uid_t, uid_t);
+int	 setrgid (gid_t);
+int	 setruid (uid_t);
+void	 setusershell (void);
+int	 strtofflags (char **, u_long *, u_long *);
+int	 swapon (const char *);
+int	 symlink (const char *, const char *);
+void	 sync (void);
+int	 syscall (int, ...);
+off_t	 __syscall (quad_t, ...);
 #ifndef _TRUNCATE_DECLARED
 #define	_TRUNCATE_DECLARED
-int	 truncate __P((const char *, off_t));
+int	 truncate (const char *, off_t);
 #endif
-int	 ttyslot __P((void));
-unsigned int	 ualarm __P((unsigned int, unsigned int));
-int	 undelete __P((const char *));
-int	 unwhiteout __P((const char *));
-int	 usleep __P((unsigned int));
-void	*valloc __P((size_t));			/* obsoleted by malloc() */
-pid_t	 vfork __P((void));
+int	 ttyslot (void);
+unsigned int	 ualarm (unsigned int, unsigned int);
+int	 undelete (const char *);
+int	 unwhiteout (const char *);
+int	 usleep (unsigned int);
+void	*valloc (size_t);			/* obsoleted by malloc() */
+pid_t	 vfork (void);
 int	 varsym_set(int, const char *, const char *);
 int	 varsym_get(int, const char *, char *, int);
 int	 varsym_list(int, char *, int, int *);
 
 extern char *suboptarg;			/* getsubopt(3) external variable */
-int	 getsubopt __P((char **, char * const *, char **));
+int	 getsubopt (char **, char * const *, char **);
 #endif /* !_POSIX_SOURCE */
 extern int optreset;			/* getopt(3) external variable */
 __END_DECLS
Index: include/utime.h
===================================================================
RCS file: /home/dcvs/src/include/utime.h,v
retrieving revision 1.1
diff -u -r1.1 utime.h
--- include/utime.h	17 Jun 2003 02:50:25 -0000	1.1
+++ include/utime.h	13 Nov 2003 02:00:44 -0000
@@ -44,7 +44,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int utime __P((const char *, const struct utimbuf *));
+int utime (const char *, const struct utimbuf *);
 __END_DECLS
 
 #endif /* !_UTIME_H_ */
Index: include/vis.h
===================================================================
RCS file: /home/dcvs/src/include/vis.h,v
retrieving revision 1.3
diff -u -r1.3 vis.h
--- include/vis.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/vis.h	13 Nov 2003 02:00:44 -0000
@@ -81,11 +81,11 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-char	*vis __P((char *, int, int, int));
-int	strvis __P((char *, const char *, int));
-int	strvisx __P((char *, const char *, __size_t, int));
-int	strunvis __P((char *, const char *));
-int	unvis __P((char *, int, int *, int));
+char	*vis (char *, int, int, int);
+int	strvis (char *, const char *, int);
+int	strvisx (char *, const char *, __size_t, int);
+int	strunvis (char *, const char *);
+int	unvis (char *, int, int *, int);
 __END_DECLS
 
 #endif /* !_VIS_H_ */
Index: include/wchar.h
===================================================================
RCS file: /home/dcvs/src/include/wchar.h,v
retrieving revision 1.3
diff -u -r1.3 wchar.h
--- include/wchar.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/wchar.h	13 Nov 2003 02:00:44 -0000
@@ -105,39 +105,39 @@
 
 __BEGIN_DECLS
 
-wchar_t	*wcscat __P((wchar_t * __restrict, const wchar_t * __restrict));
-wchar_t	*wcschr __P((const wchar_t *, wchar_t));
-int	wcscmp __P((const wchar_t *, const wchar_t *));
-wchar_t	*wcscpy __P((wchar_t * __restrict, const wchar_t * __restrict));
-size_t	wcscspn __P((const wchar_t *, const wchar_t *));
-size_t	wcslen __P((const wchar_t *));
-wchar_t	*wcsncat __P((wchar_t * __restrict, const wchar_t * __restrict,
-	    size_t));
-int	wcsncmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t	*wcsncpy __P((wchar_t * __restrict , const wchar_t * __restrict,
-	    size_t));
-wchar_t	*wcspbrk __P((const wchar_t *, const wchar_t *));
-wchar_t	*wcsrchr __P((const wchar_t *, wchar_t));
+wchar_t	*wcscat (wchar_t * __restrict, const wchar_t * __restrict);
+wchar_t	*wcschr (const wchar_t *, wchar_t);
+int	wcscmp (const wchar_t *, const wchar_t *);
+wchar_t	*wcscpy (wchar_t * __restrict, const wchar_t * __restrict);
+size_t	wcscspn (const wchar_t *, const wchar_t *);
+size_t	wcslen (const wchar_t *);
+wchar_t	*wcsncat (wchar_t * __restrict, const wchar_t * __restrict,
+	    size_t);
+int	wcsncmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wcsncpy (wchar_t * __restrict , const wchar_t * __restrict,
+	    size_t);
+wchar_t	*wcspbrk (const wchar_t *, const wchar_t *);
+wchar_t	*wcsrchr (const wchar_t *, wchar_t);
 #if 0
 /* XXX: not implemented */
-size_t	wcsrtombs __P((char * __restrict, const wchar_t ** __restrict, size_t,
-	    mbstate_t * __restrict));
+size_t	wcsrtombs (char * __restrict, const wchar_t ** __restrict, size_t,
+	    mbstate_t * __restrict);
 #endif
-size_t	wcsspn __P((const wchar_t *, const wchar_t *));
-wchar_t	*wcsstr __P((const wchar_t *, const wchar_t *));
-wchar_t	*wmemchr __P((const wchar_t *, wchar_t, size_t));
-int	wmemcmp __P((const wchar_t *, const wchar_t *, size_t));
-wchar_t	*wmemcpy __P((wchar_t * __restrict, const wchar_t * __restrict,
-	    size_t));
-wchar_t	*wmemmove __P((wchar_t *, const wchar_t *, size_t));
-wchar_t	*wmemset __P((wchar_t *, wchar_t, size_t));
+size_t	wcsspn (const wchar_t *, const wchar_t *);
+wchar_t	*wcsstr (const wchar_t *, const wchar_t *);
+wchar_t	*wmemchr (const wchar_t *, wchar_t, size_t);
+int	wmemcmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t	*wmemcpy (wchar_t * __restrict, const wchar_t * __restrict,
+	    size_t);
+wchar_t	*wmemmove (wchar_t *, const wchar_t *, size_t);
+wchar_t	*wmemset (wchar_t *, wchar_t, size_t);
 
-size_t	wcslcat __P((wchar_t *, const wchar_t *, size_t));
-size_t	wcslcpy __P((wchar_t *, const wchar_t *, size_t));
+size_t	wcslcat (wchar_t *, const wchar_t *, size_t);
+size_t	wcslcpy (wchar_t *, const wchar_t *, size_t);
 #if 0
 /* XXX: not implemented */
-int	wcswidth __P((const wchar_t *, size_t));
-int	wcwidth __P((wchar_t));
+int	wcswidth (const wchar_t *, size_t);
+int	wcwidth (wchar_t);
 #endif
 __END_DECLS
 
Index: include/wctype.h
===================================================================
RCS file: /home/dcvs/src/include/wctype.h,v
retrieving revision 1.3
diff -u -r1.3 wctype.h
--- include/wctype.h	9 Nov 2003 02:22:28 -0000	1.3
+++ include/wctype.h	13 Nov 2003 02:00:44 -0000
@@ -49,20 +49,20 @@
 #endif
 
 __BEGIN_DECLS
-int	iswalnum __P((wint_t));
-int	iswalpha __P((wint_t));
-int	iswblank __P((wint_t));
-int	iswcntrl __P((wint_t));
-int	iswdigit __P((wint_t));
-int	iswgraph __P((wint_t));
-int	iswlower __P((wint_t));
-int	iswprint __P((wint_t));
-int	iswpunct __P((wint_t));
-int	iswspace __P((wint_t));
-int	iswupper __P((wint_t));
-int	iswxdigit __P((wint_t));
-wint_t	towlower __P((wint_t));
-wint_t	towupper __P((wint_t));
+int	iswalnum (wint_t);
+int	iswalpha (wint_t);
+int	iswblank (wint_t);
+int	iswcntrl (wint_t);
+int	iswdigit (wint_t);
+int	iswgraph (wint_t);
+int	iswlower (wint_t);
+int	iswprint (wint_t);
+int	iswpunct (wint_t);
+int	iswspace (wint_t);
+int	iswupper (wint_t);
+int	iswxdigit (wint_t);
+wint_t	towlower (wint_t);
+wint_t	towupper (wint_t);
 __END_DECLS
 
 #endif		/* _WCTYPE_H_ */
Index: include/arpa/inet.h
===================================================================
RCS file: /home/dcvs/src/include/arpa/inet.h,v
retrieving revision 1.2
diff -u -r1.2 inet.h
--- include/arpa/inet.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/arpa/inet.h	13 Nov 2003 02:00:44 -0000
@@ -83,22 +83,22 @@
 #define	inet_nsap_ntoa	__inet_nsap_ntoa
 
 __BEGIN_DECLS
-int		 ascii2addr __P((int, const char *, void *));
-char		*addr2ascii __P((int, const void *, int, char *));
-in_addr_t	 inet_addr __P((const char *));
-int		 inet_aton __P((const char *, struct in_addr *));
-in_addr_t	 inet_lnaof __P((struct in_addr));
-struct in_addr	 inet_makeaddr __P((in_addr_t, in_addr_t));
-char *		 inet_neta __P((in_addr_t, char *, size_t));
-in_addr_t	 inet_netof __P((struct in_addr));
-in_addr_t	 inet_network __P((const char *));
-char		*inet_net_ntop __P((int, const void *, int, char *, size_t));
-int		 inet_net_pton __P((int, const char *, void *, size_t));
-char		*inet_ntoa __P((struct in_addr));
-int              inet_pton __P((int, const char *, void *));
-const char	*inet_ntop __P((int, const void *, char *, size_t));
-u_int		 inet_nsap_addr __P((const char *, u_char *, int));
-char		*inet_nsap_ntoa __P((int, const u_char *, char *));
+int		 ascii2addr (int, const char *, void *);
+char		*addr2ascii (int, const void *, int, char *);
+in_addr_t	 inet_addr (const char *);
+int		 inet_aton (const char *, struct in_addr *);
+in_addr_t	 inet_lnaof (struct in_addr);
+struct in_addr	 inet_makeaddr (in_addr_t, in_addr_t);
+char *		 inet_neta (in_addr_t, char *, size_t);
+in_addr_t	 inet_netof (struct in_addr);
+in_addr_t	 inet_network (const char *);
+char		*inet_net_ntop (int, const void *, int, char *, size_t);
+int		 inet_net_pton (int, const char *, void *, size_t);
+char		*inet_ntoa (struct in_addr);
+int              inet_pton (int, const char *, void *);
+const char	*inet_ntop (int, const void *, char *, size_t);
+u_int		 inet_nsap_addr (const char *, u_char *, int);
+char		*inet_nsap_ntoa (int, const u_char *, char *);
 __END_DECLS
 
 #endif /* !_INET_H_ */
Index: include/arpa/nameser.h
===================================================================
RCS file: /home/dcvs/src/include/arpa/nameser.h,v
retrieving revision 1.2
diff -u -r1.2 nameser.h
--- include/arpa/nameser.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/arpa/nameser.h	13 Nov 2003 02:00:44 -0000
@@ -416,31 +416,31 @@
 #define	ns_name_uncompress	__ns_name_uncompress
 
 __BEGIN_DECLS
-u_int		ns_get16 __P((const u_char *));
-u_long		ns_get32 __P((const u_char *));
-void		ns_put16 __P((u_int, u_char *));
-void		ns_put32 __P((u_long, u_char *));
-int		ns_initparse __P((const u_char *, int, ns_msg *));
-int		ns_parserr __P((ns_msg *, ns_sect, int, ns_rr *));
-int		ns_sprintrr __P((const ns_msg *, const ns_rr *,
-				 const char *, const char *, char *, size_t));
-int		ns_sprintrrf __P((const u_char *, size_t, const char *,
+u_int		ns_get16 (const u_char *);
+u_long		ns_get32 (const u_char *);
+void		ns_put16 (u_int, u_char *);
+void		ns_put32 (u_long, u_char *);
+int		ns_initparse (const u_char *, int, ns_msg *);
+int		ns_parserr (ns_msg *, ns_sect, int, ns_rr *);
+int		ns_sprintrr (const ns_msg *, const ns_rr *,
+				 const char *, const char *, char *, size_t);
+int		ns_sprintrrf (const u_char *, size_t, const char *,
 				  ns_class, ns_type, u_long, const u_char *,
 				  size_t, const char *, const char *,
-				  char *, size_t));
-int		ns_format_ttl __P((u_long, char *, size_t));
-int		ns_parse_ttl __P((const char *, u_long *));
-int		ns_name_ntop __P((const u_char *, char *, size_t));
-int		ns_name_pton __P((const char *, u_char *, size_t));
-int		ns_name_unpack __P((const u_char *, const u_char *,
-				    const u_char *, u_char *, size_t));
-int		ns_name_pack __P((const u_char *, u_char *, int,
-				  const u_char **, const u_char **));
-int		ns_name_uncompress __P((const u_char *, const u_char *,
-					const u_char *, char *, size_t));
-int		ns_name_compress __P((const char *, u_char *, size_t,
-				      const u_char **, const u_char **));
-int		ns_name_skip __P((const u_char **, const u_char *));
+				  char *, size_t);
+int		ns_format_ttl (u_long, char *, size_t);
+int		ns_parse_ttl (const char *, u_long *);
+int		ns_name_ntop (const u_char *, char *, size_t);
+int		ns_name_pton (const char *, u_char *, size_t);
+int		ns_name_unpack (const u_char *, const u_char *,
+				    const u_char *, u_char *, size_t);
+int		ns_name_pack (const u_char *, u_char *, int,
+				  const u_char **, const u_char **);
+int		ns_name_uncompress (const u_char *, const u_char *,
+					const u_char *, char *, size_t);
+int		ns_name_compress (const char *, u_char *, size_t,
+				      const u_char **, const u_char **);
+int		ns_name_skip (const u_char **, const u_char *);
 __END_DECLS
 
 #ifdef BIND_4_COMPAT
Index: include/rpc/auth.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/auth.h,v
retrieving revision 1.2
diff -u -r1.2 auth.h
--- include/rpc/auth.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/auth.h	13 Nov 2003 02:00:44 -0000
@@ -79,7 +79,7 @@
 };
 typedef union des_block des_block;
 __BEGIN_DECLS
-extern bool_t xdr_des_block __P((XDR *, des_block *));
+extern bool_t xdr_des_block (XDR *, des_block *);
 __END_DECLS
 
 /*
@@ -91,7 +91,7 @@
 	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
 };
 __BEGIN_DECLS
-bool_t xdr_opaque_auth __P((XDR *xdrs, struct opaque_auth *ap));
+bool_t xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap);
 __END_DECLS
 
 
@@ -103,16 +103,16 @@
 	struct	opaque_auth	ah_verf;
 	union	des_block	ah_key;
 	struct auth_ops {
-		void	(*ah_nextverf) __P((struct __rpc_auth *));
+		void	(*ah_nextverf) (struct __rpc_auth *);
 		/* nextverf & serialize */
-		int	(*ah_marshal) __P((struct __rpc_auth *, XDR *));
+		int	(*ah_marshal) (struct __rpc_auth *, XDR *);
 		/* validate verifier */
-		int	(*ah_validate) __P((struct __rpc_auth *,
-				struct opaque_auth *));
+		int	(*ah_validate) (struct __rpc_auth *,
+				struct opaque_auth *);
 		/* refresh credentials */
-		int	(*ah_refresh) __P((struct __rpc_auth *));
+		int	(*ah_refresh) (struct __rpc_auth *);
 		/* destroy this structure */
-		void	(*ah_destroy) __P((struct __rpc_auth *));
+		void	(*ah_destroy) (struct __rpc_auth *);
 	} *ah_ops;
 	caddr_t ah_private;
 } AUTH;
@@ -169,9 +169,9 @@
  */
 __BEGIN_DECLS
 struct sockaddr_in;
-extern AUTH *authunix_create		__P((char *, int, int, int, int *));
-extern AUTH *authunix_create_default	__P((void));
-extern AUTH *authnone_create		__P((void));
+extern AUTH *authunix_create		(char *, int, int, int, int *);
+extern AUTH *authunix_create_default	(void);
+extern AUTH *authnone_create		(void);
 __END_DECLS
 
 /* Forward compatibility with TI-RPC */
@@ -187,7 +187,7 @@
  * 	des_block *ckey;		- optional conversation key to use
  */
 __BEGIN_DECLS
-extern AUTH *authdes_create __P(( char *, u_int, struct sockaddr *, des_block * ));
+extern AUTH *authdes_create ( char *, u_int, struct sockaddr *, des_block * );
 #ifdef NOTYET
 /*
  * TI-RPC supports this call, but it requires the inclusion of
@@ -195,9 +195,9 @@
  * headers which would result in a tangled mess. For now, the NIS+
  * code prototypes this routine internally.
  */
-extern AUTH *authdes_pk_create __P(( char *, netobj *, u_int,
+extern AUTH *authdes_pk_create ( char *, netobj *, u_int,
 				     struct sockaddr *, des_block *,
-				     nis_server * ));
+				     nis_server * );
 #endif
 __END_DECLS
 
@@ -205,12 +205,12 @@
  * Netname manipulation routines.
  */
 __BEGIN_DECLS
-extern int netname2user __P(( char *, uid_t *, gid_t *, int *, gid_t *));
-extern int netname2host __P(( char *, char *, int ));
-extern int getnetname __P(( char * ));
-extern int user2netname __P(( char *, uid_t, char * ));
-extern int host2netname __P(( char *, char *, char * ));
-extern void passwd2des __P(( char *, char * ));
+extern int netname2user ( char *, uid_t *, gid_t *, int *, gid_t *);
+extern int netname2host ( char *, char *, int );
+extern int getnetname ( char * );
+extern int user2netname ( char *, uid_t, char * );
+extern int host2netname ( char *, char *, char * );
+extern void passwd2des ( char *, char * );
 __END_DECLS
 
 /*
@@ -230,24 +230,24 @@
 };
 
 __BEGIN_DECLS
-extern int key_decryptsession __P(( const char *, des_block * ));
-extern int key_decryptsession_pk __P(( char *, netobj *, des_block * ));
-extern int key_encryptsession __P(( const char *, des_block * ));
-extern int key_encryptsession_pk __P(( char *, netobj *, des_block * ));
-extern int key_gendes __P(( des_block * ));
-extern int key_setsecret __P(( const char * ));
-extern int key_secretkey_is_set __P(( void ));
-extern int key_setnet __P(( struct netstarg * ));
-extern int key_get_conv __P(( char *, des_block * ));
+extern int key_decryptsession ( const char *, des_block * );
+extern int key_decryptsession_pk ( char *, netobj *, des_block * );
+extern int key_encryptsession ( const char *, des_block * );
+extern int key_encryptsession_pk ( char *, netobj *, des_block * );
+extern int key_gendes ( des_block * );
+extern int key_setsecret ( const char * );
+extern int key_secretkey_is_set ( void );
+extern int key_setnet ( struct netstarg * );
+extern int key_get_conv ( char *, des_block * );
 __END_DECLS
 
 /*
  * Publickey routines.
  */
 __BEGIN_DECLS
-extern int getpublickey __P(( char *, char * ));
-extern int getpublicandprivatekey __P(( char *, char * ));
-extern int getsecretkey __P(( char *, char *, char * ));
+extern int getpublickey ( char *, char * );
+extern int getpublicandprivatekey ( char *, char * );
+extern int getsecretkey ( char *, char *, char * );
 __END_DECLS
 
 
Index: include/rpc/auth_des.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/auth_des.h,v
retrieving revision 1.1
diff -u -r1.1 auth_des.h
--- include/rpc/auth_des.h	17 Jun 2003 02:50:26 -0000	1.1
+++ include/rpc/auth_des.h	13 Nov 2003 02:00:44 -0000
@@ -103,7 +103,7 @@
 #define adv_nickname	adv_int_u
 
 __BEGIN_DECLS
-extern int authdes_getucred __P(( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * ));
+extern int authdes_getucred ( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
 __END_DECLS
 
 #endif /* ndef _AUTH_DES_ */
Index: include/rpc/auth_unix.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/auth_unix.h,v
retrieving revision 1.2
diff -u -r1.2 auth_unix.h
--- include/rpc/auth_unix.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/auth_unix.h	13 Nov 2003 02:00:44 -0000
@@ -70,7 +70,7 @@
 #define authsys_parms authunix_parms
 
 __BEGIN_DECLS
-extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *));
+extern bool_t xdr_authunix_parms (XDR *, struct authunix_parms *);
 __END_DECLS
 
 /*
Index: include/rpc/clnt.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/clnt.h,v
retrieving revision 1.2
diff -u -r1.2 clnt.h
--- include/rpc/clnt.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/clnt.h	13 Nov 2003 02:00:44 -0000
@@ -120,22 +120,22 @@
 	AUTH	*cl_auth;			/* authenticator */
 	struct clnt_ops {
 		/* call remote procedure */
-		enum clnt_stat	(*cl_call) __P((struct __rpc_client *,
+		enum clnt_stat	(*cl_call) (struct __rpc_client *,
 					u_long, xdrproc_t, caddr_t, xdrproc_t,
-					caddr_t, struct timeval));
+					caddr_t, struct timeval);
 		/* abort a call */
-		void		(*cl_abort) __P((struct __rpc_client *));
+		void		(*cl_abort) (struct __rpc_client *);
 		/* get specific error code */
-		void		(*cl_geterr) __P((struct __rpc_client *,
-					struct rpc_err *));
+		void		(*cl_geterr) (struct __rpc_client *,
+					struct rpc_err *);
 		/* frees results */
-		bool_t		(*cl_freeres) __P((struct __rpc_client *,
-					xdrproc_t, caddr_t));
+		bool_t		(*cl_freeres) (struct __rpc_client *,
+					xdrproc_t, caddr_t);
 		/* destroy this structure */
-		void		(*cl_destroy) __P((struct __rpc_client *));
+		void		(*cl_destroy) (struct __rpc_client *);
 		/* the ioctl() of rpc */
-		bool_t          (*cl_control) __P((struct __rpc_client *, u_int,
-					void *));
+		bool_t          (*cl_control) (struct __rpc_client *, u_int,
+					void *);
 	} *cl_ops;
 	caddr_t			cl_private;	/* private stuff */
 } CLIENT;
@@ -281,7 +281,7 @@
  *	u_long vers;
  */
 __BEGIN_DECLS
-extern CLIENT *clntraw_create	__P((u_long, u_long));
+extern CLIENT *clntraw_create	(u_long, u_long);
 __END_DECLS
 
 
@@ -296,7 +296,7 @@
  *	char *prot;	-- protocol
  */
 __BEGIN_DECLS
-extern CLIENT *clnt_create	__P((char *, u_long, u_long, char *));
+extern CLIENT *clnt_create	(char *, u_long, u_long, char *);
 __END_DECLS
 
 
@@ -312,12 +312,12 @@
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clnttcp_create	__P((struct sockaddr_in *,
+extern CLIENT *clnttcp_create	(struct sockaddr_in *,
 				     u_long,
 				     u_long,
 				     int *,
 				     u_int,
-				     u_int));
+				     u_int);
 __END_DECLS
 
 
@@ -343,18 +343,18 @@
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clntudp_create	__P((struct sockaddr_in *,
+extern CLIENT *clntudp_create	(struct sockaddr_in *,
 				     u_long,
 				     u_long,
 				     struct timeval,
-				     int *));
-extern CLIENT *clntudp_bufcreate __P((struct sockaddr_in *,
+				     int *);
+extern CLIENT *clntudp_bufcreate (struct sockaddr_in *,
 				     u_long,
 				     u_long,
 				     struct timeval,
 				     int *,
 				     u_int,
-				     u_int));
+				     u_int);
 __END_DECLS
 
 
@@ -370,12 +370,12 @@
  *	u_int recvsz;
  */
 __BEGIN_DECLS
-extern CLIENT *clntunix_create	__P((struct sockaddr_un *,
+extern CLIENT *clntunix_create	(struct sockaddr_un *,
 				     u_long,
 				     u_long,
 				     int *,
 				     u_int,
-				     u_int));
+				     u_int);
 __END_DECLS
 
 
@@ -383,24 +383,24 @@
  * Print why creation failed
  */
 __BEGIN_DECLS
-extern void clnt_pcreateerror	__P((char *));			/* stderr */
-extern char *clnt_spcreateerror	__P((char *));			/* string */
+extern void clnt_pcreateerror	(char *);			/* stderr */
+extern char *clnt_spcreateerror	(char *);			/* string */
 __END_DECLS
 
 /*
  * Like clnt_perror(), but is more verbose in its output
  */
 __BEGIN_DECLS
-extern void clnt_perrno		__P((enum clnt_stat));		/* stderr */
-extern char *clnt_sperrno	__P((enum clnt_stat));		/* string */
+extern void clnt_perrno		(enum clnt_stat);		/* stderr */
+extern char *clnt_sperrno	(enum clnt_stat);		/* string */
 __END_DECLS
 
 /*
  * Print an English error message, given the client error code
  */
 __BEGIN_DECLS
-extern void clnt_perror		__P((CLIENT *, char *)); 	/* stderr */
-extern char *clnt_sperror	__P((CLIENT *, char *));	/* string */
+extern void clnt_perror		(CLIENT *, char *); 	/* stderr */
+extern char *clnt_sperror	(CLIENT *, char *);	/* string */
 __END_DECLS
 
 
Index: include/rpc/des.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/des.h,v
retrieving revision 1.1
diff -u -r1.1 des.h
--- include/rpc/des.h	17 Jun 2003 02:50:26 -0000	1.1
+++ include/rpc/des.h	13 Nov 2003 02:00:44 -0000
@@ -79,4 +79,4 @@
 /*
  * Software DES.
  */
-extern int _des_crypt __P(( char *, int, struct desparams * ));
+extern int _des_crypt ( char *, int, struct desparams * );
Index: include/rpc/des_crypt.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/des_crypt.h,v
retrieving revision 1.2
diff -u -r1.2 des_crypt.h
--- include/rpc/des_crypt.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/des_crypt.h	13 Nov 2003 02:00:44 -0000
@@ -77,7 +77,7 @@
  */
 __BEGIN_DECLS
 #ifdef __STDC__
-int cbc_crypt __P(( char *, char *, unsigned int, unsigned int, char *));
+int cbc_crypt ( char *, char *, unsigned int, unsigned int, char *);
 #else
 cbc_crypt(/* key, buf, len, mode, ivec */); /*
 	char *key;	
@@ -92,7 +92,7 @@
  * Electronic Code Book mode
  */
 #ifdef __STDC__
-int ecb_crypt __P(( char *, char *, unsigned int, unsigned int ));
+int ecb_crypt ( char *, char *, unsigned int, unsigned int );
 #else
 ecb_crypt(/* key, buf, len, mode */); /*
 	char *key;	
@@ -110,7 +110,7 @@
  */
 __BEGIN_DECLS
 #ifdef __STDC__
-void des_setparity __P(( char *));
+void des_setparity ( char *);
 #else
 void
 des_setparity(/* key */); /*
Index: include/rpc/pmap_clnt.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/pmap_clnt.h,v
retrieving revision 1.4
diff -u -r1.4 pmap_clnt.h
--- include/rpc/pmap_clnt.h	9 Nov 2003 18:50:57 -0000	1.4
+++ include/rpc/pmap_clnt.h	13 Nov 2003 02:00:44 -0000
@@ -52,7 +52,7 @@
  * 	clnt_stat = clnt_broadcast(program, version, procedure,
  *		xdrargs, argsp,	xdrres, resp, eachresult)
  *		(like pmap_rmtcall, except the call is broadcasted to all
- *		locally connected nets.  For each valid response received,
+ *		locally connected nets.)  For each valid response received,
  *		the procedure eachresult is called.  Its form is:
  *	done = eachresult(resp, raddr)
  *		bool_t done;
@@ -67,23 +67,23 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern bool_t		pmap_set	__P((u_long, u_long, int, int));
-extern bool_t		pmap_unset	__P((u_long, u_long));
-extern struct pmaplist	*pmap_getmaps	__P((struct sockaddr_in *));
-extern enum clnt_stat	pmap_rmtcall	__P((struct sockaddr_in *,
+extern bool_t		pmap_set	(u_long, u_long, int, int);
+extern bool_t		pmap_unset	(u_long, u_long);
+extern struct pmaplist	*pmap_getmaps	(struct sockaddr_in *);
+extern enum clnt_stat	pmap_rmtcall	(struct sockaddr_in *,
 					     u_long, u_long, u_long,
 					     xdrproc_t, caddr_t,
 					     xdrproc_t, caddr_t,
-					     struct timeval, u_long *));
-extern enum clnt_stat	clnt_broadcast	__P((u_long, u_long, u_long,
+					     struct timeval, u_long *);
+extern enum clnt_stat	clnt_broadcast	(u_long, u_long, u_long,
 					     xdrproc_t, char *,
 					     xdrproc_t, char *,
-					     bool_t (*) __P((caddr_t,
-						 struct sockaddr_in *))));
-extern u_short		pmap_getport	__P((struct sockaddr_in *,
-					     u_long, u_long, u_int));
-extern void		pmap_getport_timeout __P((struct timeval *otv,
-					     struct timeval *ntv));
+					     bool_t (*) (caddr_t,
+						 struct sockaddr_in *));
+extern u_short		pmap_getport	(struct sockaddr_in *,
+					     u_long, u_long, u_int);
+extern void		pmap_getport_timeout (struct timeval *otv,
+					     struct timeval *ntv);
 __END_DECLS
 
 #endif /* !_RPC_PMAPCLNT_H */
Index: include/rpc/pmap_prot.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/pmap_prot.h,v
retrieving revision 1.2
diff -u -r1.2 pmap_prot.h
--- include/rpc/pmap_prot.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/pmap_prot.h	13 Nov 2003 02:00:44 -0000
@@ -98,8 +98,8 @@
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_pmap		__P((XDR *, struct pmap *));
-extern bool_t xdr_pmaplist	__P((XDR *, struct pmaplist **));
+extern bool_t xdr_pmap		(XDR *, struct pmap *);
+extern bool_t xdr_pmaplist	(XDR *, struct pmaplist **);
 __END_DECLS
 
 #endif /* !_RPC_PMAPPROT_H */
Index: include/rpc/pmap_rmt.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/pmap_rmt.h,v
retrieving revision 1.2
diff -u -r1.2 pmap_rmt.h
--- include/rpc/pmap_rmt.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/pmap_rmt.h	13 Nov 2003 02:00:44 -0000
@@ -57,8 +57,8 @@
 };
 
 __BEGIN_DECLS
-extern bool_t xdr_rmtcall_args	__P((XDR *, struct rmtcallargs *));
-extern bool_t xdr_rmtcallres	__P((XDR *, struct rmtcallres *));
+extern bool_t xdr_rmtcall_args	(XDR *, struct rmtcallargs *);
+extern bool_t xdr_rmtcallres	(XDR *, struct rmtcallres *);
 __END_DECLS
 
 #endif /* !_RPC_PMAPRMT_H */
Index: include/rpc/rpc.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/rpc.h,v
retrieving revision 1.2
diff -u -r1.2 rpc.h
--- include/rpc/rpc.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/rpc.h	13 Nov 2003 02:00:44 -0000
@@ -80,16 +80,16 @@
 };
 
 __BEGIN_DECLS
-extern struct rpcent *getrpcbyname	__P((char *));
-extern struct rpcent *getrpcbynumber	__P((int));
-extern struct rpcent *getrpcent		__P((void));
-extern int getrpcport __P((char *host, int prognum, int versnum, int proto));
-extern void setrpcent __P((int));
-extern void endrpcent __P((void));
+extern struct rpcent *getrpcbyname	(char *);
+extern struct rpcent *getrpcbynumber	(int);
+extern struct rpcent *getrpcent		(void);
+extern int getrpcport (char *host, int prognum, int versnum, int proto);
+extern void setrpcent (int);
+extern void endrpcent (void);
 
-extern int bindresvport __P((int, struct sockaddr_in *));
-extern int bindresvport_sa __P((int, struct sockaddr *));
-extern int get_myaddress __P((struct sockaddr_in *));
+extern int bindresvport (int, struct sockaddr_in *);
+extern int bindresvport_sa (int, struct sockaddr *);
+extern int get_myaddress (struct sockaddr_in *);
 __END_DECLS
 
 #endif /* !_RPC_RPC_H */
Index: include/rpc/rpc_msg.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/rpc_msg.h,v
retrieving revision 1.2
diff -u -r1.2 rpc_msg.h
--- include/rpc/rpc_msg.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/rpc_msg.h	13 Nov 2003 02:00:44 -0000
@@ -166,7 +166,7 @@
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callmsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callmsg	(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to pre-serialize the static part of a rpc message.
@@ -174,7 +174,7 @@
  * 	XDR *xdrs;
  * 	struct rpc_msg *cmsg;
  */
-extern bool_t	xdr_callhdr	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_callhdr	(XDR *, struct rpc_msg *);
 
 /*
  * XDR routine to handle a rpc reply.
@@ -182,7 +182,7 @@
  * 	XDR *xdrs;
  * 	struct rpc_msg *rmsg;
  */
-extern bool_t	xdr_replymsg	__P((XDR *, struct rpc_msg *));
+extern bool_t	xdr_replymsg	(XDR *, struct rpc_msg *);
 
 /*
  * Fills in the error part of a reply message.
@@ -191,7 +191,7 @@
  * 	struct rpc_err *error;
  */
 struct rpc_err;
-extern void	_seterr_reply	__P((struct rpc_msg *, struct rpc_err *));
+extern void	_seterr_reply	(struct rpc_msg *, struct rpc_err *);
 __END_DECLS
 
 #endif /* !_RPC_RPCMSG_H */
Index: include/rpc/svc.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/svc.h,v
retrieving revision 1.2
diff -u -r1.2 svc.h
--- include/rpc/svc.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/svc.h	13 Nov 2003 02:00:44 -0000
@@ -80,21 +80,21 @@
 	u_short		xp_port;	 /* associated port number */
 	struct xp_ops {
 	    /* receive incoming requests */
-	    bool_t	(*xp_recv) __P((struct __rpc_svcxprt *,
-				struct rpc_msg *));
+	    bool_t	(*xp_recv) (struct __rpc_svcxprt *,
+				struct rpc_msg *);
 	    /* get transport status */
-	    enum xprt_stat (*xp_stat) __P((struct __rpc_svcxprt *));
+	    enum xprt_stat (*xp_stat) (struct __rpc_svcxprt *);
 	    /* get arguments */
-	    bool_t	(*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-				caddr_t));
+	    bool_t	(*xp_getargs) (struct __rpc_svcxprt *, xdrproc_t,
+				caddr_t);
 	    /* send reply */
-	    bool_t	(*xp_reply) __P((struct __rpc_svcxprt *,
-				struct rpc_msg *));
+	    bool_t	(*xp_reply) (struct __rpc_svcxprt *,
+				struct rpc_msg *);
 	    /* free mem allocated for args */
-	    bool_t	(*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t,
-				caddr_t));
+	    bool_t	(*xp_freeargs) (struct __rpc_svcxprt *, xdrproc_t,
+				caddr_t);
 	    /* destroy this struct */
-	    void	(*xp_destroy) __P((struct __rpc_svcxprt *));
+	    void	(*xp_destroy) (struct __rpc_svcxprt *);
 	} *xp_ops;
 	int		xp_addrlen;	 /* length of remote address */
 	struct sockaddr_in xp_raddr;	 /* remote address */
@@ -171,8 +171,8 @@
  *	int protocol;        (like TCP or UDP, zero means do not register)
  */
 __BEGIN_DECLS
-extern bool_t	svc_register __P((SVCXPRT *, u_long, u_long,
-			void (*) __P((struct svc_req *, SVCXPRT *)), int));
+			void (*) (struct svc_req *, SVCXPRT *), int);
 __END_DECLS
 
 /*
@@ -183,7 +183,7 @@
  *	u_long vers;
  */
 __BEGIN_DECLS
-extern void	svc_unregister __P((u_long, u_long));
+extern void	svc_unregister (u_long, u_long);
 __END_DECLS
 
 /*
@@ -193,7 +193,7 @@
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_register	__P((SVCXPRT *));
+extern void	xprt_register	(SVCXPRT *);
 __END_DECLS
 
 /*
@@ -203,7 +203,7 @@
  *	SVCXPRT *xprt;
  */
 __BEGIN_DECLS
-extern void	xprt_unregister	__P((SVCXPRT *));
+extern void	xprt_unregister	(SVCXPRT *);
 __END_DECLS
 
 
@@ -236,14 +236,14 @@
  */
 
 __BEGIN_DECLS
-extern bool_t	svc_sendreply	__P((SVCXPRT *, xdrproc_t, char *));
-extern void	svcerr_decode	__P((SVCXPRT *));
-extern void	svcerr_weakauth	__P((SVCXPRT *));
-extern void	svcerr_noproc	__P((SVCXPRT *));
-extern void	svcerr_progvers	__P((SVCXPRT *, u_long, u_long));
-extern void	svcerr_auth	__P((SVCXPRT *, enum auth_stat));
-extern void	svcerr_noprog	__P((SVCXPRT *));
-extern void	svcerr_systemerr __P((SVCXPRT *));
+extern bool_t	svc_sendreply	(SVCXPRT *, xdrproc_t, char *);
+extern void	svcerr_decode	(SVCXPRT *);
+extern void	svcerr_weakauth	(SVCXPRT *);
+extern void	svcerr_noproc	(SVCXPRT *);
+extern void	svcerr_progvers	(SVCXPRT *, u_long, u_long);
+extern void	svcerr_auth	(SVCXPRT *, enum auth_stat);
+extern void	svcerr_noprog	(SVCXPRT *);
+extern void	svcerr_systemerr (SVCXPRT *);
 __END_DECLS
 
 /*
@@ -274,10 +274,10 @@
 #endif
 
 __BEGIN_DECLS
-extern void	svc_getreq	__P((int));
-extern void	svc_getreqset	__P((fd_set *));
-extern void	svc_getreqset2	__P((fd_set *, int)); /* XXX: nonstd, undoc */
-extern void	svc_run		__P((void));
+extern void	svc_getreq	(int);
+extern void	svc_getreqset	(fd_set *);
+extern void	svc_getreqset2	(fd_set *, int); /* XXX: nonstd, undoc */
+extern void	svc_run		(void);
 __END_DECLS
 
 /*
@@ -293,7 +293,7 @@
  * Memory based rpc for testing and timing.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcraw_create __P((void));
+extern SVCXPRT *svcraw_create (void);
 __END_DECLS
 
 
@@ -301,8 +301,8 @@
  * Udp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcudp_create __P((int));
-extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int));
+extern SVCXPRT *svcudp_create (int);
+extern SVCXPRT *svcudp_bufcreate (int, u_int, u_int);
 __END_DECLS
 
 
@@ -310,16 +310,16 @@
  * Tcp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svctcp_create __P((int, u_int, u_int));
-extern SVCXPRT *svcfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svctcp_create (int, u_int, u_int);
+extern SVCXPRT *svcfd_create (int, u_int, u_int);
 __END_DECLS
 
 /*
  * AF_UNIX socket based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcunix_create __P((int, u_int, u_int, char *));
-extern SVCXPRT *svcunixfd_create __P((int, u_int, u_int));
+extern SVCXPRT *svcunix_create (int, u_int, u_int, char *);
+extern SVCXPRT *svcunixfd_create (int, u_int, u_int);
 __END_DECLS
 
 #endif /* !_RPC_SVC_H */
Index: include/rpc/svc_auth.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/svc_auth.h,v
retrieving revision 1.2
diff -u -r1.2 svc_auth.h
--- include/rpc/svc_auth.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/svc_auth.h	13 Nov 2003 02:00:44 -0000
@@ -48,10 +48,10 @@
  * Server side authenticator
  */
 __BEGIN_DECLS
-extern enum auth_stat _authenticate __P((struct svc_req *, struct rpc_msg *));
-extern int svc_auth_reg __P((int, enum auth_stat (*)(struct svc_req *,
-						     struct rpc_msg *)));
-extern enum auth_stat _svcauth_des __P((struct svc_req *, struct rpc_msg *));
+extern enum auth_stat _authenticate (struct svc_req *, struct rpc_msg *);
+extern int svc_auth_reg (int, enum auth_stat (*)(struct svc_req *,
+						     struct rpc_msg *));
+extern enum auth_stat _svcauth_des (struct svc_req *, struct rpc_msg *);
 __END_DECLS
 
 #endif /* !_RPC_SVCAUTH_H */
Index: include/rpc/xdr.h
===================================================================
RCS file: /home/dcvs/src/include/rpc/xdr.h,v
retrieving revision 1.2
diff -u -r1.2 xdr.h
--- include/rpc/xdr.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpc/xdr.h	13 Nov 2003 02:00:44 -0000
@@ -100,21 +100,21 @@
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong) __P((struct __rpc_xdr *, long *));
+		bool_t	(*x_getlong) (struct __rpc_xdr *, long *);
 		/* put a long to underlying stream */
-		bool_t	(*x_putlong) __P((struct __rpc_xdr *, long *));
+		bool_t	(*x_putlong) (struct __rpc_xdr *, long *);
 		/* get some bytes from underlying stream */
-		bool_t	(*x_getbytes) __P((struct __rpc_xdr *, caddr_t, u_int));
+		bool_t	(*x_getbytes) (struct __rpc_xdr *, caddr_t, u_int);
 		/* put some bytes to underlying stream */
-		bool_t	(*x_putbytes) __P((struct __rpc_xdr *, caddr_t, u_int));
+		bool_t	(*x_putbytes) (struct __rpc_xdr *, caddr_t, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn) __P((struct __rpc_xdr *));
+		u_int	(*x_getpostn) (struct __rpc_xdr *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn) __P((struct __rpc_xdr *, u_int));
+		bool_t  (*x_setpostn) (struct __rpc_xdr *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline) __P((struct __rpc_xdr *, u_int));
+		int32_t *(*x_inline) (struct __rpc_xdr *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy) __P((struct __rpc_xdr *));
+		void	(*x_destroy) (struct __rpc_xdr *);
 	} *x_ops;
 	caddr_t 	x_public;	/* users' data */
 	caddr_t		x_private;	/* pointer to private data */
@@ -131,12 +131,12 @@
  * allocate dynamic storage of the appropriate size and return it.
  */
 #ifdef _KERNEL
-typedef	bool_t (*xdrproc_t) __P((XDR *, void *, u_int));
+typedef	bool_t (*xdrproc_t) (XDR *, void *, u_int);
 #else
 /*
  * XXX can't actually prototype it, because some take two args!!!
  */
-typedef	bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */));
+typedef	bool_t (*xdrproc_t) (/* XDR *, void *, u_int */);
 #endif
 
 /*
@@ -240,36 +240,36 @@
  * These are the "generic" xdr routines.
  */
 __BEGIN_DECLS
-extern bool_t	xdr_void	__P((void));
-extern bool_t	xdr_int		__P((XDR *, int *));
-extern bool_t	xdr_u_int	__P((XDR *, u_int *));
-extern bool_t	xdr_long	__P((XDR *, long *));
-extern bool_t	xdr_u_long	__P((XDR *, u_long *));
-extern bool_t	xdr_short	__P((XDR *, short *));
-extern bool_t	xdr_u_short	__P((XDR *, u_short *));
-extern bool_t	xdr_int16_t	__P((XDR *, int16_t *));
-extern bool_t	xdr_u_int16_t	__P((XDR *, u_int16_t *));
-extern bool_t	xdr_int32_t	__P((XDR *, int32_t *));
-extern bool_t	xdr_u_int32_t	__P((XDR *, u_int32_t *));
-extern bool_t	xdr_int64_t	__P((XDR *, int64_t *));
-extern bool_t	xdr_u_int64_t	__P((XDR *, u_int64_t *));
-extern bool_t	xdr_bool	__P((XDR *, bool_t *));
-extern bool_t	xdr_enum	__P((XDR *, enum_t *));
-extern bool_t	xdr_array	__P((XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_bytes	__P((XDR *, char **, u_int *, u_int));
-extern bool_t	xdr_opaque	__P((XDR *, caddr_t, u_int));
-extern bool_t	xdr_string	__P((XDR *, char **, u_int));
-extern bool_t	xdr_union	__P((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t));
-extern unsigned long	xdr_sizeof __P((xdrproc_t, void *));
-extern bool_t	xdr_char	__P((XDR *, char *));
-extern bool_t	xdr_u_char	__P((XDR *, u_char *));
-extern bool_t	xdr_vector	__P((XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t	xdr_float	__P((XDR *, float *));
-extern bool_t	xdr_double	__P((XDR *, double *));
-extern bool_t	xdr_reference	__P((XDR *, caddr_t *, u_int, xdrproc_t));
-extern bool_t	xdr_pointer	__P((XDR *, caddr_t *, u_int, xdrproc_t));
-extern bool_t	xdr_wrapstring	__P((XDR *, char **));
-extern void	xdr_free 	__P((xdrproc_t, char *));
+extern bool_t	xdr_void	(void);
+extern bool_t	xdr_int		(XDR *, int *);
+extern bool_t	xdr_u_int	(XDR *, u_int *);
+extern bool_t	xdr_long	(XDR *, long *);
+extern bool_t	xdr_u_long	(XDR *, u_long *);
+extern bool_t	xdr_short	(XDR *, short *);
+extern bool_t	xdr_u_short	(XDR *, u_short *);
+extern bool_t	xdr_int16_t	(XDR *, int16_t *);
+extern bool_t	xdr_u_int16_t	(XDR *, u_int16_t *);
+extern bool_t	xdr_int32_t	(XDR *, int32_t *);
+extern bool_t	xdr_u_int32_t	(XDR *, u_int32_t *);
+extern bool_t	xdr_int64_t	(XDR *, int64_t *);
+extern bool_t	xdr_u_int64_t	(XDR *, u_int64_t *);
+extern bool_t	xdr_bool	(XDR *, bool_t *);
+extern bool_t	xdr_enum	(XDR *, enum_t *);
+extern bool_t	xdr_array	(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_bytes	(XDR *, char **, u_int *, u_int);
+extern bool_t	xdr_opaque	(XDR *, caddr_t, u_int);
+extern bool_t	xdr_string	(XDR *, char **, u_int);
+extern bool_t	xdr_union	(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t);
+extern unsigned long	xdr_sizeof (xdrproc_t, void *);
+extern bool_t	xdr_char	(XDR *, char *);
+extern bool_t	xdr_u_char	(XDR *, u_char *);
+extern bool_t	xdr_vector	(XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t	xdr_float	(XDR *, float *);
+extern bool_t	xdr_double	(XDR *, double *);
+extern bool_t	xdr_reference	(XDR *, caddr_t *, u_int, xdrproc_t);
+extern bool_t	xdr_pointer	(XDR *, caddr_t *, u_int, xdrproc_t);
+extern bool_t	xdr_wrapstring	(XDR *, char **);
+extern void	xdr_free 	(xdrproc_t, char *);
 __END_DECLS
 
 /*
@@ -282,7 +282,7 @@
 	char	*n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t   xdr_netobj __P((XDR *, struct netobj *));
+extern bool_t   xdr_netobj (XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -290,26 +290,26 @@
  */
 __BEGIN_DECLS
 /* XDR using memory buffers */
-extern void   xdrmem_create	__P((XDR *, char *, u_int, enum xdr_op));
+extern void   xdrmem_create	(XDR *, char *, u_int, enum xdr_op);
 
 #ifdef _STDIO_H_
 /* XDR using stdio library */
-extern void   xdrstdio_create	__P((XDR *, FILE *, enum xdr_op));
+extern void   xdrstdio_create	(XDR *, FILE *, enum xdr_op);
 #endif
 
 /* XDR pseudo records for tcp */
-extern void   xdrrec_create	__P((XDR *, u_int, u_int, char *,
-				int (*) __P((caddr_t, caddr_t, int)),
-				int (*) __P((caddr_t, caddr_t, int))));
+extern void   xdrrec_create	(XDR *, u_int, u_int, char *,
+				int (*) (caddr_t, caddr_t, int),
+				int (*) (caddr_t, caddr_t, int));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord __P((XDR *, int));
+extern bool_t xdrrec_endofrecord (XDR *, int);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord	__P((XDR *));
+extern bool_t xdrrec_skiprecord	(XDR *);
 
 /* true if no more input */
-extern bool_t xdrrec_eof	__P((XDR *));
+extern bool_t xdrrec_eof	(XDR *);
 __END_DECLS
 
 #endif /* !_RPC_XDR_H */
Index: include/rpcsvc/ypclnt.h
===================================================================
RCS file: /home/dcvs/src/include/rpcsvc/ypclnt.h,v
retrieving revision 1.2
diff -u -r1.2 ypclnt.h
--- include/rpcsvc/ypclnt.h	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpcsvc/ypclnt.h	13 Nov 2003 02:00:44 -0000
@@ -73,19 +73,19 @@
 int	_yp_dobind(char *dom, struct dom_binding **ypdb);
 void	yp_unbind(char *dom);
 int	yp_get_default_domain(char **domp);
-int	yp_match 	__P((char *indomain, char *inmap,
+int	yp_match 	(char *indomain, char *inmap,
 			    const char *inkey, int inkeylen, char **outval,
-			    int *outvallen));
-int	yp_first 	__P((char *indomain, char *inmap,
+			    int *outvallen);
+int	yp_first 	(char *indomain, char *inmap,
 			    char **outkey, int *outkeylen, char **outval,
-			    int *outvallen));
-int	yp_next		__P((char *indomain, char *inmap,
+			    int *outvallen);
+int	yp_next		(char *indomain, char *inmap,
 			    char *inkey, int inkeylen, char **outkey,
-			    int *outkeylen, char **outval, int *outvallen));
+			    int *outkeylen, char **outval, int *outvallen);
 int	yp_master(char *indomain, char *inmap, char **outname);
 int	yp_order(char *indomain, char *inmap, int *outorder);
-int	yp_all		__P((char *indomain, char *inmap,
-			    struct ypall_callback *incallback));
+int	yp_all		(char *indomain, char *inmap,
+			    struct ypall_callback *incallback);
 char *	yperr_string(int incode);
 char *	ypbinderr_string(int incode);
 int	ypprot_err(unsigned int incode);
Index: include/rpcsvc/yppasswd.x
===================================================================
RCS file: /home/dcvs/src/include/rpcsvc/yppasswd.x,v
retrieving revision 1.2
diff -u -r1.2 yppasswd.x
--- include/rpcsvc/yppasswd.x	17 Jun 2003 04:25:58 -0000	1.2
+++ include/rpcsvc/yppasswd.x	13 Nov 2003 02:11:13 -0000
@@ -66,6 +66,6 @@
 
 #ifdef RPC_HDR
 %#include <sys/cdefs.h>
-%extern int _yppasswd __P(( char * , struct x_passwd * ));
+%extern int _yppasswd ( char * , struct x_passwd * );
 %#define yppasswd(x,y) _yppasswd(x,y)
 #endif
Index: libexec/atrun/atrun.c
===================================================================
RCS file: /home/dcvs/src/libexec/atrun/atrun.c,v
retrieving revision 1.2
diff -u -r1.2 atrun.c
--- libexec/atrun/atrun.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/atrun/atrun.c	13 Nov 2003 17:47:42 -0000
@@ -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
Index: libexec/bootpd/hwaddr.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/hwaddr.c,v
retrieving revision 1.2
diff -u -r1.2 hwaddr.c
--- libexec/bootpd/hwaddr.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/bootpd/hwaddr.c	13 Nov 2003 17:47:42 -0000
@@ -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
 
Index: libexec/bootpd/rtmsg.c
===================================================================
RCS file: /home/dcvs/src/libexec/bootpd/rtmsg.c,v
retrieving revision 1.2
diff -u -r1.2 rtmsg.c
--- libexec/bootpd/rtmsg.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/bootpd/rtmsg.c	13 Nov 2003 17:47:42 -0000
@@ -73,7 +73,7 @@
 #include "report.h"
 
 
-static int rtmsg __P((int));
+static int rtmsg (int);
 
 static int s = -1; 	/* routing socket */
 
Index: libexec/comsat/comsat.c
===================================================================
RCS file: /home/dcvs/src/libexec/comsat/comsat.c,v
retrieving revision 1.2
diff -u -r1.2 comsat.c
--- libexec/comsat/comsat.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/comsat/comsat.c	13 Nov 2003 17:47:42 -0000
@@ -69,11 +69,11 @@
 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)
Index: libexec/fingerd/fingerd.c
===================================================================
RCS file: /home/dcvs/src/libexec/fingerd/fingerd.c,v
retrieving revision 1.2
diff -u -r1.2 fingerd.c
--- libexec/fingerd/fingerd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/fingerd/fingerd.c	13 Nov 2003 17:47:42 -0000
@@ -53,7 +53,7 @@
 #include <strings.h>
 #include "pathnames.h"
 
-void logerr __P((const char *, ...));
+void logerr (const char *, ...);
 
 int
 main(argc, argv)
Index: libexec/ftpd/extern.h
===================================================================
RCS file: /home/dcvs/src/libexec/ftpd/extern.h,v
retrieving revision 1.2
diff -u -r1.2 extern.h
--- libexec/ftpd/extern.h	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/ftpd/extern.h	13 Nov 2003 17:47:42 -0000
@@ -38,44 +38,44 @@
 #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;
Index: libexec/ftpd/ftpcmd.y
===================================================================
RCS file: /home/dcvs/src/libexec/ftpd/ftpcmd.y,v
retrieving revision 1.2
diff -u -r1.2 ftpcmd.y
--- libexec/ftpd/ftpcmd.y	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/ftpd/ftpcmd.y	13 Nov 2003 17:47:42 -0000
@@ -1153,16 +1153,16 @@
 	{ 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)
Index: libexec/ftpd/ftpd.c
===================================================================
RCS file: /home/dcvs/src/libexec/ftpd/ftpd.c,v
retrieving revision 1.2
diff -u -r1.2 ftpd.c
--- libexec/ftpd/ftpd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/ftpd/ftpd.c	13 Nov 2003 17:47:42 -0000
@@ -179,7 +179,7 @@
 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 @@
 	}
 
 #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 @@
 {
 	FILE *fin, *dout;
 	struct stat st;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc) (FILE *);
 	time_t start;
 
 	if (cmd == 0) {
@@ -1686,7 +1686,7 @@
 {
 	int fd;
 	FILE *fout, *din;
-	int (*closefunc) __P((FILE *));
+	int (*closefunc) (FILE *);
 
 	if (*mode == 'a') {		/* APPE */
 		if (unique) {
Index: libexec/getNAME/getNAME.c
===================================================================
RCS file: /home/dcvs/src/libexec/getNAME/getNAME.c,v
retrieving revision 1.2
diff -u -r1.2 getNAME.c
--- libexec/getNAME/getNAME.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/getNAME/getNAME.c	13 Nov 2003 17:47:42 -0000
@@ -52,12 +52,12 @@
 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)
Index: libexec/getty/chat.c
===================================================================
RCS file: /home/dcvs/src/libexec/getty/chat.c,v
retrieving revision 1.2
diff -u -r1.2 chat.c
--- libexec/getty/chat.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/getty/chat.c	13 Nov 2003 17:47:42 -0000
@@ -66,15 +66,15 @@
 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 *);
 
 
 /*
Index: libexec/getty/extern.h
===================================================================
RCS file: /home/dcvs/src/libexec/getty/extern.h,v
retrieving revision 1.2
diff -u -r1.2 extern.h
--- libexec/getty/extern.h	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/getty/extern.h	13 Nov 2003 17:47:42 -0000
@@ -48,17 +48,17 @@
 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);
Index: libexec/getty/main.c
===================================================================
RCS file: /home/dcvs/src/libexec/getty/main.c,v
retrieving revision 1.2
diff -u -r1.2 main.c
--- libexec/getty/main.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/getty/main.c	13 Nov 2003 17:47:42 -0000
@@ -122,22 +122,22 @@
 
 #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));
+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 __P((int, char **));
+int		main (int, char **);
 
 jmp_buf timeout;
 
Index: libexec/getty/subr.c
===================================================================
RCS file: /home/dcvs/src/libexec/getty/subr.c,v
retrieving revision 1.2
diff -u -r1.2 subr.c
--- libexec/getty/subr.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/getty/subr.c	13 Nov 2003 17:47:42 -0000
@@ -57,7 +57,7 @@
 
 
 #ifdef COMPAT_43
-static void	compatflags __P((long));
+static void	compatflags (long);
 #endif
 
 /*
Index: libexec/makekey/makekey.c
===================================================================
RCS file: /home/dcvs/src/libexec/makekey/makekey.c,v
retrieving revision 1.2
diff -u -r1.2 makekey.c
--- libexec/makekey/makekey.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/makekey/makekey.c	13 Nov 2003 17:47:42 -0000
@@ -45,7 +45,7 @@
 #include <string.h>
 #include <unistd.h>
 
-static void get __P((char *, int));
+static void get (char *, int);
 
 int
 main()
Index: libexec/mknetid/hash.h
===================================================================
RCS file: /home/dcvs/src/libexec/mknetid/hash.h,v
retrieving revision 1.2
diff -u -r1.2 hash.h
--- libexec/mknetid/hash.h	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/mknetid/hash.h	13 Nov 2003 17:47:42 -0000
@@ -50,6 +50,6 @@
 #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 * );
 
Index: libexec/mknetid/mknetid.c
===================================================================
RCS file: /home/dcvs/src/libexec/mknetid/mknetid.c,v
retrieving revision 1.2
diff -u -r1.2 mknetid.c
--- libexec/mknetid/mknetid.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/mknetid/mknetid.c	13 Nov 2003 17:47:42 -0000
@@ -80,9 +80,9 @@
  */
 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()
Index: libexec/rbootd/defs.h
===================================================================
RCS file: /home/dcvs/src/libexec/rbootd/defs.h,v
retrieving revision 1.2
diff -u -r1.2 defs.h
--- libexec/rbootd/defs.h	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rbootd/defs.h	13 Nov 2003 17:47:42 -0000
@@ -152,36 +152,36 @@
 
 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 *);
Index: libexec/rbootd/rbootd.c
===================================================================
RCS file: /home/dcvs/src/libexec/rbootd/rbootd.c,v
retrieving revision 1.2
diff -u -r1.2 rbootd.c
--- libexec/rbootd/rbootd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rbootd/rbootd.c	13 Nov 2003 17:47:42 -0000
@@ -63,7 +63,7 @@
 #include <unistd.h>
 #include "defs.h"
 
-static void usage __P((void));
+static void usage (void);
 
 int
 main(argc, argv)
Index: libexec/revnetgroup/hash.h
===================================================================
RCS file: /home/dcvs/src/libexec/revnetgroup/hash.h,v
retrieving revision 1.2
diff -u -r1.2 hash.h
--- libexec/revnetgroup/hash.h	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/revnetgroup/hash.h	13 Nov 2003 17:47:42 -0000
@@ -60,9 +60,9 @@
 
 #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 ** );
Index: libexec/rexecd/rexecd.c
===================================================================
RCS file: /home/dcvs/src/libexec/rexecd/rexecd.c,v
retrieving revision 1.2
diff -u -r1.2 rexecd.c
--- libexec/rexecd/rexecd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rexecd/rexecd.c	13 Nov 2003 17:47:42 -0000
@@ -66,10 +66,10 @@
 
 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;
 
Index: libexec/rlogind/rlogind.c
===================================================================
RCS file: /home/dcvs/src/libexec/rlogind/rlogind.c,v
retrieving revision 1.2
diff -u -r1.2 rlogind.c
--- libexec/rlogind/rlogind.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rlogind/rlogind.c	13 Nov 2003 17:47:42 -0000
@@ -107,16 +107,16 @@
 #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));
-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
Index: libexec/rpc.rquotad/rquotad.c
===================================================================
RCS file: /home/dcvs/src/libexec/rpc.rquotad/rquotad.c,v
retrieving revision 1.3
diff -u -r1.3 rquotad.c
--- libexec/rpc.rquotad/rquotad.c	8 Aug 2003 04:18:36 -0000	1.3
+++ libexec/rpc.rquotad/rquotad.c	13 Nov 2003 17:47:42 -0000
@@ -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
Index: libexec/rpc.rstatd/rstat_proc.c
===================================================================
RCS file: /home/dcvs/src/libexec/rpc.rstatd/rstat_proc.c,v
retrieving revision 1.2
diff -u -r1.2 rstat_proc.c
--- libexec/rpc.rstatd/rstat_proc.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rpc.rstatd/rstat_proc.c	13 Nov 2003 17:47:42 -0000
@@ -78,9 +78,9 @@
 	{ "" },
 };
 
-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;
Index: libexec/rpc.rwalld/rwalld.c
===================================================================
RCS file: /home/dcvs/src/libexec/rpc.rwalld/rwalld.c,v
retrieving revision 1.2
diff -u -r1.2 rwalld.c
--- libexec/rpc.rwalld/rwalld.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rpc.rwalld/rwalld.c	13 Nov 2003 17:47:42 -0000
@@ -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;
Index: libexec/rpc.sprayd/sprayd.c
===================================================================
RCS file: /home/dcvs/src/libexec/rpc.sprayd/sprayd.c,v
retrieving revision 1.2
diff -u -r1.2 sprayd.c
--- libexec/rpc.sprayd/sprayd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rpc.sprayd/sprayd.c	13 Nov 2003 17:47:43 -0000
@@ -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;
 
Index: libexec/rshd/rshd.c
===================================================================
RCS file: /home/dcvs/src/libexec/rshd/rshd.c,v
retrieving revision 1.2
diff -u -r1.2 rshd.c
--- libexec/rshd/rshd.c	17 Jun 2003 04:27:07 -0000	1.2
+++ libexec/rshd/rshd.c	13 Nov 2003 17:47:43 -0000
@@ -97,12 +97,12 @@
 #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"
 
Index: libexec/rtld-aout/dynamic.h
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-aout/dynamic.h,v
retrieving revision 1.2
diff -u -r1.2 dynamic.h
--- libexec/rtld-aout/dynamic.h	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/rtld-aout/dynamic.h	13 Nov 2003 18:04:44 -0000
@@ -294,88 +294,88 @@
 #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__ */
Index: libexec/rtld-aout/rtld.c
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-aout/rtld.c,v
retrieving revision 1.2
diff -u -r1.2 rtld.c
--- libexec/rtld-aout/rtld.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/rtld-aout/rtld.c	13 Nov 2003 17:51:47 -0000
@@ -203,66 +203,66 @@
 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 @@
  * be gotten via dlerror().
  */
         static int
-map_preload __P((void)) {
+map_preload (void) {
 	char    *ld_name = ld_preload;
 	char	*name;
 
@@ -1754,7 +1754,7 @@
  * 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 @@
 }
 
 static const char *
-__dlerror __P((void))
+__dlerror (void)
 {
         const char	*err;
 
@@ -2265,7 +2265,7 @@
 }
 
 static void
-__dlexit __P((void))
+__dlexit (void)
 {
 #ifdef DEBUG
 xprintf("__dlexit called\n");
@@ -2278,7 +2278,7 @@
  * 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 *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 @@
  * main program's sbrk arena.
  */
 static void
-init_internal_malloc __P((void))
+init_internal_malloc (void)
 {
 	const struct exec *hdr;
 
@@ -2466,7 +2466,7 @@
  * malloc functions.
  */
 static void
-init_external_malloc __P((void))
+init_external_malloc (void)
 {
 	/*
          * Patch the program's idea of the current break address to
Index: libexec/rtld-aout/shlib.h
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-aout/shlib.h,v
retrieving revision 1.2
diff -u -r1.2 shlib.h
--- libexec/rtld-aout/shlib.h	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/rtld-aout/shlib.h	13 Nov 2003 17:47:43 -0000
@@ -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);
Index: libexec/rtld-aout/support.h
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-aout/support.h,v
retrieving revision 1.2
diff -u -r1.2 support.h
--- libexec/rtld-aout/support.h	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/rtld-aout/support.h	13 Nov 2003 17:47:43 -0000
@@ -31,6 +31,6 @@
  * 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 *);
Index: libexec/rtld-aout/i386/md.h
===================================================================
RCS file: /home/dcvs/src/libexec/rtld-aout/i386/md.h,v
retrieving revision 1.2
diff -u -r1.2 md.h
--- libexec/rtld-aout/i386/md.h	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/rtld-aout/i386/md.h	13 Nov 2003 17:47:43 -0000
@@ -179,11 +179,11 @@
 
 /* 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 @@
 
 #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__ */
Index: libexec/talkd/announce.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/announce.c,v
retrieving revision 1.2
diff -u -r1.2 announce.c
--- libexec/talkd/announce.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/talkd/announce.c	13 Nov 2003 17:47:43 -0000
@@ -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.
Index: libexec/talkd/process.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/process.c,v
retrieving revision 1.2
diff -u -r1.2 process.c
--- libexec/talkd/process.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/talkd/process.c	13 Nov 2003 17:47:43 -0000
@@ -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)
Index: libexec/talkd/table.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/table.c,v
retrieving revision 1.2
diff -u -r1.2 table.c
--- libexec/talkd/table.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/talkd/table.c	13 Nov 2003 17:47:43 -0000
@@ -72,11 +72,11 @@
 
 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
Index: libexec/talkd/talkd.c
===================================================================
RCS file: /home/dcvs/src/libexec/talkd/talkd.c,v
retrieving revision 1.2
diff -u -r1.2 talkd.c
--- libexec/talkd/talkd.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/talkd/talkd.c	13 Nov 2003 17:47:43 -0000
@@ -69,7 +69,7 @@
 #define TIMEOUT 30
 #define MAXIDLE 120
 
-void process_request __P((CTL_MSG *, CTL_RESPONSE *));
+void process_request (CTL_MSG *, CTL_RESPONSE *);
 void timeout();
 
 int
Index: libexec/xtend/status.c
===================================================================
RCS file: /home/dcvs/src/libexec/xtend/status.c,v
retrieving revision 1.2
diff -u -r1.2 status.c
--- libexec/xtend/status.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/xtend/status.c	13 Nov 2003 17:47:43 -0000
@@ -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
Index: libexec/xtend/user.c
===================================================================
RCS file: /home/dcvs/src/libexec/xtend/user.c,v
retrieving revision 1.2
diff -u -r1.2 user.c
--- libexec/xtend/user.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/xtend/user.c	13 Nov 2003 17:47:43 -0000
@@ -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
Index: libexec/xtend/xtend.c
===================================================================
RCS file: /home/dcvs/src/libexec/xtend/xtend.c,v
retrieving revision 1.2
diff -u -r1.2 xtend.c
--- libexec/xtend/xtend.c	17 Jun 2003 04:27:08 -0000	1.2
+++ libexec/xtend/xtend.c	13 Nov 2003 17:47:43 -0000
@@ -73,11 +73,11 @@
 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)
Index: release/picobsd/tinyware/oinit/oinit.c
===================================================================
RCS file: /home/dcvs/src/release/picobsd/tinyware/oinit/oinit.c,v
retrieving revision 1.2
diff -u -r1.2 oinit.c
--- release/picobsd/tinyware/oinit/oinit.c	17 Jun 2003 04:27:20 -0000	1.2
+++ release/picobsd/tinyware/oinit/oinit.c	13 Nov 2003 17:47:43 -0000
@@ -100,17 +100,17 @@
 };
 
 /* 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[]={
Index: release/picobsd/tinyware/view/view.c
===================================================================
RCS file: /home/dcvs/src/release/picobsd/tinyware/view/view.c,v
retrieving revision 1.2
diff -u -r1.2 view.c
--- release/picobsd/tinyware/view/view.c	17 Jun 2003 04:27:21 -0000	1.2
+++ release/picobsd/tinyware/view/view.c	13 Nov 2003 17:47:44 -0000
@@ -48,7 +48,7 @@
 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;
Index: secure/lib/libcrypt/blowfish.h
===================================================================
RCS file: /home/dcvs/src/secure/lib/libcrypt/blowfish.h,v
retrieving revision 1.2
diff -u -r1.2 blowfish.h
--- secure/lib/libcrypt/blowfish.h	17 Jun 2003 04:27:48 -0000	1.2
+++ secure/lib/libcrypt/blowfish.h	13 Nov 2003 17:47:44 -0000
@@ -62,26 +62,26 @@
  *	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
Index: secure/lib/libcrypt/crypt-blowfish.c
===================================================================
RCS file: /home/dcvs/src/secure/lib/libcrypt/crypt-blowfish.c,v
retrieving revision 1.2
diff -u -r1.2 crypt-blowfish.c
--- secure/lib/libcrypt/crypt-blowfish.c	17 Jun 2003 04:27:48 -0000	1.2
+++ secure/lib/libcrypt/crypt-blowfish.c	13 Nov 2003 17:47:44 -0000
@@ -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];
Index: share/examples/ses/srcs/getencstat.c
===================================================================
RCS file: /home/dcvs/src/share/examples/ses/srcs/getencstat.c,v
retrieving revision 1.2
diff -u -r1.2 getencstat.c
--- share/examples/ses/srcs/getencstat.c	17 Jun 2003 04:36:58 -0000	1.2
+++ share/examples/ses/srcs/getencstat.c	13 Nov 2003 17:47:44 -0000
@@ -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)
Index: share/examples/ses/srcs/getobjmap.c
===================================================================
RCS file: /home/dcvs/src/share/examples/ses/srcs/getobjmap.c,v
retrieving revision 1.2
diff -u -r1.2 getobjmap.c
--- share/examples/ses/srcs/getobjmap.c	17 Jun 2003 04:36:58 -0000	1.2
+++ share/examples/ses/srcs/getobjmap.c	13 Nov 2003 17:47:44 -0000
@@ -40,7 +40,7 @@
 #include <sys/ioctl.h>
 #include SESINC
 
-extern char *geteltnm __P((int));
+extern char *geteltnm (int);
 
 int
 main(a, v)
Index: share/man/man5/types.5
===================================================================
RCS file: /home/dcvs/src/share/man/man5/types.5,v
retrieving revision 1.4
diff -u -r1.4 types.5
--- share/man/man5/types.5	9 Nov 2003 02:34:03 -0000	1.4
+++ share/man/man5/types.5	13 Nov 2003 17:47:44 -0000
@@ -202,19 +202,19 @@
 __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 */
Index: share/man/man9/accept_filter.9
===================================================================
RCS file: /home/dcvs/src/share/man/man9/accept_filter.9,v
retrieving revision 1.2
diff -u -r1.2 accept_filter.9
--- share/man/man9/accept_filter.9	17 Jun 2003 04:37:01 -0000	1.2
+++ share/man/man9/accept_filter.9	13 Nov 2003 17:47:44 -0000
@@ -64,11 +64,11 @@
 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
Index: sys/boot/pc98/boot2/quota.h
===================================================================
RCS file: /home/dcvs/src/sys/boot/pc98/boot2/quota.h,v
retrieving revision 1.1
diff -u -r1.1 quota.h
--- sys/boot/pc98/boot2/quota.h	10 Nov 2003 06:08:38 -0000	1.1
+++ sys/boot/pc98/boot2/quota.h	13 Nov 2003 17:47:44 -0000
@@ -180,25 +180,25 @@
 struct ucred;
 struct vnode;
 
-int	chkdq __P((struct inode *, long, struct ucred *, int));
-int	chkiq __P((struct inode *, long, struct ucred *, int));
-void	dqinit __P((void));
-void	dqrele __P((struct vnode *, struct dquot *));
-int	getinoquota __P((struct inode *));
-int	getquota __P((struct mount *, u_long, int, caddr_t));
-int	qsync __P((struct mount *mp));
-int	quotaoff __P((struct proc *, struct mount *, int));
-int	quotaon __P((struct proc *, struct mount *, int, caddr_t));
-int	setquota __P((struct mount *, u_long, int, caddr_t));
-int	setuse __P((struct mount *, u_long, int, caddr_t));
-int	ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
+int	chkdq (struct inode *, long, struct ucred *, int);
+int	chkiq (struct inode *, long, struct ucred *, int);
+void	dqinit (void);
+void	dqrele (struct vnode *, struct dquot *);
+int	getinoquota (struct inode *);
+int	getquota (struct mount *, u_long, int, caddr_t);
+int	qsync (struct mount *mp);
+int	quotaoff (struct proc *, struct mount *, int);
+int	quotaon (struct proc *, struct mount *, int, caddr_t);
+int	setquota (struct mount *, u_long, int, caddr_t);
+int	setuse (struct mount *, u_long, int, caddr_t);
+int	ufs_quotactl (struct mount *, int, uid_t, caddr_t, struct proc *);
 
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	quotactl __P((const char *, int, int, void *));
+int	quotactl (const char *, int, int, void *);
 __END_DECLS
 
 #endif /* _KERNEL */
Index: tools/regression/sysvshm/shmtest.c
===================================================================
RCS file: /home/dcvs/src/tools/regression/sysvshm/shmtest.c,v
retrieving revision 1.1
diff -u -r1.1 shmtest.c
--- tools/regression/sysvshm/shmtest.c	18 Oct 2003 12:13:01 -0000	1.1
+++ tools/regression/sysvshm/shmtest.c	13 Nov 2003 17:47:44 -0000
@@ -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);
 
 const char *m_str = "The quick brown fox jumped over the lazy dog.";
 


[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]