diff options
Diffstat (limited to 'usr.bin/vi/cl')
| -rw-r--r-- | usr.bin/vi/cl/cl_bsd.c | 20 | ||||
| -rw-r--r-- | usr.bin/vi/cl/cl_funcs.c | 32 | ||||
| -rw-r--r-- | usr.bin/vi/cl/cl_main.c | 18 | ||||
| -rw-r--r-- | usr.bin/vi/cl/cl_read.c | 6 | ||||
| -rw-r--r-- | usr.bin/vi/cl/cl_screen.c | 20 | ||||
| -rw-r--r-- | usr.bin/vi/cl/cl_term.c | 20 |
6 files changed, 58 insertions, 58 deletions
diff --git a/usr.bin/vi/cl/cl_bsd.c b/usr.bin/vi/cl/cl_bsd.c index 5630b7b37f7..73d9e2dd486 100644 --- a/usr.bin/vi/cl/cl_bsd.c +++ b/usr.bin/vi/cl/cl_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_bsd.c,v 1.6 2001/01/29 01:58:27 niklas Exp $ */ +/* $OpenBSD: cl_bsd.c,v 1.7 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1995, 1996 @@ -47,7 +47,7 @@ static char *vb; /* Visible bell string. */ * addnstr -- * * PUBLIC: #ifndef HAVE_CURSES_ADDNSTR - * PUBLIC: int addnstr __P((char *, int)); + * PUBLIC: int addnstr(char *, int); * PUBLIC: #endif */ int @@ -68,7 +68,7 @@ addnstr(s, n) * beep -- * * PUBLIC: #ifndef HAVE_CURSES_BEEP - * PUBLIC: void beep __P((void)); + * PUBLIC: void beep(void); * PUBLIC: #endif */ void @@ -84,7 +84,7 @@ beep() * Flash the screen. * * PUBLIC: #ifndef HAVE_CURSES_FLASH - * PUBLIC: void flash __P((void)); + * PUBLIC: void flash(void); * PUBLIC: #endif */ void @@ -104,7 +104,7 @@ flash() * Turn on/off hardware line insert/delete. * * PUBLIC: #ifndef HAVE_CURSES_IDLOK - * PUBLIC: void idlok __P((WINDOW *, int)); + * PUBLIC: void idlok(WINDOW *, int); * PUBLIC: #endif */ void @@ -122,7 +122,7 @@ idlok(win, bf) * Put the keypad/cursor arrows into or out of application mode. * * PUBLIC: #ifndef HAVE_CURSES_KEYPAD - * PUBLIC: int keypad __P((void *, int)); + * PUBLIC: int keypad(void *, int); * PUBLIC: #endif */ int @@ -146,7 +146,7 @@ keypad(a, on) * Create a new curses screen. * * PUBLIC: #ifndef HAVE_CURSES_NEWTERM - * PUBLIC: void *newterm __P((const char *, FILE *, FILE *)); + * PUBLIC: void *newterm(const char *, FILE *, FILE *); * PUBLIC: #endif */ void * @@ -164,7 +164,7 @@ newterm(a, b, c) * Set up terminal. * * PUBLIC: #ifndef HAVE_CURSES_SETUPTERM - * PUBLIC: void setupterm __P((char *, int, int *)); + * PUBLIC: void setupterm(char *, int, int *); * PUBLIC: #endif */ void @@ -283,7 +283,7 @@ lcmp(a, b) * PUBLIC: #ifdef HAVE_CURSES_TIGETSTR * PUBLIC: char *tigetstr(); * PUBLIC: #else - * PUBLIC: char *tigetstr __P((char *)); + * PUBLIC: char *tigetstr(char *); * PUBLIC: #endif */ char * @@ -327,7 +327,7 @@ tigetstr(name) * tigetnum -- * * PUBLIC: #ifndef HAVE_CURSES_TIGETSTR - * PUBLIC: int tigetnum __P((char *)); + * PUBLIC: int tigetnum(char *); * PUBLIC: #endif */ int diff --git a/usr.bin/vi/cl/cl_funcs.c b/usr.bin/vi/cl/cl_funcs.c index a84778e16a3..43d33e99667 100644 --- a/usr.bin/vi/cl/cl_funcs.c +++ b/usr.bin/vi/cl/cl_funcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_funcs.c,v 1.8 2001/01/29 01:58:27 niklas Exp $ */ +/* $OpenBSD: cl_funcs.c,v 1.9 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)cl_funcs.c 10.50 (Berkeley) 9/24/96"; * cl_addstr -- * Add len bytes from the string at the cursor, advancing the cursor. * - * PUBLIC: int cl_addstr __P((SCR *, const char *, size_t)); + * PUBLIC: int cl_addstr(SCR *, const char *, size_t); */ int cl_addstr(sp, str, len) @@ -75,7 +75,7 @@ cl_addstr(sp, str, len) * cl_attr -- * Toggle a screen attribute on/off. * - * PUBLIC: int cl_attr __P((SCR *, scr_attr_t, int)); + * PUBLIC: int cl_attr(SCR *, scr_attr_t, int); */ int cl_attr(sp, attribute, on) @@ -163,7 +163,7 @@ cl_attr(sp, attribute, on) * cl_baud -- * Return the baud rate. * - * PUBLIC: int cl_baud __P((SCR *, u_long *)); + * PUBLIC: int cl_baud(SCR *, u_long *); */ int cl_baud(sp, ratep) @@ -206,7 +206,7 @@ cl_baud(sp, ratep) * cl_bell -- * Ring the bell/flash the screen. * - * PUBLIC: int cl_bell __P((SCR *)); + * PUBLIC: int cl_bell(SCR *); */ int cl_bell(sp) @@ -238,7 +238,7 @@ cl_bell(sp) * cl_clrtoeol -- * Clear from the current cursor to the end of the line. * - * PUBLIC: int cl_clrtoeol __P((SCR *)); + * PUBLIC: int cl_clrtoeol(SCR *); */ int cl_clrtoeol(sp) @@ -251,7 +251,7 @@ cl_clrtoeol(sp) * cl_cursor -- * Return the current cursor position. * - * PUBLIC: int cl_cursor __P((SCR *, size_t *, size_t *)); + * PUBLIC: int cl_cursor(SCR *, size_t *, size_t *); */ int cl_cursor(sp, yp, xp) @@ -274,7 +274,7 @@ cl_cursor(sp, yp, xp) * cl_deleteln -- * Delete the current line, scrolling all lines below it. * - * PUBLIC: int cl_deleteln __P((SCR *)); + * PUBLIC: int cl_deleteln(SCR *); */ int cl_deleteln(sp) @@ -339,7 +339,7 @@ cl_deleteln(sp) * Adjust the screen for ex. This routine is purely for standalone * ex programs. All special purpose, all special case. * - * PUBLIC: int cl_ex_adjust __P((SCR *, exadj_t)); + * PUBLIC: int cl_ex_adjust(SCR *, exadj_t); */ int cl_ex_adjust(sp, action) @@ -396,7 +396,7 @@ cl_ex_adjust(sp, action) * cl_insertln -- * Push down the current line, discarding the bottom line. * - * PUBLIC: int cl_insertln __P((SCR *)); + * PUBLIC: int cl_insertln(SCR *); */ int cl_insertln(sp) @@ -413,7 +413,7 @@ cl_insertln(sp) * cl_keyval -- * Return the value for a special key. * - * PUBLIC: int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); + * PUBLIC: int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); */ int cl_keyval(sp, val, chp, dnep) @@ -455,7 +455,7 @@ cl_keyval(sp, val, chp, dnep) * cl_move -- * Move the cursor. * - * PUBLIC: int cl_move __P((SCR *, size_t, size_t)); + * PUBLIC: int cl_move(SCR *, size_t, size_t); */ int cl_move(sp, lno, cno) @@ -475,7 +475,7 @@ cl_move(sp, lno, cno) * cl_refresh -- * Refresh the screen. * - * PUBLIC: int cl_refresh __P((SCR *, int)); + * PUBLIC: int cl_refresh(SCR *, int); */ int cl_refresh(sp, repaint) @@ -510,7 +510,7 @@ cl_refresh(sp, repaint) * cl_rename -- * Rename the file. * - * PUBLIC: int cl_rename __P((SCR *, char *, int)); + * PUBLIC: int cl_rename(SCR *, char *, int); */ int cl_rename(sp, name, on) @@ -551,7 +551,7 @@ cl_rename(sp, name, on) * cl_suspend -- * Suspend a screen. * - * PUBLIC: int cl_suspend __P((SCR *, int *)); + * PUBLIC: int cl_suspend(SCR *, int *); */ int cl_suspend(sp, allowedp) @@ -687,7 +687,7 @@ cl_suspend(sp, allowedp) * cl_usage -- * Print out the curses usage messages. * - * PUBLIC: void cl_usage __P((void)); + * PUBLIC: void cl_usage(void); */ void cl_usage() diff --git a/usr.bin/vi/cl/cl_main.c b/usr.bin/vi/cl/cl_main.c index cf7225c81bf..362f994b329 100644 --- a/usr.bin/vi/cl/cl_main.c +++ b/usr.bin/vi/cl/cl_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_main.c,v 1.11 2001/01/29 01:58:27 niklas Exp $ */ +/* $OpenBSD: cl_main.c,v 1.12 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -39,13 +39,13 @@ static const char sccsid[] = "@(#)cl_main.c 10.36 (Berkeley) 10/14/96"; GS *__global_list; /* GLOBAL: List of screens. */ sigset_t __sigblockset; /* GLOBAL: Blocked signals. */ -static void cl_func_std __P((GS *)); -static CL_PRIVATE *cl_init __P((GS *)); -static GS *gs_init __P((char *)); -static void perr __P((char *, char *)); +static void cl_func_std(GS *); +static CL_PRIVATE *cl_init(GS *); +static GS *gs_init(char *); +static void perr(char *, char *); static int setsig __P((int, struct sigaction *, void (*)(int))); -static void sig_end __P((GS *)); -static void term_init __P((char *, char *)); +static void sig_end(GS *); +static void term_init(char *, char *); /* * main -- @@ -331,7 +331,7 @@ h_winch(signo) * sig_init -- * Initialize signals. * - * PUBLIC: int sig_init __P((GS *, SCR *)); + * PUBLIC: int sig_init(GS *, SCR *); */ int sig_init(gp, sp) @@ -381,7 +381,7 @@ static int setsig(signo, oactp, handler) int signo; struct sigaction *oactp; - void (*handler) __P((int)); + void (*handler)(int); { struct sigaction act; diff --git a/usr.bin/vi/cl/cl_read.c b/usr.bin/vi/cl/cl_read.c index e3339005d95..cef45baa5ba 100644 --- a/usr.bin/vi/cl/cl_read.c +++ b/usr.bin/vi/cl/cl_read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_read.c,v 1.9 2001/01/29 01:58:28 niklas Exp $ */ +/* $OpenBSD: cl_read.c,v 1.10 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -39,13 +39,13 @@ static const char sccsid[] = "@(#)cl_read.c 10.15 (Berkeley) 9/24/96"; static input_t cl_read __P((SCR *, u_int32_t, CHAR_T *, size_t, int *, struct timeval *)); -static int cl_resize __P((SCR *, size_t, size_t)); +static int cl_resize(SCR *, size_t, size_t); /* * cl_event -- * Return a single event. * - * PUBLIC: int cl_event __P((SCR *, EVENT *, u_int32_t, int)); + * PUBLIC: int cl_event(SCR *, EVENT *, u_int32_t, int); */ int cl_event(sp, evp, flags, ms) diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c index 5a1ae7f1d31..6a475f07415 100644 --- a/usr.bin/vi/cl/cl_screen.c +++ b/usr.bin/vi/cl/cl_screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_screen.c,v 1.12 2001/01/29 01:58:28 niklas Exp $ */ +/* $OpenBSD: cl_screen.c,v 1.13 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -31,18 +31,18 @@ static const char sccsid[] = "@(#)cl_screen.c 10.49 (Berkeley) 9/24/96"; #include "../common/common.h" #include "cl.h" -static int cl_ex_end __P((GS *)); -static int cl_ex_init __P((SCR *)); -static void cl_freecap __P((CL_PRIVATE *)); -static int cl_vi_end __P((GS *)); -static int cl_vi_init __P((SCR *)); -static int cl_putenv __P((char *, char *, u_long)); +static int cl_ex_end(GS *); +static int cl_ex_init(SCR *); +static void cl_freecap(CL_PRIVATE *); +static int cl_vi_end(GS *); +static int cl_vi_init(SCR *); +static int cl_putenv(char *, char *, u_long); /* * cl_screen -- * Switch screen types. * - * PUBLIC: int cl_screen __P((SCR *, u_int32_t)); + * PUBLIC: int cl_screen(SCR *, u_int32_t); */ int cl_screen(sp, flags) @@ -126,7 +126,7 @@ cl_screen(sp, flags) * cl_quit -- * Shutdown the screens. * - * PUBLIC: int cl_quit __P((GS *)); + * PUBLIC: int cl_quit(GS *); */ int cl_quit(gp) @@ -515,7 +515,7 @@ cl_ex_end(gp) * cl_getcap -- * Retrieve termcap/terminfo strings. * - * PUBLIC: int cl_getcap __P((SCR *, char *, char **)); + * PUBLIC: int cl_getcap(SCR *, char *, char **); */ int cl_getcap(sp, name, elementp) diff --git a/usr.bin/vi/cl/cl_term.c b/usr.bin/vi/cl/cl_term.c index 98e971f8891..6a945ef5b9f 100644 --- a/usr.bin/vi/cl/cl_term.c +++ b/usr.bin/vi/cl/cl_term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl_term.c,v 1.11 2001/01/29 01:58:28 niklas Exp $ */ +/* $OpenBSD: cl_term.c,v 1.12 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -34,7 +34,7 @@ static const char sccsid[] = "@(#)cl_term.c 10.22 (Berkeley) 9/15/96"; #include "../common/common.h" #include "cl.h" -static int cl_pfmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); +static int cl_pfmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); /* * XXX @@ -80,7 +80,7 @@ static TKLIST const m2_tklist[] = { /* Input mappings (set or delete). */ * cl_term_init -- * Initialize the special keys defined by the termcap/terminfo entry. * - * PUBLIC: int cl_term_init __P((SCR *)); + * PUBLIC: int cl_term_init(SCR *); */ int cl_term_init(sp) @@ -155,7 +155,7 @@ cl_term_init(sp) * cl_term_end -- * End the special keys defined by the termcap/terminfo entry. * - * PUBLIC: int cl_term_end __P((GS *)); + * PUBLIC: int cl_term_end(GS *); */ int cl_term_end(gp) @@ -176,7 +176,7 @@ cl_term_end(gp) * cl_fmap -- * Map a function key. * - * PUBLIC: int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); + * PUBLIC: int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); */ int cl_fmap(sp, stype, from, flen, to, tlen) @@ -229,7 +229,7 @@ cl_pfmap(sp, stype, from, flen, to, tlen) * cl_optchange -- * Curses screen specific "option changed" routine. * - * PUBLIC: int cl_optchange __P((SCR *, int, char *, u_long *)); + * PUBLIC: int cl_optchange(SCR *, int, char *, u_long *); */ int cl_optchange(sp, opt, str, valp) @@ -280,7 +280,7 @@ cl_optchange(sp, opt, str, valp) * cl_omesg -- * Turn the tty write permission on or off. * - * PUBLIC: int cl_omesg __P((SCR *, CL_PRIVATE *, int)); + * PUBLIC: int cl_omesg(SCR *, CL_PRIVATE *, int); */ int cl_omesg(sp, clp, on) @@ -329,7 +329,7 @@ cl_omesg(sp, clp, on) * cl_ssize -- * Return the terminal size. * - * PUBLIC: int cl_ssize __P((SCR *, int, size_t *, size_t *, int *)); + * PUBLIC: int cl_ssize(SCR *, int, size_t *, size_t *, int *); */ int cl_ssize(sp, sigwinch, rowp, colp, changedp) @@ -454,7 +454,7 @@ noterm: if (row == 0) * cl_putchar -- * Function version of putchar, for tputs. * - * PUBLIC: int cl_putchar __P((int)); + * PUBLIC: int cl_putchar(int); */ void cl_putchar(ch) @@ -467,7 +467,7 @@ cl_putchar(ch) * cl_putchar -- * Function version of putchar, for tputs. * - * PUBLIC: int cl_putchar __P((int)); + * PUBLIC: int cl_putchar(int); */ int cl_putchar(ch) |