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

20 files changed, 201 insertions, 201 deletions

diff --git a/usr.bin/vi/common/api.c b/usr.bin/vi/common/api.c
index 6f678d17f97..38bf9bcda28 100644
--- a/usr.bin/vi/common/api.c
+++ b/usr.bin/vi/common/api.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: api.c,v 1.10 2001/08/18 20:34:38 millert Exp $	*/
+/*	$OpenBSD: api.c,v 1.11 2002/02/16 21:27:56 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -38,7 +38,7 @@ extern GS *__global_list;			/* XXX */
  *	Return a pointer to the screen specified by the screen id
  *	or a file name.
  *
- * PUBLIC: SCR *api_fscreen __P((int, char *));
+ * PUBLIC: SCR *api_fscreen(int, char *);
  */
 SCR *
 api_fscreen(id, name)
@@ -74,7 +74,7 @@ api_fscreen(id, name)
  * api_aline --
  *	Append a line.
  *
- * PUBLIC: int api_aline __P((SCR *, recno_t, char *, size_t));
+ * PUBLIC: int api_aline(SCR *, recno_t, char *, size_t);
  */
 int
 api_aline(sp, lno, line, len)
@@ -90,7 +90,7 @@ api_aline(sp, lno, line, len)
  * api_dline --
  *	Delete a line.
  *
- * PUBLIC: int api_dline __P((SCR *, recno_t));
+ * PUBLIC: int api_dline(SCR *, recno_t);
  */
 int
 api_dline(sp, lno)
@@ -104,7 +104,7 @@ api_dline(sp, lno)
  * api_gline --
  *	Get a line.
  *
- * PUBLIC: int api_gline __P((SCR *, recno_t, char **, size_t *));
+ * PUBLIC: int api_gline(SCR *, recno_t, char **, size_t *);
  */
 int
 api_gline(sp, lno, linepp, lenp)
@@ -127,7 +127,7 @@ api_gline(sp, lno, linepp, lenp)
  * api_iline --
  *	Insert a line.
  *
- * PUBLIC: int api_iline __P((SCR *, recno_t, char *, size_t));
+ * PUBLIC: int api_iline(SCR *, recno_t, char *, size_t);
  */
 int
 api_iline(sp, lno, line, len)
@@ -143,7 +143,7 @@ api_iline(sp, lno, line, len)
  * api_lline --
  *	Return the line number of the last line in the file.
  *
- * PUBLIC: int api_lline __P((SCR *, recno_t *));
+ * PUBLIC: int api_lline(SCR *, recno_t *);
  */
 int
 api_lline(sp, lnop)
@@ -157,7 +157,7 @@ api_lline(sp, lnop)
  * api_sline --
  *	Set a line.
  *
- * PUBLIC: int api_sline __P((SCR *, recno_t, char *, size_t));
+ * PUBLIC: int api_sline(SCR *, recno_t, char *, size_t);
  */
 int
 api_sline(sp, lno, line, len)
@@ -173,7 +173,7 @@ api_sline(sp, lno, line, len)
  * api_getmark --
  *	Get the mark.
  *
- * PUBLIC: int api_getmark __P((SCR *, int, MARK *));
+ * PUBLIC: int api_getmark(SCR *, int, MARK *);
  */
 int
 api_getmark(sp, markname, mp)
@@ -188,7 +188,7 @@ api_getmark(sp, markname, mp)
  * api_setmark --
  *	Set the mark.
  *
- * PUBLIC: int api_setmark __P((SCR *, int, MARK *));
+ * PUBLIC: int api_setmark(SCR *, int, MARK *);
  */
 int
 api_setmark(sp, markname, mp)
@@ -204,7 +204,7 @@ api_setmark(sp, markname, mp)
  *	Return the first mark if next not set, otherwise return the
  *	subsequent mark.
  *
- * PUBLIC: int api_nextmark __P((SCR *, int, char *));
+ * PUBLIC: int api_nextmark(SCR *, int, char *);
  */
 int
 api_nextmark(sp, next, namep)
@@ -231,7 +231,7 @@ api_nextmark(sp, next, namep)
  * api_getcursor --
  *	Get the cursor.
  *
- * PUBLIC: int api_getcursor __P((SCR *, MARK *));
+ * PUBLIC: int api_getcursor(SCR *, MARK *);
  */
 int
 api_getcursor(sp, mp)
@@ -247,7 +247,7 @@ api_getcursor(sp, mp)
  * api_setcursor --
  *	Set the cursor.
  *
- * PUBLIC: int api_setcursor __P((SCR *, MARK *));
+ * PUBLIC: int api_setcursor(SCR *, MARK *);
  */
 int
 api_setcursor(sp, mp)
@@ -273,7 +273,7 @@ api_setcursor(sp, mp)
  * api_emessage --
  *	Print an error message.
  *
- * PUBLIC: void api_emessage __P((SCR *, char *));
+ * PUBLIC: void api_emessage(SCR *, char *);
  */
 void
 api_emessage(sp, text)
@@ -287,7 +287,7 @@ api_emessage(sp, text)
  * api_imessage --
  *	Print an informational message.
  *
- * PUBLIC: void api_imessage __P((SCR *, char *));
+ * PUBLIC: void api_imessage(SCR *, char *);
  */
 void
 api_imessage(sp, text)
@@ -302,7 +302,7 @@ api_imessage(sp, text)
  *	Create a new screen and return its id 
  *	or edit a new file in the current screen.
  *
- * PUBLIC: int api_edit __P((SCR *, char *, SCR **, int));
+ * PUBLIC: int api_edit(SCR *, char *, SCR **, int);
  */
 int
 api_edit(sp, file, spp, newscreen)
@@ -331,7 +331,7 @@ api_edit(sp, file, spp, newscreen)
  * api_escreen
  *	End a screen.
  *
- * PUBLIC: int api_escreen __P((SCR *));
+ * PUBLIC: int api_escreen(SCR *);
  */
 int
 api_escreen(sp)
@@ -352,7 +352,7 @@ api_escreen(sp)
  * api_swscreen --
  *    Switch to a new screen.
  *
- * PUBLIC: int api_swscreen __P((SCR *, SCR *));
+ * PUBLIC: int api_swscreen(SCR *, SCR *);
  */
 int
 api_swscreen(sp, new)
@@ -373,7 +373,7 @@ api_swscreen(sp, new)
  * api_map --
  *	Map a key.
  *
- * PUBLIC: int api_map __P((SCR *, char *, char *, size_t));
+ * PUBLIC: int api_map(SCR *, char *, char *, size_t);
  */
 int
 api_map(sp, name, map, len)
@@ -394,7 +394,7 @@ api_map(sp, name, map, len)
  * api_unmap --
  *	Unmap a key.
  *
- * PUBLIC: int api_unmap __P((SCR *, char *));
+ * PUBLIC: int api_unmap(SCR *, char *);
  */
 int 
 api_unmap(sp, name)
@@ -415,7 +415,7 @@ api_unmap(sp, name)
  *	If the option is of type boolean, boolvalue is (un)set
  *	according to the value; otherwise boolvalue is -1.
  *
- * PUBLIC: int api_opts_get __P((SCR *, char *, char **, int *));
+ * PUBLIC: int api_opts_get(SCR *, char *, char **, int *);
  */
 int
 api_opts_get(sp, name, value, boolvalue)
@@ -465,7 +465,7 @@ api_opts_get(sp, name, value, boolvalue)
  * api_opts_set --
  *	Set options.
  *
- * PUBLIC: int api_opts_set __P((SCR *, char *, char *, u_long, int));
+ * PUBLIC: int api_opts_set(SCR *, char *, char *, u_long, int);
  */
 int
 api_opts_set(sp, name, str_value, num_value, bool_value)
@@ -522,7 +522,7 @@ api_opts_set(sp, name, str_value, num_value, bool_value)
  * api_run_str --
  *      Execute a string as an ex command.
  *
- * PUBLIC: int api_run_str __P((SCR *, char *));
+ * PUBLIC: int api_run_str(SCR *, char *);
  */
 int     
 api_run_str(sp, cmd)
diff --git a/usr.bin/vi/common/cut.c b/usr.bin/vi/common/cut.c
index b952db5e334..32a5fb512f1 100644
--- a/usr.bin/vi/common/cut.c
+++ b/usr.bin/vi/common/cut.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cut.c,v 1.6 2002/01/31 11:10:39 hugh Exp $	*/
+/*	$OpenBSD: cut.c,v 1.7 2002/02/16 21:27:56 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)cut.c	10.10 (Berkeley) 9/15/96";
 
 #include "common.h"
 
-static void	cb_rotate __P((SCR *));
+static void	cb_rotate(SCR *);
 
 /*
  * cut --
@@ -63,7 +63,7 @@ static void	cb_rotate __P((SCR *));
  * replacing the contents.  Hopefully it's not worth getting right, and here
  * we just treat the numeric buffers like any other named buffer.
  *
- * PUBLIC: int cut __P((SCR *, CHAR_T *, MARK *, MARK *, int));
+ * PUBLIC: int cut(SCR *, CHAR_T *, MARK *, MARK *, int);
  */
 int
 cut(sp, namep, fm, tm, flags)
@@ -239,7 +239,7 @@ cb_rotate(sp)
  * cut_line --
  *	Cut a portion of a single line.
  *
- * PUBLIC: int cut_line __P((SCR *, recno_t, size_t, size_t, CB *));
+ * PUBLIC: int cut_line(SCR *, recno_t, size_t, size_t, CB *);
  */
 int
 cut_line(sp, lno, fcno, clen, cbp)
@@ -282,7 +282,7 @@ cut_line(sp, lno, fcno, clen, cbp)
  * cut_close --
  *	Discard all cut buffers.
  *
- * PUBLIC: void cut_close __P((GS *));
+ * PUBLIC: void cut_close(GS *);
  */
 void
 cut_close(gp)
@@ -308,7 +308,7 @@ cut_close(gp)
  * text_init --
  *	Allocate a new TEXT structure.
  *
- * PUBLIC: TEXT *text_init __P((SCR *, const char *, size_t, size_t));
+ * PUBLIC: TEXT *text_init(SCR *, const char *, size_t, size_t);
  */
 TEXT *
 text_init(sp, p, len, total_len)
@@ -339,7 +339,7 @@ text_init(sp, p, len, total_len)
  * text_lfree --
  *	Free a chain of text structures.
  *
- * PUBLIC: void text_lfree __P((TEXTH *));
+ * PUBLIC: void text_lfree(TEXTH *);
  */
 void
 text_lfree(headp)
@@ -357,7 +357,7 @@ text_lfree(headp)
  * text_free --
  *	Free a text structure.
  *
- * PUBLIC: void text_free __P((TEXT *));
+ * PUBLIC: void text_free(TEXT *);
  */
 void
 text_free(tp)
diff --git a/usr.bin/vi/common/delete.c b/usr.bin/vi/common/delete.c
index 7d8f808e736..c3dde6c9b66 100644
--- a/usr.bin/vi/common/delete.c
+++ b/usr.bin/vi/common/delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: delete.c,v 1.6 2001/09/19 02:43:19 pvalchev Exp $	*/
+/*	$OpenBSD: delete.c,v 1.7 2002/02/16 21:27:56 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)delete.c	10.12 (Berkeley) 10/23/96";
  * del --
  *	Delete a range of text.
  *
- * PUBLIC: int del __P((SCR *, MARK *, MARK *, int));
+ * PUBLIC: int del(SCR *, MARK *, MARK *, int);
  */
 int
 del(sp, fm, tm, lmode)
diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c
index 4951ee385b1..34287fbfaa1 100644
--- a/usr.bin/vi/common/exf.c
+++ b/usr.bin/vi/common/exf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exf.c,v 1.14 2001/09/17 04:42:55 pvalchev Exp $	*/
+/*	$OpenBSD: exf.c,v 1.15 2002/02/16 21:27:56 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -40,10 +40,10 @@ static const char sccsid[] = "@(#)exf.c	10.49 (Berkeley) 10/10/96";
 
 #include "common.h"
 
-static int	file_backup __P((SCR *, char *, char *));
-static void	file_cinit __P((SCR *));
-static void	file_comment __P((SCR *));
-static int	file_spath __P((SCR *, FREF *, struct stat *, int *));
+static int	file_backup(SCR *, char *, char *);
+static void	file_cinit(SCR *);
+static void	file_comment(SCR *);
+static int	file_spath(SCR *, FREF *, struct stat *, int *);
 
 /*
  * file_add --
@@ -58,7 +58,7 @@ static int	file_spath __P((SCR *, FREF *, struct stat *, int *));
  * vi now remembers the last location in any file that it has ever edited,
  * not just the previously edited file.
  *
- * PUBLIC: FREF *file_add __P((SCR *, CHAR_T *));
+ * PUBLIC: FREF *file_add(SCR *, CHAR_T *);
  */
 FREF *
 file_add(sp, name)
@@ -123,7 +123,7 @@ file_add(sp, name)
  *	let go of any previous file.  Don't release the previous file until
  *	absolutely sure we have the new one.
  *
- * PUBLIC: int file_init __P((SCR *, FREF *, char *, int));
+ * PUBLIC: int file_init(SCR *, FREF *, char *, int);
  */
 int
 file_init(sp, frp, rcv_name, flags)
@@ -629,7 +629,7 @@ file_cinit(sp)
  * file_end --
  *	Stop editing a file.
  *
- * PUBLIC: int file_end __P((SCR *, EXF *, int));
+ * PUBLIC: int file_end(SCR *, EXF *, int);
  */
 int
 file_end(sp, ep, force)
@@ -741,7 +741,7 @@ file_end(sp, ep, force)
  *	semantics for whether or not writes would happen.  That's
  *	why all the flags.
  *
- * PUBLIC: int file_write __P((SCR *, MARK *, MARK *, char *, int));
+ * PUBLIC: int file_write(SCR *, MARK *, MARK *, char *, int);
  */
 int
 file_write(sp, fm, tm, name, flags)
@@ -1237,7 +1237,7 @@ file_comment(sp)
  * 	First modification check routine.  The :next, :prev, :rewind, :tag,
  *	:tagpush, :tagpop, ^^ modifications check.
  *
- * PUBLIC: int file_m1 __P((SCR *, int, int));
+ * PUBLIC: int file_m1(SCR *, int, int);
  */
 int
 file_m1(sp, force, flags)
@@ -1277,7 +1277,7 @@ file_m1(sp, force, flags)
  * 	Second modification check routine.  The :edit, :quit, :recover
  *	modifications check.
  *
- * PUBLIC: int file_m2 __P((SCR *, int));
+ * PUBLIC: int file_m2(SCR *, int);
  */
 int
 file_m2(sp, force)
@@ -1309,7 +1309,7 @@ file_m2(sp, force)
  * file_m3 --
  * 	Third modification check routine.
  *
- * PUBLIC: int file_m3 __P((SCR *, int));
+ * PUBLIC: int file_m3(SCR *, int);
  */
 int
 file_m3(sp, force)
@@ -1345,7 +1345,7 @@ file_m3(sp, force)
  *	is not set, write the file.  A routine so there's a place to put the
  *	comment.
  *
- * PUBLIC: int file_aw __P((SCR *, int));
+ * PUBLIC: int file_aw(SCR *, int);
  */
 int
 file_aw(sp, flags)
@@ -1406,7 +1406,7 @@ file_aw(sp, flags)
  * If the user edits a temporary file, there may be times when there is no
  * alternative file name.  A name argument of NULL turns it off.
  *
- * PUBLIC: void set_alt_name __P((SCR *, char *));
+ * PUBLIC: void set_alt_name(SCR *, char *);
  */
 void
 set_alt_name(sp, name)
@@ -1442,7 +1442,7 @@ set_alt_name(sp, name)
  * files opened for writing are flushed back to disk when the DB session
  * is ended. So, in that case we have to acquire an extra file descriptor.
  *
- * PUBLIC: lockr_t file_lock __P((SCR *, char *, int *, int, int));
+ * PUBLIC: lockr_t file_lock(SCR *, char *, int *, int, int);
  */
 lockr_t
 file_lock(sp, name, fdp, fd, iswrite)
diff --git a/usr.bin/vi/common/gs.h b/usr.bin/vi/common/gs.h
index dfcdbc06f06..c0674b63b6c 100644
--- a/usr.bin/vi/common/gs.h
+++ b/usr.bin/vi/common/gs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gs.h,v 1.6 2001/01/29 01:58:29 niklas Exp $	*/
+/*	$OpenBSD: gs.h,v 1.7 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -150,47 +150,47 @@ struct _gs {
 
 	/* Screen interface functions. */
 					/* Add a string to the screen. */
-	int	(*scr_addstr) __P((SCR *, const char *, size_t));
+	int	(*scr_addstr)(SCR *, const char *, size_t);
 					/* Toggle a screen attribute. */
-	int	(*scr_attr) __P((SCR *, scr_attr_t, int));
+	int	(*scr_attr)(SCR *, scr_attr_t, int);
 					/* Terminal baud rate. */
-	int	(*scr_baud) __P((SCR *, u_long *));
+	int	(*scr_baud)(SCR *, u_long *);
 					/* Beep/bell/flash the terminal. */
-	int	(*scr_bell) __P((SCR *));
+	int	(*scr_bell)(SCR *);
 					/* Display a busy message. */
-	void	(*scr_busy) __P((SCR *, const char *, busy_t));
+	void	(*scr_busy)(SCR *, const char *, busy_t);
 					/* Clear to the end of the line. */
-	int	(*scr_clrtoeol) __P((SCR *));
+	int	(*scr_clrtoeol)(SCR *);
 					/* Return the cursor location. */
-	int	(*scr_cursor) __P((SCR *, size_t *, size_t *));
+	int	(*scr_cursor)(SCR *, size_t *, size_t *);
 					/* Delete a line. */
-	int	(*scr_deleteln) __P((SCR *));
+	int	(*scr_deleteln)(SCR *);
 					/* Get a keyboard event. */
-	int	(*scr_event) __P((SCR *, EVENT *, u_int32_t, int));
+	int	(*scr_event)(SCR *, EVENT *, u_int32_t, int);
 					/* Ex: screen adjustment routine. */
-	int	(*scr_ex_adjust) __P((SCR *, exadj_t));
+	int	(*scr_ex_adjust)(SCR *, exadj_t);
 	int	(*scr_fmap)		/* Set a function key. */
-	    __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t));
+(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t);
 					/* Get terminal key value. */
-	int	(*scr_keyval) __P((SCR *, scr_keyval_t, CHAR_T *, int *));
+	int	(*scr_keyval)(SCR *, scr_keyval_t, CHAR_T *, int *);
 					/* Insert a line. */
-	int	(*scr_insertln) __P((SCR *));
+	int	(*scr_insertln)(SCR *);
 					/* Handle an option change. */
-	int	(*scr_optchange) __P((SCR *, int, char *, u_long *));
+	int	(*scr_optchange)(SCR *, int, char *, u_long *);
 					/* Move the cursor. */
-	int	(*scr_move) __P((SCR *, size_t, size_t));
+	int	(*scr_move)(SCR *, size_t, size_t);
 					/* Message or ex output. */
-	void	(*scr_msg) __P((SCR *, mtype_t, char *, size_t));
+	void	(*scr_msg)(SCR *, mtype_t, char *, size_t);
 					/* Refresh the screen. */
-	int	(*scr_refresh) __P((SCR *, int));
+	int	(*scr_refresh)(SCR *, int);
 					/* Rename the file. */
-	int	(*scr_rename) __P((SCR *, char *, int));
+	int	(*scr_rename)(SCR *, char *, int);
 					/* Set the screen type. */
-	int	(*scr_screen) __P((SCR *, u_int32_t));
+	int	(*scr_screen)(SCR *, u_int32_t);
 					/* Suspend the editor. */
-	int	(*scr_suspend) __P((SCR *, int *));
+	int	(*scr_suspend)(SCR *, int *);
 					/* Print usage message. */
-	void	(*scr_usage) __P((void));
+	void	(*scr_usage)(void);
 };
 
 /*
diff --git a/usr.bin/vi/common/key.c b/usr.bin/vi/common/key.c
index 347f6d933a2..d23dccda1d0 100644
--- a/usr.bin/vi/common/key.c
+++ b/usr.bin/vi/common/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.5 2001/01/29 01:58:29 niklas Exp $	*/
+/*	$OpenBSD: key.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -32,11 +32,11 @@ static const char sccsid[] = "@(#)key.c	10.33 (Berkeley) 9/24/96";
 #include "common.h"
 #include "../vi/vi.h"
 
-static int	v_event_append __P((SCR *, EVENT *));
-static int	v_event_grow __P((SCR *, int));
-static int	v_key_cmp __P((const void *, const void *));
-static void	v_keyval __P((SCR *, int, scr_keyval_t));
-static void	v_sync __P((SCR *, int));
+static int	v_event_append(SCR *, EVENT *);
+static int	v_event_grow(SCR *, int);
+static int	v_key_cmp(const void *, const void *);
+static void	v_keyval(SCR *, int, scr_keyval_t);
+static void	v_sync(SCR *, int);
 
 /*
  * !!!
@@ -99,7 +99,7 @@ static int nkeylist =
  * v_key_init --
  *	Initialize the special key lookup table.
  *
- * PUBLIC: int v_key_init __P((SCR *));
+ * PUBLIC: int v_key_init(SCR *);
  */
 int
 v_key_init(sp)
@@ -202,7 +202,7 @@ v_keyval(sp, val, name)
  * v_key_ilookup --
  *	Build the fast-lookup key display array.
  *
- * PUBLIC: void v_key_ilookup __P((SCR *));
+ * PUBLIC: void v_key_ilookup(SCR *);
  */
 void
 v_key_ilookup(sp)
@@ -223,7 +223,7 @@ v_key_ilookup(sp)
  *	Return the length of the string that will display the key.
  *	This routine is the backup for the KEY_LEN() macro.
  *
- * PUBLIC: size_t v_key_len __P((SCR *, ARG_CHAR_T));
+ * PUBLIC: size_t v_key_len(SCR *, ARG_CHAR_T);
  */
 size_t
 v_key_len(sp, ch)
@@ -239,7 +239,7 @@ v_key_len(sp, ch)
  *	Return the string that will display the key.  This routine
  *	is the backup for the KEY_NAME() macro.
  *
- * PUBLIC: CHAR_T *v_key_name __P((SCR *, ARG_CHAR_T));
+ * PUBLIC: CHAR_T *v_key_name(SCR *, ARG_CHAR_T);
  */
 CHAR_T *
 v_key_name(sp, ach)
@@ -320,7 +320,7 @@ done:	sp->cname[sp->clen = len] = '\0';
  *	Fill in the value for a key.  This routine is the backup
  *	for the KEY_VAL() macro.
  *
- * PUBLIC: int v_key_val __P((SCR *, ARG_CHAR_T));
+ * PUBLIC: int v_key_val(SCR *, ARG_CHAR_T);
  */
 int
 v_key_val(sp, ch)
@@ -344,7 +344,7 @@ v_key_val(sp, ch)
  * an associated flag value, which indicates if it has already been quoted,
  * and if it is the result of a mapping or an abbreviation.
  *
- * PUBLIC: int v_event_push __P((SCR *, EVENT *, CHAR_T *, size_t, u_int));
+ * PUBLIC: int v_event_push(SCR *, EVENT *, CHAR_T *, size_t, u_int);
  */
 int
 v_event_push(sp, p_evp, p_s, nitems, flags)
@@ -525,7 +525,7 @@ v_event_append(sp, argp)
  * point.  Given that this might make the log grow unacceptably (consider that
  * cursor keys are done with maps), for now we leave any changes made in place.
  *
- * PUBLIC: int v_event_get __P((SCR *, EVENT *, int, u_int32_t));
+ * PUBLIC: int v_event_get(SCR *, EVENT *, int, u_int32_t);
  */
 int
 v_event_get(sp, argp, timeout, flags)
@@ -763,7 +763,7 @@ v_sync(sp, flags)
  * v_event_err --
  *	Unexpected event.
  *
- * PUBLIC: void v_event_err __P((SCR *, EVENT *));
+ * PUBLIC: void v_event_err(SCR *, EVENT *);
  */
 void
 v_event_err(sp, evp)
@@ -819,7 +819,7 @@ v_event_err(sp, evp)
  * v_event_flush --
  *	Flush any flagged keys, returning if any keys were flushed.
  *
- * PUBLIC: int v_event_flush __P((SCR *, u_int));
+ * PUBLIC: int v_event_flush(SCR *, u_int);
  */
 int
 v_event_flush(sp, flags)
diff --git a/usr.bin/vi/common/line.c b/usr.bin/vi/common/line.c
index 5c5d0f3f133..b1075923451 100644
--- a/usr.bin/vi/common/line.c
+++ b/usr.bin/vi/common/line.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: line.c,v 1.4 2001/01/29 01:58:30 niklas Exp $	*/
+/*	$OpenBSD: line.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -28,13 +28,13 @@ static const char sccsid[] = "@(#)line.c	10.21 (Berkeley) 9/15/96";
 #include "common.h"
 #include "../vi/vi.h"
 
-static int scr_update __P((SCR *, recno_t, lnop_t, int));
+static int scr_update(SCR *, recno_t, lnop_t, int);
 
 /*
  * db_eget --
  *	Front-end to db_get, special case handling for empty files.
  *
- * PUBLIC: int db_eget __P((SCR *, recno_t, char **, size_t *, int *));
+ * PUBLIC: int db_eget(SCR *, recno_t, char **, size_t *, int *);
  */
 int
 db_eget(sp, lno, pp, lenp, isemptyp)
@@ -78,7 +78,7 @@ db_eget(sp, lno, pp, lenp, isemptyp)
  *	Look in the text buffers for a line, followed by the cache, followed
  *	by the database.
  *
- * PUBLIC: int db_get __P((SCR *, recno_t, u_int32_t, char **, size_t *));
+ * PUBLIC: int db_get(SCR *, recno_t, u_int32_t, char **, size_t *);
  */
 int
 db_get(sp, lno, flags, pp, lenp)
@@ -186,7 +186,7 @@ err3:		if (lenp != NULL)
  * db_delete --
  *	Delete a line from the file.
  *
- * PUBLIC: int db_delete __P((SCR *, recno_t));
+ * PUBLIC: int db_delete(SCR *, recno_t);
  */
 int
 db_delete(sp, lno)
@@ -244,7 +244,7 @@ db_delete(sp, lno)
  * db_append --
  *	Append a line into the file.
  *
- * PUBLIC: int db_append __P((SCR *, int, recno_t, char *, size_t));
+ * PUBLIC: int db_append(SCR *, int, recno_t, char *, size_t);
  */
 int
 db_append(sp, update, lno, p, len)
@@ -318,7 +318,7 @@ db_append(sp, update, lno, p, len)
  * db_insert --
  *	Insert a line into the file.
  *
- * PUBLIC: int db_insert __P((SCR *, recno_t, char *, size_t));
+ * PUBLIC: int db_insert(SCR *, recno_t, char *, size_t);
  */
 int
 db_insert(sp, lno, p, len)
@@ -383,7 +383,7 @@ db_insert(sp, lno, p, len)
  * db_set --
  *	Store a line in the file.
  *
- * PUBLIC: int db_set __P((SCR *, recno_t, char *, size_t));
+ * PUBLIC: int db_set(SCR *, recno_t, char *, size_t);
  */
 int
 db_set(sp, lno, p, len)
@@ -442,7 +442,7 @@ db_set(sp, lno, p, len)
  * db_exist --
  *	Return if a line exists.
  *
- * PUBLIC: int db_exist __P((SCR *, recno_t));
+ * PUBLIC: int db_exist(SCR *, recno_t);
  */
 int
 db_exist(sp, lno)
@@ -477,7 +477,7 @@ db_exist(sp, lno)
  * db_last --
  *	Return the number of lines in the file.
  *
- * PUBLIC: int db_last __P((SCR *, recno_t *));
+ * PUBLIC: int db_last(SCR *, recno_t *);
  */
 int
 db_last(sp, lnop)
@@ -538,7 +538,7 @@ db_last(sp, lnop)
  * db_err --
  *	Report a line error.
  *
- * PUBLIC: void db_err __P((SCR *, recno_t));
+ * PUBLIC: void db_err(SCR *, recno_t);
  */
 void
 db_err(sp, lno)
diff --git a/usr.bin/vi/common/log.c b/usr.bin/vi/common/log.c
index e31d0ccf430..8a9be397fe6 100644
--- a/usr.bin/vi/common/log.c
+++ b/usr.bin/vi/common/log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: log.c,v 1.3 2001/01/29 01:58:30 niklas Exp $	*/
+/*	$OpenBSD: log.c,v 1.4 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -64,10 +64,10 @@ static const char sccsid[] = "@(#)log.c	10.8 (Berkeley) 3/6/96";
  * behaved that way.
  */
 
-static int	log_cursor1 __P((SCR *, int));
-static void	log_err __P((SCR *, char *, int));
+static int	log_cursor1(SCR *, int);
+static void	log_err(SCR *, char *, int);
 #if defined(DEBUG) && 0
-static void	log_trace __P((SCR *, char *, recno_t, u_char *));
+static void	log_trace(SCR *, char *, recno_t, u_char *);
 #endif
 
 /* Try and restart the log on failure, i.e. if we run out of memory. */
@@ -80,7 +80,7 @@ static void	log_trace __P((SCR *, char *, recno_t, u_char *));
  * log_init --
  *	Initialize the logging subsystem.
  *
- * PUBLIC: int log_init __P((SCR *, EXF *));
+ * PUBLIC: int log_init(SCR *, EXF *);
  */
 int
 log_init(sp, ep)
@@ -116,7 +116,7 @@ log_init(sp, ep)
  * log_end --
  *	Close the logging subsystem.
  *
- * PUBLIC: int log_end __P((SCR *, EXF *));
+ * PUBLIC: int log_end(SCR *, EXF *);
  */
 int
 log_end(sp, ep)
@@ -146,7 +146,7 @@ log_end(sp, ep)
  * log_cursor --
  *	Log the current cursor position, starting an event.
  *
- * PUBLIC: int log_cursor __P((SCR *));
+ * PUBLIC: int log_cursor(SCR *);
  */
 int
 log_cursor(sp)
@@ -211,7 +211,7 @@ log_cursor1(sp, type)
  * log_line --
  *	Log a line change.
  *
- * PUBLIC: int log_line __P((SCR *, recno_t, u_int));
+ * PUBLIC: int log_line(SCR *, recno_t, u_int);
  */
 int
 log_line(sp, lno, action)
@@ -311,7 +311,7 @@ log_line(sp, lno, action)
  *	would mean that undo operations would only reset marks, and not
  *	cause any other change.
  *
- * PUBLIC: int log_mark __P((SCR *, LMARK *));
+ * PUBLIC: int log_mark(SCR *, LMARK *);
  */
 int
 log_mark(sp, lmp)
@@ -357,7 +357,7 @@ log_mark(sp, lmp)
  * Log_backward --
  *	Roll the log backward one operation.
  *
- * PUBLIC: int log_backward __P((SCR *, MARK *));
+ * PUBLIC: int log_backward(SCR *, MARK *);
  */
 int
 log_backward(sp, rp)
@@ -463,7 +463,7 @@ err:	F_CLR(ep, F_NOLOG);
  * then move back on and do a 'U', the line will be restored to the way
  * it was before the original change.
  *
- * PUBLIC: int log_setline __P((SCR *));
+ * PUBLIC: int log_setline(SCR *);
  */
 int
 log_setline(sp)
@@ -550,7 +550,7 @@ err:	F_CLR(ep, F_NOLOG);
  * Log_forward --
  *	Roll the log forward one operation.
  *
- * PUBLIC: int log_forward __P((SCR *, MARK *));
+ * PUBLIC: int log_forward(SCR *, MARK *);
  */
 int
 log_forward(sp, rp)
diff --git a/usr.bin/vi/common/main.c b/usr.bin/vi/common/main.c
index d203eef71fe..55d52fb7196 100644
--- a/usr.bin/vi/common/main.c
+++ b/usr.bin/vi/common/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.7 2001/01/29 01:58:30 niklas Exp $	*/
+/*	$OpenBSD: main.c,v 1.8 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -41,15 +41,15 @@ static const char sccsid[] = "@(#)main.c	10.48 (Berkeley) 10/11/96";
 #include "../vi/vi.h"
 #include "pathnames.h"
 
-static void	 attach __P((GS *));
-static void	 v_estr __P((char *, int, char *));
-static int	 v_obsolete __P((char *, char *[]));
+static void	 attach(GS *);
+static void	 v_estr(char *, int, char *);
+static int	 v_obsolete(char *, char *[]);
 
 /*
  * editor --
  *	Main editor routine.
  *
- * PUBLIC: int editor __P((GS *, int, char *[]));
+ * PUBLIC: int editor(GS *, int, char *[]);
  */
 int
 editor(gp, argc, argv)
@@ -435,7 +435,7 @@ err:		rval = 1;
  * v_end --
  *	End the program, discarding screens and most of the global area.
  *
- * PUBLIC: void v_end __P((GS *));
+ * PUBLIC: void v_end(GS *);
  */
 void
 v_end(gp)
diff --git a/usr.bin/vi/common/mark.c b/usr.bin/vi/common/mark.c
index 1bb4ca326e7..e18183732c9 100644
--- a/usr.bin/vi/common/mark.c
+++ b/usr.bin/vi/common/mark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mark.c,v 1.4 2001/01/29 01:58:30 niklas Exp $	*/
+/*	$OpenBSD: mark.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -27,7 +27,7 @@ static const char sccsid[] = "@(#)mark.c	10.13 (Berkeley) 7/19/96";
 
 #include "common.h"
 
-static LMARK *mark_find __P((SCR *, ARG_CHAR_T));
+static LMARK *mark_find(SCR *, ARG_CHAR_T);
 
 /*
  * Marks are maintained in a key sorted doubly linked list.  We can't
@@ -64,7 +64,7 @@ static LMARK *mark_find __P((SCR *, ARG_CHAR_T));
  * mark_init --
  *	Set up the marks.
  *
- * PUBLIC: int mark_init __P((SCR *, EXF *));
+ * PUBLIC: int mark_init(SCR *, EXF *);
  */
 int
 mark_init(sp, ep)
@@ -85,7 +85,7 @@ mark_init(sp, ep)
  * mark_end --
  *	Free up the marks.
  *
- * PUBLIC: int mark_end __P((SCR *, EXF *));
+ * PUBLIC: int mark_end(SCR *, EXF *);
  */
 int
 mark_end(sp, ep)
@@ -109,7 +109,7 @@ mark_end(sp, ep)
  * mark_get --
  *	Get the location referenced by a mark.
  *
- * PUBLIC: int mark_get __P((SCR *, ARG_CHAR_T, MARK *, mtype_t));
+ * PUBLIC: int mark_get(SCR *, ARG_CHAR_T, MARK *, mtype_t);
  */
 int
 mark_get(sp, key, mp, mtype)
@@ -154,7 +154,7 @@ mark_get(sp, key, mp, mtype)
  * mark_set --
  *	Set the location referenced by a mark.
  *
- * PUBLIC: int mark_set __P((SCR *, ARG_CHAR_T, MARK *, int));
+ * PUBLIC: int mark_set(SCR *, ARG_CHAR_T, MARK *, int);
  */
 int
 mark_set(sp, key, value, userset)
@@ -220,7 +220,7 @@ mark_find(sp, key)
  * mark_insdel --
  *	Update the marks based on an insertion or deletion.
  *
- * PUBLIC: int mark_insdel __P((SCR *, lnop_t, recno_t));
+ * PUBLIC: int mark_insdel(SCR *, lnop_t, recno_t);
  */
 int
 mark_insdel(sp, op, lno)
diff --git a/usr.bin/vi/common/msg.c b/usr.bin/vi/common/msg.c
index 6308345a2ef..dfff4e47a87 100644
--- a/usr.bin/vi/common/msg.c
+++ b/usr.bin/vi/common/msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msg.c,v 1.8 2001/01/29 01:58:30 niklas Exp $	*/
+/*	$OpenBSD: msg.c,v 1.9 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -44,7 +44,7 @@ static const char sccsid[] = "@(#)msg.c	10.48 (Berkeley) 9/15/96";
  * msgq --
  *	Display a message.
  *
- * PUBLIC: void msgq __P((SCR *, mtype_t, const char *, ...));
+ * PUBLIC: void msgq(SCR *, mtype_t, const char *, ...);
  */
 void
 #ifdef __STDC__
@@ -358,7 +358,7 @@ alloc_err:
  * msgq_str --
  *	Display a message with an embedded string.
  *
- * PUBLIC: void msgq_str __P((SCR *, mtype_t, char *, char *));
+ * PUBLIC: void msgq_str(SCR *, mtype_t, char *, char *);
  */
 void
 msgq_str(sp, mtype, str, fmt)
@@ -400,7 +400,7 @@ msgq_str(sp, mtype, str, fmt)
  * the command 2d}, from the 'b' would report that two lines were deleted,
  * not one.
  *
- * PUBLIC: void mod_rpt __P((SCR *));
+ * PUBLIC: void mod_rpt(SCR *);
  */
 void
 mod_rpt(sp)
@@ -510,7 +510,7 @@ alloc_err:
  * msgq_status --
  *	Report on the file's status.
  *
- * PUBLIC: void msgq_status __P((SCR *, recno_t, u_int));
+ * PUBLIC: void msgq_status(SCR *, recno_t, u_int);
  */
 void
 msgq_status(sp, lno, flags)
@@ -676,7 +676,7 @@ alloc_err:
  * msg_open --
  *	Open the message catalogs.
  *
- * PUBLIC: int msg_open __P((SCR *, char *));
+ * PUBLIC: int msg_open(SCR *, char *);
  */
 int
 msg_open(sp, file)
@@ -747,7 +747,7 @@ msg_open(sp, file)
  * msg_close --
  *	Close the message catalogs.
  *
- * PUBLIC: void msg_close __P((GS *));
+ * PUBLIC: void msg_close(GS *);
  */
 void
 msg_close(gp)
@@ -761,7 +761,7 @@ msg_close(gp)
  * msg_cont --
  *	Return common continuation messages.
  *
- * PUBLIC: const char *msg_cmsg __P((SCR *, cmsg_t, size_t *));
+ * PUBLIC: const char *msg_cmsg(SCR *, cmsg_t, size_t *);
  */
 const char *
 msg_cmsg(sp, which, lenp)
@@ -799,7 +799,7 @@ msg_cmsg(sp, which, lenp)
  * Only a single catalog message can be accessed at a time, if multiple
  * ones are needed, they must be copied into local memory.
  *
- * PUBLIC: const char *msg_cat __P((SCR *, const char *, size_t *));
+ * PUBLIC: const char *msg_cat(SCR *, const char *, size_t *);
  */
 const char *
 msg_cat(sp, str, lenp)
@@ -849,7 +849,7 @@ msg_cat(sp, str, lenp)
  * msg_print --
  *	Return a printable version of a string, in allocated memory.
  *
- * PUBLIC: char *msg_print __P((SCR *, const char *, int *));
+ * PUBLIC: char *msg_print(SCR *, const char *, int *);
  */
 char *
 msg_print(sp, s, needfree)
diff --git a/usr.bin/vi/common/options.c b/usr.bin/vi/common/options.c
index fce52c6197f..f80a6f81df7 100644
--- a/usr.bin/vi/common/options.c
+++ b/usr.bin/vi/common/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.9 2001/01/29 01:58:31 niklas Exp $	*/
+/*	$OpenBSD: options.c,v 1.10 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -33,9 +33,9 @@ static const char sccsid[] = "@(#)options.c	10.51 (Berkeley) 10/14/96";
 #include "../vi/vi.h"
 #include "pathnames.h"
 
-static int	 	 opts_abbcmp __P((const void *, const void *));
-static int	 	 opts_cmp __P((const void *, const void *));
-static int	 	 opts_print __P((SCR *, OPTLIST const *));
+static int	 	 opts_abbcmp(const void *, const void *);
+static int	 	 opts_cmp(const void *, const void *);
+static int	 	 opts_print(SCR *, OPTLIST const *);
 
 /*
  * O'Reilly noted options and abbreviations are from "Learning the VI Editor",
@@ -281,7 +281,7 @@ static OABBREV const abbrev[] = {
  * opts_init --
  *	Initialize some of the options.
  *
- * PUBLIC: int opts_init __P((SCR *, int *));
+ * PUBLIC: int opts_init(SCR *, int *);
  */
 int
 opts_init(sp, oargs)
@@ -439,7 +439,7 @@ err:	msgq(sp, M_ERR,
  * opts_set --
  *	Change the values of one or more options.
  *
- * PUBLIC: int opts_set __P((SCR *, ARGS *[], char *));
+ * PUBLIC: int opts_set(SCR *, ARGS *[], char *);
  */
 int
 opts_set(sp, argv, usage)
@@ -742,7 +742,7 @@ badnum:				p = msg_print(sp, name, &nf);
  * o_set --
  *	Set an option's value.
  *
- * PUBLIC: int o_set __P((SCR *, int, u_int, char *, u_long));
+ * PUBLIC: int o_set(SCR *, int, u_int, char *, u_long);
  */
 int
 o_set(sp, opt, flags, str, val)
@@ -786,7 +786,7 @@ o_set(sp, opt, flags, str, val)
  * opts_empty --
  *	Return 1 if the string option is invalid, 0 if it's OK.
  *
- * PUBLIC: int opts_empty __P((SCR *, int, int));
+ * PUBLIC: int opts_empty(SCR *, int, int);
  */
 int
 opts_empty(sp, off, silent)
@@ -808,7 +808,7 @@ opts_empty(sp, off, silent)
  * opts_dump --
  *	List the current values of selected options.
  *
- * PUBLIC: void opts_dump __P((SCR *, enum optdisp));
+ * PUBLIC: void opts_dump(SCR *, enum optdisp);
  */
 void
 opts_dump(sp, type)
@@ -974,7 +974,7 @@ opts_print(sp, op)
  * opts_save --
  *	Write the current configuration to a file.
  *
- * PUBLIC: int opts_save __P((SCR *, FILE *));
+ * PUBLIC: int opts_save(SCR *, FILE *);
  */
 int
 opts_save(sp, fp)
@@ -1031,7 +1031,7 @@ opts_save(sp, fp)
  * opts_search --
  *	Search for an option.
  *
- * PUBLIC: OPTLIST const *opts_search __P((char *));
+ * PUBLIC: OPTLIST const *opts_search(char *);
  */
 OPTLIST const *
 opts_search(name)
@@ -1077,7 +1077,7 @@ opts_search(name)
  * opts_nomatch --
  *	Standard nomatch error message for options.
  *
- * PUBLIC: void opts_nomatch __P((SCR *, char *));
+ * PUBLIC: void opts_nomatch(SCR *, char *);
  */
 void
 opts_nomatch(sp, name)
@@ -1106,7 +1106,7 @@ opts_cmp(a, b)
  * opts_copy --
  *	Copy a screen's OPTION array.
  *
- * PUBLIC: int opts_copy __P((SCR *, SCR *));
+ * PUBLIC: int opts_copy(SCR *, SCR *);
  */
 int
 opts_copy(orig, sp)
@@ -1153,7 +1153,7 @@ nomem:			msgq(orig, M_SYSERR, NULL);
  * opts_free --
  *	Free all option strings
  *
- * PUBLIC: void opts_free __P((SCR *));
+ * PUBLIC: void opts_free(SCR *);
  */
 void
 opts_free(sp)
diff --git a/usr.bin/vi/common/options.h b/usr.bin/vi/common/options.h
index d3ef0fffdf9..9e1f424dba2 100644
--- a/usr.bin/vi/common/options.h
+++ b/usr.bin/vi/common/options.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.h,v 1.6 2001/01/29 01:58:31 niklas Exp $	*/
+/*	$OpenBSD: options.h,v 1.7 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -80,7 +80,7 @@ struct _option {
 struct _optlist {
 	char	*name;			/* Name. */
 					/* Change function. */
-	int	(*func) __P((SCR *, OPTION *, char *, u_long *));
+	int	(*func)(SCR *, OPTION *, char *, u_long *);
 					/* Type of object. */
 	enum { OPT_0BOOL, OPT_1BOOL, OPT_NUM, OPT_STR } type;
 
diff --git a/usr.bin/vi/common/options_f.c b/usr.bin/vi/common/options_f.c
index f35cf078ad4..c290fb3e3ed 100644
--- a/usr.bin/vi/common/options_f.c
+++ b/usr.bin/vi/common/options_f.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options_f.c,v 1.5 2001/01/29 01:58:31 niklas Exp $	*/
+/*	$OpenBSD: options_f.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)options_f.c	10.25 (Berkeley) 7/12/96";
 #include "common.h"
 
 /*
- * PUBLIC: int f_altwerase __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_altwerase(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_altwerase(sp, op, str, valp)
@@ -46,7 +46,7 @@ f_altwerase(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_columns __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_columns(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_columns(sp, op, str, valp)
@@ -80,7 +80,7 @@ f_columns(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_lines __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_lines(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_lines(sp, op, str, valp)
@@ -137,7 +137,7 @@ f_lines(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_lisp __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_lisp(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_lisp(sp, op, str, valp)
@@ -151,7 +151,7 @@ f_lisp(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_msgcat __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_msgcat(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_msgcat(sp, op, str, valp)
@@ -165,7 +165,7 @@ f_msgcat(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_paragraph __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_paragraph(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_paragraph(sp, op, str, valp)
@@ -183,7 +183,7 @@ f_paragraph(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_print __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_print(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_print(sp, op, str, valp)
@@ -201,7 +201,7 @@ f_print(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_readonly __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_readonly(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_readonly(sp, op, str, valp)
@@ -222,7 +222,7 @@ f_readonly(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_recompile __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_recompile(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_recompile(sp, op, str, valp)
@@ -243,7 +243,7 @@ f_recompile(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_reformat __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_reformat(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_reformat(sp, op, str, valp)
@@ -257,7 +257,7 @@ f_reformat(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_section __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_section(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_section(sp, op, str, valp)
@@ -275,7 +275,7 @@ f_section(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_ttywerase __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_ttywerase(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_ttywerase(sp, op, str, valp)
@@ -290,7 +290,7 @@ f_ttywerase(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_w300 __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_w300(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_w300(sp, op, str, valp)
@@ -311,7 +311,7 @@ f_w300(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_w1200 __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_w1200(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_w1200(sp, op, str, valp)
@@ -332,7 +332,7 @@ f_w1200(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_w9600 __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_w9600(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_w9600(sp, op, str, valp)
@@ -353,7 +353,7 @@ f_w9600(sp, op, str, valp)
 }
 
 /*
- * PUBLIC: int f_window __P((SCR *, OPTION *, char *, u_long *));
+ * PUBLIC: int f_window(SCR *, OPTION *, char *, u_long *);
  */
 int
 f_window(sp, op, str, valp)
diff --git a/usr.bin/vi/common/put.c b/usr.bin/vi/common/put.c
index 17a8a27bca7..08ee3b79240 100644
--- a/usr.bin/vi/common/put.c
+++ b/usr.bin/vi/common/put.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: put.c,v 1.5 2001/01/29 01:58:31 niklas Exp $	*/
+/*	$OpenBSD: put.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)put.c	10.11 (Berkeley) 9/23/96";
  * put --
  *	Put text buffer contents into the file.
  *
- * PUBLIC: int put __P((SCR *, CB *, CHAR_T *, MARK *, MARK *, int));
+ * PUBLIC: int put(SCR *, CB *, CHAR_T *, MARK *, MARK *, int);
  */
 int
 put(sp, cbp, namep, cp, rp, append)
diff --git a/usr.bin/vi/common/recover.c b/usr.bin/vi/common/recover.c
index 2b47562da48..588022c1372 100644
--- a/usr.bin/vi/common/recover.c
+++ b/usr.bin/vi/common/recover.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: recover.c,v 1.7 2001/06/18 21:39:26 millert Exp $	*/
+/*	$OpenBSD: recover.c,v 1.8 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -111,17 +111,17 @@ static const char sccsid[] = "@(#)recover.c	10.21 (Berkeley) 9/15/96";
 #define	VI_FHEADER	"X-vi-recover-file: "
 #define	VI_PHEADER	"X-vi-recover-path: "
 
-static int	 rcv_copy __P((SCR *, int, char *));
-static void	 rcv_email __P((SCR *, char *));
-static char	*rcv_gets __P((char *, size_t, int));
-static int	 rcv_mailfile __P((SCR *, int, char *));
-static int	 rcv_mktemp __P((SCR *, char *, char *, int));
+static int	 rcv_copy(SCR *, int, char *);
+static void	 rcv_email(SCR *, char *);
+static char	*rcv_gets(char *, size_t, int);
+static int	 rcv_mailfile(SCR *, int, char *);
+static int	 rcv_mktemp(SCR *, char *, char *, int);
 
 /*
  * rcv_tmp --
  *	Build a file name that will be used as the recovery file.
  *
- * PUBLIC: int rcv_tmp __P((SCR *, EXF *, char *));
+ * PUBLIC: int rcv_tmp(SCR *, EXF *, char *);
  */
 int
 rcv_tmp(sp, ep, name)
@@ -185,7 +185,7 @@ err:		msgq(sp, M_ERR,
  * rcv_init --
  *	Force the file to be snapshotted for recovery.
  *
- * PUBLIC: int rcv_init __P((SCR *));
+ * PUBLIC: int rcv_init(SCR *);
  */
 int
 rcv_init(sp)
@@ -248,7 +248,7 @@ err:	msgq(sp, M_ERR,
  *		sending email to the user if the file was modified
  *		ending the file session
  *
- * PUBLIC: int rcv_sync __P((SCR *, u_int));
+ * PUBLIC: int rcv_sync(SCR *, u_int);
  */
 int
 rcv_sync(sp, flags)
@@ -487,7 +487,7 @@ err:	if (!issync)
  * rcv_list --
  *	List the files that can be recovered by this user.
  *
- * PUBLIC: int rcv_list __P((SCR *));
+ * PUBLIC: int rcv_list(SCR *);
  */
 int
 rcv_list(sp)
@@ -590,7 +590,7 @@ next:		(void)fclose(fp);
  * rcv_read --
  *	Start a recovered file as the file to edit.
  *
- * PUBLIC: int rcv_read __P((SCR *, FREF *));
+ * PUBLIC: int rcv_read(SCR *, FREF *);
  */
 int
 rcv_read(sp, frp)
diff --git a/usr.bin/vi/common/screen.c b/usr.bin/vi/common/screen.c
index e118c128024..78a7283ed83 100644
--- a/usr.bin/vi/common/screen.c
+++ b/usr.bin/vi/common/screen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: screen.c,v 1.5 2001/01/29 01:58:31 niklas Exp $	*/
+/*	$OpenBSD: screen.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994
@@ -34,7 +34,7 @@ static const char sccsid[] = "@(#)screen.c	10.15 (Berkeley) 9/15/96";
  * screen_init --
  *	Do the default initialization of an SCR structure.
  *
- * PUBLIC: int screen_init __P((GS *, SCR *, SCR **));
+ * PUBLIC: int screen_init(GS *, SCR *, SCR **);
  */
 int
 screen_init(gp, orig, spp)
@@ -128,7 +128,7 @@ err:	screen_end(sp);
  *	Release a screen, no matter what had (and had not) been
  *	initialized.
  *
- * PUBLIC: int screen_end __P((SCR *));
+ * PUBLIC: int screen_end(SCR *);
  */
 int
 screen_end(sp)
@@ -206,7 +206,7 @@ screen_end(sp)
  * screen_next --
  *	Return the next screen in the queue.
  *
- * PUBLIC: SCR *screen_next __P((SCR *));
+ * PUBLIC: SCR *screen_next(SCR *);
  */
 SCR *
 screen_next(sp)
diff --git a/usr.bin/vi/common/search.c b/usr.bin/vi/common/search.c
index 27dbb504b32..72effe783ad 100644
--- a/usr.bin/vi/common/search.c
+++ b/usr.bin/vi/common/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.5 2001/01/29 01:58:32 niklas Exp $	*/
+/*	$OpenBSD: search.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -31,8 +31,8 @@ static const char sccsid[] = "@(#)search.c	10.25 (Berkeley) 6/30/96";
 
 typedef enum { S_EMPTY, S_EOF, S_NOPREV, S_NOTFOUND, S_SOF, S_WRAP } smsg_t;
 
-static void	search_msg __P((SCR *, smsg_t));
-static int	search_init __P((SCR *, dir_t, char *, size_t, char **, u_int));
+static void	search_msg(SCR *, smsg_t);
+static int	search_init(SCR *, dir_t, char *, size_t, char **, u_int);
 
 /*
  * search_init --
@@ -483,7 +483,7 @@ search_msg(sp, msg)
  * search_busy --
  *	Put up the busy searching message.
  *
- * PUBLIC: void search_busy __P((SCR *, busy_t));
+ * PUBLIC: void search_busy(SCR *, busy_t);
  */
 void
 search_busy(sp, btype)
diff --git a/usr.bin/vi/common/seq.c b/usr.bin/vi/common/seq.c
index 8d221d44141..b1cea0c3832 100644
--- a/usr.bin/vi/common/seq.c
+++ b/usr.bin/vi/common/seq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seq.c,v 1.4 2001/01/29 01:58:32 niklas Exp $	*/
+/*	$OpenBSD: seq.c,v 1.5 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -133,7 +133,7 @@ mem1:		errno = sv_errno;
  * seq_delete --
  *	Delete a sequence.
  *
- * PUBLIC: int seq_delete __P((SCR *, CHAR_T *, size_t, seq_t));
+ * PUBLIC: int seq_delete(SCR *, CHAR_T *, size_t, seq_t);
  */
 int
 seq_delete(sp, input, ilen, stype)
@@ -153,7 +153,7 @@ seq_delete(sp, input, ilen, stype)
  * seq_mdel --
  *	Delete a map entry, without lookup.
  *
- * PUBLIC: int seq_mdel __P((SEQ *));
+ * PUBLIC: int seq_mdel(SEQ *);
  */
 int
 seq_mdel(qp)
@@ -175,7 +175,7 @@ seq_mdel(qp)
  *	isn't NULL, partial matches count.
  *
  * PUBLIC: SEQ *seq_find
- * PUBLIC:    __P((SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *));
+ * PUBLIC:(SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *);
  */
 SEQ *
 seq_find(sp, lastqp, e_input, c_input, ilen, stype, ispartialp)
@@ -260,7 +260,7 @@ seq_find(sp, lastqp, e_input, c_input, ilen, stype, ispartialp)
  * seq_close --
  *	Discard all sequences.
  *
- * PUBLIC: void seq_close __P((GS *));
+ * PUBLIC: void seq_close(GS *);
  */
 void
 seq_close(gp)
@@ -284,7 +284,7 @@ seq_close(gp)
  * seq_dump --
  *	Display the sequence entries of a specified type.
  *
- * PUBLIC: int seq_dump __P((SCR *, seq_t, int));
+ * PUBLIC: int seq_dump(SCR *, seq_t, int);
  */
 int
 seq_dump(sp, stype, isname)
@@ -332,7 +332,7 @@ seq_dump(sp, stype, isname)
  * seq_save --
  *	Save the sequence entries to a file.
  *
- * PUBLIC: int seq_save __P((SCR *, FILE *, char *, seq_t));
+ * PUBLIC: int seq_save(SCR *, FILE *, char *, seq_t);
  */
 int
 seq_save(sp, fp, prefix, stype)
@@ -378,7 +378,7 @@ seq_save(sp, fp, prefix, stype)
  * e_memcmp --
  *	Compare a string of EVENT's to a string of CHAR_T's.
  *
- * PUBLIC: int e_memcmp __P((CHAR_T *, EVENT *, size_t));
+ * PUBLIC: int e_memcmp(CHAR_T *, EVENT *, size_t);
  */
 int
 e_memcmp(p1, ep, n)
diff --git a/usr.bin/vi/common/util.c b/usr.bin/vi/common/util.c
index 74d5ba94733..0172e887517 100644
--- a/usr.bin/vi/common/util.c
+++ b/usr.bin/vi/common/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.5 2001/01/29 01:58:32 niklas Exp $	*/
+/*	$OpenBSD: util.c,v 1.6 2002/02/16 21:27:57 millert Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)util.c	10.11 (Berkeley) 9/15/96";
  * binc --
  *	Increase the size of a buffer.
  *
- * PUBLIC: void *binc __P((SCR *, void *, size_t *, size_t));
+ * PUBLIC: void *binc(SCR *, void *, size_t *, size_t);
  */
 void *
 binc(sp, bp, bsizep, min)
@@ -72,7 +72,7 @@ binc(sp, bp, bsizep, min)
  *	including or after the starting column.  On error, set
  *	the column to 0, it's safest.
  *
- * PUBLIC: int nonblank __P((SCR *, recno_t, size_t *));
+ * PUBLIC: int nonblank(SCR *, recno_t, size_t *);
  */
 int
 nonblank(sp, lno, cnop)
@@ -108,7 +108,7 @@ nonblank(sp, lno, cnop)
  * tail --
  *	Return tail of a path.
  *
- * PUBLIC: char *tail __P((char *));
+ * PUBLIC: char *tail(char *);
  */
 char *
 tail(path)
@@ -125,7 +125,7 @@ tail(path)
  * v_strdup --
  *	Strdup for wide character strings with an associated length.
  *
- * PUBLIC: CHAR_T *v_strdup __P((SCR *, const CHAR_T *, size_t));
+ * PUBLIC: CHAR_T *v_strdup(SCR *, const CHAR_T *, size_t);
  */
 CHAR_T *
 v_strdup(sp, str, len)
@@ -147,7 +147,7 @@ v_strdup(sp, str, len)
  * nget_uslong --
  *      Get an unsigned long, checking for overflow.
  *
- * PUBLIC: enum nresult nget_uslong __P((u_long *, const char *, char **, int));
+ * PUBLIC: enum nresult nget_uslong(u_long *, const char *, char **, int);
  */
 enum nresult
 nget_uslong(valp, p, endp, base)
@@ -169,7 +169,7 @@ nget_uslong(valp, p, endp, base)
  * nget_slong --
  *      Convert a signed long, checking for overflow and underflow.
  *
- * PUBLIC: enum nresult nget_slong __P((long *, const char *, char **, int));
+ * PUBLIC: enum nresult nget_slong(long *, const char *, char **, int);
  */
 enum nresult
 nget_slong(valp, p, endp, base)
@@ -202,7 +202,7 @@ nget_slong(valp, p, endp, base)
  * TRACE --
  *	debugging trace routine.
  *
- * PUBLIC: void TRACE __P((SCR *, const char *, ...));
+ * PUBLIC: void TRACE(SCR *, const char *, ...);
  */
 void
 #ifdef __STDC__