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.

30 files changed, 242 insertions, 242 deletions

diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c
index dd42d448e13..00d39e93b8f 100644
--- a/lib/libedit/chared.c
+++ b/lib/libedit/chared.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chared.c,v 1.3 1997/03/14 05:12:41 millert Exp $	*/
+/*	$OpenBSD: chared.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: chared.c,v 1.2 1997/01/11 06:47:48 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)chared.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: chared.c,v 1.3 1997/03/14 05:12:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: chared.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -177,7 +177,7 @@ protected char *
 c__prev_word(p, low, n, wtest) 
     register char *p, *low;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest)(int);
 {
     p--;
 
@@ -204,7 +204,7 @@ protected char *
 c__next_word(p, high, n, wtest)
     register char *p, *high;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest)(int);
 {
     while (n--) {
 	while ((p < high) && !(*wtest)((unsigned char) *p)) 
@@ -226,7 +226,7 @@ cv_next_word(el, p, high, n, wtest)
     EditLine *el;
     register char *p, *high;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest)(int);
 {
     int test;
 
@@ -259,7 +259,7 @@ cv_prev_word(el, p, low, n, wtest)
     EditLine *el;
     register char *p, *low;
     register int n;
-    int (*wtest) __P((int));
+    int (*wtest)(int);
 {
     int test;
 
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
index c4c1d94f2be..91cdf7f253e 100644
--- a/lib/libedit/chared.h
+++ b/lib/libedit/chared.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chared.h,v 1.3 1997/03/14 05:12:42 millert Exp $	*/
+/*	$OpenBSD: chared.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: chared.h,v 1.2 1997/01/11 06:47:49 lukem Exp $	*/
 
 /*-
@@ -137,25 +137,25 @@ typedef struct el_chared_t {
 #include "fcns.h"
 
 
-protected int   cv__isword	__P((int));
-protected void  cv_delfini	__P((EditLine *));
-protected char *cv__endword	__P((char *, char *, int));
-protected int   ce__isword	__P((int));
-protected void  cv_undo		__P((EditLine *, int, int, char *));
+protected int   cv__isword(int);
+protected void  cv_delfini(EditLine *);
+protected char *cv__endword(char *, char *, int);
+protected int   ce__isword(int);
+protected void  cv_undo(EditLine *, int, int, char *);
 protected char *cv_next_word	__P((EditLine*, char *, char *, int, 
 				     int (*)(int)));
 protected char *cv_prev_word	__P((EditLine*, char *, char *, int,
 				     int (*)(int)));
 protected char *c__next_word	__P((char *, char *, int, int (*)(int)));
 protected char *c__prev_word	__P((char *, char *, int, int (*)(int)));
-protected void  c_insert	__P((EditLine *, int));
-protected void  c_delbefore	__P((EditLine *, int));
-protected void  c_delafter	__P((EditLine *, int));
-protected int   c_gets		__P((EditLine *, char *));
-protected int   c_hpos		__P((EditLine *));
-
-protected int   ch_init		__P((EditLine *));
-protected void  ch_reset	__P((EditLine *));
-protected void  ch_end		__P((EditLine *));
+protected void  c_insert(EditLine *, int);
+protected void  c_delbefore(EditLine *, int);
+protected void  c_delafter(EditLine *, int);
+protected int   c_gets(EditLine *, char *);
+protected int   c_hpos(EditLine *);
+
+protected int   ch_init(EditLine *);
+protected void  ch_reset(EditLine *);
+protected void  ch_end(EditLine *);
 
 #endif /* _h_el_chared */
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
index c64bed49d5a..8113b21b1f0 100644
--- a/lib/libedit/hist.h
+++ b/lib/libedit/hist.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hist.h,v 1.4 1997/03/14 05:12:49 millert Exp $	*/
+/*	$OpenBSD: hist.h,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: hist.h,v 1.3 1997/01/11 06:47:56 lukem Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@
 
 #include "histedit.h"
 
-typedef const HistEvent *	(*hist_fun_t) __P((ptr_t, int, ...));
+typedef const HistEvent *	(*hist_fun_t)(ptr_t, int, ...);
 
 typedef struct el_history_t {
     char *buf;				/* The history buffer		*/
@@ -71,10 +71,10 @@ typedef struct el_history_t {
 #define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
 #define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
 
-protected int 		hist_init	__P((EditLine *));
-protected void 		hist_end	__P((EditLine *));
-protected el_action_t	hist_get	__P((EditLine *));
-protected int		hist_set	__P((EditLine *, hist_fun_t, ptr_t));
-protected int		hist_list	__P((EditLine *, int, char **));
+protected int 		hist_init(EditLine *);
+protected void 		hist_end(EditLine *);
+protected el_action_t	hist_get(EditLine *);
+protected int		hist_set(EditLine *, hist_fun_t, ptr_t);
+protected int		hist_list(EditLine *, int, char **);
 
 #endif /* _h_el_hist */
diff --git a/lib/libedit/histedit.h b/lib/libedit/histedit.h
index 7da08c8ed57..aa65004ff0a 100644
--- a/lib/libedit/histedit.h
+++ b/lib/libedit/histedit.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: histedit.h,v 1.5 1997/06/29 23:40:49 millert Exp $	*/
+/*	$OpenBSD: histedit.h,v 1.6 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: histedit.h,v 1.5 1997/04/11 17:52:45 christos Exp $	*/
 
 /*-
@@ -80,28 +80,28 @@ typedef struct lineinfo {
 /*
  * Initialization, cleanup, and resetting
  */
-EditLine	*el_init	__P((const char *, FILE *, FILE *));
-void		 el_reset	__P((EditLine *));
-void		 el_end		__P((EditLine *));
+EditLine	*el_init(const char *, FILE *, FILE *);
+void		 el_reset(EditLine *);
+void		 el_end(EditLine *);
 
 
 /*
  * Get a line, a character or push a string back in the input queue
  */
-const char	*el_gets	__P((EditLine *, int *));
-int		 el_getc	__P((EditLine *, char *));
-void		 el_push	__P((EditLine *, const char *));
+const char	*el_gets(EditLine *, int *);
+int		 el_getc(EditLine *, char *);
+void		 el_push(EditLine *, const char *);
 
 /*
  * High level function internals control
  * Parses argc, argv array and executes builtin editline commands
  */
-int		 el_parse	__P((EditLine *, int, char **)); 
+int		 el_parse(EditLine *, int, char **); 
 
 /*
  * Low level editline access function
  */
-int 		 el_set		__P((EditLine *, int, ...));
+int 		 el_set(EditLine *, int, ...);
 
 /*
  * el_set/el_get parameters
@@ -122,22 +122,22 @@ int 		 el_set		__P((EditLine *, int, ...));
 /*
  * Source named file or $PWD/.editrc or $HOME/.editrc
  */
-int		el_source	__P((EditLine *, const char *));
+int		el_source(EditLine *, const char *);
 
 /*
  * Must be called when the terminal changes size; If EL_SIGNAL
  * is set this is done automatically otherwise it is the responsibility
  * of the application
  */
-void		 el_resize	__P((EditLine *));
+void		 el_resize(EditLine *);
 
 
 /*
  * User-defined function interface.
  */
-const LineInfo   *el_line	__P((EditLine *));
-int   		  el_insertstr	__P((EditLine *, char *));
-void		  el_deletestr	__P((EditLine *, int));
+const LineInfo   *el_line(EditLine *);
+int   		  el_insertstr(EditLine *, char *);
+void		  el_deletestr(EditLine *, int);
 
 /*
  * ==== History ====
@@ -153,10 +153,10 @@ typedef struct HistEvent {
 /*
  * History access functions.
  */
-History *		history_init	__P((void));
-void 			history_end	__P((History *));
+History *		history_init(void);
+void 			history_end(History *);
 
-const HistEvent *	history		__P((History *, int, ...));
+const HistEvent *	history(History *, int, ...);
 
 #define H_FUNC		 0	/* , UTSL		*/
 #define H_EVENT		 1	/* , const int);	*/
diff --git a/lib/libedit/history.c b/lib/libedit/history.c
index 4155dd023c8..d266b82c077 100644
--- a/lib/libedit/history.c
+++ b/lib/libedit/history.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: history.c,v 1.5 1997/06/29 23:40:49 millert Exp $	*/
+/*	$OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: history.c,v 1.5 1997/04/11 17:52:46 christos Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: history.c,v 1.5 1997/06/29 23:40:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -62,9 +62,9 @@ static const char hist_cookie[] = "_HiStOrY_V1_\n";
 
 #include "histedit.h"
 
-typedef const HistEvent *	(*history_gfun_t) __P((ptr_t));
-typedef const HistEvent *	(*history_efun_t) __P((ptr_t, const char *));
-typedef void 			(*history_vfun_t) __P((ptr_t));
+typedef const HistEvent *	(*history_gfun_t)(ptr_t);
+typedef const HistEvent *	(*history_efun_t)(ptr_t, const char *);
+typedef void 			(*history_vfun_t)(ptr_t);
 
 struct history {
     ptr_t	   h_ref;		/* Argument for history fcns	*/
@@ -91,14 +91,14 @@ struct history {
 #define h_free(a)	free(a)
 
 
-private int		 history_set_num	__P((History *, int));
-private int		 history_set_fun	__P((History *, History *));
-private int 		 history_load		__P((History *, const char *));
-private int 		 history_save		__P((History *, const char *));
-private const HistEvent *history_prev_event	__P((History *, int));
-private const HistEvent *history_next_event	__P((History *, int));
-private const HistEvent *history_next_string	__P((History *, const char *));
-private const HistEvent *history_prev_string	__P((History *, const char *));
+private int		 history_set_num(History *, int);
+private int		 history_set_fun(History *, History *);
+private int 		 history_load(History *, const char *);
+private int 		 history_save(History *, const char *);
+private const HistEvent *history_prev_event(History *, int);
+private const HistEvent *history_next_event(History *, int);
+private const HistEvent *history_next_string(History *, const char *);
+private const HistEvent *history_prev_string(History *, const char *);
 
 
 /***********************************************************************/
@@ -120,17 +120,17 @@ typedef struct history_t {
     int	eventno;		/* Current event number		*/
 } history_t;
 
-private const HistEvent *history_def_first  __P((ptr_t));
-private const HistEvent *history_def_last   __P((ptr_t));
-private const HistEvent *history_def_next   __P((ptr_t));
-private const HistEvent *history_def_prev   __P((ptr_t));
-private const HistEvent *history_def_curr   __P((ptr_t));
-private const HistEvent *history_def_enter  __P((ptr_t, const char *));
-private const HistEvent *history_def_add    __P((ptr_t, const char *));
-private void             history_def_init   __P((ptr_t *, int));
-private void             history_def_clear  __P((ptr_t));
-private const HistEvent *history_def_insert __P((history_t *, const char *));
-private void             history_def_delete __P((history_t *, hentry_t *));
+private const HistEvent *history_def_first(ptr_t);
+private const HistEvent *history_def_last(ptr_t);
+private const HistEvent *history_def_next(ptr_t);
+private const HistEvent *history_def_prev(ptr_t);
+private const HistEvent *history_def_curr(ptr_t);
+private const HistEvent *history_def_enter(ptr_t, const char *);
+private const HistEvent *history_def_add(ptr_t, const char *);
+private void             history_def_init(ptr_t *, int);
+private void             history_def_clear(ptr_t);
+private const HistEvent *history_def_insert(history_t *, const char *);
+private void             history_def_delete(history_t *, hentry_t *);
 
 #define history_def_set(p, num)	(void)(((history_t *) p)->max = (num))
 
diff --git a/lib/libedit/key.c b/lib/libedit/key.c
index 5a81521e52f..e108095f350 100644
--- a/lib/libedit/key.c
+++ b/lib/libedit/key.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.c,v 1.3 1997/03/14 05:12:52 millert Exp $	*/
+/*	$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: key.c,v 1.2 1997/01/11 06:47:58 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)key.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: key.c,v 1.3 1997/03/14 05:12:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -89,13 +89,13 @@ private	int            node_trav	__P((EditLine *, key_node_t *, char *,
 					     key_value_t *));
 private	int            node__try	__P((key_node_t *, char *, 
 					     key_value_t *, int));
-private	key_node_t    *node__get	__P((int));
-private	void	       node__put	__P((key_node_t *));
-private	int	       node__delete	__P((key_node_t **, char *));
+private	key_node_t    *node__get(int);
+private	void	       node__put(key_node_t *);
+private	int	       node__delete(key_node_t **, char *);
 private	int	       node_lookup 	__P((EditLine *, char *, key_node_t *,
 					     int));
-private	int	       node_enum	__P((EditLine *, key_node_t *, int));
-private	int	       key__decode_char	__P((char *, int, int));
+private	int	       node_enum(EditLine *, key_node_t *, int);
+private	int	       key__decode_char(char *, int, int);
 
 #define KEY_BUFSIZ	EL_BUFSIZ
 
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
index 924154bd4b9..256d48b72a7 100644
--- a/lib/libedit/key.h
+++ b/lib/libedit/key.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: key.h,v 1.3 1997/03/14 05:12:52 millert Exp $	*/
+/*	$OpenBSD: key.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: key.h,v 1.2 1997/01/11 06:47:59 lukem Exp $	*/
 
 /*-
@@ -63,21 +63,21 @@ typedef struct el_key_t {
 #define XK_NOD	2
 #define XK_EXE	3
 
-protected int 		key_init	__P((EditLine *));
-protected void 		key_end		__P((EditLine *));
-protected key_value_t *	key_map_cmd	__P((EditLine *, int));
-protected key_value_t *	key_map_str	__P((EditLine *, char *));
-protected void		key_reset	__P((EditLine *));
+protected int 		key_init(EditLine *);
+protected void 		key_end(EditLine *);
+protected key_value_t *	key_map_cmd(EditLine *, int);
+protected key_value_t *	key_map_str(EditLine *, char *);
+protected void		key_reset(EditLine *);
 protected int 		key_get		__P((EditLine *, char *, 
 					     key_value_t *));
 protected void		key_add		__P((EditLine *, char *, key_value_t *,
 					     int));
 protected void		key_clear	__P((EditLine *, el_action_t *,
 					     char *));
-protected int		key_delete	__P((EditLine *, char *));
-protected void		key_print	__P((EditLine *, char *));
+protected int		key_delete(EditLine *, char *);
+protected void		key_print(EditLine *, char *);
 protected void	        key_kprint	__P((EditLine *, char *, 
 					     key_value_t *, int));
-protected char 	       *key__decode_str	__P((char *, char *, char *));
+protected char 	       *key__decode_str(char *, char *, char *);
 
 #endif /* _h_el_key */
diff --git a/lib/libedit/makelist b/lib/libedit/makelist
index 2204cfc3583..51e7b2454c5 100644
--- a/lib/libedit/makelist
+++ b/lib/libedit/makelist
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#	$OpenBSD: makelist,v 1.3 1997/03/14 05:12:53 millert Exp $
+#	$OpenBSD: makelist,v 1.4 2002/02/16 21:27:26 millert Exp $
 #	$NetBSD: makelist,v 1.3 1997/01/11 06:48:00 lukem Exp $
 #
 # Copyright (c) 1992, 1993
@@ -67,7 +67,7 @@ case $FLAG in
 	    pr = substr($2, 1, 2);
 	    if (pr == "vi" || pr == "em" || pr == "ed") {
 		name = substr($2, 1, length($2) - 3);
-		printf("protected el_action_t\t%-25.25s __P((EditLine *, int));\n", name);
+		printf("protected el_action_t\t%-25.25s(EditLine *, int);\n", name);
 	    }
 	}
 	END {
@@ -122,7 +122,7 @@ case $FLAG in
 	BEGIN { 
 	    printf("/* Automatically generated file, do not edit */\n");
 	    printf("#ifndef _h_help_c\n#define _h_help_c\n");
-	    printf("protected el_bindings_t *help__get\t__P((void));\n");
+	    printf("protected el_bindings_t *help__get\t(void);\n");
 	    printf("#endif /* _h_help_c */\n");
 	}' /dev/null;;
 -fh)
@@ -139,8 +139,8 @@ case $FLAG in
 	END {
 	    printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count);
 
-	    printf("typedef el_action_t (*el_func_t) __P((EditLine *, int));");
-	    printf("\nprotected el_func_t* func__get __P((void));\n");
+	    printf("typedef el_action_t (*el_func_t)(EditLine *, int);");
+	    printf("\nprotected el_func_t* func__get(void);\n");
 	    printf("#endif /* _h_fcns_c */\n");
 	}';;
 -fc)
diff --git a/lib/libedit/map.c b/lib/libedit/map.c
index 00283efa6cc..70429ed3bbc 100644
--- a/lib/libedit/map.c
+++ b/lib/libedit/map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $	*/
+/*	$OpenBSD: map.c,v 1.6 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: map.c,v 1.3 1997/01/11 06:48:00 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: map.c,v 1.6 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -54,11 +54,11 @@ static char rcsid[] = "$OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $";
 
 #define N_KEYS 256
 
-private void map_print_key	 __P((EditLine *, el_action_t *, char *));
-private void map_print_some_keys __P((EditLine *, el_action_t *, int, int));
-private void map_print_all_keys	 __P((EditLine *));
-private void map_init_nls 	 __P((EditLine *));
-private void map_init_meta	 __P((EditLine *));
+private void map_print_key(EditLine *, el_action_t *, char *);
+private void map_print_some_keys(EditLine *, el_action_t *, int, int);
+private void map_print_all_keys(EditLine *);
+private void map_init_nls(EditLine *);
+private void map_init_meta(EditLine *);
 
 /* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */
 
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
index a6c73ed6cca..c63f11c60a3 100644
--- a/lib/libedit/map.h
+++ b/lib/libedit/map.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.h,v 1.3 1997/03/14 05:12:55 millert Exp $	*/
+/*	$OpenBSD: map.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: map.h,v 1.2 1997/01/11 06:48:01 lukem Exp $	*/
 
 /*-
@@ -68,12 +68,12 @@ typedef struct el_map_t {
 #define MAP_EMACS	0
 #define MAP_VI		1
 
-protected int	map_bind		__P((EditLine *, int, char **));
-protected int	map_init		__P((EditLine *));
-protected void	map_end			__P((EditLine *));
-protected void	map_init_vi		__P((EditLine *));
-protected void	map_init_emacs		__P((EditLine *));
-protected int	map_set_editor		__P((EditLine *, char *));
+protected int	map_bind(EditLine *, int, char **);
+protected int	map_init(EditLine *);
+protected void	map_end(EditLine *);
+protected void	map_init_vi(EditLine *);
+protected void	map_init_emacs(EditLine *);
+protected int	map_set_editor(EditLine *, char *);
 protected int	map_addfunc		__P((EditLine *, const char *, 
 					     const char *, el_func_t));
 
diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c
index b113983a20d..a1096d05bc7 100644
--- a/lib/libedit/parse.c
+++ b/lib/libedit/parse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $	*/
+/*	$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: parse.c,v 1.5 1997/01/11 09:57:08 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $
 
 private struct {
     char *name;
-    int (*func) __P((EditLine *, int, char **));
+    int (*func)(EditLine *, int, char **);
 } cmds[] = {
     {	"bind",		map_bind 	},
     {	"echotc",	term_echotc 	},
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
index f11f849a9a1..619b2a0a71c 100644
--- a/lib/libedit/parse.h
+++ b/lib/libedit/parse.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.h,v 1.3 1997/03/14 05:12:56 millert Exp $	*/
+/*	$OpenBSD: parse.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: parse.h,v 1.2 1997/01/11 06:48:03 lukem Exp $	*/
 
 /*-
@@ -45,9 +45,9 @@
 #ifndef _h_el_parse
 #define _h_el_parse
 
-protected int		 parse_line	__P((EditLine *, const char *)); 
-protected int		 parse__escape	__P((const char ** const));
-protected char *	 parse__string	__P((char *, const char *));
-protected int		 parse_cmd	__P((EditLine *, const char *));
+protected int		 parse_line(EditLine *, const char *); 
+protected int		 parse__escape(const char ** const);
+protected char *	 parse__string(char *, const char *);
+protected int		 parse_cmd(EditLine *, const char *);
 
 #endif /* _h_el_parse */
diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c
index 82d4f5d3e93..264b0cd667f 100644
--- a/lib/libedit/prompt.c
+++ b/lib/libedit/prompt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp $	*/
+/*	$OpenBSD: prompt.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: prompt.c,v 1.2 1997/01/11 06:48:04 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)prompt.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: prompt.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp
 #include <stdio.h>
 #include "el.h"
 
-private char *prompt_default	__P((EditLine *));
+private char *prompt_default(EditLine *);
 
 /* prompt_default():
  *	Just a default prompt, in case the user did not provide one
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
index 4b456acdb4e..9985b6ce619 100644
--- a/lib/libedit/prompt.h
+++ b/lib/libedit/prompt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prompt.h,v 1.3 1997/03/14 05:12:58 millert Exp $	*/
+/*	$OpenBSD: prompt.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: prompt.h,v 1.2 1997/01/11 06:48:05 lukem Exp $	*/
 
 /*-
@@ -47,16 +47,16 @@
 
 #include "histedit.h"
 
-typedef char * (*el_pfunc_t) __P((EditLine*));
+typedef char * (*el_pfunc_t)(EditLine*);
 
 typedef struct el_prompt_t {
     el_pfunc_t p_func;		/* Function to return the prompt	*/
     coord_t    p_pos;		/* position in the line after prompt	*/
 } el_prompt_t;
 
-protected void prompt_print	__P((EditLine *));
-protected int  prompt_set	__P((EditLine *, el_pfunc_t));
-protected int  prompt_init	__P((EditLine *));
-protected void prompt_end	__P((EditLine *));
+protected void prompt_print(EditLine *);
+protected int  prompt_set(EditLine *, el_pfunc_t);
+protected int  prompt_init(EditLine *);
+protected void prompt_end(EditLine *);
 
 #endif /* _h_el_prompt */
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
index 0f99fdd1035..f45aaa52257 100644
--- a/lib/libedit/read.c
+++ b/lib/libedit/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.6 1997/08/20 03:30:13 millert Exp $	*/
+/*	$OpenBSD: read.c,v 1.7 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: read.c,v 1.4 1997/04/11 17:52:47 christos Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: read.c,v 1.6 1997/08/20 03:30:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.7 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -58,9 +58,9 @@ extern int errno;
 
 #define OKCMD -1
 
-private int read__fixio		__P((int, int));
-private int read_preread	__P((EditLine *));
-private int read_getcmd		__P((EditLine *, el_action_t *, char *));
+private int read__fixio(int, int);
+private int read_preread(EditLine *);
+private int read_getcmd(EditLine *, el_action_t *, char *);
 
 #ifdef DEBUG_EDIT
 private void
diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c
index 08bff2fcc94..df6fe26fe90 100644
--- a/lib/libedit/refresh.c
+++ b/lib/libedit/refresh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp $	*/
+/*	$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: refresh.c,v 1.2 1997/01/11 06:48:07 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)refresh.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -56,16 +56,16 @@ static char rcsid[] = "$OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp
 
 #include "el.h"
 
-private	void	re_addc 		__P((EditLine *, int));
-private	void	re_update_line 		__P((EditLine *, char *, char *, int));
+private	void	re_addc(EditLine *, int);
+private	void	re_update_line(EditLine *, char *, char *, int);
 private	void	re_insert		__P((EditLine *, char *, int, int, 
 					     char *, int));
 private	void	re_delete		__P((EditLine *, char *, int, int, 
 					     int));
-private	void	re_fastputc		__P((EditLine *, int));
+private	void	re_fastputc(EditLine *, int);
 
-private	void	re__strncopy		__P((char *, char *, size_t));
-private	void	re__copy_and_pad	__P((char *, char *, size_t));
+private	void	re__strncopy(char *, char *, size_t);
+private	void	re__copy_and_pad(char *, char *, size_t);
 
 #ifdef DEBUG_REFRESH
 private	void	re_printstr		__P((EditLine *, char *, char *, 
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
index 9ffbde99d42..71d3919e574 100644
--- a/lib/libedit/refresh.h
+++ b/lib/libedit/refresh.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: refresh.h,v 1.3 1997/03/14 05:13:00 millert Exp $	*/
+/*	$OpenBSD: refresh.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: refresh.h,v 1.2 1997/01/11 06:48:08 lukem Exp $	*/
 
 /*-
@@ -52,12 +52,12 @@ typedef struct {
     int r_oldcv, r_newcv;	/* Vertical locations		*/
 } el_refresh_t;
 
-protected void	re_putc 		__P((EditLine *, int));
-protected void	re_clear_lines		__P((EditLine *));
-protected void	re_clear_display	__P((EditLine *));
-protected void	re_refresh		__P((EditLine *));
-protected void	re_refresh_cursor	__P((EditLine *));
-protected void	re_fastaddc		__P((EditLine *));
-protected void	re_goto_bottom		__P((EditLine *));
+protected void	re_putc(EditLine *, int);
+protected void	re_clear_lines(EditLine *);
+protected void	re_clear_display(EditLine *);
+protected void	re_refresh(EditLine *);
+protected void	re_refresh_cursor(EditLine *);
+protected void	re_fastaddc(EditLine *);
+protected void	re_goto_bottom(EditLine *);
 
 #endif /* _h_el_refresh */
diff --git a/lib/libedit/search.c b/lib/libedit/search.c
index 06976ae33fe..c157c19cc88 100644
--- a/lib/libedit/search.c
+++ b/lib/libedit/search.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.c,v 1.4 1997/06/29 23:40:51 millert Exp $	*/
+/*	$OpenBSD: search.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: search.c,v 1.4 1997/01/23 14:02:47 mrg Exp $		*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)search.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: search.c,v 1.4 1997/06/29 23:40:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: search.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -118,8 +118,8 @@ el_match(str, pat)
     regexp *rp;
     int rv;
 #else 
-    extern char *re_comp __P((const char *));
-    extern int re_exec __P((const char *));
+    extern char *re_comp(const char *);
+    extern int re_exec(const char *);
 #endif
 
     if (strstr(str, pat) != NULL)
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
index 6cf20ed58c7..68e56d8525a 100644
--- a/lib/libedit/search.h
+++ b/lib/libedit/search.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: search.h,v 1.3 1997/03/14 05:13:02 millert Exp $	*/
+/*	$OpenBSD: search.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: search.h,v 1.2 1997/01/11 06:48:09 lukem Exp $	*/
 
 /*-
@@ -56,16 +56,16 @@ typedef struct el_search_t {
 } el_search_t;
 
 
-protected int 		el_match	__P((const char *, const char *));
-protected int		search_init	__P((EditLine *));
-protected void		search_end	__P((EditLine *));
-protected int		c_hmatch	__P((EditLine *, const char *));
-protected void		c_setpat	__P((EditLine *));
-protected el_action_t	ce_inc_search	__P((EditLine *, int));
-protected el_action_t	cv_search	__P((EditLine *, int));
-protected el_action_t	ce_search_line	__P((EditLine *, char *, int));
-protected el_action_t	cv_repeat_srch	__P((EditLine *, int));
-protected el_action_t	cv_csearch_back	__P((EditLine *, int, int, int));
-protected el_action_t	cv_csearch_fwd	__P((EditLine *, int, int, int));
+protected int 		el_match(const char *, const char *);
+protected int		search_init(EditLine *);
+protected void		search_end(EditLine *);
+protected int		c_hmatch(EditLine *, const char *);
+protected void		c_setpat(EditLine *);
+protected el_action_t	ce_inc_search(EditLine *, int);
+protected el_action_t	cv_search(EditLine *, int);
+protected el_action_t	ce_search_line(EditLine *, char *, int);
+protected el_action_t	cv_repeat_srch(EditLine *, int);
+protected el_action_t	cv_csearch_back(EditLine *, int, int, int);
+protected el_action_t	cv_csearch_fwd(EditLine *, int, int, int);
 
 #endif /* _h_el_search */
diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c
index b85de1a01b2..e720a46502f 100644
--- a/lib/libedit/sig.c
+++ b/lib/libedit/sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sig.c,v 1.6 2001/12/06 04:26:00 deraadt Exp $	*/
+/*	$OpenBSD: sig.c,v 1.7 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: sig.c,v 1.3 1997/04/11 17:52:48 christos Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)sig.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: sig.c,v 1.6 2001/12/06 04:26:00 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sig.c,v 1.7 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -63,7 +63,7 @@ private int sighdl[] = {
     -1
 };
 
-private void sig_handler	__P((int));
+private void sig_handler(int);
 
 /* sig_handler():
  *	This is the handler called for all signals
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
index e70bbb611bf..9e7424142b5 100644
--- a/lib/libedit/sig.h
+++ b/lib/libedit/sig.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sig.h,v 1.3 1997/03/14 05:13:03 millert Exp $	*/
+/*	$OpenBSD: sig.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: sig.h,v 1.2 1997/01/11 06:48:11 lukem Exp $	*/
 
 /*-
@@ -65,9 +65,9 @@
 
 typedef sig_t *el_signal_t;
 
-protected void	sig_end		__P((EditLine*));
-protected int	sig_init	__P((EditLine*));
-protected void	sig_set		__P((EditLine*));
-protected void	sig_clr		__P((EditLine*));
+protected void	sig_end(EditLine*);
+protected int	sig_init(EditLine*);
+protected void	sig_set(EditLine*);
+protected void	sig_clr(EditLine*);
 
 #endif /* _h_el_sig */
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
index cfe5a2019a9..975dec2d7ba 100644
--- a/lib/libedit/sys.h
+++ b/lib/libedit/sys.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys.h,v 1.4 1997/07/25 20:30:16 mickey Exp $	*/
+/*	$OpenBSD: sys.h,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: sys.h,v 1.3 1997/01/11 06:48:12 lukem Exp $	*/
 
 /*-
@@ -87,33 +87,33 @@ typedef char* ioctl_t;
 # undef REGEX
 # undef REGEXP
 # include <malloc.h>
-typedef void (*sig_t)__P((int));
+typedef void (*sig_t)(int);
 # ifdef __GNUC__
 /*
  * Broken hdrs.
  */
-extern char    *getenv		__P((const char *));
-extern int	fprintf		__P((FILE *, const char *, ...));
-extern int	sigsetmask	__P((int));
-extern int	sigblock	__P((int));
-extern int	ioctl		__P((int, int, void *));
-extern int	fputc		__P((int, FILE *));
-extern int	fgetc		__P((FILE *));
-extern int	fflush		__P((FILE *));
-extern int	tolower		__P((int));
-extern int	toupper		__P((int));
+extern char    *getenv(const char *);
+extern int	fprintf(FILE *, const char *, ...);
+extern int	sigsetmask(int);
+extern int	sigblock(int);
+extern int	ioctl(int, int, void *);
+extern int	fputc(int, FILE *);
+extern int	fgetc(FILE *);
+extern int	fflush(FILE *);
+extern int	tolower(int);
+extern int	toupper(int);
 extern int	errno, sys_nerr;
 extern char	*sys_errlist[];
-extern void	perror		__P((const char *));
-extern int	read		__P((int, const char*, int));
+extern void	perror(const char *);
+extern int	read(int, const char*, int);
 #  include <string.h>
 #  define strerror(e)	sys_errlist[e]
 # endif
 # ifdef SABER
-extern ptr_t    memcpy		__P((ptr_t, const ptr_t, size_t));
-extern ptr_t    memset		__P((ptr_t, int, size_t));
+extern ptr_t    memcpy(ptr_t, const ptr_t, size_t);
+extern ptr_t    memset(ptr_t, int, size_t);
 # endif
-extern char    *fgetline	__P((FILE *, int *));
+extern char    *fgetline(FILE *, int *);
 #endif
 
 #endif /* _h_sys */
diff --git a/lib/libedit/term.c b/lib/libedit/term.c
index 61e5089160d..2ecbc08bb41 100644
--- a/lib/libedit/term.c
+++ b/lib/libedit/term.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.c,v 1.4 1997/07/03 14:25:29 niklas Exp $	*/
+/*	$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: term.c,v 1.8 1997/01/23 14:02:49 mrg Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: term.c,v 1.4 1997/07/03 14:25:29 niklas Exp $";
+static char rcsid[] = "$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -251,13 +251,13 @@ private struct termcapval {
 
 /* do two or more of the attributes use me */
 
-private	void	term_rebuffer_display	__P((EditLine *));
-private	void	term_free_display	__P((EditLine *));
-private	void	term_alloc_display	__P((EditLine *));
+private	void	term_rebuffer_display(EditLine *);
+private	void	term_free_display(EditLine *);
+private	void	term_alloc_display(EditLine *);
 private	void	term_alloc		__P((EditLine *,
 					     struct termcapstr *, char *)); 
-private void	term_init_arrow		__P((EditLine *));
-private void	term_reset_arrow	__P((EditLine *));
+private void	term_init_arrow(EditLine *);
+private void	term_reset_arrow(EditLine *);
 
 
 private FILE *term_outfile = NULL;	/* XXX: How do we fix that? */
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
index 451d85291c9..5c251653d94 100644
--- a/lib/libedit/term.h
+++ b/lib/libedit/term.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: term.h,v 1.3 1997/03/14 05:13:06 millert Exp $	*/
+/*	$OpenBSD: term.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: term.h,v 1.4 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -81,30 +81,30 @@ typedef struct {
 #define A_K_RT		3
 #define A_K_NKEYS	4
 
-protected void term_move_to_line	__P((EditLine *, int));
-protected void term_move_to_char	__P((EditLine *, int));
-protected void term_clear_EOL		__P((EditLine *, int));
-protected void term_overwrite		__P((EditLine *, char *, int));
-protected void term_insertwrite		__P((EditLine *, char *, int));
-protected void term_deletechars		__P((EditLine *, int));
-protected void term_clear_screen	__P((EditLine *));
-protected void term_beep		__P((EditLine *));
-protected void term_change_size		__P((EditLine *, int, int));
-protected int  term_get_size		__P((EditLine *, int *, int *));
-protected int  term_init		__P((EditLine *));
-protected void term_bind_arrow		__P((EditLine *));
-protected void term_print_arrow		__P((EditLine *, char *));
-protected int  term_clear_arrow		__P((EditLine *, char *));
+protected void term_move_to_line(EditLine *, int);
+protected void term_move_to_char(EditLine *, int);
+protected void term_clear_EOL(EditLine *, int);
+protected void term_overwrite(EditLine *, char *, int);
+protected void term_insertwrite(EditLine *, char *, int);
+protected void term_deletechars(EditLine *, int);
+protected void term_clear_screen(EditLine *);
+protected void term_beep(EditLine *);
+protected void term_change_size(EditLine *, int, int);
+protected int  term_get_size(EditLine *, int *, int *);
+protected int  term_init(EditLine *);
+protected void term_bind_arrow(EditLine *);
+protected void term_print_arrow(EditLine *, char *);
+protected int  term_clear_arrow(EditLine *, char *);
 protected int  term_set_arrow		__P((EditLine *, char *, 
 					     key_value_t *, int));
-protected void term_end			__P((EditLine *));
-protected int  term_set			__P((EditLine *, char *));
-protected int  term_settc		__P((EditLine *, int, char **));
-protected int  term_telltc		__P((EditLine *, int, char **));
-protected int  term_echotc		__P((EditLine *, int, char **));
+protected void term_end(EditLine *);
+protected int  term_set(EditLine *, char *);
+protected int  term_settc(EditLine *, int, char **);
+protected int  term_telltc(EditLine *, int, char **);
+protected int  term_echotc(EditLine *, int, char **);
 
-protected void term__putc		__P((int));
-protected void term__flush		__P((void));
+protected void term__putc(int);
+protected void term__flush(void);
 
 /*
  * Easy access macros
diff --git a/lib/libedit/termcap.h b/lib/libedit/termcap.h
index 507bdbf6796..f7190a6d865 100644
--- a/lib/libedit/termcap.h
+++ b/lib/libedit/termcap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termcap.h,v 1.3 1997/03/14 05:13:06 millert Exp $	*/
+/*	$OpenBSD: termcap.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: termcap.h,v 1.2 1997/01/11 06:48:14 lukem Exp $	*/
 
 /*-
@@ -45,11 +45,11 @@
 #ifndef _h_termcap
 #define _h_termcap
 
-int   tgetent	__P((char *, char *));
-char *tgetstr	__P((char *, char **));
-int   tgetflag	__P((char *));
-int   tgetnum	__P((char *));
-char *tgoto	__P((char *, int, int));
+int   tgetent(char *, char *);
+char *tgetstr(char *, char **);
+int   tgetflag(char *);
+int   tgetnum(char *);
+char *tgoto(char *, int, int);
 char *tputs	__P((char *, int, void (*)(int)));
 
 #endif /* _h_termcap */
diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 22f25145060..9beca22371a 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tokenizer.c,v 1.4 1998/08/16 20:24:54 millert Exp $	*/
+/*	$OpenBSD: tokenizer.c,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: tokenizer.c,v 1.2 1997/01/11 06:48:15 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: tokenizer.c,v 1.4 1998/08/16 20:24:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: tokenizer.c,v 1.5 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -80,7 +80,7 @@ struct tokenizer {
 };
 
 
-private void tok_finish	__P((Tokenizer *));
+private void tok_finish(Tokenizer *);
 
 
 /* tok_finish():
diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h
index 33cc9753bff..2a5c4d2deb3 100644
--- a/lib/libedit/tokenizer.h
+++ b/lib/libedit/tokenizer.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tokenizer.h,v 1.3 1997/03/14 05:13:08 millert Exp $	*/
+/*	$OpenBSD: tokenizer.h,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: tokenizer.h,v 1.2 1997/01/11 06:48:16 lukem Exp $	*/
 
 /*-
@@ -47,9 +47,9 @@
 
 typedef struct tokenizer Tokenizer;
 
-Tokenizer 	*tok_init	__P((const char *));
-void		 tok_reset	__P((Tokenizer *));
-void		 tok_end	__P((Tokenizer *));
+Tokenizer 	*tok_init(const char *);
+void		 tok_reset(Tokenizer *);
+void		 tok_end(Tokenizer *);
 int		 tok_line	__P((Tokenizer *, const char *, 
 				     int *, char ***));
 
diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c
index 8ea40de82bd..cade741c99f 100644
--- a/lib/libedit/tty.c
+++ b/lib/libedit/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.5 2001/04/13 20:21:19 deraadt Exp $	*/
+/*	$OpenBSD: tty.c,v 1.6 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: tty.c,v 1.3 1997/04/11 17:52:49 christos Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: tty.c,v 1.5 2001/04/13 20:21:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: tty.c,v 1.6 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -453,10 +453,10 @@ private ttymodes_t ttymodes[] = {
 #define tty__geteightbit(td) (((td)->c_cflag & CSIZE) == CS8)
 #define tty__cooked_mode(td) ((td)->c_lflag & ICANON)
 
-private void    tty__getchar	__P((struct termios *, unsigned char *));
-private void    tty__setchar	__P((struct termios *, unsigned char *));
-private speed_t tty__getspeed	__P((struct termios *));
-private int     tty_setup	__P((EditLine *));
+private void    tty__getchar(struct termios *, unsigned char *);
+private void    tty__setchar(struct termios *, unsigned char *);
+private speed_t tty__getspeed(struct termios *);
+private int     tty_setup(EditLine *);
 
 #define t_qu t_ts
 
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
index 26ff4854013..58fa6e2fbe4 100644
--- a/lib/libedit/tty.h
+++ b/lib/libedit/tty.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.h,v 1.4 1997/06/29 23:40:53 millert Exp $	*/
+/*	$OpenBSD: tty.h,v 1.5 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: tty.h,v 1.4 1997/04/11 21:38:02 christos Exp $	*/
 
 /*-
@@ -460,14 +460,14 @@ typedef struct {
 
 typedef unsigned char ttychar_t[NN_IO][C_NCC];
 
-protected int	tty_init	__P((EditLine *));
-protected void	tty_end		__P((EditLine *));
-protected int	tty_stty	__P((EditLine *, int, char**));
-protected int	tty_rawmode	__P((EditLine *));
-protected int	tty_cookedmode	__P((EditLine *));
-protected int	tty_quotemode	__P((EditLine *));
-protected int	tty_noquotemode	__P((EditLine *));
-protected void	tty_bind_char	__P((EditLine *, int));
+protected int	tty_init(EditLine *);
+protected void	tty_end(EditLine *);
+protected int	tty_stty(EditLine *, int, char**);
+protected int	tty_rawmode(EditLine *);
+protected int	tty_cookedmode(EditLine *);
+protected int	tty_quotemode(EditLine *);
+protected int	tty_noquotemode(EditLine *);
+protected void	tty_bind_char(EditLine *, int);
 
 typedef struct {
     ttyperm_t t_t;
diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c
index 8226fab7a13..f1abb964efb 100644
--- a/lib/libedit/vi.c
+++ b/lib/libedit/vi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $	*/
+/*	$OpenBSD: vi.c,v 1.4 2002/02/16 21:27:26 millert Exp $	*/
 /*	$NetBSD: vi.c,v 1.2 1997/01/11 06:48:19 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)vi.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: vi.c,v 1.4 2002/02/16 21:27:26 millert Exp $";
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $";
 #include "sys.h"
 #include "el.h"
 
-private el_action_t cv_action __P((EditLine *, int));
+private el_action_t cv_action(EditLine *, int);
 
 /* cv_action():
  *	Handle vi actions.