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.

7 files changed, 95 insertions, 95 deletions

diff --git a/lib/libocurses/cr_put.c b/lib/libocurses/cr_put.c
index d98e66b50e0..e11b69167e4 100644
--- a/lib/libocurses/cr_put.c
+++ b/lib/libocurses/cr_put.c
@@ -55,10 +55,10 @@ mvcur(ly, lx, y, x)
 	return (__mvcur(ly, lx, y, x, 0));
 }
 
-static void	fgoto __P((int));
-static int	plod __P((int, int));
-static void	plodput __P((int));
-static int	tabcol __P((int, int));
+static void	fgoto(int);
+static int	plod(int, int);
+static void	plodput(int);
+static int	tabcol(int, int);
 
 static int outcol, outline, destcol, destline;
 
diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h
index 3b80a82a691..3914699e45c 100644
--- a/lib/libocurses/curses.h
+++ b/lib/libocurses/curses.h
@@ -233,87 +233,87 @@ extern char	*ttytype;		/* Full name of current terminal. */
 
 /* Public function prototypes. */
 __BEGIN_DECLS
-int	 box __P((WINDOW *, int, int));
-int	 cbreak __P((void));
-int	 delwin __P((WINDOW *));
-int	 echo __P((void));
-int	 endwin __P((void));
-char	*fullname __P((char *, char *));
-char	*getcap __P((char *));
-int	 gettmode __P((void));
-void	 idlok __P((WINDOW *, int));
-WINDOW	*initscr __P((void));
-char	*longname __P((char *, char *));
-int	 mvcur __P((int, int, int, int));
-int	 mvprintw __P((int, int, const char *, ...));
-int	 mvscanw __P((int, int, const char *, ...));
-int	 mvwin __P((WINDOW *, int, int));
-int	 mvwprintw __P((WINDOW *, int, int, const char *, ...));
-int	 mvwscanw __P((WINDOW *, int, int, const char *, ...));
-WINDOW	*newwin __P((int, int, int, int));
-int	 nl __P((void));
-int	 nocbreak __P((void));
-int	 noecho __P((void));
-int	 nonl __P((void));
-int	 noraw __P((void));
-int	 overlay __P((WINDOW *, WINDOW *));
-int	 overwrite __P((WINDOW *, WINDOW *));
-int	 printw __P((const char *, ...));
-int	 raw __P((void));
-int	 resetty __P((void));
-int	 savetty __P((void));
-int	 scanw __P((const char *, ...));
-int	 scroll __P((WINDOW *));
-int	 setterm __P((char *));
-int	 sscans __P((WINDOW *, const char *, ...));
-WINDOW	*subwin __P((WINDOW *, int, int, int, int));
-int	 suspendwin __P((void));
-int	 touchline __P((WINDOW *, int, int, int));
-int	 touchoverlap __P((WINDOW *, WINDOW *));
-int	 touchwin __P((WINDOW *));
-int 	 vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
-int      vwscanw __P((WINDOW *, const char *, _BSD_VA_LIST_));
-int	 waddch __P((WINDOW *, int));
-int	 waddnstr __P((WINDOW *, const char *, int));
-int	 wclear __P((WINDOW *));
-int	 wclrtobot __P((WINDOW *));
-int	 wclrtoeol __P((WINDOW *));
-int	 wdelch __P((WINDOW *));
-int	 wdeleteln __P((WINDOW *));
-int	 werase __P((WINDOW *));
-int	 wgetch __P((WINDOW *));
-int	 wgetstr __P((WINDOW *, char *));
-int	 winsch __P((WINDOW *, int));
-int	 winsertln __P((WINDOW *));
-int	 wmove __P((WINDOW *, int, int));
-int	 wprintw __P((WINDOW *, const char *, ...));
-int	 wrefresh __P((WINDOW *));
-int	 wscanw __P((WINDOW *, const char *, ...));
-int	 wstandend __P((WINDOW *));
-int	 wstandout __P((WINDOW *));
-int	 vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_));
+int	 box(WINDOW *, int, int);
+int	 cbreak(void);
+int	 delwin(WINDOW *);
+int	 echo(void);
+int	 endwin(void);
+char	*fullname(char *, char *);
+char	*getcap(char *);
+int	 gettmode(void);
+void	 idlok(WINDOW *, int);
+WINDOW	*initscr(void);
+char	*longname(char *, char *);
+int	 mvcur(int, int, int, int);
+int	 mvprintw(int, int, const char *, ...);
+int	 mvscanw(int, int, const char *, ...);
+int	 mvwin(WINDOW *, int, int);
+int	 mvwprintw(WINDOW *, int, int, const char *, ...);
+int	 mvwscanw(WINDOW *, int, int, const char *, ...);
+WINDOW	*newwin(int, int, int, int);
+int	 nl(void);
+int	 nocbreak(void);
+int	 noecho(void);
+int	 nonl(void);
+int	 noraw(void);
+int	 overlay(WINDOW *, WINDOW *);
+int	 overwrite(WINDOW *, WINDOW *);
+int	 printw(const char *, ...);
+int	 raw(void);
+int	 resetty(void);
+int	 savetty(void);
+int	 scanw(const char *, ...);
+int	 scroll(WINDOW *);
+int	 setterm(char *);
+int	 sscans(WINDOW *, const char *, ...);
+WINDOW	*subwin(WINDOW *, int, int, int, int);
+int	 suspendwin(void);
+int	 touchline(WINDOW *, int, int, int);
+int	 touchoverlap(WINDOW *, WINDOW *);
+int	 touchwin(WINDOW *);
+int 	 vwprintw(WINDOW *, const char *, _BSD_VA_LIST_);
+int      vwscanw(WINDOW *, const char *, _BSD_VA_LIST_);
+int	 waddch(WINDOW *, int);
+int	 waddnstr(WINDOW *, const char *, int);
+int	 wclear(WINDOW *);
+int	 wclrtobot(WINDOW *);
+int	 wclrtoeol(WINDOW *);
+int	 wdelch(WINDOW *);
+int	 wdeleteln(WINDOW *);
+int	 werase(WINDOW *);
+int	 wgetch(WINDOW *);
+int	 wgetstr(WINDOW *, char *);
+int	 winsch(WINDOW *, int);
+int	 winsertln(WINDOW *);
+int	 wmove(WINDOW *, int, int);
+int	 wprintw(WINDOW *, const char *, ...);
+int	 wrefresh(WINDOW *);
+int	 wscanw(WINDOW *, const char *, ...);
+int	 wstandend(WINDOW *);
+int	 wstandout(WINDOW *);
+int	 vwprintw(WINDOW *, const char *, _BSD_VA_LIST_);
 
 /* Private functions that are needed for user programs prototypes. */
-void	 __cputchar __P((int));
-int	 __waddbytes __P((WINDOW *, const char *, int, int));
+void	 __cputchar(int);
+int	 __waddbytes(WINDOW *, const char *, int, int);
 __END_DECLS
 
 /* Private functions. */
 #ifdef _CURSES_PRIVATE
-void	 __CTRACE __P((const char *, ...));
-unsigned int	 __hash __P((char *, int));
-void	 __id_subwins __P((WINDOW *));
-int	 __mvcur __P((int, int, int, int, int));
-void	 __restore_stophandler __P((void));
-void	 __set_stophandler __P((void));
-void	 __set_subwin __P((WINDOW *, WINDOW *));
-void	 __startwin __P((void));
-void	 __stop_signal_handler __P((int));
-void	 __swflags __P((WINDOW *));
-int	 __touchline __P((WINDOW *, int, int, int, int));
-int	 __touchwin __P((WINDOW *));
-char	*__tscroll __P((const char *, int, int));
-int	 __waddch __P((WINDOW *, __LDATA *));
+void	 __CTRACE(const char *, ...);
+unsigned int	 __hash(char *, int);
+void	 __id_subwins(WINDOW *);
+int	 __mvcur(int, int, int, int, int);
+void	 __restore_stophandler(void);
+void	 __set_stophandler(void);
+void	 __set_subwin(WINDOW *, WINDOW *);
+void	 __startwin(void);
+void	 __stop_signal_handler(int);
+void	 __swflags(WINDOW *);
+int	 __touchline(WINDOW *, int, int, int, int);
+int	 __touchwin(WINDOW *);
+char	*__tscroll(const char *, int, int);
+int	 __waddch(WINDOW *, __LDATA *);
 
 /* Private #defines. */
 #define	min(a,b)	(a < b ? a : b)
@@ -329,11 +329,11 @@ extern int	 __noqch;
 
 /* Termcap functions. */
 __BEGIN_DECLS
-int	 tgetent __P((char *, char *));
-int	 tgetnum __P((char *));
-int	 tgetflag __P((char *));
-char	*tgetstr __P((char *, char **));
-char	*tgoto __P((char *, int, int));
+int	 tgetent(char *, char *);
+int	 tgetnum(char *);
+int	 tgetflag(char *);
+char	*tgetstr(char *, char **);
+char	*tgoto(char *, int, int);
 void	 tputs __P((char *, int, void (*)(int)));
 __END_DECLS
 
diff --git a/lib/libocurses/newwin.c b/lib/libocurses/newwin.c
index 8f09cbf7966..3ddcc662494 100644
--- a/lib/libocurses/newwin.c
+++ b/lib/libocurses/newwin.c
@@ -41,9 +41,9 @@ static char sccsid[] = "@(#)newwin.c	8.3 (Berkeley) 7/27/94";
 
 #undef	nl		/* Don't need it here, and it interferes. */
 
-static WINDOW 	*__makenew __P((int, int, int, int, int));
+static WINDOW 	*__makenew(int, int, int, int, int);
 
-void	 __set_subwin __P((WINDOW *, WINDOW *));
+void	 __set_subwin(WINDOW *, WINDOW *);
 
 /*
  * newwin --
diff --git a/lib/libocurses/printw.c b/lib/libocurses/printw.c
index ae6ea49dabf..2a397c1dffb 100644
--- a/lib/libocurses/printw.c
+++ b/lib/libocurses/printw.c
@@ -50,7 +50,7 @@ static char sccsid[] = "@(#)printw.c	8.3 (Berkeley) 5/4/94";
  * is not in effect.
  */
 
-static int __winwrite __P((void *, const char *, int));
+static int __winwrite(void *, const char *, int);
 
 /*
  * printw --
diff --git a/lib/libocurses/refresh.c b/lib/libocurses/refresh.c
index b89c685f677..0158eb2b77c 100644
--- a/lib/libocurses/refresh.c
+++ b/lib/libocurses/refresh.c
@@ -42,10 +42,10 @@ static char sccsid[] = "@(#)refresh.c	8.7 (Berkeley) 8/13/94";
 static int curwin;
 static short ly, lx;
 
-static void	domvcur __P((int, int, int, int));
-static int	makech __P((WINDOW *, int));
-static void	quickch __P((WINDOW *));
-static void	scrolln __P((WINDOW *, int, int, int, int, int));
+static void	domvcur(int, int, int, int);
+static int	makech(WINDOW *, int);
+static void	quickch(WINDOW *);
+static void	scrolln(WINDOW *, int, int, int, int, int);
 
 /*
  * wrefresh --
diff --git a/lib/libocurses/setterm.c b/lib/libocurses/setterm.c
index 4652edfc596..73f57edb7a8 100644
--- a/lib/libocurses/setterm.c
+++ b/lib/libocurses/setterm.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)setterm.c	8.7 (Berkeley) 7/27/94";
 
 #include "curses.h"
 
-static void zap __P((void));
+static void zap(void);
 
 static char	*sflags[] = {
 		/*       am   bs   da   eo   hc   in   mi   ms  */
diff --git a/lib/libocurses/tputs.c b/lib/libocurses/tputs.c
index fd8e7cfaff7..a2441cb68f2 100644
--- a/lib/libocurses/tputs.c
+++ b/lib/libocurses/tputs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tputs.c,v 1.1 1998/07/23 21:10:28 millert Exp $	*/
+/*	$OpenBSD: tputs.c,v 1.2 2002/02/16 21:27:27 millert Exp $	*/
 /*	$NetBSD: tputs.c,v 1.5 1995/06/06 08:14:37 pk Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tputs.c	8.1 (Berkeley) 6/4/93";
 #else
-static char rcsid[] = "$OpenBSD: tputs.c,v 1.1 1998/07/23 21:10:28 millert Exp $";
+static char rcsid[] = "$OpenBSD: tputs.c,v 1.2 2002/02/16 21:27:27 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -69,7 +69,7 @@ void
 tputs(cp, affcnt, outc)
 	register char *cp;
 	int affcnt;
-	void (*outc) __P((int));
+	void (*outc)(int);
 {
 	register int i = 0;
 	register int mspc10;