Manual cleanup of remaining userland __P use (excluding packages maintained outside the tree)

3 files changed, 15 insertions, 21 deletions

diff --git a/usr.bin/vi/include/com_extern.h b/usr.bin/vi/include/com_extern.h
index cd9735dcb4d..34caf560158 100644
--- a/usr.bin/vi/include/com_extern.h
+++ b/usr.bin/vi/include/com_extern.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: com_extern.h,v 1.4 2002/02/16 21:27:57 millert Exp $	*/
+/*	$OpenBSD: com_extern.h,v 1.5 2002/02/17 19:42:34 millert Exp $	*/
 
 #ifndef HAVE_BSEARCH
-void	*bsearch __P((const void *, const void *, size_t,
-   size_t, int (*)(const void *, const void *)));
+void	*bsearch(const void *, const void *, size_t,
+   size_t, int (*)(const void *, const void *));
 #endif
 #ifndef HAVE_SETENV
 int setenv(const char *, const char *, int);
@@ -177,13 +177,11 @@ int rcv_read(SCR *, FREF *);
 int screen_init(GS *, SCR *, SCR **);
 int screen_end(SCR *);
 SCR *screen_next(SCR *);
-int f_search __P((SCR *,
-   MARK *, MARK *, char *, size_t, char **, u_int));
-int b_search __P((SCR *,
-   MARK *, MARK *, char *, size_t, char **, u_int));
+int f_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
+int b_search(SCR *, MARK *, MARK *, char *, size_t, char **, u_int);
 void search_busy(SCR *, busy_t);
-int seq_set __P((SCR *, CHAR_T *,
-   size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int));
+int seq_set(SCR *, CHAR_T *,
+   size_t, CHAR_T *, size_t, CHAR_T *, size_t, seq_t, int);
 int seq_delete(SCR *, CHAR_T *, size_t, seq_t);
 int seq_mdel(SEQ *);
 SEQ *seq_find
diff --git a/usr.bin/vi/include/ex_extern.h b/usr.bin/vi/include/ex_extern.h
index 9372d714eda..e787ed1ae9a 100644
--- a/usr.bin/vi/include/ex_extern.h
+++ b/usr.bin/vi/include/ex_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ex_extern.h,v 1.6 2002/02/16 21:27:58 millert Exp $	*/
+/*	$OpenBSD: ex_extern.h,v 1.7 2002/02/17 19:42:34 millert Exp $	*/
 
 int ex(SCR **);
 int ex_cmd(SCR *);
@@ -34,8 +34,7 @@ int ex_display(SCR *, EXCMD *);
 int ex_edit(SCR *, EXCMD *);
 int ex_equal(SCR *, EXCMD *);
 int ex_file(SCR *, EXCMD *);
-int ex_filter __P((SCR *, 
-   EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype));
+int ex_filter(SCR *, EXCMD *, MARK *, MARK *, MARK *, char *, enum filtertype);
 int ex_global(SCR *, EXCMD *);
 int ex_v(SCR *, EXCMD *);
 int ex_g_insdel(SCR *, lnop_t, recno_t);
@@ -87,8 +86,7 @@ int ex_stop(SCR *, EXCMD *);
 int ex_s(SCR *, EXCMD *);
 int ex_subagain(SCR *, EXCMD *);
 int ex_subtilde(SCR *, EXCMD *);
-int re_compile __P((SCR *,
-    char *, size_t, char **, size_t *, regex_t *, u_int));
+int re_compile(SCR *, char *, size_t, char **, size_t *, regex_t *, u_int);
 void re_error(SCR *, int, regex_t *);
 int ex_tag_first(SCR *, char *);
 int ex_tag_push(SCR *, EXCMD *);
@@ -110,8 +108,7 @@ int ex_undo(SCR *, EXCMD *);
 int ex_help(SCR *, EXCMD *);
 int ex_usage(SCR *, EXCMD *);
 int ex_viusage(SCR *, EXCMD *);
-void ex_cinit __P((EXCMD *,
-   int, int, recno_t, recno_t, int, ARGS **));
+void ex_cinit(EXCMD *, int, int, recno_t, recno_t, int, ARGS **);
 void ex_cadd(EXCMD *, ARGS *, char *, size_t);
 int ex_getline(SCR *, FILE *, size_t *);
 int ex_ncheck(SCR *, int);
@@ -123,7 +120,6 @@ int ex_wn(SCR *, EXCMD *);
 int ex_wq(SCR *, EXCMD *);
 int ex_write(SCR *, EXCMD *);
 int ex_xit(SCR *, EXCMD *);
-int ex_writefp __P((SCR *,
-   char *, FILE *, MARK *, MARK *, u_long *, u_long *, int));
+int ex_writefp(SCR *, char *, FILE *, MARK *, MARK *, u_long *, u_long *, int);
 int ex_yank(SCR *, EXCMD *);
 int ex_z(SCR *, EXCMD *);
diff --git a/usr.bin/vi/include/vi_extern.h b/usr.bin/vi/include/vi_extern.h
index ebc1d721a62..df253ae0f78 100644
--- a/usr.bin/vi/include/vi_extern.h
+++ b/usr.bin/vi/include/vi_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vi_extern.h,v 1.7 2002/02/16 21:27:58 millert Exp $	*/
+/*	$OpenBSD: vi_extern.h,v 1.8 2002/02/17 19:42:34 millert Exp $	*/
 
 int cs_init(SCR *, VCS *);
 int cs_next(SCR *, VCS *);
@@ -84,8 +84,8 @@ int v_sentencef(SCR *, VICMD *);
 int v_sentenceb(SCR *, VICMD *);
 int v_status(SCR *, VICMD *);
 int v_tcmd(SCR *, VICMD *, ARG_CHAR_T, u_int);
-int v_txt __P((SCR *, VICMD *, MARK *,
-   const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t));
+int v_txt(SCR *, VICMD *, MARK *,
+   const char *, size_t, ARG_CHAR_T, recno_t, u_long, u_int32_t);
 int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *);
 int v_ulcase(SCR *, VICMD *);
 int v_mulcase(SCR *, VICMD *);