remove __P

74 files changed, 389 insertions, 421 deletions

diff --git a/bin/chflags/chflags.c b/bin/chflags/chflags.c
index bc2ca62f3187..ebd3a7ebb3b7 100644
--- a/bin/chflags/chflags.c
+++ b/bin/chflags/chflags.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	usage __P((void));
+int	main(int, char *[]);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index b951d67266b6..19dddde5d7ad 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -69,8 +69,8 @@ CHDR chdr;
 u_int options;
 char *archive, *posarg, *posname;
 const char *envtmp;
-static void badoptions __P((const char *));
-static void usage __P((void));
+static void badoptions(const char *);
+static void usage(void);
 
 /*
  * main --
@@ -85,7 +85,7 @@ main(argc, argv)
 {
 	int c;
 	char *p;
-	int (*fcall) __P((char **)) = NULL;
+	int (*fcall)(char **) = NULL;
 
 	(void) setlocale(LC_TIME, "");;
 
diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h
index f517a9521077..7bbf6b98ffd5 100644
--- a/usr.bin/ar/archive.h
+++ b/usr.bin/ar/archive.h
@@ -98,9 +98,9 @@ typedef struct {
 
 struct stat;
 
-void	close_archive __P((int));
-void	copy_ar __P((CF *, off_t));
-int	get_arobj __P((int));
-int	open_archive __P((int));
-void	put_arobj __P((CF *, struct stat *));
-void	skip_arobj __P((int));
+void	close_archive(int);
+void	copy_ar(CF *, off_t);
+int	get_arobj(int);
+int	open_archive(int);
+void	put_arobj(CF *, struct stat *);
+void	skip_arobj(int);
diff --git a/usr.bin/ar/extern.h b/usr.bin/ar/extern.h
index a27f72a2e573..68e0c47d92cd 100644
--- a/usr.bin/ar/extern.h
+++ b/usr.bin/ar/extern.h
@@ -34,19 +34,19 @@
  * $FreeBSD$
  */
 
-int	append __P((char **));
-void	badfmt __P((void));
-int	compare __P((char *));
-int	contents __P((char **));
-int	delete __P((char **));
-void	error __P((const char *));
-int	extract __P((char **));
-char   *files __P((char **argv));
-int	move __P((char **));
-void	orphans __P((char **argv));
-int	print __P((char **));
-int	replace __P((char **));
-int	tmp __P((void));
+int	append(char **);
+void	badfmt(void);
+int	compare(char *);
+int	contents(char **);
+int	delete(char **);
+void	error(const char *);
+int	extract(char **);
+char   *files(char **argv);
+int	move(char **);
+void	orphans(char **argv);
+int	print(char **);
+int	replace(char **);
+int	tmp(void);
 
 extern char *archive;
 extern char *posarg, *posname;		/* positioning file name */
diff --git a/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 81388d8c0841..99914e047de0 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1028,7 +1028,7 @@ char	print[DWIDTH];
 int	debug, i, j, linen, max, nchars, pc, term, trace, x, y;
 int	width = DWIDTH;	/* -w option: scrunch letters to 80 columns */
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(int argc, char *argv[])
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index cc407c953f0b..6d7a873de09e 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-int main __P((int, char **));
-void usage __P((void));
+int main(int, char **);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 81aa4178035e..67341bac8ee9 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <unistd.h>
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index e8622109ee23..08cbb942f488 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -41,21 +41,21 @@ extern struct tm *tp;
 extern const char *calendarFile;
 extern char *optarg;
 
-void	 cal __P((void));
-void	 closecal __P((FILE *));
-int	 getday __P((char *));
-int	 getdayvar __P((char *));
-int	 getfield __P((char *, char **, int *));
-int	 getmonth __P((char *));
-int	 geteaster __P((char *, int));
-int      getpaskha __P((char *, int));
-int      easter __P((int));
-int	 isnow __P((char *, int *, int *, int *));
-FILE	*opencal __P((void));
-void	 settime __P((time_t));
-time_t   Mktime __P((char *));
-void	 usage __P((void));
-void     setnnames __P((void));
+void	 cal(void);
+void	 closecal(FILE *);
+int	 getday(char *);
+int	 getdayvar(char *);
+int	 getfield(char *, char **, int *);
+int	 getmonth(char *);
+int	 geteaster(char *, int);
+int      getpaskha(char *, int);
+int      easter(int);
+int	 isnow(char *, int *, int *, int *);
+FILE	*opencal(void);
+void	 settime(time_t);
+time_t   Mktime(char *);
+void	 usage(void);
+void     setnnames(void);
 
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 8b111b1663a1..135a039a124f 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -57,9 +57,9 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-void	 db_build __P((char **));
-void	 dounlink __P((void));
-void	 usage __P((void));
+void	 db_build(char **);
+void	 dounlink(void);
+void	 usage(void);
 
 DB *capdbp;
 int verbose;
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index 03133d84bd2a..1b99e6935f76 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -113,19 +113,7 @@ static const char rcsid[] =
 #define SIGTYPE void
 #endif
 
-#undef __P
-#undef __V
-
-#ifdef __STDC__
 #include <stdarg.h>
-#define __V(x)	x
-#define __P(x)	x
-#else
-#include <varargs.h>
-#define __V(x)	(va_alist) va_dcl
-#define __P(x)	()
-#define const
-#endif
 
 #ifndef O_NONBLOCK
 #define O_NONBLOCK	O_NDELAY
@@ -198,38 +186,38 @@ int clear_report_next = 0;
 
 int say_next = 0, hup_next = 0;
 
-void *dup_mem __P((void *b, size_t c));
-void *copy_of __P((char *s));
-static void usage __P((void));
-void logf __P((const char *fmt, ...));
-void fatal __P((int code, const char *fmt, ...));
-SIGTYPE sigalrm __P((int signo));
-SIGTYPE sigint __P((int signo));
-SIGTYPE sigterm __P((int signo));
-SIGTYPE sighup __P((int signo));
-void unalarm __P((void));
-void init __P((void));
-void set_tty_parameters __P((void));
-void echo_stderr __P((int));
-void break_sequence __P((void));
-void terminate __P((int status));
-void do_file __P((char *chat_file));
-int  get_string __P((register char *string));
-int  put_string __P((register char *s));
-int  write_char __P((int c));
-int  put_char __P((int c));
-int  get_char __P((void));
-void chat_send __P((register char *s));
-char *character __P((int c));
-void chat_expect __P((register char *s));
-char *clean __P((register char *s, int sending));
-void break_sequence __P((void));
-void terminate __P((int status));
-void pack_array __P((char **array, int end));
-char *expect_strtok __P((char *, char *));
-int vfmtmsg __P((char *, int, const char *, va_list));	/* vsprintf++ */
-
-int main __P((int, char *[]));
+void *dup_mem(void *b, size_t c);
+void *copy_of(char *s);
+static void usage(void);
+void logf(const char *fmt, ...);
+void fatal(int code, const char *fmt, ...);
+SIGTYPE sigalrm(int signo);
+SIGTYPE sigint(int signo);
+SIGTYPE sigterm(int signo);
+SIGTYPE sighup(int signo);
+void unalarm(void);
+void init(void);
+void set_tty_parameters(void);
+void echo_stderr(int);
+void break_sequence(void);
+void terminate(int status);
+void do_file(char *chat_file);
+int  get_string(register char *string);
+int  put_string(register char *s);
+int  write_char(int c);
+int  put_char(int c);
+int  get_char(void);
+void chat_send(register char *s);
+char *character(int c);
+void chat_expect(register char *s);
+char *clean(register char *s, int sending);
+void break_sequence(void);
+void terminate(int status);
+void pack_array(char **array, int end);
+char *expect_strtok(char *, char *);
+int vfmtmsg(char *, int, const char *, va_list);	/* vsprintf++ */
+
+int main(int, char *[]);
 
 void *dup_mem(b, c)
 void *b;
@@ -464,18 +452,11 @@ char line[1024];
 /*
  * Send a message to syslog and/or stderr.
  */
-void logf __V((const char *fmt, ...))
+void logf(const char *fmt, ...)
 {
     va_list args;
 
-#ifdef __STDC__
     va_start(args, fmt);
-#else
-    char *fmt;
-    va_start(args);
-    fmt = va_arg(args, char *);
-#endif
-
     vfmtmsg(line, sizeof(line), fmt, args);
     if (to_log)
 	syslog(LOG_INFO, "%s", line);
@@ -487,20 +468,11 @@ void logf __V((const char *fmt, ...))
  *	Print an error message and terminate.
  */
 
-void fatal __V((int code, const char *fmt, ...))
+void fatal(int code, const char *fmt, ...)
 {
     va_list args;
 
-#ifdef __STDC__
     va_start(args, fmt);
-#else
-    int code;
-    char *fmt;
-    va_start(args);
-    code = va_arg(args, int);
-    fmt = va_arg(args, char *);
-#endif
-
     vfmtmsg(line, sizeof(line), fmt, args);
     if (to_log)
 	syslog(LOG_ERR, "%s", line);
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index 24e04f786bcd..8bd683162c01 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -62,18 +62,18 @@ __FBSDID("$FreeBSD$");
 #define MAXBR	100	/* Max number of bracket pairs known */
 #define MAXCMDS	500	/* Max number of commands known */
 
-void addcmd __P((char *));
-void addmac __P((const char *));
-int binsrch __P((const char *));
-void checkknown __P((char *));
-void chkcmd __P((char *, char *));
-void complain __P((int));
-int eq __P((const char *, const char *));
-void nomatch __P((char *));
-void pe __P((int));
-void process __P((FILE *));
-void prop __P((int));
-static void usage __P((void));
+void addcmd(char *);
+void addmac(const char *);
+int binsrch(const char *);
+void checkknown(char *);
+void chkcmd(char *, char *);
+void complain(int);
+int eq(const char *, const char *);
+void nomatch(char *);
+void pe(int);
+void process(FILE *);
+void prop(int);
+static void usage(void);
 
 /*
  * The stack on which we remember what we've seen so far.
diff --git a/usr.bin/chflags/chflags.c b/usr.bin/chflags/chflags.c
index bc2ca62f3187..ebd3a7ebb3b7 100644
--- a/usr.bin/chflags/chflags.c
+++ b/usr.bin/chflags/chflags.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	usage __P((void));
+int	main(int, char *[]);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 86955f61cdc8..f88aa238f5d1 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -74,8 +74,8 @@ int yp_errno = YP_TRUE;
 char *tempname;
 uid_t uid;
 
-void	baduser __P((void));
-void	usage __P((void));
+void	baduser(void);
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index d48e4e1d678b..5b2b608d7347 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)chpass.h	8.4 (Berkeley) 4/2/94
+ * $FreeBSD$
  */
 
 struct passwd;
@@ -52,20 +53,20 @@ typedef struct _entry {
 extern ENTRY list[];
 extern uid_t uid;
 
-int	 atot __P((char *, time_t *));
-void	 display __P((int, struct passwd *));
-void	 edit __P((struct passwd *));
-char    *ok_shell __P((char *));
-int	 p_change __P((char *, struct passwd *, ENTRY *));
-int	 p_class __P((char *, struct passwd *, ENTRY *));
-int	 p_expire __P((char *, struct passwd *, ENTRY *));
-int	 p_gecos __P((char *, struct passwd *, ENTRY *));
-int	 p_gid __P((char *, struct passwd *, ENTRY *));
-int	 p_hdir __P((char *, struct passwd *, ENTRY *));
-int	 p_login __P((char *, struct passwd *, ENTRY *));
-int	 p_login __P((char *, struct passwd *, ENTRY *));
-int	 p_passwd __P((char *, struct passwd *, ENTRY *));
-int	 p_shell __P((char *, struct passwd *, ENTRY *));
-int	 p_uid __P((char *, struct passwd *, ENTRY *));
-char    *ttoa __P((time_t));
-int	 verify __P((struct passwd *));
+int	 atot(char *, time_t *);
+void	 display(int, struct passwd *);
+void	 edit(struct passwd *);
+char    *ok_shell(char *);
+int	 p_change(char *, struct passwd *, ENTRY *);
+int	 p_class(char *, struct passwd *, ENTRY *);
+int	 p_expire(char *, struct passwd *, ENTRY *);
+int	 p_gecos(char *, struct passwd *, ENTRY *);
+int	 p_gid(char *, struct passwd *, ENTRY *);
+int	 p_hdir(char *, struct passwd *, ENTRY *);
+int	 p_login(char *, struct passwd *, ENTRY *);
+int	 p_login(char *, struct passwd *, ENTRY *);
+int	 p_passwd(char *, struct passwd *, ENTRY *);
+int	 p_shell(char *, struct passwd *, ENTRY *);
+int	 p_uid(char *, struct passwd *, ENTRY *);
+char    *ttoa(time_t);
+int	 verify(struct passwd *);
diff --git a/usr.bin/chpass/pw_copy.h b/usr.bin/chpass/pw_copy.h
index 20f3bcca1c66..645453688614 100644
--- a/usr.bin/chpass/pw_copy.h
+++ b/usr.bin/chpass/pw_copy.h
@@ -33,4 +33,4 @@
  *	$FreeBSD$
  */
 
-void	 pw_copy __P((int, int, struct passwd *, struct passwd *));
+void	 pw_copy(int, int, struct passwd *, struct passwd *);
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index bd75151162d7..60218298fb23 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -59,7 +59,7 @@ static const char rcsid[] =
 
 #include "extern.h"
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
@@ -69,8 +69,8 @@ main(argc, argv)
 	int ch, fd, rval;
 	u_int32_t len, val;
 	char *fn, *p;
-	int (*cfncn) __P((int, u_int32_t *, u_int32_t *));
-	void (*pfncn) __P((char *, u_int32_t, u_int32_t));
+	int (*cfncn)(int, u_int32_t *, u_int32_t *);
+	void (*pfncn)(char *, u_int32_t, u_int32_t);
 
 	if ((p = rindex(argv[0], '/')) == NULL)
 		p = argv[0];
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index ab1ee7319b2d..452a3f945bfa 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -37,11 +37,11 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	crc __P((int, u_int32_t *, u_int32_t *));
-void	pcrc __P((char *, u_int32_t, u_int32_t));
-void	psum1 __P((char *, u_int32_t, u_int32_t));
-void	psum2 __P((char *, u_int32_t, u_int32_t));
-int	csum1 __P((int, u_int32_t *, u_int32_t *));
-int	csum2 __P((int, u_int32_t *, u_int32_t *));
-int	crc32 __P((int, u_int32_t *, u_int32_t *));
+int	crc(int, u_int32_t *, u_int32_t *);
+void	pcrc(char *, u_int32_t, u_int32_t);
+void	psum1(char *, u_int32_t, u_int32_t);
+void	psum2(char *, u_int32_t, u_int32_t);
+int	csum1(int, u_int32_t *, u_int32_t *);
+int	csum2(int, u_int32_t *, u_int32_t *);
+int	crc32(int, u_int32_t *, u_int32_t *);
 __END_DECLS
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index ca732c6325e5..162c6cd14764 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
 
 int	lflag, sflag, xflag, zflag;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 9ab37d6d372c..75afb2b215f1 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -40,9 +40,9 @@
 #define DIFF_EXIT	1
 #define ERR_EXIT	2	/* error exit code */
 
-void	c_regular __P((int, const char *, off_t, off_t, int, const char *, off_t, off_t));
-void	c_special __P((int, const char *, off_t, int, const char *, off_t));
-void	diffmsg __P((const char *, const char *, off_t, off_t));
-void	eofmsg __P((const char *));
+void	c_regular(int, const char *, off_t, off_t, int, const char *, off_t, off_t);
+void	c_special(int, const char *, off_t, int, const char *, off_t);
+void	diffmsg(const char *, const char *, off_t, off_t);
+void	eofmsg(const char *);
 
 extern int lflag, sflag, xflag;
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 014657e45987..982e1b5dadd6 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include "extern.h"
 
-static u_char *remmap __P((u_char *, int, off_t));
+static u_char *remmap(u_char *, int, off_t);
 #define MMAP_CHUNK (8*1024*1024)
 
 #define ROUNDPAGE(i) ((i) & ~pagemask)
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index 85a6eac6579a..ea9a98d4ecbf 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -94,14 +94,14 @@ struct line_str {
 	int	l_max_col;		/* max column in the line */
 };
 
-LINE   *alloc_line __P((void));
-void	dowarn __P((int));
-void	flush_line __P((LINE *));
-void	flush_lines __P((int));
-void	flush_blanks __P((void));
-void	free_line __P((LINE *));
-int	main __P((int, char **));
-void	usage __P((void));
+LINE   *alloc_line(void);
+void	dowarn(int);
+void	flush_line(LINE *);
+void	flush_lines(int);
+void	flush_blanks(void);
+void	free_line(LINE *);
+int	main(int, char **);
+void	usage(void);
 
 CSET	last_set;		/* char_set of last char printed */
 LINE   *lines;
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index b6705702c2dd..116daee57c8a 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -75,11 +75,11 @@ char	printall;
 
 FILE	*f;
 
-int		main __P((int, char *[]));
-static void	move __P((int, int));
-static void	pflush __P((int));
-static int	plus __P((char, char));
-static void	usage __P((void));
+int		main(int, char *[]);
+static void	move(int, int);
+static void	pflush(int);
+static int	plus(char, char);
+static void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 226c2fe6fd58..68326c670f96 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -57,8 +57,8 @@ __FBSDID("$FreeBSD$");
 
 #define	TAB	8
 
-void check __P((FILE *));
-static void usage __P((void));
+void check(FILE *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 39b9c2a94f65..16a067cd9dae 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -59,12 +59,12 @@ __FBSDID("$FreeBSD$");
 
 #define	TAB	8
 
-void  c_columnate __P((void));
-void  input __P((FILE *));
-void  maketbl __P((void));
-void  print __P((void));
-void  r_columnate __P((void));
-void  usage __P((void));
+void  c_columnate(void);
+void  input(FILE *);
+void  maketbl(void);
+void  print(void);
+void  r_columnate(void);
+void  usage(void);
 
 int termwidth = 80;		/* default terminal width */
 
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 5d234c88bbca..3c089c636a15 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -62,10 +62,10 @@ __FBSDID("$FreeBSD$");
 
 const char *tabs[] = { "", "\t", "\t\t" };
 
-FILE   *file __P((char *));
-void	show __P((FILE *, const char *, char *));
-int     stricoll __P((char *, char *));
-static void	usage __P((void));
+FILE   *file(char *);
+void	show(FILE *, const char *, char *);
+int     stricoll(char *, char *);
+static void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/compress/compress.c b/usr.bin/compress/compress.c
index 9b814ebe0915..449ac95cae7b 100644
--- a/usr.bin/compress/compress.c
+++ b/usr.bin/compress/compress.c
@@ -65,13 +65,13 @@ __FBSDID("$FreeBSD$");
 
 #include "zopen.h"
 
-void	compress __P((const char *, const char *, int));
-void	cwarn __P((const char *, ...)) __printflike(1, 2);
-void	cwarnx __P((const char *, ...)) __printflike(1, 2);
-void	decompress __P((const char *, const char *, int));
-int	permission __P((const char *));
-void	setfile __P((const char *, struct stat *));
-void	usage __P((int));
+void	compress(const char *, const char *, int);
+void	cwarn(const char *, ...) __printflike(1, 2);
+void	cwarnx(const char *, ...) __printflike(1, 2);
+void	decompress(const char *, const char *, int);
+int	permission(const char *);
+void	setfile(const char *, struct stat *);
+void	usage(int);
 
 int eval, force, verbose;
 
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 1251d1bbe286..20f9bfbda308 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -201,13 +201,13 @@ struct s_zstate {
 #define	FIRST	257		/* First free entry. */
 #define	CLEAR	256		/* Table clear output code. */
 
-static int	cl_block __P((struct s_zstate *));
-static void	cl_hash __P((struct s_zstate *, count_int));
-static code_int	getcode __P((struct s_zstate *));
-static int	output __P((struct s_zstate *, code_int));
-static int	zclose __P((void *));
-static int	zread __P((void *, char *, int));
-static int	zwrite __P((void *, const char *, int));
+static int	cl_block(struct s_zstate *);
+static void	cl_hash(struct s_zstate *, count_int);
+static code_int	getcode(struct s_zstate *);
+static int	output(struct s_zstate *, code_int);
+static int	zclose(void *);
+static int	zread(void *, char *, int);
+static int	zwrite(void *, const char *, int);
 
 /*-
  * Algorithm from "A Technique for High Performance Data Compression",
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 1a22de12cab3..a27a4f9b98aa 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -29,6 +29,6 @@
 #ifndef _ZOPEN_H_
 #define _ZOPEN_H_
 
-FILE  *zopen __P((const char *, const char *, int));
+FILE  *zopen(const char *, const char *, int);
 
 #endif /* _ZOPEN_H_ */
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 8d9e178cbd3b..592ea37dfacc 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -46,10 +46,10 @@ __FBSDID("$FreeBSD$");
 
 #include "ctags.h"
 
-static int	func_entry __P((void));
-static void	hash_entry __P((void));
-static void	skip_string __P((int));
-static int	str_entry __P((int));
+static int	func_entry(void);
+static void	hash_entry(void);
+static void	skip_string(int);
+static int	str_entry(int);
 
 /*
  * c_entries --
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index eb9519b9f942..745156b8c20f 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -80,9 +80,9 @@ char	*curfile;		/* current input file name */
 char	searchar = '/';		/* use /.../ searches by default */
 char	lbuf[LINE_MAX];
 
-void	init __P((void));
-void	find_entries __P((char *));
-static void usage __P((void));
+void	init(void);
+void	find_entries(char *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index a7780299cac6..ce4484f2f6bc 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -87,14 +87,14 @@ extern char	lbuf[LINE_MAX];
 extern char    *lbp;
 extern char	searchar;		/* ex search character */
 
-extern int	cicmp __P((const char *));
-extern void	getline __P((void));
-extern void	pfnote __P((const char *, int));
-extern int	skip_key __P((int));
-extern void	put_entries __P((NODE *));
-extern void	toss_yysec __P((void));
-extern void	l_entries __P((void));
-extern void	y_entries __P((void));
-extern int	PF_funcs __P((void));
-extern void	c_entries __P((void));
-extern void	skip_comment __P((int));
+extern int	cicmp(const char *);
+extern void	getline(void);
+extern void	pfnote(const char *, int);
+extern int	skip_key(int);
+extern void	put_entries(NODE *);
+extern void	toss_yysec(void);
+extern void	l_entries(void);
+extern void	y_entries(void);
+extern int	PF_funcs(void);
+extern void	c_entries(void);
+extern void	skip_comment(int);
diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 2195606242c4..89b3d853d1b7 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include "ctags.h"
 
-static void takeprec __P((void));
+static void takeprec(void);
 
 char *lbp;				/* line buffer pointer */
 
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 8c9b25c663f2..7e8ddeeb2611 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 
 #include "ctags.h"
 
-static void	add_node __P((NODE *, NODE *));
-static void	free_tree __P((NODE *));
+static void	add_node(NODE *, NODE *);
+static void	free_tree(NODE *);
 
 /*
  * pfnote --
diff --git a/usr.bin/dirname/dirname.c b/usr.bin/dirname/dirname.c
index b8541bd0e1c8..cbee92572dee 100644
--- a/usr.bin/dirname/dirname.c
+++ b/usr.bin/dirname/dirname.c
@@ -49,7 +49,7 @@ static const char sccsid[] = "@(#)dirname.c	8.4 (Berkeley) 5/4/95";
 #include <stdlib.h>
 #include <unistd.h>
 
-void usage __P((void));
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 62888cefc07f..7bf007c636bd 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -96,13 +96,13 @@ struct ignentry {
 	SLIST_ENTRY(ignentry)	next;
 };
 
-int		linkchk __P((FTSENT *));
-static void	usage __P((void));
-void		prthumanval __P((double));
-unit_t		unit_adjust __P((double *));
-void		ignoreadd __P((const char *));
-void		ignoreclean __P((void));
-int		ignorep __P((FTSENT *));
+int		linkchk(FTSENT *);
+static void	usage(void);
+void		prthumanval(double);
+unit_t		unit_adjust(double *);
+void		ignoreadd(const char *);
+void		ignoreclean(void);
+int		ignorep(FTSENT *);
 
 int
 main(argc, argv)
diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index b498b846cdbc..14ffc4bebdb3 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 
 extern char **environ;
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 5ecd76459068..ec2a20dafe95 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -57,8 +57,8 @@ static const char rcsid[] =
 int	nstops;
 int	tabstops[100];
 
-static void getstops __P((char *));
-static void usage __P((void));
+static void getstops(char *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index eb80ac372bc6..89219c68528a 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -39,15 +39,15 @@ extern int entries;			/* Number of people. */
 extern DB *db;				/* Database. */
 extern int d_first;
 
-void	 enter_lastlog __P((PERSON *));
-PERSON	*enter_person __P((struct passwd *));
-void	 enter_where __P((struct utmp *, PERSON *));
-PERSON	*find_person __P((char *));
-int		hide __P((struct passwd *));
-void	 lflag_print __P((void));
-int	 match __P((struct passwd *, char *));
-void	 netfinger __P((char *));
-PERSON	*palloc __P((void));
-char	*prphone __P((char *));
-void	 sflag_print __P((void));
-int	 show_text __P((const char *, const char *, const char *));
+void	 enter_lastlog(PERSON *);
+PERSON	*enter_person(struct passwd *);
+void	 enter_where(struct utmp *, PERSON *);
+PERSON	*find_person(char *);
+int		hide(struct passwd *);
+void	 lflag_print(void);
+int	 match(struct passwd *, char *);
+void	 netfinger(char *);
+PERSON	*palloc(void);
+char	*prphone(char *);
+void	 sflag_print(void);
+int	 show_text(const char *, const char *, const char *);
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 138021a53b26..d5d38c35d47a 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -93,10 +93,10 @@ int entries, lflag, mflag, pplan, sflag, oflag, Tflag;
 int d_first = -1;
 char tbuf[1024];
 
-static void loginlist __P((void));
-static int option __P((int, char **));
-static void usage __P((void));
-static void userlist __P((int, char **));
+static void loginlist(void);
+static int option(int, char **);
+static void usage(void);
+static void userlist(int, char **);
 
 static int
 option(argc, argv)
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 5ef10fd97190..f55b6d4037c3 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -64,9 +64,9 @@ __FBSDID("$FreeBSD$");
 #define	LINE_LEN	80
 #define	TAB_LEN		8		/* 8 spaces between tabs */
 
-static int	demi_print __P((char *, int));
-static void	lprint __P((PERSON *));
-static void     vputc __P((unsigned char));
+static int	demi_print(char *, int);
+static void	lprint(PERSON *);
+static void     vputc(unsigned char);
 
 void
 lflag_print()
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 67fdcbb2ab17..be7006ede845 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <utmp.h>
 #include "finger.h"
 
-static void	  stimeprint __P((WHERE *));
+static void	  stimeprint(WHERE *);
 
 void
 sflag_print()
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 3a001a2869ea..218b1bffd0ff 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -60,9 +60,9 @@ __FBSDID("$FreeBSD$");
 #include "finger.h"
 #include "pathnames.h"
 
-static void	 find_idle_and_ttywrite __P((WHERE *));
-static void	 userinfo __P((PERSON *, struct passwd *));
-static WHERE	*walloc __P((PERSON *));
+static void	 find_idle_and_ttywrite(WHERE *);
+static void	 userinfo(PERSON *, struct passwd *);
+static WHERE	*walloc(PERSON *);
 
 int
 match(pw, user)
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 48f6c721aa73..33208ae0d4c5 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
 
 #define	DEFLINEWIDTH	80
 
-void fold __P((int));
-static void usage __P((void));
+void fold(int);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index a8dffbb9ba93..1dd0449e96b3 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -55,8 +55,8 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-int match __P((char *, char *));
-static void usage __P((void));
+int match(char *, char *);
+static void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index b31bf255f1ad..564efbf65acc 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -138,18 +138,18 @@ int maxfiles;
 
 kvm_t *kd;
 
-void dofiles __P((struct kinfo_proc *kp));
-void dommap __P((struct kinfo_proc *kp));
-void vtrans __P((struct vnode *vp, int i, int flag));
-int  ufs_filestat __P((struct vnode *vp, struct filestat *fsp));
-int  nfs_filestat __P((struct vnode *vp, struct filestat *fsp));
-int  devfs_filestat __P((struct vnode *vp, struct filestat *fsp));
-char *getmnton __P((struct mount *m));
-void pipetrans __P((struct pipe *pi, int i, int flag));
-void socktrans __P((struct socket *sock, int i));
-void getinetproto __P((int number));
-int  getfname __P((char *filename));
-void usage __P((void));
+void dofiles(struct kinfo_proc *kp);
+void dommap(struct kinfo_proc *kp);
+void vtrans(struct vnode *vp, int i, int flag);
+int  ufs_filestat(struct vnode *vp, struct filestat *fsp);
+int  nfs_filestat(struct vnode *vp, struct filestat *fsp);
+int  devfs_filestat(struct vnode *vp, struct filestat *fsp);
+char *getmnton(struct mount *m);
+void pipetrans(struct pipe *pi, int i, int flag);
+void socktrans(struct socket *sock, int i);
+void getinetproto(int number);
+int  getfname(char *filename);
+void usage(void);
 
 
 int
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index 02ce12a0d15b..f42a1cd2c1b1 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -64,10 +64,10 @@ extern kvm_t *kd;
 extern int vflg;
 extern int Pid;
 
-udev_t dev2udev __P((dev_t dev));
+udev_t dev2udev(dev_t dev);
 
 /* Additional filesystem types */
-int isofs_filestat __P((struct vnode *vp, struct filestat *fsp));
-int msdosfs_filestat __P((struct vnode *vp, struct filestat *fsp));
+int isofs_filestat(struct vnode *vp, struct filestat *fsp);
+int msdosfs_filestat(struct vnode *vp, struct filestat *fsp);
 
 #endif /* __FSTAT_H__ */
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index 8894cd4d2eed..c6e29d15a513 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -79,12 +79,12 @@ static const char rcsid[] =
 
 #include "extern.h"
 
-static void	core __P((int, int, struct kinfo_proc *));
-static void	datadump __P((int, int, struct kinfo_proc *, u_long, int));
-static void	killed __P((int));
-static void	restart_target __P((void));
-static void	usage __P((void)) __dead2;
-static void	userdump __P((int, struct kinfo_proc *, u_long, int));
+static void	core(int, int, struct kinfo_proc *);
+static void	datadump(int, int, struct kinfo_proc *, u_long, int);
+static void	killed(int);
+static void	restart_target(void);
+static void	usage(void) __dead2;
+static void	userdump(int, struct kinfo_proc *, u_long, int);
 
 kvm_t *kd;
 
diff --git a/usr.bin/gcore/extern.h b/usr.bin/gcore/extern.h
index f157e531a5f3..3d27fd9ed39d 100644
--- a/usr.bin/gcore/extern.h
+++ b/usr.bin/gcore/extern.h
@@ -31,11 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
 #include <kvm.h>
 
-void	err __P((int, const char *, ...));
-void	elf_coredump __P((int, pid_t));
-void	md_core __P((kvm_t *, int, struct kinfo_proc *));
+void	err(int, const char *, ...);
+void	elf_coredump(int, pid_t);
+void	md_core(kvm_t *, int, struct kinfo_proc *);
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 8894cd4d2eed..c6e29d15a513 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -79,12 +79,12 @@ static const char rcsid[] =
 
 #include "extern.h"
 
-static void	core __P((int, int, struct kinfo_proc *));
-static void	datadump __P((int, int, struct kinfo_proc *, u_long, int));
-static void	killed __P((int));
-static void	restart_target __P((void));
-static void	usage __P((void)) __dead2;
-static void	userdump __P((int, struct kinfo_proc *, u_long, int));
+static void	core(int, int, struct kinfo_proc *);
+static void	datadump(int, int, struct kinfo_proc *, u_long, int);
+static void	killed(int);
+static void	restart_target(void);
+static void	usage(void) __dead2;
+static void	userdump(int, struct kinfo_proc *, u_long, int);
 
 kvm_t *kd;
 
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index 94d99f9f828a..e773f432afc8 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -60,10 +60,10 @@ static const char rcsid[] =
  * Bill Joy UCB August 24, 1977
  */
 
-void head __P((FILE *, int));
-void head_bytes __P((FILE *, int));
-void obsolete __P((char *[]));
-void usage __P((void));
+void head(FILE *, int);
+void head_bytes(FILE *, int);
+void obsolete(char *[]);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/hesinfo/hesinfo.c b/usr.bin/hesinfo/hesinfo.c
index 7858e27c5508..206f28bd03d2 100644
--- a/usr.bin/hesinfo/hesinfo.c
+++ b/usr.bin/hesinfo/hesinfo.c
@@ -32,7 +32,7 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-int	main __P((int, char **));
+int	main(int, char **);
 extern char *__progname;
 
 int 
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index fa9ed6d70320..4a1a0e06935e 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -55,7 +55,7 @@ enum _vflag vflag = FIRST;
 static off_t address;			/* address/offset in stream */
 static off_t eaddress;			/* end address */
 
-static inline void print __P((PR *, u_char *));
+static inline void print(PR *, u_char *);
 
 void
 display()
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 86073c38abe6..181581981fb6 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -75,23 +75,23 @@ extern FS *fshead;			/* head of format strings list */
 extern int blocksize;			/* data block size */
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
 
-void	 add __P((const char *));
-void	 addfile __P((char *));
-void	 badcnt __P((char *));
-void	 badconv __P((char *));
-void	 badfmt __P((const char *));
-void	 badsfmt __P((void));
-void	 bpad __P((PR *));
-void	 conv_c __P((PR *, u_char *));
-void	 conv_u __P((PR *, u_char *));
-void	 display __P((void));
-void	 doskip __P((const char *, int));
-void	 escape __P((char *));
-u_char	*get __P((void));
-void	 newsyntax __P((int, char ***));
-int	 next __P((char **));
-void	 nomem __P((void));
-void	 oldsyntax __P((int, char ***));
-void	 rewrite __P((FS *));
-int	 size __P((FS *));
-void	 usage __P((void));
+void	 add(const char *);
+void	 addfile(char *);
+void	 badcnt(char *);
+void	 badconv(char *);
+void	 badfmt(const char *);
+void	 badsfmt(void);
+void	 bpad(PR *);
+void	 conv_c(PR *, u_char *);
+void	 conv_u(PR *, u_char *);
+void	 display(void);
+void	 doskip(const char *, int);
+void	 escape(char *);
+u_char	*get(void);
+void	 newsyntax(int, char ***);
+int	 next(char **);
+void	 nomem(void);
+void	 oldsyntax(int, char ***);
+void	 rewrite(FS *);
+int	 size(FS *);
+void	 usage(void);
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 8823a9cf34f5..35cd04e9c656 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -51,8 +51,8 @@ static const char rcsid[] =
 
 int deprecated;
 
-static void odoffset __P((int, char ***));
-static void odprecede __P((void));
+static void odoffset(int, char ***);
+static void odprecede(void);
 
 void
 oldsyntax(argc, argvp)
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index c0936f31c346..e8c9b71fbdbc 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -55,15 +55,15 @@ static const char rcsid[] =
 #include <string.h>
 #include <unistd.h>
 
-int	main __P((int, char *[]));
-void	current __P((void));
-void	pline __P((struct passwd *));
-void	pretty __P((struct passwd *));
-void	group __P((struct passwd *, int));
-void	usage __P((void));
-void	user __P((struct passwd *));
+int	main(int, char *[]);
+void	current(void);
+void	pline(struct passwd *);
+void	pretty(struct passwd *);
+void	group(struct passwd *, int);
+void	usage(void);
+void	user(struct passwd *);
 struct passwd *
-	who __P((char *));
+	who(char *);
 
 int isgroups, iswhoami;
 
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 7cf9dc9bdcf7..4f62296df09c 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -52,11 +52,11 @@ static const char rcsid[] =
 
 int signaled;
 
-void usage __P((void));
-int msgrm __P((key_t, int));
-int shmrm __P((key_t, int));
-int semrm __P((key_t, int));
-void not_configured __P((int));
+void usage(void);
+int msgrm(key_t, int);
+int shmrm(key_t, int);
+int semrm(key_t, int);
+void not_configured(int);
 
 void usage()
 {
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 9b8f440855f4..f780841adf8f 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -71,10 +71,9 @@ struct msqid_ds	*msqids;
 struct shminfo	shminfo;
 struct shmid_ds	*shmsegs;
 
-void	sysctlgatherstruct __P((void *addr, size_t size,
-    struct scgs_vector *vec));
-void	kget __P((int idx, void *addr, size_t size));
-void	usage __P((void));
+void	sysctlgatherstruct(void *addr, size_t size, struct scgs_vector *vec);
+void	kget(int idx, void *addr, size_t size);
+void	usage(void);
 
 static struct nlist symbols[] = {
 	{"sema"},
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 4b4add9bc1d6..0731646c6522 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -102,15 +102,15 @@ int spans = 1;			/* span multiple delimiters (-t) */
 char *empty;			/* empty field replacement string (-e) */
 char *tabchar = " \t";		/* delimiter characters (-t) */
 
-int  cmp __P((LINE *, u_long, LINE *, u_long));
-void fieldarg __P((char *));
-void joinlines __P((INPUT *, INPUT *));
-void obsolete __P((char **));
-void outfield __P((LINE *, u_long, int));
-void outoneline __P((INPUT *, LINE *));
-void outtwoline __P((INPUT *, LINE *, INPUT *, LINE *));
-void slurp __P((INPUT *));
-void usage __P((void));
+int  cmp(LINE *, u_long, LINE *, u_long);
+void fieldarg(char *);
+void joinlines(INPUT *, INPUT *);
+void obsolete(char **);
+void outfield(LINE *, u_long, int);
+void outoneline(INPUT *, LINE *);
+void outtwoline(INPUT *, LINE *, INPUT *, LINE *);
+void slurp(INPUT *);
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 1ab2bd9c2d5e..86f802321794 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -83,11 +83,11 @@ int	nofinalnl;
 const	char *sepstring = "\n";
 char	format[BUFSIZ];
 
-int		main __P((int, char *[]));
-void		getformat __P((void));
-int		getprec __P((char *));
-int		putdata __P((double, long));
-static void	usage __P((void));
+int		main(int, char *[]);
+void		getformat(void);
+int		getprec(char *);
+int		putdata(double, long);
+static void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 4a0b39fd7435..1d75adacb622 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -59,8 +59,8 @@ static const char rcsid[] =
 
 #include "ktrace.h"
 
-void no_ktrace __P((int));
-void usage __P((void));
+void no_ktrace(int);
+void usage(void);
 
 main(argc, argv)
 	int argc;
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index eed36f542993..5029a05981e7 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -98,16 +98,16 @@ static time_t	snaptime;			/* if != 0, we will only
 						 * at this snapshot time
 						 */
 
-void	 addarg __P((int, char *));
-time_t	 dateconv __P((char *));
-void	 doentry __P((struct utmp *));
-void	 hostconv __P((char *));
-void	 onintr __P((int));
-void	 printentry __P((struct utmp *, struct ttytab *));
-char	*ttyconv __P((char *));
-int	 want __P((struct utmp *));
-void	 usage __P((void));
-void	 wtmp __P((void));
+void	 addarg(int, char *);
+time_t	 dateconv(char *);
+void	 doentry(struct utmp *);
+void	 hostconv(char *);
+void	 onintr(int);
+void	 printentry(struct utmp *, struct ttytab *);
+char	*ttyconv(char *);
+int	 want(struct utmp *);
+void	 usage(void);
+void	 wtmp(void);
 
 void
 usage(void)
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 945c17f12b49..e627be9cf5fe 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -60,11 +60,11 @@ static const char rcsid[] =
 #include <utmp.h>
 #include "pathnames.h"
 
-time_t	 expand __P((u_int));
-char	*flagbits __P((int));
-const	 char *getdev __P((dev_t));
-int	 requested __P((char *[], struct acct *));
-static	 void usage __P((void));
+time_t	 expand(u_int);
+char	*flagbits(int);
+const	 char *getdev(dev_t);
+int	 requested(char *[], struct acct *);
+static	 void usage(void);
 
 #define AC_UTIME 1 /* user */
 #define AC_STIME 2 /* system */
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 19db2f1b5d37..da44c5c45612 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -43,7 +43,7 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <unistd.h>
 
-extern void	dump_file __P((const char *));
+extern void	dump_file(const char *);
 extern int	error_count;
 
 void
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 37375e417ccd..4880fb7bc48e 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -53,8 +53,8 @@ static const char rcsid[] =
 #include <time.h>
 #include <unistd.h>
 
-void doalarm __P((u_int));
-static void usage __P((void));
+void doalarm(u_int);
+static void usage(void);
 
 /*
  * leave [[+]hhmm]
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index e44c51663e64..6290c67201ef 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -115,11 +115,11 @@ bg_t big[UCHAR_MAX + 1][UCHAR_MAX + 1];
 #else
 #define BGINDEX(x) bgindex(x)
 typedef int bg_t;
-int	bgindex __P((char *));
+int	bgindex(char *);
 #endif /* LOOKUP */
 
 
-void	usage __P((void));
+void	usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index e4d01796db21..928359951f8d 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -96,13 +96,6 @@ static const char rcsid[] =
 #endif
 
 
-#ifdef sun
-#include <netinet/in.h> /* SunOS byteorder(3) htohl(3) */
-#ifndef __P
-#define __P(x) x
-#endif
-#endif
-
 #include "locate.h"
 #include "pathnames.h"
 
@@ -121,23 +114,23 @@ int f_limit;            /* limit number of output lines, 0 == infinite */
 u_int counter;          /* counter for matches [-c] */
 
 
-void    usage __P((void));
-void    statistic __P((FILE *, char *));
-void    fastfind __P((FILE *, char *, char *));
-void    fastfind_icase __P((FILE *, char *, char *));
-void    fastfind_mmap __P((char *, caddr_t, int, char *));
-void    fastfind_mmap_icase __P((char *, caddr_t, int, char *));
-void	search_mmap __P((char *, char **));
-void	search_fopen __P((char *, char **));
-unsigned long cputime __P((void));
-
-extern char     **colon __P((char **, char*, char*));
-extern void     print_matches __P((u_int));
-extern int      getwm __P((caddr_t));
-extern int      getwf __P((FILE *));
-extern u_char   *tolower_word __P((u_char *));
-extern int	check_bigram_char __P((int));
-extern char 	*patprep __P((char *));
+void    usage(void);
+void    statistic(FILE *, char *);
+void    fastfind(FILE *, char *, char *);
+void    fastfind_icase(FILE *, char *, char *);
+void    fastfind_mmap(char *, caddr_t, int, char *);
+void    fastfind_mmap_icase(char *, caddr_t, int, char *);
+void	search_mmap(char *, char **);
+void	search_fopen(char *, char **);
+unsigned long cputime(void);
+
+extern char     **colon(char **, char*, char*);
+extern void     print_matches(u_int);
+extern int      getwm(caddr_t);
+extern int      getwf(FILE *);
+extern u_char   *tolower_word(u_char *);
+extern int	check_bigram_char(int);
+extern char 	*patprep(char *);
 
 int
 main(argc, argv)
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 4fee1f346968..ab77699f3300 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -47,13 +47,13 @@
 
 #include "locate.h"
 
-char 	**colon __P((char **, char*, char*));
-char 	*patprep __P((char *));
-void print_matches __P((u_int));
-u_char 	*tolower_word __P((u_char *));
-int 	getwm __P((caddr_t));
-int 	getwf __P((FILE *));
-int	check_bigram_char __P((int));
+char 	**colon(char **, char*, char*);
+char 	*patprep(char *);
+void print_matches(u_int);
+u_char 	*tolower_word(u_char *);
+int 	getwm(caddr_t);
+int 	getwf(FILE *);
+int	check_bigram_char(int);
 
 /* 
  * Validate bigram chars. If the test failed the database is corrupt 
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index eeca3ff76247..f40afda7b9a8 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -73,8 +73,10 @@ static const char rcsid[] =
 
 #define	TIMEOUT	15
 
-void quit __P((int)), bye __P((int)), hi __P((int));
-static void usage __P((void));
+void quit(int);
+void bye(int);
+void hi(int);
+static void usage(void);
 
 struct timeval	timeout;
 struct timeval	zerotime;
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index ca048b7d5e7b..f610c92b9639 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -60,10 +60,10 @@ static const char rcsid[] =
 #define	SYSLOG_NAMES
 #include <syslog.h>
 
-int	decode __P((char *, CODE *));
-int	pencode __P((char *));
-static void	logmessage __P((int, char *, char *));
-static void	usage __P((void));
+int	decode(char *, CODE *);
+int	pencode(char *);
+static void	logmessage(int, char *, char *);
+static void	usage(void);
 
 struct socks {
     int sock;
diff --git a/usr.bin/login/login.h b/usr.bin/login/login.h
index 21a8f76be3c8..6be2539c7bb6 100644
--- a/usr.bin/login/login.h
+++ b/usr.bin/login/login.h
@@ -25,6 +25,6 @@
  * $FreeBSD$
  */
 
-void	login_fbtab __P((char *, uid_t, gid_t));
+void	login_fbtab(char *, uid_t, gid_t);
 
 extern	char **environ;
diff --git a/usr.bin/login/login_access.c b/usr.bin/login/login_access.c
index 3a98d028cec1..f6f5745d3351 100644
--- a/usr.bin/login/login_access.c
+++ b/usr.bin/login/login_access.c
@@ -40,12 +40,12 @@ static char sep[] = ", \t";		/* list-element separator */
 #define YES             1
 #define NO              0
 
-static int	from_match __P((const char *, const char *));
-static int	list_match __P((char *, const char *,
-				int (*)(const char *, const char *)));
-static int	netgroup_match __P((const char *, const char *, const char *));
-static int	string_match __P((const char *, const char *));
-static int	user_match __P((const char *, const char *));
+static int	from_match(const char *, const char *);
+static int	list_match(char *, const char *,
+		    int (*)(const char *, const char *));
+static int	netgroup_match(const char *, const char *, const char *);
+static int	string_match(const char *, const char *);
+static int	user_match(const char *, const char *);
 
 /* login_access - match username/group and host/tty with access control file */
 
@@ -114,7 +114,7 @@ const char   *from;
 static int list_match(list, item, match_fn)
 char         *list;
 const char   *item;
-int         (*match_fn) __P((const char *, const char *));
+int         (*match_fn)(const char *, const char *);
 {
     char   *tok;
     int     match = NO;
diff --git a/usr.bin/login/login_fbtab.c b/usr.bin/login/login_fbtab.c
index a62c6eff570e..c0a4290a4677 100644
--- a/usr.bin/login/login_fbtab.c
+++ b/usr.bin/login/login_fbtab.c
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #include "login.h"
 #include "pathnames.h"
 
-static void	login_protect	__P((const char *, char *, int, uid_t, gid_t));
+static void	login_protect(const char *, char *, int, uid_t, gid_t);
 
 #define	WSPACE		" \t\n"
 
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index cea6e5fd0979..f83422859af5 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -50,7 +50,7 @@ static const char sccsid[] = "@(#)logname.c	8.2 (Berkeley) 4/3/94";
 #include <stdlib.h>
 #include <string.h>
 
-void usage __P((void));
+void usage(void);
 
 int
 main(argc, argv)
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 5fb79002cdbd..2fc332f8975b 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -90,13 +90,13 @@ static const char rcsid[] =
 
 int dflag, fflag;
 
-char    *binary_search __P((unsigned char *, unsigned char *, unsigned char *));
-int      compare __P((unsigned char *, unsigned char *, unsigned char *));
-char    *linear_search __P((unsigned char *, unsigned char *, unsigned char *));
-int      look __P((unsigned char *, unsigned char *, unsigned char *));
-void     print_from __P((unsigned char *, unsigned char *, unsigned char *));
+char    *binary_search(unsigned char *, unsigned char *, unsigned char *);
+int      compare(unsigned char *, unsigned char *, unsigned char *);
+char    *linear_search(unsigned char *, unsigned char *, unsigned char *);
+int      look(unsigned char *, unsigned char *, unsigned char *);
+void     print_from(unsigned char *, unsigned char *, unsigned char *);
 
-static void usage __P((void));
+static void usage(void);
 
 int
 main(argc, argv)