diff options
Diffstat (limited to 'usr.bin')
440 files changed, 4726 insertions, 4726 deletions
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c index e21a3a05e85..284cb60a5df 100644 --- a/usr.bin/apply/apply.c +++ b/usr.bin/apply/apply.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apply.c,v 1.10 2001/09/04 23:35:58 millert Exp $ */ +/* $OpenBSD: apply.c,v 1.11 2002/02/16 21:27:43 millert Exp $ */ /* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94"; #else -static char rcsid[] = "$OpenBSD: apply.c,v 1.10 2001/09/04 23:35:58 millert Exp $"; +static char rcsid[] = "$OpenBSD: apply.c,v 1.11 2002/02/16 21:27:43 millert Exp $"; #endif #endif /* not lint */ @@ -56,8 +56,8 @@ static char rcsid[] = "$OpenBSD: apply.c,v 1.10 2001/09/04 23:35:58 millert Exp #include <string.h> #include <unistd.h> -void usage __P((void)); -int system __P((const char *)); +void usage(void); +int system(const char *); int main(argc, argv) diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c index 9e0e9c57a3f..9208d258532 100644 --- a/usr.bin/apropos/apropos.c +++ b/usr.bin/apropos/apropos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apropos.c,v 1.7 2000/11/20 14:03:31 deraadt Exp $ */ +/* $OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $ */ /* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: apropos.c,v 1.7 2000/11/20 14:03:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $"; #endif #endif /* not lint */ @@ -66,10 +66,10 @@ static int *found, foundman; #define MAXLINELEN 8192 /* max line handled */ -void apropos __P((char **, char *, int)); -void lowstr __P((char *, char *)); -int match __P((char *, char *)); -void usage __P((void)); +void apropos(char **, char *, int); +void lowstr(char *, char *); +int match(char *, char *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c index 673d759fff3..2ca0b6b9d4b 100644 --- a/usr.bin/ar/ar.c +++ b/usr.bin/ar/ar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar.c,v 1.6 2000/11/20 14:03:30 deraadt Exp $ */ +/* $OpenBSD: ar.c,v 1.7 2002/02/16 21:27:43 millert Exp $ */ /* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ar.c,v 1.6 2000/11/20 14:03:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ar.c,v 1.7 2002/02/16 21:27:43 millert Exp $"; #endif #endif /* not lint */ @@ -68,8 +68,8 @@ static char rcsid[] = "$OpenBSD: ar.c,v 1.6 2000/11/20 14:03:30 deraadt Exp $"; CHDR chdr; u_int options; char *archive, *envtmp, *posarg, *posname; -static void badoptions __P((char *)); -static void usage __P((void)); +static void badoptions(char *); +static void usage(void); /* * main -- @@ -84,7 +84,7 @@ main(argc, argv) { int c; char *p; - int (*fcall) __P((char **)); + int (*fcall)(char **); if (argc < 3) usage(); diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h index cdaaeb26bc7..39e93a4b1bc 100644 --- a/usr.bin/ar/archive.h +++ b/usr.bin/ar/archive.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archive.h,v 1.3 1997/08/19 07:22:08 denny Exp $ */ +/* $OpenBSD: archive.h,v 1.4 2002/02/16 21:27:43 millert Exp $ */ /* $NetBSD: archive.h,v 1.6 1995/03/25 06:39:43 glass Exp $ */ /*- @@ -101,9 +101,9 @@ typedef struct { struct stat; -void close_archive __P((int)); -void copy_ar __P((CF *, off_t)); -int get_arobj __P((int)); -int open_archive __P((int)); -void put_arobj __P((CF *, struct stat *)); -void skip_arobj __P((int)); +void close_archive(int); +void copy_ar(CF *, off_t); +int get_arobj(int); +int open_archive(int); +void put_arobj(CF *, struct stat *); +void skip_arobj(int); diff --git a/usr.bin/ar/extern.h b/usr.bin/ar/extern.h index 16640e9cdcf..b4f83b540c2 100644 --- a/usr.bin/ar/extern.h +++ b/usr.bin/ar/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:31:20 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:43 millert Exp $ */ /* $NetBSD: extern.h,v 1.4 1995/03/25 06:39:46 glass Exp $ */ /*- @@ -36,20 +36,20 @@ * @(#)extern.h 8.3 (Berkeley) 4/2/94 */ -int append __P((char **)); -void badfmt __P((void)); -int compare __P((char *)); -int contents __P((char **)); -int delete __P((char **)); -void error __P((char *)); -int extract __P((char **)); -char *files __P((char **argv)); -int move __P((char **)); -void orphans __P((char **argv)); -int print __P((char **)); -int replace __P((char **)); -char *rname __P((char *)); -int tmp __P((void)); +int append(char **); +void badfmt(void); +int compare(char *); +int contents(char **); +int delete(char **); +void error(char *); +int extract(char **); +char *files(char **argv); +int move(char **); +void orphans(char **argv); +int print(char **); +int replace(char **); +char *rname(char *); +int tmp(void); extern char *archive; extern char *posarg, *posname; /* positioning file name */ diff --git a/usr.bin/arch/arch.c b/usr.bin/arch/arch.c index 41c6eb60438..73690f001af 100644 --- a/usr.bin/arch/arch.c +++ b/usr.bin/arch/arch.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: arch.c,v 1.5 1999/08/21 18:02:29 espie Exp $"; +static char rcsid[] = "$OpenBSD: arch.c,v 1.6 2002/02/16 21:27:43 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -39,7 +39,7 @@ static char rcsid[] = "$OpenBSD: arch.c,v 1.5 1999/08/21 18:02:29 espie Exp $"; #include <stdio.h> #include <unistd.h> -static void usage __P((void)); +static void usage(void); static int machine; diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c index ee1dbfd00a6..a5164978e63 100644 --- a/usr.bin/at/at.c +++ b/usr.bin/at/at.c @@ -1,4 +1,4 @@ -/* $OpenBSD: at.c,v 1.20 2001/01/17 19:29:06 deraadt Exp $ */ +/* $OpenBSD: at.c,v 1.21 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $ */ /* @@ -74,7 +74,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT }; /* what program we want to run */ /* File scope variables */ #ifndef lint -static char rcsid[] = "$OpenBSD: at.c,v 1.20 2001/01/17 19:29:06 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: at.c,v 1.21 2002/02/16 21:27:44 millert Exp $"; #endif char *no_export[] = @@ -96,11 +96,11 @@ char atverify = 0; /* verify time instead of queuing job */ /* Function declarations */ -static void sigc __P((int)); -static void alarmc __P((int)); -static char *cwdname __P((void)); -static void writefile __P((time_t, char)); -static void list_jobs __P((void)); +static void sigc(int); +static void alarmc(int); +static char *cwdname(void); +static void writefile(time_t, char); +static void list_jobs(void); /* Signal catching functions */ diff --git a/usr.bin/at/panic.h b/usr.bin/at/panic.h index 991e1fa0502..f6415dc45a4 100644 --- a/usr.bin/at/panic.h +++ b/usr.bin/at/panic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: panic.h,v 1.3 1997/03/01 23:40:10 millert Exp $ */ +/* $OpenBSD: panic.h,v 1.4 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: panic.h,v 1.2 1995/03/25 18:13:35 glass Exp $ */ /* @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -void panic __P((char *)); -void perr __P((char *)); -void perr2 __P((char *, char *)); -void usage __P((void)); +void panic(char *); +void perr(char *); +void perr2(char *, char *); +void usage(void); diff --git a/usr.bin/at/parsetime.h b/usr.bin/at/parsetime.h index 1ae67f05fe5..bca21610240 100644 --- a/usr.bin/at/parsetime.h +++ b/usr.bin/at/parsetime.h @@ -1,4 +1,4 @@ -/* $OpenBSD: parsetime.h,v 1.3 1997/03/01 23:40:11 millert Exp $ */ +/* $OpenBSD: parsetime.h,v 1.4 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: parsetime.h,v 1.2 1995/03/25 18:13:37 glass Exp $ */ /* @@ -27,4 +27,4 @@ * */ -time_t parsetime __P((int, char **)); +time_t parsetime(int, char **); diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c index c8c0671200d..10c263da320 100644 --- a/usr.bin/at/perm.c +++ b/usr.bin/at/perm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: perm.c,v 1.1 1997/03/01 23:40:12 millert Exp $ */ +/* $OpenBSD: perm.c,v 1.2 2002/02/16 21:27:44 millert Exp $ */ /* * perm.c - check user permission for at(1) @@ -46,12 +46,12 @@ /* File scope variables */ #ifndef lint -static char rcsid[] = "$OpenBSD: perm.c,v 1.1 1997/03/01 23:40:12 millert Exp $"; +static char rcsid[] = "$OpenBSD: perm.c,v 1.2 2002/02/16 21:27:44 millert Exp $"; #endif /* Function declarations */ -static int check_for_user __P((FILE *, const char *)); +static int check_for_user(FILE *, const char *); /* Local functions */ diff --git a/usr.bin/at/perm.h b/usr.bin/at/perm.h index 58876d2db37..3b0f76fe566 100644 --- a/usr.bin/at/perm.h +++ b/usr.bin/at/perm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: perm.h,v 1.2 2001/01/29 01:57:55 niklas Exp $ */ +/* $OpenBSD: perm.h,v 1.3 2002/02/16 21:27:44 millert Exp $ */ /* * perm.h - header for at(1) @@ -25,4 +25,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -int check_permission __P((void)); +int check_permission(void); diff --git a/usr.bin/audioctl/audioctl.c b/usr.bin/audioctl/audioctl.c index 8df1b6998eb..3ca93d245cd 100644 --- a/usr.bin/audioctl/audioctl.c +++ b/usr.bin/audioctl/audioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audioctl.c,v 1.5 2000/11/21 13:58:06 aaron Exp $ */ +/* $OpenBSD: audioctl.c,v 1.6 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: audioctl.c,v 1.14 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -47,12 +47,12 @@ #include <sys/ioctl.h> #include <sys/audioio.h> -struct field *findfield __P((char *name)); -void prfield __P((struct field *p, char *sep)); -void rdfield __P((struct field *p, char *q)); -void getinfo __P((int fd)); -void usage __P((void)); -int main __P((int argc, char **argv)); +struct field *findfield(char *name); +void prfield(struct field *p, char *sep); +void rdfield(struct field *p, char *q); +void getinfo(int fd); +void usage(void); +int main(int argc, char **argv); FILE *out = stdout; diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c index efa4218004e..41e7d7c0e6f 100644 --- a/usr.bin/basename/basename.c +++ b/usr.bin/basename/basename.c @@ -1,4 +1,4 @@ -/* $OpenBSD: basename.c,v 1.3 1997/08/17 21:25:01 millert Exp $ */ +/* $OpenBSD: basename.c,v 1.4 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: basename.c,v 1.9 1995/09/02 05:29:46 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: basename.c,v 1.3 1997/08/17 21:25:01 millert Exp $"; +static char rcsid[] = "$OpenBSD: basename.c,v 1.4 2002/02/16 21:27:44 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: basename.c,v 1.3 1997/08/17 21:25:01 millert Ex #include <locale.h> #include <unistd.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c index e44383ade81..d9edde50ac0 100644 --- a/usr.bin/bdes/bdes.c +++ b/usr.bin/bdes/bdes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bdes.c,v 1.6 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: bdes.c,v 1.7 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $ */ /*- @@ -51,7 +51,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: bdes.c,v 1.6 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: bdes.c,v 1.7 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -94,23 +94,23 @@ static char rcsid[] = "$OpenBSD: bdes.c,v 1.6 2001/11/19 19:02:13 mpech Exp $"; #include <string.h> typedef char Desbuf[8]; -int tobinhexi __P((char, int)); -void cvtkey __P((char *, char *)); -int setbits __P((char *, int)); -void makekey __P((Desbuf)); -void ecbenc __P((void)); -void ecbdec __P((void)); -void cbcenc __P((void)); -void cbcdec __P((void)); -void cbcauth __P((void)); -void cfbenc __P((void)); -void cfbdec __P((void)); -void cfbaenc __P((void)); -void cfbadec __P((void)); -void cfbauth __P((void)); -void ofbdec __P((void)); -void ofbenc __P((void)); -void usage __P((void)); +int tobinhexi(char, int); +void cvtkey(char *, char *); +int setbits(char *, int); +void makekey(Desbuf); +void ecbenc(void); +void ecbdec(void); +void cbcenc(void); +void cbcdec(void); +void cbcauth(void); +void cfbenc(void); +void cfbdec(void); +void cfbaenc(void); +void cfbadec(void); +void cfbauth(void); +void ofbdec(void); +void ofbenc(void); +void usage(void); /* * BSD and System V systems offer special library calls that do diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c index 0f36c3ab18a..e033cc64942 100644 --- a/usr.bin/biff/biff.c +++ b/usr.bin/biff/biff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biff.c,v 1.6 2000/06/30 16:00:11 millert Exp $ */ +/* $OpenBSD: biff.c,v 1.7 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: biff.c,v 1.6 2000/06/30 16:00:11 millert Exp $"; +static char rcsid[] = "$OpenBSD: biff.c,v 1.7 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: biff.c,v 1.6 2000/06/30 16:00:11 millert Exp $" #include <string.h> #include <unistd.h> -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c index f2bb5608785..470e1acebe7 100644 --- a/usr.bin/cal/cal.c +++ b/usr.bin/cal/cal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cal.c,v 1.6 1998/04/25 01:09:15 deraadt Exp $ */ +/* $OpenBSD: cal.c,v 1.7 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: cal.c,v 1.6 1998/04/25 01:09:15 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cal.c,v 1.7 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -126,16 +126,16 @@ char *j_day_headings = " Su Mo Tu We Th Fr Sa"; int julian; -void ascii_day __P((char *, int)); -void center __P((char *, int, int)); -void day_array __P((int, int, int *)); -int day_in_week __P((int, int, int)); -int day_in_year __P((int, int, int)); -void j_yearly __P((int)); -void monthly __P((int, int)); -void trim_trailing_spaces __P((char *)); -void usage __P((void)); -void yearly __P((int)); +void ascii_day(char *, int); +void center(char *, int, int); +void day_array(int, int, int *); +int day_in_week(int, int, int); +int day_in_year(int, int, int); +void j_yearly(int); +void monthly(int, int); +void trim_trailing_spaces(char *); +void usage(void); +void yearly(int); int main(argc, argv) diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index dc83991eb7d..d9288ef3ffc 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.c,v 1.16 2001/09/26 20:38:55 mickey Exp $ */ +/* $OpenBSD: calendar.c,v 1.17 2002/02/16 21:27:44 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: calendar.c,v 1.16 2001/09/26 20:38:55 mickey Exp $"; +static char rcsid[] = "$OpenBSD: calendar.c,v 1.17 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -80,7 +80,7 @@ int f_dayBefore = 0; /* days before current date */ struct specialev spev[NUMEV]; -void childsig __P((int)); +void childsig(int); int main(argc, argv) diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h index 71d8fd0a075..a5a17a2e5fe 100644 --- a/usr.bin/calendar/calendar.h +++ b/usr.bin/calendar/calendar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.h,v 1.7 2001/09/27 18:19:20 mickey Exp $ */ +/* $OpenBSD: calendar.h,v 1.8 2002/02/16 21:27:44 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -70,26 +70,26 @@ struct specialev { int nlen; char *uname; int ulen; - int (*getev) __P((int)); + int (*getev)(int); }; -void cal __P((void)); -void closecal __P((FILE *)); -int getday __P((char *)); -int getdayvar __P((char *)); -int getfield __P((char *, char **, int *)); -int getmonth __P((char *)); -int easter __P((int)); -int paskha __P((int)); -void insert __P((struct event **, struct event *)); -struct match *isnow __P((char *, int)); -FILE *opencal __P((void)); -void settime __P((time_t *)); -time_t Mktime __P((char *)); -void usage __P((void)); -int foy __P((int)); -void variable_weekday __P((int *, int, int)); -void setnnames __P((void)); +void cal(void); +void closecal(FILE *); +int getday(char *); +int getdayvar(char *); +int getfield(char *, char **, int *); +int getmonth(char *); +int easter(int); +int paskha(int); +void insert(struct event **, struct event *); +struct match *isnow(char *, int); +FILE *opencal(void); +void settime(time_t *); +time_t Mktime(char *); +void usage(void); +int foy(int); +void variable_weekday(int *, int, int); +void setnnames(void); /* some flags */ #define F_ISMONTH 0x01 /* month (Januar ...) */ diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c index 3e3b5ea65dc..1ad679711f9 100644 --- a/usr.bin/cap_mkdb/cap_mkdb.c +++ b/usr.bin/cap_mkdb/cap_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cap_mkdb.c,v 1.8 2001/07/12 05:16:56 deraadt Exp $ */ +/* $OpenBSD: cap_mkdb.c,v 1.9 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95"; #endif -static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.8 2001/07/12 05:16:56 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.9 2002/02/16 21:27:44 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -61,11 +61,11 @@ static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.8 2001/07/12 05:16:56 deraadt Ex #include <ctype.h> #include <unistd.h> -void db_build __P((char **)); -void dounlink __P((void)); -void usage __P((void)); -int igetnext __P((char **, char **)); -int main __P((int, char *[])); +void db_build(char **); +void dounlink(void); +void usage(void); +int igetnext(char **, char **); +int main(int, char *[]); DB *capdbp; int info, verbose; diff --git a/usr.bin/cap_mkdb/getinfo.c b/usr.bin/cap_mkdb/getinfo.c index 2a0457c9ba3..e90d67fb507 100644 --- a/usr.bin/cap_mkdb/getinfo.c +++ b/usr.bin/cap_mkdb/getinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getinfo.c,v 1.4 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: getinfo.c,v 1.5 2002/02/16 21:27:44 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: getinfo.c,v 1.4 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: getinfo.c,v 1.5 2002/02/16 21:27:44 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -57,12 +57,12 @@ static char rcsid[] = "$OpenBSD: getinfo.c,v 1.4 2001/11/19 19:02:13 mpech Exp $ #define TCERR (char)1 #define SHADOW (char)2 -static int getent __P((char **, u_int *, char **, int, char *, int)); -static char *igetcap __P((char *, char *, int)); -static int igetmatch __P((char *, char *)); -static int igetclose __P((void)); +static int getent(char **, u_int *, char **, int, char *, int); +static char *igetcap(char *, char *, int); +static int igetmatch(char *, char *); +static int igetclose(void); -int igetnext __P((char **, char **)); +int igetnext(char **, char **); /* * Cgetcap searches the capability record buf for the capability cap with diff --git a/usr.bin/cdio/cdio.c b/usr.bin/cdio/cdio.c index e6c22775b7f..e63c0821c2f 100644 --- a/usr.bin/cdio/cdio.c +++ b/usr.bin/cdio/cdio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdio.c,v 1.18 2001/10/28 03:57:59 deraadt Exp $ */ +/* $OpenBSD: cdio.c,v 1.19 2002/02/16 21:27:44 millert Exp $ */ /* * Compact Disc Control Utility by Serge V. Vakulenko <vak@cronyx.ru>. * Based on the non-X based CD player by Jean-Marc Zucconi and @@ -107,27 +107,27 @@ int msf = 1; extern char *__progname; -int setvol __P((int, int)); -int read_toc_entrys __P((int)); -int play_msf __P((int, int, int, int, int, int)); -int play_track __P((int, int, int, int)); -int get_vol __P((int *, int *)); -int status __P((int *, int *, int *, int *)); -int open_cd __P((char *)); -int play __P((char *arg)); -int info __P((char *arg)); -int pstatus __P((char *arg)); -int play_next __P((char *arg)); -int play_prev __P((char *arg)); -int play_same __P((char *arg)); -char *input __P((int *)); -void prtrack __P((struct cd_toc_entry *e, int lastflag)); +int setvol(int, int); +int read_toc_entrys(int); +int play_msf(int, int, int, int, int, int); +int play_track(int, int, int, int); +int get_vol(int *, int *); +int status(int *, int *, int *, int *); +int open_cd(char *); +int play(char *arg); +int info(char *arg); +int pstatus(char *arg); +int play_next(char *arg); +int play_prev(char *arg); +int play_same(char *arg); +char *input(int *); +void prtrack(struct cd_toc_entry *e, int lastflag); void lba2msf __P((unsigned long lba, u_char *m, u_char *s, u_char *f)); -unsigned int msf2lba __P((u_char m, u_char s, u_char f)); -int play_blocks __P((int blk, int len)); -int run __P((int cmd, char *arg)); -char *parse __P((char *buf, int *cmd)); +unsigned int msf2lba(u_char m, u_char s, u_char f); +int play_blocks(int blk, int len); +int run(int cmd, char *arg); +char *parse(char *buf, int *cmd); void help() diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index d41925acb61..9958e511cff 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.c,v 1.20 2001/08/27 02:57:07 millert Exp $ */ +/* $OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: chpass.c,v 1.20 2001/08/27 02:57:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: chpass.c,v 1.21 2002/02/16 21:27:44 millert Exp $"; #endif #endif /* not lint */ @@ -78,14 +78,14 @@ extern char *__progname; int use_yp; int force_yp = 0; extern struct passwd *ypgetpwnam(), *ypgetpwuid(); -int _yp_check __P((char **)); -int pw_yp __P((struct passwd *, uid_t)); +int _yp_check(char **); +int pw_yp(struct passwd *, uid_t); #endif -void baduser __P((void)); -void tempcleanup __P((void)); -void kbintr __P((int)); -void usage __P((void)); +void baduser(void); +void tempcleanup(void); +void kbintr(int); +void usage(void); int main(argc, argv) diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h index 7a7027cdb8e..58dd95b6bf6 100644 --- a/usr.bin/chpass/chpass.h +++ b/usr.bin/chpass/chpass.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chpass.h,v 1.4 1998/03/30 06:59:29 deraadt Exp $ */ +/* $OpenBSD: chpass.h,v 1.5 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: chpass.h,v 1.4 1996/05/15 21:50:44 jtc Exp $ */ /* @@ -54,20 +54,20 @@ typedef struct _entry { extern ENTRY list[]; extern uid_t uid; -int atot __P((char *, time_t *)); -void display __P((char *, int, struct passwd *)); -void edit __P((char *, struct passwd *)); -char *ok_shell __P((char *)); -int p_change __P((char *, struct passwd *, ENTRY *)); -int p_class __P((char *, struct passwd *, ENTRY *)); -int p_expire __P((char *, struct passwd *, ENTRY *)); -int p_gecos __P((char *, struct passwd *, ENTRY *)); -int p_gid __P((char *, struct passwd *, ENTRY *)); -int p_hdir __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_login __P((char *, struct passwd *, ENTRY *)); -int p_passwd __P((char *, struct passwd *, ENTRY *)); -int p_shell __P((char *, struct passwd *, ENTRY *)); -int p_uid __P((char *, struct passwd *, ENTRY *)); -char *ttoa __P((char *, size_t, time_t)); -int verify __P((char *, struct passwd *)); +int atot(char *, time_t *); +void display(char *, int, struct passwd *); +void edit(char *, struct passwd *); +char *ok_shell(char *); +int p_change(char *, struct passwd *, ENTRY *); +int p_class(char *, struct passwd *, ENTRY *); +int p_expire(char *, struct passwd *, ENTRY *); +int p_gecos(char *, struct passwd *, ENTRY *); +int p_gid(char *, struct passwd *, ENTRY *); +int p_hdir(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_login(char *, struct passwd *, ENTRY *); +int p_passwd(char *, struct passwd *, ENTRY *); +int p_shell(char *, struct passwd *, ENTRY *); +int p_uid(char *, struct passwd *, ENTRY *); +char *ttoa(char *, size_t, time_t); +int verify(char *, struct passwd *); diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c index 5165ef5a9c1..6eade95fb57 100644 --- a/usr.bin/cksum/cksum.c +++ b/usr.bin/cksum/cksum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cksum.c,v 1.7 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: cksum.c,v 1.8 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: cksum.c,v 1.7 1995/09/02 05:45:18 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: cksum.c,v 1.7 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: cksum.c,v 1.8 2002/02/16 21:27:44 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -64,7 +64,7 @@ static char rcsid[] = "$OpenBSD: cksum.c,v 1.7 2001/11/19 19:02:13 mpech Exp $"; #include "extern.h" -void usage __P((void)); +void usage(void); extern char *__progname; @@ -76,8 +76,8 @@ main(argc, argv) int ch, fd, rval; u_int32_t len, val; char *fn; - int (*cfncn) __P((int, u_int32_t *, u_int32_t *)); - void (*pfncn) __P((char *, u_int32_t, u_int32_t)); + int (*cfncn)(int, u_int32_t *, u_int32_t *); + void (*pfncn)(char *, u_int32_t, u_int32_t); setlocale(LC_ALL, ""); diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h index 5c821aabe58..27156b21b1f 100644 --- a/usr.bin/cksum/extern.h +++ b/usr.bin/cksum/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:32:02 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:44 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1995/03/26 05:15:19 glass Exp $ */ /*- @@ -39,10 +39,10 @@ #include <sys/cdefs.h> __BEGIN_DECLS -int crc __P((int, u_int32_t *, u_int32_t *)); -void pcrc __P((char *, u_int32_t, u_int32_t)); -void psum1 __P((char *, u_int32_t, u_int32_t)); -void psum2 __P((char *, u_int32_t, u_int32_t)); -int csum1 __P((int, u_int32_t *, u_int32_t *)); -int csum2 __P((int, u_int32_t *, u_int32_t *)); +int crc(int, u_int32_t *, u_int32_t *); +void pcrc(char *, u_int32_t, u_int32_t); +void psum1(char *, u_int32_t, u_int32_t); +void psum2(char *, u_int32_t, u_int32_t); +int csum1(int, u_int32_t *, u_int32_t *); +int csum2(int, u_int32_t *, u_int32_t *); __END_DECLS diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c index 324ac2721bc..1c6904cd9e8 100644 --- a/usr.bin/cmp/cmp.c +++ b/usr.bin/cmp/cmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmp.c,v 1.8 1999/08/03 16:02:44 mickey Exp $ */ +/* $OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: cmp.c,v 1.8 1999/08/03 16:02:44 mickey Exp $"; +static char rcsid[] = "$OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: cmp.c,v 1.8 1999/08/03 16:02:44 mickey Exp $"; int lflag, sflag; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h index 58dbadfd3c1..481821f12e3 100644 --- a/usr.bin/cmp/extern.h +++ b/usr.bin/cmp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:32:05 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/09/08 03:22:57 tls Exp $ */ /*- @@ -40,9 +40,9 @@ #define DIFF_EXIT 1 #define ERR_EXIT 2 /* error exit code */ -void c_regular __P((int, char *, off_t, off_t, int, char *, off_t, off_t)); -void c_special __P((int, char *, off_t, int, char *, off_t)); -void diffmsg __P((char *, char *, off_t, off_t)); -void eofmsg __P((char *)); +void c_regular(int, char *, off_t, off_t, int, char *, off_t, off_t); +void c_special(int, char *, off_t, int, char *, off_t); +void diffmsg(char *, char *, off_t, off_t); +void eofmsg(char *); extern int lflag, sflag; diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c index d53bde72afa..ffb6275b740 100644 --- a/usr.bin/col/col.c +++ b/usr.bin/col/col.c @@ -1,4 +1,4 @@ -/* $OpenBSD: col.c,v 1.6 2000/11/21 18:15:09 aaron Exp $ */ +/* $OpenBSD: col.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: col.c,v 1.6 2000/11/21 18:15:09 aaron Exp $"; +static char rcsid[] = "$OpenBSD: col.c,v 1.7 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -94,14 +94,14 @@ struct line_str { int l_max_col; /* max column in the line */ }; -LINE *alloc_line __P((void)); -void dowarn __P((int)); -void flush_line __P((LINE *)); -void flush_lines __P((int)); -void flush_blanks __P((void)); -void free_line __P((LINE *)); -void usage __P((void)); -void *xmalloc __P((void *, size_t)); +LINE *alloc_line(void); +void dowarn(int); +void flush_line(LINE *); +void flush_lines(int); +void flush_blanks(void); +void free_line(LINE *); +void usage(void); +void *xmalloc(void *, size_t); CSET last_set; /* char_set of last char printed */ LINE *lines; diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c index 9d643cefc43..347a2c57b77 100644 --- a/usr.bin/colrm/colrm.c +++ b/usr.bin/colrm/colrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: colrm.c,v 1.5 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: colrm.c,v 1.6 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: colrm.c,v 1.5 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: colrm.c,v 1.6 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: colrm.c,v 1.5 2001/11/19 19:02:13 mpech Exp $"; #define TAB 8 -void check __P((FILE *)); -void usage __P((void)); +void check(FILE *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index ed9672b729b..66f23749341 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -1,4 +1,4 @@ -/* $OpenBSD: column.c,v 1.6 2001/07/12 05:16:59 deraadt Exp $ */ +/* $OpenBSD: column.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: column.c,v 1.6 2001/07/12 05:16:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: column.c,v 1.7 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -58,13 +58,13 @@ static char rcsid[] = "$OpenBSD: column.c,v 1.6 2001/07/12 05:16:59 deraadt Exp #include <string.h> #include <unistd.h> -void c_columnate __P((void)); -void *emalloc __P((int)); -void input __P((FILE *)); -void maketbl __P((void)); -void print __P((void)); -void r_columnate __P((void)); -void usage __P((void)); +void c_columnate(void); +void *emalloc(int); +void input(FILE *); +void maketbl(void); +void print(void); +void r_columnate(void); +void usage(void); int termwidth = 80; /* default terminal width */ diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c index 42b9d805eb1..1b25e1e42f0 100644 --- a/usr.bin/comm/comm.c +++ b/usr.bin/comm/comm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comm.c,v 1.4 2000/11/21 18:06:45 aaron Exp $ */ +/* $OpenBSD: comm.c,v 1.5 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)comm.c 8.4 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: comm.c,v 1.4 2000/11/21 18:06:45 aaron Exp $"; +static char rcsid[] = "$OpenBSD: comm.c,v 1.5 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <err.h> @@ -62,9 +62,9 @@ static char rcsid[] = "$OpenBSD: comm.c,v 1.4 2000/11/21 18:06:45 aaron Exp $"; char *tabs[] = { "", "\t", "\t\t" }; -FILE *file __P((const char *)); -void show __P((FILE *, char *, char *)); -void usage __P((void)); +FILE *file(const char *); +void show(FILE *, char *, char *); +void usage(void); int main(argc, argv) @@ -76,7 +76,7 @@ main(argc, argv) FILE *fp1, *fp2; char *col1, *col2, *col3; char **p, line1[MAXLINELEN], line2[MAXLINELEN]; - int (*compare) __P((const char * ,const char *)); + int (*compare)(const char * ,const char *); setlocale(LC_ALL, ""); diff --git a/usr.bin/compress/compress.h b/usr.bin/compress/compress.h index 50084ee8639..e12f6802d69 100644 --- a/usr.bin/compress/compress.h +++ b/usr.bin/compress/compress.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.h,v 1.1 1997/07/06 20:22:56 mickey Exp $ */ +/* $OpenBSD: compress.h,v 1.2 2002/02/16 21:27:45 millert Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -34,15 +34,15 @@ #define Z_BUFSIZE 16384 -extern int z_check_header __P((int, struct stat *, const char *)); -extern void *z_open __P((int, const char *, int)); -extern FILE *zopen __P((const char *, const char *,int)); -extern int zread __P((void *, char *, int)); -extern int zwrite __P((void *, const char *, int)); -extern int zclose __P((void *)); -extern int gz_check_header __P((int, struct stat *, const char *)); -extern void *gz_open __P((int, const char *, int)); -extern int gz_read __P((void *, char *, int)); -extern int gz_write __P((void *, const char *, int)); -extern int gz_close __P((void *)); -extern int gz_flush __P((void *, int)); +extern int z_check_header(int, struct stat *, const char *); +extern void *z_open(int, const char *, int); +extern FILE *zopen(const char *, const char *,int); +extern int zread(void *, char *, int); +extern int zwrite(void *, const char *, int); +extern int zclose(void *); +extern int gz_check_header(int, struct stat *, const char *); +extern void *gz_open(int, const char *, int); +extern int gz_read(void *, char *, int); +extern int gz_write(void *, const char *, int); +extern int gz_close(void *); +extern int gz_flush(void *, int); diff --git a/usr.bin/compress/gzopen.c b/usr.bin/compress/gzopen.c index 8e7ed269d0e..3514f912b92 100644 --- a/usr.bin/compress/gzopen.c +++ b/usr.bin/compress/gzopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gzopen.c,v 1.2 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: gzopen.c,v 1.3 2002/02/16 21:27:45 millert Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -96,10 +96,10 @@ struct gz_stream { static u_char gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ -static int put_int32 __P((gz_stream *, u_int32_t)); -static u_int32_t get_int32 __P((gz_stream *)); -static int get_header __P((gz_stream *)); -static int get_byte __P((gz_stream *)); +static int put_int32(gz_stream *, u_int32_t); +static u_int32_t get_int32(gz_stream *); +static int get_header(gz_stream *); +static int get_byte(gz_stream *); int gz_check_header(fd, sb, ofn) diff --git a/usr.bin/compress/main.c b/usr.bin/compress/main.c index dd6be0407f0..7f3da2cf249 100644 --- a/usr.bin/compress/main.c +++ b/usr.bin/compress/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.16 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.17 2002/02/16 21:27:45 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)compress.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.16 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.17 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -67,11 +67,11 @@ extern char *__progname; struct compressor { char *name; char *suffix; - int (*check_header) __P((int, struct stat *, const char *)); - void *(*open) __P((int, const char *, int)); - int (*read) __P((void *, char *, int)); - int (*write) __P((void *, const char *, int)); - int (*close) __P((void *)); + int (*check_header)(int, struct stat *, const char *); + void *(*open)(int, const char *, int); + int (*read)(void *, char *, int); + int (*write)(void *, const char *, int); + int (*close)(void *); } c_table[] = { #define M_COMPRESS (&c_table[0]) { "compress", ".Z", z_check_header, z_open, zread, zwrite, zclose }, @@ -80,14 +80,14 @@ struct compressor { { NULL } }; -int permission __P((char *)); -void setfile __P((char *, struct stat *)); -void usage __P((void)); +int permission(char *); +void setfile(char *, struct stat *); +void usage(void); int compress - __P((const char *, const char *, struct compressor *, int)); +(const char *, const char *, struct compressor *, int); int decompress - __P((const char *, const char *, struct compressor *, int)); -struct compressor *check_method __P((int, const char *)); +(const char *, const char *, struct compressor *, int); +struct compressor *check_method(int, const char *); struct stat sb, osb; diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c index 3d3f416e3c5..97eb7fb0c60 100644 --- a/usr.bin/compress/zopen.c +++ b/usr.bin/compress/zopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zopen.c,v 1.7 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: zopen.c,v 1.8 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; #else -static char rcsid[] = "$OpenBSD: zopen.c,v 1.7 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: zopen.c,v 1.8 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -185,10 +185,10 @@ struct s_zstate { #define FIRST 257 /* First free entry. */ #define CLEAR 256 /* Table clear output code. */ -static int cl_block __P((struct s_zstate *)); -static void cl_hash __P((struct s_zstate *, register count_int)); -static code_int getcode __P((struct s_zstate *)); -static int output __P((struct s_zstate *, code_int)); +static int cl_block(struct s_zstate *); +static void cl_hash(struct s_zstate *, register count_int); +static code_int getcode(struct s_zstate *); +static int output(struct s_zstate *, code_int); /*- * Algorithm from "A Technique for High Performance Data Compression", diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index 2f1b3d22480..ec10901191a 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -1,4 +1,4 @@ -/* $OpenBSD: C.c,v 1.6 2000/07/26 17:46:52 espie Exp $ */ +/* $OpenBSD: C.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: C.c,v 1.3 1995/03/26 20:14:02 glass Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: C.c,v 1.6 2000/07/26 17:46:52 espie Exp $"; +static char rcsid[] = "$OpenBSD: C.c,v 1.7 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -48,10 +48,10 @@ static char rcsid[] = "$OpenBSD: C.c,v 1.6 2000/07/26 17:46:52 espie Exp $"; #include "ctags.h" -static int func_entry __P((void)); -static void hash_entry __P((void)); -static void skip_string __P((int)); -static int str_entry __P((int)); +static int func_entry(void); +static void hash_entry(void); +static void skip_string(int); +static int str_entry(int); /* * c_entries -- diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c index 88a6a3d4a54..5abe78d1f98 100644 --- a/usr.bin/ctags/ctags.c +++ b/usr.bin/ctags/ctags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctags.c,v 1.5 2000/07/25 19:28:30 deraadt Exp $ */ +/* $OpenBSD: ctags.c,v 1.6 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95"; #endif -static char rcsid[] = "$OpenBSD: ctags.c,v 1.5 2000/07/25 19:28:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ctags.c,v 1.6 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <err.h> @@ -81,8 +81,8 @@ char *curfile; /* current input file name */ char searchar = '/'; /* use /.../ searches by default */ char lbuf[LINE_MAX]; -void init __P((void)); -void find_entries __P((char *)); +void init(void); +void find_entries(char *); int main(argc, argv) diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h index 9dd9412d0ad..cf40c704a4d 100644 --- a/usr.bin/ctags/ctags.h +++ b/usr.bin/ctags/ctags.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ctags.h,v 1.2 1996/06/26 05:32:28 deraadt Exp $ */ +/* $OpenBSD: ctags.h,v 1.3 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: ctags.h,v 1.3 1995/03/26 20:14:07 glass Exp $ */ /* @@ -80,14 +80,14 @@ extern char lbuf[LINE_MAX]; extern char *lbp; extern char searchar; /* ex search character */ -extern int cicmp __P((char *)); -extern void getline __P((void)); -extern void pfnote __P((char *, int)); -extern int skip_key __P((int)); -extern void put_entries __P((NODE *)); -extern void toss_yysec __P((void)); -extern void l_entries __P((void)); -extern void y_entries __P((void)); -extern int PF_funcs __P((void)); -extern void c_entries __P((void)); -extern void skip_comment __P((void)); +extern int cicmp(char *); +extern void getline(void); +extern void pfnote(char *, int); +extern int skip_key(int); +extern void put_entries(NODE *); +extern void toss_yysec(void); +extern void l_entries(void); +extern void y_entries(void); +extern int PF_funcs(void); +extern void c_entries(void); +extern void skip_comment(void); diff --git a/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c index f889077b7c9..53fad340e72 100644 --- a/usr.bin/ctags/fortran.c +++ b/usr.bin/ctags/fortran.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fortran.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $ */ +/* $OpenBSD: fortran.c,v 1.4 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: fortran.c,v 1.3 1995/03/26 20:14:08 glass Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: fortran.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: fortran.c,v 1.4 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: fortran.c,v 1.3 2000/07/25 19:28:30 deraadt Exp #include "ctags.h" -static void takeprec __P((void)); +static void takeprec(void); char *lbp; /* line buffer pointer */ diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c index 4537d3e34e1..15aa29f9feb 100644 --- a/usr.bin/ctags/tree.c +++ b/usr.bin/ctags/tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $ */ +/* $OpenBSD: tree.c,v 1.4 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: tree.c,v 1.4 1995/03/26 20:14:11 glass Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: tree.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tree.c,v 1.4 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: tree.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $" #include "ctags.h" -static void add_node __P((NODE *, NODE *)); -static void free_tree __P((NODE *)); +static void add_node(NODE *, NODE *); +static void free_tree(NODE *); /* * pfnote -- diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c index dce652e164e..064bc3e97a5 100644 --- a/usr.bin/cut/cut.c +++ b/usr.bin/cut/cut.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cut.c,v 1.8 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: cut.c,v 1.9 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: cut.c,v 1.8 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: cut.c,v 1.9 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -66,10 +66,10 @@ int dflag; int fflag; int sflag; -void c_cut __P((FILE *, char *)); -void f_cut __P((FILE *, char *)); -void get_list __P((char *)); -void usage __P((void)); +void c_cut(FILE *, char *); +void f_cut(FILE *, char *); +void get_list(char *); +void usage(void); int main(argc, argv) @@ -77,7 +77,7 @@ main(argc, argv) char *argv[]; { FILE *fp; - void (*fcn) __P((FILE *, char *)); + void (*fcn)(FILE *, char *); int ch; setlocale (LC_ALL, ""); diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c index f2a704cc723..46b93a4aa70 100644 --- a/usr.bin/du/du.c +++ b/usr.bin/du/du.c @@ -1,4 +1,4 @@ -/* $OpenBSD: du.c,v 1.10 2001/07/30 00:53:38 deraadt Exp $ */ +/* $OpenBSD: du.c,v 1.11 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: du.c,v 1.10 2001/07/30 00:53:38 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: du.c,v 1.11 2002/02/16 21:27:45 millert Exp $"; #endif #endif /* not lint */ @@ -64,9 +64,9 @@ static char rcsid[] = "$OpenBSD: du.c,v 1.10 2001/07/30 00:53:38 deraadt Exp $"; #include <string.h> #include <unistd.h> -int linkchk __P((FTSENT *)); -void prtout __P((quad_t, char *, int)); -void usage __P((void)); +int linkchk(FTSENT *); +void prtout(quad_t, char *, int); +void usage(void); int main(argc, argv) diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c index e41b20246fc..ab1e954cb78 100644 --- a/usr.bin/encrypt/encrypt.c +++ b/usr.bin/encrypt/encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: encrypt.c,v 1.15 2001/07/31 18:30:38 millert Exp $ */ +/* $OpenBSD: encrypt.c,v 1.16 2002/02/16 21:27:45 millert Exp $ */ /* * Copyright (c) 1996, Jason Downs. All rights reserved. @@ -82,8 +82,8 @@ print_passwd(char *string, int operation, void *extra) char msalt[3], *salt; struct passwd pwd; login_cap_t *lc; - int pwd_gensalt __P((char *, int, struct passwd *, login_cap_t *, char)); - void to64 __P((char *, int32_t, int n)); + int pwd_gensalt(char *, int, struct passwd *, login_cap_t *, char); + void to64(char *, int32_t, int n); switch(operation) { case DO_MAKEKEY: diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c index 864d5025eec..2f6fe09a0e6 100644 --- a/usr.bin/env/env.c +++ b/usr.bin/env/env.c @@ -1,4 +1,4 @@ -/* $OpenBSD: env.c,v 1.6 2001/03/01 20:21:10 aaron Exp $ */ +/* $OpenBSD: env.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */ /* * Copyright (c) 1988, 1993, 1994 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";*/ -static char rcsid[] = "$OpenBSD: env.c,v 1.6 2001/03/01 20:21:10 aaron Exp $"; +static char rcsid[] = "$OpenBSD: env.c,v 1.7 2002/02/16 21:27:45 millert Exp $"; #endif /* not lint */ #include <err.h> @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: env.c,v 1.6 2001/03/01 20:21:10 aaron Exp $"; #include <locale.h> #include <errno.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/fgen/fgen.h b/usr.bin/fgen/fgen.h index 45ee349b4a7..6a96850d171 100644 --- a/usr.bin/fgen/fgen.h +++ b/usr.bin/fgen/fgen.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fgen.h,v 1.1 2001/08/17 21:31:02 jason Exp $ */ +/* $OpenBSD: fgen.h,v 1.2 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: fgen.h,v 1.4 2001/06/13 10:46:05 wiz Exp $ */ /* * fgen.h -- stuff for the fcode tokenizer. @@ -42,7 +42,7 @@ struct tok { }; #define TOKEN struct tok -#define YY_DECL TOKEN* yylex __P((void)) +#define YY_DECL TOKEN* yylex(void) #define FCODE 0xF00DBABE #define MACRO 0xFEEDBABE diff --git a/usr.bin/fgen/fgen.l b/usr.bin/fgen/fgen.l index a2057cf930d..f8a7d4f36aa 100644 --- a/usr.bin/fgen/fgen.l +++ b/usr.bin/fgen/fgen.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: fgen.l,v 1.1 2001/08/17 21:31:02 jason Exp $ */ +/* $OpenBSD: fgen.l,v 1.2 2002/02/16 21:27:45 millert Exp $ */ /* $NetBSD: fgen.l,v 1.12 2001/06/13 10:46:05 wiz Exp $ */ /* FLEX input for FORTH input file scanner */ /* @@ -91,7 +91,7 @@ int tokenizer = 0; Cell parse_stack[PSTKSIZ]; int parse_stack_ptr = 0; -void token_err __P((int, char *, char *, char *, ...)) +void token_err(int, char *, char *, char *, ...) __attribute__((__format__(__printf__, 4, 5))); YY_DECL; @@ -283,21 +283,21 @@ fload { token.type = TOK_FLOAD; token.text = yytext; %% /* Function definitions */ -void push __P((Cell)); -Cell pop __P((void)); -int depth __P((void)); -int fadd __P((struct fcode *, struct fcode *)); -struct fcode *flookup __P((struct fcode *, char *)); -int aadd __P((struct macro *, struct macro *)); -struct macro *alookup __P((struct macro *, char *)); -void initdic __P((void)); -void usage __P((char *)); -void tokenize __P((YY_BUFFER_STATE)); -int emit __P((char *)); -int spit __P((long)); -void sspit __P((char *)); -int apply_macros __P((YY_BUFFER_STATE, char *)); -int main __P((int argc, char *argv[])); +void push(Cell); +Cell pop(void); +int depth(void); +int fadd(struct fcode *, struct fcode *); +struct fcode *flookup(struct fcode *, char *); +int aadd(struct macro *, struct macro *); +struct macro *alookup(struct macro *, char *); +void initdic(void); +void usage(char *); +void tokenize(YY_BUFFER_STATE); +int emit(char *); +int spit(long); +void sspit(char *); +int apply_macros(YY_BUFFER_STATE, char *); +int main(int argc, char *argv[]); /* * Standard FCode names and numbers. Includes standard diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c index 29fa9781d7a..c6bc2814c6a 100644 --- a/usr.bin/file/apprentice.c +++ b/usr.bin/file/apprentice.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apprentice.c,v 1.11 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: apprentice.c,v 1.12 2002/02/16 21:27:46 millert Exp $ */ /* * apprentice - make one pass through /etc/magic, learning its secrets. @@ -36,7 +36,7 @@ #include "file.h" #ifndef lint -static char *moduleid = "$OpenBSD: apprentice.c,v 1.11 2001/11/19 19:02:13 mpech Exp $"; +static char *moduleid = "$OpenBSD: apprentice.c,v 1.12 2002/02/16 21:27:46 millert Exp $"; #endif /* lint */ #define EATAB {while (isascii((unsigned char) *l) && \ @@ -45,16 +45,16 @@ static char *moduleid = "$OpenBSD: apprentice.c,v 1.11 2001/11/19 19:02:13 mpech tolower((unsigned char) (l)) : (l)) -static int getvalue __P((struct magic *, char **)); -static int hextoint __P((int)); -static char *getstr __P((char *, char *, int, int *)); -static int parse __P((char *, int *, int)); -static void eatsize __P((char **)); +static int getvalue(struct magic *, char **); +static int hextoint(int); +static char *getstr(char *, char *, int, int *); +static int parse(char *, int *, int); +static void eatsize(char **); static int maxmagic = 0; static int alloc_incr = 256; -static int apprentice_1 __P((char *, int)); +static int apprentice_1(char *, int); int apprentice(fn, check) diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c index 7c6ef4d42a2..081cf713c51 100644 --- a/usr.bin/file/compress.c +++ b/usr.bin/file/compress.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compress.c,v 1.4 1998/07/10 15:05:19 mickey Exp $ */ +/* $OpenBSD: compress.c,v 1.5 2002/02/16 21:27:46 millert Exp $ */ /* * compress routines: @@ -33,7 +33,7 @@ static struct { static int ncompr = sizeof(compr) / sizeof(compr[0]); -static int uncompress __P((int, const unsigned char *, unsigned char **, int)); +static int uncompress(int, const unsigned char *, unsigned char **, int); int zmagic(buf, nbytes) diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index 7b60497b186..a7ec04264e2 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.7 1999/02/19 00:28:37 deraadt Exp $ */ +/* $OpenBSD: file.c,v 1.8 2002/02/16 21:27:46 millert Exp $ */ /* * file - find type of a file or files - main program. @@ -27,7 +27,7 @@ * 4. This notice may not be removed or altered. */ #ifndef lint -static char *moduleid = "$OpenBSD: file.c,v 1.7 1999/02/19 00:28:37 deraadt Exp $"; +static char *moduleid = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:46 millert Exp $"; #endif /* lint */ #include <stdio.h> @@ -79,10 +79,10 @@ char *magicfile; /* where magic be found */ int lineno; /* line number in the magic file */ -static void unwrap __P((char *fn)); +static void unwrap(char *fn); #if 0 -static int byteconv4 __P((int, int, int)); -static short byteconv2 __P((int, int, int)); +static int byteconv4(int, int, int); +static short byteconv2(int, int, int); #endif /* diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h index 8db21741a18..d5da9a614cb 100644 --- a/usr.bin/file/file.h +++ b/usr.bin/file/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.7 1999/09/26 20:47:28 ian Exp $ */ +/* $OpenBSD: file.h,v 1.8 2002/02/16 21:27:46 millert Exp $ */ /* * file.h - definitions for file(1) program @@ -90,23 +90,23 @@ struct magic { # endif #endif -extern int apprentice __P((char *, int)); -extern int ascmagic __P((unsigned char *, int)); -extern void ckfputs __P((const char *, FILE *)); +extern int apprentice(char *, int); +extern int ascmagic(unsigned char *, int); +extern void ckfputs(const char *, FILE *); struct stat; -extern int fsmagic __P((const char *, struct stat *)); -extern int is_compress __P((const unsigned char *, int *)); -extern int is_tar __P((unsigned char *, int)); -extern void mdump __P((struct magic *)); -extern void process __P((const char *, int)); -extern void showstr __P((FILE *, const char *, int)); -extern int softmagic __P((unsigned char *, int)); -extern int tryit __P((unsigned char *, int, int)); -extern int zmagic __P((unsigned char *, int)); -extern void ckfprintf __P((FILE *, const char *, ...)); -extern uint32 signextend __P((struct magic *, unsigned int32)); -extern int internatmagic __P((unsigned char *, int)); -extern void tryelf __P((int, char *, int)); +extern int fsmagic(const char *, struct stat *); +extern int is_compress(const unsigned char *, int *); +extern int is_tar(unsigned char *, int); +extern void mdump(struct magic *); +extern void process(const char *, int); +extern void showstr(FILE *, const char *, int); +extern int softmagic(unsigned char *, int); +extern int tryit(unsigned char *, int, int); +extern int zmagic(unsigned char *, int); +extern void ckfprintf(FILE *, const char *, ...); +extern uint32 signextend(struct magic *, unsigned int32); +extern int internatmagic(unsigned char *, int); +extern void tryelf(int, char *, int); extern int errno; /* Some unixes don't define this.. */ diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c index ed222bbd653..0c57a93ba3b 100644 --- a/usr.bin/file/softmagic.c +++ b/usr.bin/file/softmagic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: softmagic.c,v 1.6 2002/02/16 21:27:46 millert Exp $ */ /* * softmagic - interpret variable magic from /etc/magic @@ -37,16 +37,16 @@ #include "file.h" #ifndef lint -static char *moduleid = "$OpenBSD: softmagic.c,v 1.5 2001/11/19 19:02:13 mpech Exp $"; +static char *moduleid = "$OpenBSD: softmagic.c,v 1.6 2002/02/16 21:27:46 millert Exp $"; #endif /* lint */ -static int match __P((unsigned char *, int)); +static int match(unsigned char *, int); static int mget __P((union VALUETYPE *, unsigned char *, struct magic *, int)); -static int mcheck __P((union VALUETYPE *, struct magic *)); -static int32 mprint __P((union VALUETYPE *, struct magic *)); -static void mdebug __P((int32, char *, int)); -static int mconvert __P((union VALUETYPE *, struct magic *)); +static int mcheck(union VALUETYPE *, struct magic *); +static int32 mprint(union VALUETYPE *, struct magic *); +static void mdebug(int32, char *, int); +static int mconvert(union VALUETYPE *, struct magic *); /* * softmagic - lookup one file in database diff --git a/usr.bin/find/extern.h b/usr.bin/find/extern.h index fc8839789da..cbcf6f7631d 100644 --- a/usr.bin/find/extern.h +++ b/usr.bin/find/extern.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: extern.h,v 1.11 2000/07/08 16:09:33 millert Exp $*/ +/* * $OpenBSD: extern.h,v 1.12 2002/02/16 21:27:46 millert Exp $*/ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -36,58 +36,58 @@ #include <sys/cdefs.h> -void brace_subst __P((char *, char **, char *, int)); -void *emalloc __P((unsigned int)); -PLAN *find_create __P((char ***)); -void find_execute __P((PLAN *, char **)); -PLAN *find_formplan __P((char **)); -PLAN *not_squish __P((PLAN *)); -OPTION *option __P((char *)); -PLAN *or_squish __P((PLAN *)); -PLAN *paren_squish __P((PLAN *)); +void brace_subst(char *, char **, char *, int); +void *emalloc(unsigned int); +PLAN *find_create(char ***); +void find_execute(PLAN *, char **); +PLAN *find_formplan(char **); +PLAN *not_squish(PLAN *); +OPTION *option(char *); +PLAN *or_squish(PLAN *); +PLAN *paren_squish(PLAN *); struct stat; -void printlong __P((char *, char *, struct stat *)); -int queryuser __P((char **)); -void show_path __P((int)); +void printlong(char *, char *, struct stat *); +int queryuser(char **); +void show_path(int); -PLAN *c_amin __P((char *)); -PLAN *c_anewer __P((char *)); -PLAN *c_atime __P((char *)); -PLAN *c_cmin __P((char *)); -PLAN *c_cnewer __P((char *)); -PLAN *c_ctime __P((char *)); -PLAN *c_depth __P((void)); -PLAN *c_empty __P((void)); -PLAN *c_exec __P((char ***, int)); -PLAN *c_execdir __P((char ***)); -PLAN *c_flags __P((char *)); -PLAN *c_follow __P((void)); -PLAN *c_fstype __P((char *)); -PLAN *c_group __P((char *)); -PLAN *c_iname __P((char *)); -PLAN *c_inum __P((char *)); -PLAN *c_links __P((char *)); -PLAN *c_ls __P((void)); -PLAN *c_maxdepth __P((char *)); -PLAN *c_mindepth __P((char *)); -PLAN *c_mmin __P((char *)); -PLAN *c_name __P((char *)); -PLAN *c_newer __P((char *)); -PLAN *c_nogroup __P((void)); -PLAN *c_nouser __P((void)); -PLAN *c_path __P((char *)); -PLAN *c_perm __P((char *)); -PLAN *c_print __P((void)); -PLAN *c_print0 __P((void)); -PLAN *c_prune __P((void)); -PLAN *c_size __P((char *)); -PLAN *c_type __P((char *)); -PLAN *c_user __P((char *)); -PLAN *c_xdev __P((void)); -PLAN *c_openparen __P((void)); -PLAN *c_closeparen __P((void)); -PLAN *c_mtime __P((char *)); -PLAN *c_not __P((void)); -PLAN *c_or __P((void)); +PLAN *c_amin(char *); +PLAN *c_anewer(char *); +PLAN *c_atime(char *); +PLAN *c_cmin(char *); +PLAN *c_cnewer(char *); +PLAN *c_ctime(char *); +PLAN *c_depth(void); +PLAN *c_empty(void); +PLAN *c_exec(char ***, int); +PLAN *c_execdir(char ***); +PLAN *c_flags(char *); +PLAN *c_follow(void); +PLAN *c_fstype(char *); +PLAN *c_group(char *); +PLAN *c_iname(char *); +PLAN *c_inum(char *); +PLAN *c_links(char *); +PLAN *c_ls(void); +PLAN *c_maxdepth(char *); +PLAN *c_mindepth(char *); +PLAN *c_mmin(char *); +PLAN *c_name(char *); +PLAN *c_newer(char *); +PLAN *c_nogroup(void); +PLAN *c_nouser(void); +PLAN *c_path(char *); +PLAN *c_perm(char *); +PLAN *c_print(void); +PLAN *c_print0(void); +PLAN *c_prune(void); +PLAN *c_size(char *); +PLAN *c_type(char *); +PLAN *c_user(char *); +PLAN *c_xdev(void); +PLAN *c_openparen(void); +PLAN *c_closeparen(void); +PLAN *c_mtime(char *); +PLAN *c_not(void); +PLAN *c_or(void); extern int ftsoptions, isdeprecated, isdepth, isoutput, isxargs; diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h index 10a0c26c5d9..62dd4bb4771 100644 --- a/usr.bin/find/find.h +++ b/usr.bin/find/find.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: find.h,v 1.10 2000/07/08 16:09:33 millert Exp $*/ +/* * $OpenBSD: find.h,v 1.11 2002/02/16 21:27:46 millert Exp $*/ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -53,7 +53,7 @@ enum ntype { typedef struct _plandata { struct _plandata *next; /* next node */ int (*eval) /* node evaluation function */ - __P((struct _plandata *, FTSENT *)); +(struct _plandata *, FTSENT *); #define F_EQUAL 1 /* [acm]time inum links size */ #define F_LESSTHAN 2 #define F_GREATER 3 diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index 441433e0a2d..7a86d1e38ef 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -1,4 +1,4 @@ -/* $OpenBSD: function.c,v 1.21 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: function.c,v 1.22 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -38,7 +38,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)function.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: function.c,v 1.21 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: function.c,v 1.22 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: function.c,v 1.21 2001/11/19 19:02:13 mpech Exp } \ } -static PLAN *palloc __P((enum ntype, int (*) __P((PLAN *, FTSENT *)))); +static PLAN *palloc __P((enum ntype, int (*)(PLAN *, FTSENT *))); extern int dotfd; extern time_t now; @@ -1516,7 +1516,7 @@ c_or() static PLAN * palloc(t, f) enum ntype t; - int (*f) __P((PLAN *, FTSENT *)); + int (*f)(PLAN *, FTSENT *); { PLAN *new; diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c index 739c28c8cb9..da3f78bd1dc 100644 --- a/usr.bin/find/ls.c +++ b/usr.bin/find/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.8 2001/07/12 05:17:03 deraadt Exp $ */ +/* $OpenBSD: ls.c,v 1.9 2002/02/16 21:27:46 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: ls.c,v 1.8 2001/07/12 05:17:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.9 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -52,8 +52,8 @@ static char rcsid[] = "$OpenBSD: ls.c,v 1.8 2001/07/12 05:17:03 deraadt Exp $"; /* Derived from the print routines in the ls(1) source code. */ -static void printlink __P((char *)); -static void printtime __P((time_t)); +static void printlink(char *); +static void printtime(time_t); #define NAME_WIDTH 8 diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c index c34c8effd1c..2482072419c 100644 --- a/usr.bin/find/main.c +++ b/usr.bin/find/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.12 2001/08/22 23:43:13 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.13 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: main.c,v 1.12 2001/08/22 23:43:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.13 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -61,7 +61,7 @@ int isdepth; /* do directories on post-order visit */ int isoutput; /* user specified output operator */ int isxargs; /* don't permit xargs delimiting chars */ -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c index 8da5413c11c..df0f189ab4f 100644 --- a/usr.bin/find/option.c +++ b/usr.bin/find/option.c @@ -1,4 +1,4 @@ -/* $OpenBSD: option.c,v 1.13 2001/11/19 19:02:13 mpech Exp $ */ +/* $OpenBSD: option.c,v 1.14 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -38,7 +38,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)option.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: option.c,v 1.13 2001/11/19 19:02:13 mpech Exp $"; +static char rcsid[] = "$OpenBSD: option.c,v 1.14 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -149,7 +149,7 @@ option(name) char *name; { OPTION tmp; - int typecompare __P((const void *, const void *)); + int typecompare(const void *, const void *); tmp.name = name; return ((OPTION *)bsearch(&tmp, options, diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h index bc0497f6406..2ef84222f7e 100644 --- a/usr.bin/finger/extern.h +++ b/usr.bin/finger/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1997/06/02 21:33:27 kstailey Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -42,25 +42,25 @@ extern int lflag; extern int oflag; extern int pplan; -int demi_print __P((char *, int)); -void enter_lastlog __P((PERSON *)); -PERSON *enter_person __P((struct passwd *)); -void enter_where __P((struct utmp *, PERSON *)); -void expandusername __P((char *, char *, char *, int)); -PERSON *find_person __P((char *)); -int hash __P((char *)); -void lflag_print __P((void)); -void loginlist __P((void)); -void lprint __P((PERSON *)); -int match __P((struct passwd *, char *)); -void netfinger __P((char *)); -PERSON *palloc __P((void)); -char *prphone __P((char *)); -int psort __P((const void *, const void *)); -void sflag_print __P((void)); -int show_text __P((char *, char *, char *)); -PERSON **sort __P((void)); -void stimeprint __P((WHERE *)); -char *vs __P((char *)); -void userlist __P((int, char **)); -void vputc __P((int)); +int demi_print(char *, int); +void enter_lastlog(PERSON *); +PERSON *enter_person(struct passwd *); +void enter_where(struct utmp *, PERSON *); +void expandusername(char *, char *, char *, int); +PERSON *find_person(char *); +int hash(char *); +void lflag_print(void); +void loginlist(void); +void lprint(PERSON *); +int match(struct passwd *, char *); +void netfinger(char *); +PERSON *palloc(void); +char *prphone(char *); +int psort(const void *, const void *); +void sflag_print(void); +int show_text(char *, char *, char *); +PERSON **sort(void); +void stimeprint(WHERE *); +char *vs(char *); +void userlist(int, char **); +void vputc(int); diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c index 2cef80cd639..e8d73683448 100644 --- a/usr.bin/fsplit/fsplit.c +++ b/usr.bin/fsplit/fsplit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsplit.c,v 1.8 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: fsplit.c,v 1.9 2002/02/16 21:27:46 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: fsplit.c,v 1.8 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: fsplit.c,v 1.9 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -57,13 +57,13 @@ static char rcsid[] = "$OpenBSD: fsplit.c,v 1.8 2001/11/19 19:02:14 mpech Exp $" #include <sys/fcntl.h> #include <err.h> -void badparms __P(()); -void get_name __P((char *, int)); -int lname __P((char *)); -int getline __P((void)); -int lend __P((void)); -int scan_name __P((char *, char *)); -int saveit __P((char *)); +void badparms(); +void get_name(char *, int); +int lname(char *); +int getline(void); +int lend(void); +int scan_name(char *, char *); +int saveit(char *); /* * usage: fsplit [-e efile] ... [file] diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index a7bb92c7aef..dc8c2f66c8b 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fstat.c,v 1.34 2001/12/01 18:59:59 deraadt Exp $ */ +/* $OpenBSD: fstat.c,v 1.35 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$OpenBSD: fstat.c,v 1.34 2001/12/01 18:59:59 deraadt Exp $"; +static char *rcsid = "$OpenBSD: fstat.c,v 1.35 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -145,20 +145,20 @@ int maxfiles; kvm_t *kd; -int ufs_filestat __P((struct vnode *, struct filestat *)); -int ext2fs_filestat __P((struct vnode *, struct filestat *)); -int isofs_filestat __P((struct vnode *, struct filestat *)); -int msdos_filestat __P((struct vnode *, struct filestat *)); -int nfs_filestat __P((struct vnode *, struct filestat *)); -int xfs_filestat __P((struct vnode *, struct filestat *)); -int null_filestat __P((struct vnode *, struct filestat *)); -void dofiles __P((struct kinfo_proc *)); -void getinetproto __P((int)); -void socktrans __P((struct socket *, int)); -void usage __P((void)); -void vtrans __P((struct vnode *, int, int, off_t)); -int getfname __P((char *)); -void pipetrans __P((struct pipe *, int)); +int ufs_filestat(struct vnode *, struct filestat *); +int ext2fs_filestat(struct vnode *, struct filestat *); +int isofs_filestat(struct vnode *, struct filestat *); +int msdos_filestat(struct vnode *, struct filestat *); +int nfs_filestat(struct vnode *, struct filestat *); +int xfs_filestat(struct vnode *, struct filestat *); +int null_filestat(struct vnode *, struct filestat *); +void dofiles(struct kinfo_proc *); +void getinetproto(int); +void socktrans(struct socket *, int); +void usage(void); +void vtrans(struct vnode *, int, int, off_t); +int getfname(char *); +void pipetrans(struct pipe *, int); int main(argc, argv) diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c index fe6d0fe33e2..d10ad9a4dfa 100644 --- a/usr.bin/ftp/complete.c +++ b/usr.bin/ftp/complete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: complete.c,v 1.12 2001/08/03 22:43:16 millert Exp $ */ +/* $OpenBSD: complete.c,v 1.13 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: complete.c,v 1.10 1997/08/18 10:20:18 lukem Exp $ */ /*- @@ -39,7 +39,7 @@ #ifndef SMALL #ifndef lint -static char rcsid[] = "$OpenBSD: complete.c,v 1.12 2001/08/03 22:43:16 millert Exp $"; +static char rcsid[] = "$OpenBSD: complete.c,v 1.13 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ /* @@ -55,11 +55,11 @@ static char rcsid[] = "$OpenBSD: complete.c,v 1.12 2001/08/03 22:43:16 millert E #include "ftp_var.h" -static int comparstr __P((const void *, const void *)); -static unsigned char complete_ambiguous __P((char *, int, StringList *)); -static unsigned char complete_command __P((char *, int)); -static unsigned char complete_local __P((char *, int)); -static unsigned char complete_remote __P((char *, int)); +static int comparstr(const void *, const void *); +static unsigned char complete_ambiguous(char *, int, StringList *); +static unsigned char complete_command(char *, int); +static unsigned char complete_local(char *, int); +static unsigned char complete_remote(char *, int); static int comparstr(a, b) diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h index 9224691cf3d..6b0411ec95e 100644 --- a/usr.bin/ftp/extern.h +++ b/usr.bin/ftp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.20 2000/06/21 19:22:54 itojun Exp $ */ +/* $OpenBSD: extern.h,v 1.21 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $ */ /* @@ -67,132 +67,132 @@ #include <sys/types.h> -void abort_remote __P((FILE *)); -void abortpt __P((int)); -void abortrecv __P((int)); -void abortsend __P((int)); -void account __P((int, char **)); -void alarmtimer __P((int)); -int another __P((int *, char ***, const char *)); -int auto_fetch __P((int, char **, char *)); -void blkfree __P((char **)); -void cd __P((int, char **)); -void cdup __P((int, char **)); -void changetype __P((int, int)); -void cmdabort __P((int)); -void cmdscanner __P((int)); -int command __P((const char *, ...)); +void abort_remote(FILE *); +void abortpt(int); +void abortrecv(int); +void abortsend(int); +void account(int, char **); +void alarmtimer(int); +int another(int *, char ***, const char *); +int auto_fetch(int, char **, char *); +void blkfree(char **); +void cd(int, char **); +void cdup(int, char **); +void changetype(int, int); +void cmdabort(int); +void cmdscanner(int); +int command(const char *, ...); #ifndef SMALL -unsigned char complete __P((EditLine *, int)); -void controlediting __P((void)); +unsigned char complete(EditLine *, int); +void controlediting(void); #endif /* !SMALL */ -int confirm __P((const char *, const char *)); -FILE *dataconn __P((const char *)); -void delete __P((int, char **)); -void disconnect __P((int, char **)); -void do_chmod __P((int, char **)); -void do_umask __P((int, char **)); -void domacro __P((int, char **)); -char *domap __P((char *)); -void doproxy __P((int, char **)); -char *dotrans __P((char *)); -int empty __P((fd_set *, int)); -int foregroundproc __P((void)); -void get __P((int, char **)); -struct cmd *getcmd __P((const char *)); -int getit __P((int, char **, int, const char *)); -int getreply __P((int)); -int globulize __P((char **)); -char *gunique __P((const char *)); -void help __P((int, char **)); -char *hookup __P((char *, char *)); -void idle __P((int, char **)); -int initconn __P((void)); -void intr __P((void)); -int isurl __P((const char *)); -void list_vertical __P((StringList *)); -void lcd __P((int, char **)); -int login __P((const char *, char *, char *)); -void lostpeer __P((void)); -void lpwd __P((int, char **)); -void ls __P((int, char **)); -void mabort __P((int)); -void macdef __P((int, char **)); -void makeargv __P((void)); -void makedir __P((int, char **)); -void mdelete __P((int, char **)); -void mget __P((int, char **)); -void mls __P((int, char **)); -void modtime __P((int, char **)); -void mput __P((int, char **)); -char *onoff __P((int)); -void newer __P((int, char **)); -void page __P((int, char **)); -void progressmeter __P((int)); -char *prompt __P((void)); -void proxabort __P((int)); -void proxtrans __P((const char *, const char *, const char *)); -void psabort __P((int)); -void psummary __P((int)); -void pswitch __P((int)); -void ptransfer __P((int)); -void put __P((int, char **)); -void pwd __P((int, char **)); -void quit __P((int, char **)); -void quote __P((int, char **)); -void quote1 __P((const char *, int, char **)); +int confirm(const char *, const char *); +FILE *dataconn(const char *); +void delete(int, char **); +void disconnect(int, char **); +void do_chmod(int, char **); +void do_umask(int, char **); +void domacro(int, char **); +char *domap(char *); +void doproxy(int, char **); +char *dotrans(char *); +int empty(fd_set *, int); +int foregroundproc(void); +void get(int, char **); +struct cmd *getcmd(const char *); +int getit(int, char **, int, const char *); +int getreply(int); +int globulize(char **); +char *gunique(const char *); +void help(int, char **); +char *hookup(char *, char *); +void idle(int, char **); +int initconn(void); +void intr(void); +int isurl(const char *); +void list_vertical(StringList *); +void lcd(int, char **); +int login(const char *, char *, char *); +void lostpeer(void); +void lpwd(int, char **); +void ls(int, char **); +void mabort(int); +void macdef(int, char **); +void makeargv(void); +void makedir(int, char **); +void mdelete(int, char **); +void mget(int, char **); +void mls(int, char **); +void modtime(int, char **); +void mput(int, char **); +char *onoff(int); +void newer(int, char **); +void page(int, char **); +void progressmeter(int); +char *prompt(void); +void proxabort(int); +void proxtrans(const char *, const char *, const char *); +void psabort(int); +void psummary(int); +void pswitch(int); +void ptransfer(int); +void put(int, char **); +void pwd(int, char **); +void quit(int, char **); +void quote(int, char **); +void quote1(const char *, int, char **); void recvrequest __P((const char *, const char *, const char *, const char *, int, int)); -void reget __P((int, char **)); -char *remglob __P((char **, int, char **)); -off_t remotesize __P((const char *, int)); -time_t remotemodtime __P((const char *, int)); -void removedir __P((int, char **)); -void renamefile __P((int, char **)); -void reset __P((int, char **)); -void restart __P((int, char **)); -void rmthelp __P((int, char **)); -void rmtstatus __P((int, char **)); -int ruserpass __P((const char *, char **, char **, char **)); -void sendrequest __P((const char *, const char *, const char *, int)); -void setascii __P((int, char **)); -void setbell __P((int, char **)); -void setbinary __P((int, char **)); -void setcase __P((int, char **)); -void setcr __P((int, char **)); -void setdebug __P((int, char **)); -void setedit __P((int, char **)); -void setepsv4 __P((int, char **)); -void setform __P((int, char **)); -void setftmode __P((int, char **)); -void setgate __P((int, char **)); -void setglob __P((int, char **)); -void sethash __P((int, char **)); -void setnmap __P((int, char **)); -void setntrans __P((int, char **)); -void setpassive __P((int, char **)); -void setpeer __P((int, char **)); -void setport __P((int, char **)); -void setpreserve __P((int, char **)); -void setprogress __P((int, char **)); -void setprompt __P((int, char **)); -void setrunique __P((int, char **)); -void setstruct __P((int, char **)); -void setsunique __P((int, char **)); -void settenex __P((int, char **)); -void settrace __P((int, char **)); -void setttywidth __P((int)); -void settype __P((int, char **)); -void setverbose __P((int, char **)); -void shell __P((int, char **)); -void site __P((int, char **)); -void sizecmd __P((int, char **)); -char *slurpstring __P((void)); -void status __P((int, char **)); -void syst __P((int, char **)); -int togglevar __P((int, char **, int *, const char *)); -void usage __P((void)); -void user __P((int, char **)); +void reget(int, char **); +char *remglob(char **, int, char **); +off_t remotesize(const char *, int); +time_t remotemodtime(const char *, int); +void removedir(int, char **); +void renamefile(int, char **); +void reset(int, char **); +void restart(int, char **); +void rmthelp(int, char **); +void rmtstatus(int, char **); +int ruserpass(const char *, char **, char **, char **); +void sendrequest(const char *, const char *, const char *, int); +void setascii(int, char **); +void setbell(int, char **); +void setbinary(int, char **); +void setcase(int, char **); +void setcr(int, char **); +void setdebug(int, char **); +void setedit(int, char **); +void setepsv4(int, char **); +void setform(int, char **); +void setftmode(int, char **); +void setgate(int, char **); +void setglob(int, char **); +void sethash(int, char **); +void setnmap(int, char **); +void setntrans(int, char **); +void setpassive(int, char **); +void setpeer(int, char **); +void setport(int, char **); +void setpreserve(int, char **); +void setprogress(int, char **); +void setprompt(int, char **); +void setrunique(int, char **); +void setstruct(int, char **); +void setsunique(int, char **); +void settenex(int, char **); +void settrace(int, char **); +void setttywidth(int); +void settype(int, char **); +void setverbose(int, char **); +void shell(int, char **); +void site(int, char **); +void sizecmd(int, char **); +char *slurpstring(void); +void status(int, char **); +void syst(int, char **); +int togglevar(int, char **, int *, const char *); +void usage(void); +void user(int, char **); extern jmp_buf abortprox; diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c index 8c7f8ce8e1d..e78b107543b 100644 --- a/usr.bin/ftp/fetch.c +++ b/usr.bin/ftp/fetch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fetch.c,v 1.37 2001/11/14 07:59:28 heko Exp $ */ +/* $OpenBSD: fetch.c,v 1.38 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: fetch.c,v 1.37 2001/11/14 07:59:28 heko Exp $"; +static char rcsid[] = "$OpenBSD: fetch.c,v 1.38 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ /* @@ -69,11 +69,11 @@ static char rcsid[] = "$OpenBSD: fetch.c,v 1.37 2001/11/14 07:59:28 heko Exp $"; #include "ftp_var.h" -static int url_get __P((const char *, const char *, const char *)); -void aborthttp __P((int)); -void abortfile __P((int)); -char hextochar __P((const char *)); -char *urldecode __P((const char *)); +static int url_get(const char *, const char *, const char *); +void aborthttp(int); +void abortfile(int); +char hextochar(const char *); +char *urldecode(const char *); #define FTP_URL "ftp://" /* ftp URL prefix */ #define HTTP_URL "http://" /* http URL prefix */ diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c index c2310f829cd..aa38b099fc9 100644 --- a/usr.bin/ftp/ftp.c +++ b/usr.bin/ftp/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.41 2001/06/26 23:44:00 lebel Exp $ */ +/* $OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */ /* @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94"; #else -static char rcsid[] = "$OpenBSD: ftp.c,v 1.41 2001/06/26 23:44:00 lebel Exp $"; +static char rcsid[] = "$OpenBSD: ftp.c,v 1.42 2002/02/16 21:27:46 millert Exp $"; #endif #endif /* not lint */ @@ -506,7 +506,7 @@ sendrequest(cmd, local, remote, printnames) struct stat st; int c, d; FILE * volatile fin, * volatile dout; - int (* volatile closefunc) __P((FILE *)); + int (* volatile closefunc)(FILE *); volatile sig_t oldinti, oldintr, oldintp; volatile off_t hashbytes; char * volatile lmode; @@ -799,7 +799,7 @@ recvrequest(cmd, local, remote, lmode, printnames, ignorespecial) int printnames, ignorespecial; { FILE * volatile fout, * volatile din; - int (* volatile closefunc) __P((FILE *)); + int (* volatile closefunc)(FILE *); volatile sig_t oldinti, oldintr, oldintp; int c, d; volatile int is_retr, tcrflag, bare_lfs; diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h index ac74f4c6314..2af8e180de5 100644 --- a/usr.bin/ftp/ftp_var.h +++ b/usr.bin/ftp/ftp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp_var.h,v 1.20 2001/10/27 10:31:27 heko Exp $ */ +/* $OpenBSD: ftp_var.h,v 1.21 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $ */ /* @@ -203,7 +203,7 @@ struct cmd { #ifndef SMALL char *c_complete; /* context sensitive completion list */ #endif /* !SMALL */ - void (*c_handler) __P((int, char **)); /* function to call */ + void (*c_handler)(int, char **); /* function to call */ }; struct macel { diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c index 14831e9e1bd..88bc6333c93 100644 --- a/usr.bin/ftp/ruserpass.c +++ b/usr.bin/ftp/ruserpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ruserpass.c,v 1.12 2000/07/27 19:59:13 millert Exp $ */ +/* $OpenBSD: ruserpass.c,v 1.13 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.12 2000/07/27 19:59:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.13 2002/02/16 21:27:46 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.12 2000/07/27 19:59:13 millert #include "ftp_var.h" -static int token __P((void)); +static int token(void); static FILE *cfile; #define DEFAULT 1 diff --git a/usr.bin/ftp/stringlist.h b/usr.bin/ftp/stringlist.h index 8d8f0dd3a81..1f7630c0112 100644 --- a/usr.bin/ftp/stringlist.h +++ b/usr.bin/ftp/stringlist.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stringlist.h,v 1.1 1997/02/03 01:05:45 millert Exp $ */ +/* $OpenBSD: stringlist.h,v 1.2 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /* @@ -48,10 +48,10 @@ typedef struct _stringlist { } StringList; __BEGIN_DECLS -StringList *sl_init __P((void)); -void sl_add __P((StringList *, char *)); -void sl_free __P((StringList *, int)); -char *sl_find __P((StringList *, char *)); +StringList *sl_init(void); +void sl_add(StringList *, char *); +void sl_free(StringList *, int); +char *sl_find(StringList *, char *); __END_DECLS #endif /* _STRINGLIST_H */ diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c index 1572a1cf74d..fe8d815efdd 100644 --- a/usr.bin/ftp/util.c +++ b/usr.bin/ftp/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.26 2001/07/12 05:17:08 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.27 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $ */ /* @@ -35,7 +35,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: util.c,v 1.26 2001/07/12 05:17:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: util.c,v 1.27 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ /* @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: util.c,v 1.26 2001/07/12 05:17:08 deraadt Exp $ #include "ftp_var.h" #include "pathnames.h" -static void updateprogressmeter __P((int)); +static void updateprogressmeter(int); /* * Connect to peer server and diff --git a/usr.bin/gencat/gencat.c b/usr.bin/gencat/gencat.c index cc502849bbb..d4d8a17ac17 100644 --- a/usr.bin/gencat/gencat.c +++ b/usr.bin/gencat/gencat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gencat.c,v 1.6 2000/09/27 23:53:29 danh Exp $ */ +/* $OpenBSD: gencat.c,v 1.7 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: gencat.c,v 1.9 1998/10/09 17:00:56 itohy Exp $ */ /*- @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #ifndef lint static char rcsid[] = - "$OpenBSD: gencat.c,v 1.6 2000/09/27 23:53:29 danh Exp $"; + "$OpenBSD: gencat.c,v 1.7 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ /*********************************************************** @@ -111,25 +111,25 @@ static long lineno = 0; extern char *__progname; /* from crt0.o */ -static char *cskip __P((char *)); -static void error __P((char *, char *)); -static void nomem __P((void)); -static char *getline __P((int)); -static char *getmsg __P((int, char *, char)); -static void warning __P((char *, char *)); -static char *wskip __P((char *)); -static char *xstrdup __P((const char *)); -static void *xmalloc __P((size_t)); -static void *xrealloc __P((void *, size_t)); - -void MCParse __P((int fd)); -void MCWriteCat __P((int fd)); -void MCDelMsg __P((int msgId)); -void MCAddMsg __P((int msgId, const char *msg)); -void MCAddSet __P((int setId)); -void MCDelSet __P((int setId)); -int main __P((int, char **)); -void usage __P((void)); +static char *cskip(char *); +static void error(char *, char *); +static void nomem(void); +static char *getline(int); +static char *getmsg(int, char *, char); +static void warning(char *, char *); +static char *wskip(char *); +static char *xstrdup(const char *); +static void *xmalloc(size_t); +static void *xrealloc(void *, size_t); + +void MCParse(int fd); +void MCWriteCat(int fd); +void MCDelMsg(int msgId); +void MCAddMsg(int msgId, const char *msg); +void MCAddSet(int setId); +void MCDelSet(int setId); +int main(int, char **); +void usage(void); void diff --git a/usr.bin/getconf/getconf.c b/usr.bin/getconf/getconf.c index b2546a8c53b..07d31d1f475 100644 --- a/usr.bin/getconf/getconf.c +++ b/usr.bin/getconf/getconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getconf.c,v 1.5 2001/07/12 05:17:08 deraadt Exp $ */ +/* $OpenBSD: getconf.c,v 1.6 2002/02/16 21:27:46 millert Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: getconf.c,v 1.5 2001/07/12 05:17:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getconf.c,v 1.6 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: getconf.c,v 1.5 2001/07/12 05:17:08 deraadt Exp #include <err.h> #include <errno.h> -static void usage __P((void)); +static void usage(void); struct conf_variable { diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h index 6cd3c377e02..c7e8024bf90 100644 --- a/usr.bin/gprof/gprof.h +++ b/usr.bin/gprof/gprof.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gprof.h,v 1.6 2001/03/22 05:18:30 mickey Exp $ */ +/* $OpenBSD: gprof.h,v 1.7 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: gprof.h,v 1.13 1996/04/01 21:54:06 mark Exp $ */ /* @@ -236,18 +236,18 @@ struct stringlist *ktolist; * function declarations */ void addarc(); -int addcycle __P((arctype **, arctype **)); -void addlist __P((struct stringlist *listp, char *funcname)); +int addcycle(arctype **, arctype **); +void addlist(struct stringlist *listp, char *funcname); int arccmp(); arctype *arclookup(); void asgnsamples(); void alignentries(); void printblurb(); -int cycleanalyze __P((void)); -void cyclelink __P((void)); -void cycletime __P((void)); -void compresslist __P((void)); -int descend __P((nltype *node, arctype **stkstart, arctype **stkp)); +int cycleanalyze(void); +void cyclelink(void); +void cycletime(void); +void compresslist(void); +int descend(nltype *node, arctype **stkstart, arctype **stkp); void dfn(); bool dfn_busy(); void dfn_findcycle(); @@ -257,10 +257,10 @@ void dfn_post_visit(); void dfn_pre_visit(); void dfn_self_cycle(); nltype **doarcs(); -void doflags __P((void)); -void dotime __P((void)); +void doflags(void); +void dotime(void); void dumpsum(); -void findcall __P((nltype *, u_long, u_long)); +void findcall(nltype *, u_long, u_long); void flatprofheader(); void flatprofline(); bool funcsymbol(); @@ -272,7 +272,7 @@ void gettextspace(); void gprofheader(); void gprofline(); int hertz(); -void inheritflags __P((nltype *childp)); +void inheritflags(nltype *childp); unsigned long max(); int membercmp(); unsigned long min(); @@ -297,10 +297,10 @@ void sortmembers(); void sortparents(); void tally(); int timecmp(); -void timepropagate __P((nltype *)); +void timepropagate(nltype *); int topcmp(); int totalcmp(); -int valcmp __P((nltype *p1, nltype *p2)); +int valcmp(nltype *p1, nltype *p2); #define LESSTHAN -1 #define EQUALTO 0 diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c index cc98ce714bd..e3d9ec62f98 100644 --- a/usr.bin/head/head.c +++ b/usr.bin/head/head.c @@ -1,4 +1,4 @@ -/* $OpenBSD: head.c,v 1.7 2001/07/04 06:31:25 deraadt Exp $ */ +/* $OpenBSD: head.c,v 1.8 2002/02/16 21:27:46 millert Exp $ */ /* * Copyright (c) 1980, 1987 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)head.c 5.5 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: head.c,v 1.7 2001/07/04 06:31:25 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: head.c,v 1.8 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: head.c,v 1.7 2001/07/04 06:31:25 deraadt Exp $" #include <errno.h> #include <unistd.h> -static void usage __P((void)); +static void usage(void); /* * head - give the first few lines of a stream or of each of a set of files diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c index d02234df1fa..c12b83ffede 100644 --- a/usr.bin/hexdump/display.c +++ b/usr.bin/hexdump/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $ */ +/* $OpenBSD: display.c,v 1.10 2002/02/16 21:27:46 millert Exp $ */ /* $NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $ */ /* @@ -36,7 +36,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)display.c 5.11 (Berkeley) 3/9/91";*/ -static char rcsid[] = "$OpenBSD: display.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: display.c,v 1.10 2002/02/16 21:27:46 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -57,7 +57,7 @@ enum _vflag vflag = FIRST; static off_t address; /* address/offset in stream */ static off_t eaddress; /* end address */ -static inline void print __P((PR *, u_char *)); +static inline void print(PR *, u_char *); void display() diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c index 52b99388364..b1cd8b63dfc 100644 --- a/usr.bin/hexdump/hexdump.c +++ b/usr.bin/hexdump/hexdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hexdump.c,v 1.7 2001/12/30 08:17:32 pvalchev Exp $ */ +/* $OpenBSD: hexdump.c,v 1.8 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: hexdump.c,v 1.7 1997/10/19 02:34:06 lukem Exp $ */ /* @@ -42,7 +42,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)hexdump.c 5.5 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: hexdump.c,v 1.7 2001/12/30 08:17:32 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: hexdump.c,v 1.8 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -55,7 +55,7 @@ int blocksize; /* data block size */ int exitval; /* final exit value */ int length = -1; /* max bytes to read */ -int main __P((int, char **)); +int main(int, char **); int main(argc, argv) diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h index 3f14b233169..a640726b281 100644 --- a/usr.bin/hexdump/hexdump.h +++ b/usr.bin/hexdump/hexdump.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hexdump.h,v 1.4 2001/12/30 08:17:32 pvalchev Exp $ */ +/* $OpenBSD: hexdump.h,v 1.5 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: hexdump.h,v 1.7 2001/12/07 15:14:29 bjh21 Exp $ */ /* @@ -84,25 +84,25 @@ extern int length; /* max bytes to read */ extern off_t skip; /* bytes to skip */ extern enum _vflag vflag; -void add __P((const char *)); -void addfile __P((char *)); -void badcnt __P((char *)); -void badconv __P((char *)); -void badfmt __P((const char *)); -void badsfmt __P((void)); -void bpad __P((PR *)); -void conv_c __P((PR *, u_char *)); -void conv_u __P((PR *, u_char *)); -void display __P((void)); -void doskip __P((const char *, int)); -/*void err __P((const char *, ...));*/ -void *emalloc __P((int)); -void escape __P((char *)); -u_char *get __P((void)); -void newsyntax __P((int, char ***)); -int next __P((char **)); -void nomem __P((void)); -void oldsyntax __P((int, char ***)); -void rewrite __P((FS *)); -int size __P((FS *)); -void usage __P((void)); +void add(const char *); +void addfile(char *); +void badcnt(char *); +void badconv(char *); +void badfmt(const char *); +void badsfmt(void); +void bpad(PR *); +void conv_c(PR *, u_char *); +void conv_u(PR *, u_char *); +void display(void); +void doskip(const char *, int); +/*void err(const char *, ...);*/ +void *emalloc(int); +void escape(char *); +u_char *get(void); +void newsyntax(int, char ***); +int next(char **); +void nomem(void); +void oldsyntax(int, char ***); +void rewrite(FS *); +int size(FS *); +void usage(void); diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c index c29ae72cf1c..9d597ae8629 100644 --- a/usr.bin/hexdump/odsyntax.c +++ b/usr.bin/hexdump/odsyntax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: odsyntax.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $ */ +/* $OpenBSD: odsyntax.c,v 1.10 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: odsyntax.c,v 1.15 2001/12/07 15:14:29 bjh21 Exp $ */ /*- @@ -36,7 +36,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)odsyntax.c 5.4 (Berkeley) 3/8/91";*/ -static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.9 2001/12/30 08:17:32 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.10 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -51,9 +51,9 @@ static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.9 2001/12/30 08:17:32 pvalchev E int deprecated; -static void odoffset __P((int, char ***)); -static void posixtypes __P((char *)); -static void odprecede __P((void)); +static void odoffset(int, char ***); +static void posixtypes(char *); +static void odprecede(void); /* diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c index c74f863983c..6f3aa1b836b 100644 --- a/usr.bin/id/id.c +++ b/usr.bin/id/id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: id.c,v 1.10 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: id.c,v 1.11 2002/02/16 21:27:47 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/ -static char rcsid[] = "$OpenBSD: id.c,v 1.10 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: id.c,v 1.11 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -55,13 +55,13 @@ static char rcsid[] = "$OpenBSD: id.c,v 1.10 2001/11/19 19:02:14 mpech Exp $"; #include <unistd.h> #include <err.h> -void current __P((void)); -void pretty __P((struct passwd *)); -void group __P((struct passwd *, int)); -void usage __P((void)); -void user __P((struct passwd *)); +void current(void); +void pretty(struct passwd *); +void group(struct passwd *, int); +void usage(void); +void user(struct passwd *); struct passwd * - who __P((char *)); + who(char *); int main(argc, argv) diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c index 454b34fa039..b63c81cbbdb 100644 --- a/usr.bin/indent/args.c +++ b/usr.bin/indent/args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: args.c,v 1.8 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: args.c,v 1.9 2002/02/16 21:27:47 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -38,7 +38,7 @@ #ifndef lint /*static char sccsid[] = "@(#)args.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: args.c,v 1.8 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: args.c,v 1.9 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ /* @@ -157,8 +157,8 @@ struct pro { { 0, 0, 0, 0, 0 } }; -void scan_profile __P((FILE *)); -void set_option __P((char *)); +void scan_profile(FILE *); +void set_option(char *); /* * set_profile reads $HOME/.indent.pro and ./.indent.pro and handles arguments diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h index 34d6c57e9f1..59d53c79f53 100644 --- a/usr.bin/indent/indent_globs.h +++ b/usr.bin/indent/indent_globs.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: indent_globs.h,v 1.6 2001/06/25 04:58:31 pjanzen Exp $*/ +/* * $OpenBSD: indent_globs.h,v 1.7 2002/02/16 21:27:47 millert Exp $*/ /* * Copyright (c) 1985 Sun Microsystems, Inc. * Copyright (c) 1980, 1993 @@ -319,24 +319,24 @@ int rparen_count; struct parser_state state_stack[5]; struct parser_state match_state[5]; -int compute_code_target __P((void)); -int compute_label_target __P((void)); -int count_spaces __P((int, char *)); -void diag __P((int, char *, ...)); -void dump_line __P((void)); -int eqin __P((char *, char *)); -void fill_buffer __P((void)); -int pad_output __P((int, int)); -void scan_profile __P((FILE *)); -void set_defaults __P((void)); -void set_option __P((char *)); -void addkey __P((char *, int)); -void set_profile __P((void)); -char *chfont __P((struct fstate *, struct fstate *, char *)); -void parsefont __P((struct fstate *, char *)); -void writefdef __P((struct fstate *, int)); -int lexi __P((void)); -void reduce __P((void)); -void parse __P((int)); -void pr_comment __P((void)); -void bakcopy __P((void)); +int compute_code_target(void); +int compute_label_target(void); +int count_spaces(int, char *); +void diag(int, char *, ...); +void dump_line(void); +int eqin(char *, char *); +void fill_buffer(void); +int pad_output(int, int); +void scan_profile(FILE *); +void set_defaults(void); +void set_option(char *); +void addkey(char *, int); +void set_profile(void); +char *chfont(struct fstate *, struct fstate *, char *); +void parsefont(struct fstate *, char *); +void writefdef(struct fstate *, int); +int lexi(void); +void reduce(void); +void parse(int); +void pr_comment(void); +void bakcopy(void); diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c index b5dc75b3eb3..cdfead8ad8c 100644 --- a/usr.bin/ipcrm/ipcrm.c +++ b/usr.bin/ipcrm/ipcrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipcrm.c,v 1.3 1997/09/11 07:59:01 deraadt Exp $*/ +/* $OpenBSD: ipcrm.c,v 1.4 2002/02/16 21:27:47 millert Exp $*/ /* * Copyright (c) 1994 Adam Glass @@ -50,11 +50,11 @@ int signaled; -void usage __P((void)); -int msgrm __P((key_t, int)); -int shmrm __P((key_t, int)); -int semrm __P((key_t, int)); -void not_configured __P((int)); +void usage(void); +int msgrm(key_t, int); +int shmrm(key_t, int); +int semrm(key_t, int); +void not_configured(int); void usage() diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index a49fc67bb7c..00b1d43ed5d 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: join.c,v 1.13 2001/01/29 01:57:59 niklas Exp $ */ +/* $OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */ -static char rcsid[] = "$OpenBSD: join.c,v 1.13 2001/01/29 01:57:59 niklas Exp $"; +static char rcsid[] = "$OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -103,16 +103,16 @@ int spans = 1; /* span multiple delimiters (-t) */ char *empty; /* empty field replacement string (-e) */ char *tabchar = " \t"; /* delimiter characters (-t) */ -int cmp __P((LINE *, u_long, LINE *, u_long)); -void fieldarg __P((char *)); -void joinlines __P((INPUT *, INPUT *)); -void obsolete __P((char **)); -void outfield __P((LINE *, u_long, int)); -void outoneline __P((INPUT *, LINE *)); -void outtwoline __P((INPUT *, LINE *, INPUT *, LINE *)); -void slurp __P((INPUT *)); -void slurpit __P((INPUT *)); -void usage __P((void)); +int cmp(LINE *, u_long, LINE *, u_long); +void fieldarg(char *); +void joinlines(INPUT *, INPUT *); +void obsolete(char **); +void outfield(LINE *, u_long, int); +void outoneline(INPUT *, LINE *); +void outtwoline(INPUT *, LINE *, INPUT *, LINE *); +void slurp(INPUT *); +void slurpit(INPUT *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c index 69502c46bf5..34fb117e0cb 100644 --- a/usr.bin/jot/jot.c +++ b/usr.bin/jot/jot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jot.c,v 1.8 2001/03/08 01:39:17 pjanzen Exp $ */ +/* $OpenBSD: jot.c,v 1.9 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: jot.c,v 1.8 2001/03/08 01:39:17 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: jot.c,v 1.9 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ /* @@ -82,11 +82,11 @@ int nofinalnl; char sepstring[BUFSIZ] = "\n"; char format[BUFSIZ]; -void getargs __P((int, char *[])); -void getformat __P((void)); -int getprec __P((char *)); -void putdata __P((double, long)); -static void usage __P((void)); +void getargs(int, char *[]); +void getformat(void); +int getprec(char *); +void putdata(double, long); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 4e8a11abf45..c212e649b72 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kdump.c,v 1.12 2001/08/18 00:48:57 espie Exp $ */ +/* $OpenBSD: kdump.c,v 1.13 2002/02/16 21:27:47 millert Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95"; #endif -static char *rcsid = "$OpenBSD: kdump.c,v 1.12 2001/08/18 00:48:57 espie Exp $"; +static char *rcsid = "$OpenBSD: kdump.c,v 1.13 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -145,17 +145,17 @@ static char *ptrace_ops[] = { "PT_KILL", "PT_ATTACH", "PT_DETACH", }; -static int fread_tail __P((void *, int, int)); -static void dumpheader __P((struct ktr_header *)); -static void ktrcsw __P((struct ktr_csw *)); -static void ktremul __P((char *, int)); -static void ktrgenio __P((struct ktr_genio *, int)); -static void ktrnamei __P((const char *, int)); -static void ktrpsig __P((struct ktr_psig *)); -static void ktrsyscall __P((struct ktr_syscall *)); -static void ktrsysret __P((struct ktr_sysret *)); -static void setemul __P((const char *)); -static void usage __P((void)); +static int fread_tail(void *, int, int); +static void dumpheader(struct ktr_header *); +static void ktrcsw(struct ktr_csw *); +static void ktremul(char *, int); +static void ktrgenio(struct ktr_genio *, int); +static void ktrnamei(const char *, int); +static void ktrpsig(struct ktr_psig *); +static void ktrsyscall(struct ktr_syscall *); +static void ktrsysret(struct ktr_sysret *); +static void setemul(const char *); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/ktrace/extern.h b/usr.bin/ktrace/extern.h index b64675c9a9e..2a8a42150da 100644 --- a/usr.bin/ktrace/extern.h +++ b/usr.bin/ktrace/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.1 2001/08/18 00:48:57 espie Exp $ */ +/* $OpenBSD: extern.h,v 1.2 2002/02/16 21:27:47 millert Exp $ */ /* * Copyright (c) 2001 Marc Espie. @@ -25,5 +25,5 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -extern int getpoints __P((const char *)); -extern const char *ioctlname __P((unsigned long)); +extern int getpoints(const char *); +extern const char *ioctlname(unsigned long); diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index c900f02f2fe..1428d0afcc5 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ktrace.c,v 1.12 2001/11/14 20:00:48 deraadt Exp $ */ +/* $OpenBSD: ktrace.c,v 1.13 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95"; #endif -static char *rcsid = "$OpenBSD: ktrace.c,v 1.12 2001/11/14 20:00:48 deraadt Exp $"; +static char *rcsid = "$OpenBSD: ktrace.c,v 1.13 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -63,9 +63,9 @@ static char *rcsid = "$OpenBSD: ktrace.c,v 1.12 2001/11/14 20:00:48 deraadt Exp #include "ktrace.h" #include "extern.h" -static int rpid __P((const char *)); -static void no_ktrace __P((int)); -static void usage __P((void)); +static int rpid(const char *); +static void no_ktrace(int); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c index c8f814e1e6e..4630c4dde30 100644 --- a/usr.bin/lam/lam.c +++ b/usr.bin/lam/lam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lam.c,v 1.3 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: lam.c,v 1.4 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: lam.c,v 1.3 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: lam.c,v 1.4 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ /* @@ -73,10 +73,10 @@ int nofinalnl; /* normally append \n to each output line */ char line[BIGBUFSIZ]; char *linep; -void error __P((char *, char *)); -char *gatherline __P((struct openfile *)); -void getargs __P((char *[])); -char *pad __P((struct openfile *)); +void error(char *, char *); +char *gatherline(struct openfile *); +void getargs(char *[]); +char *pad(struct openfile *); int main(argc, argv) diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index fed6ba32329..290450739d3 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -1,4 +1,4 @@ -/* $OpenBSD: last.c,v 1.18 2002/02/04 17:40:59 mickey Exp $ */ +/* $OpenBSD: last.c,v 1.19 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94"; #endif -static char rcsid[] = "$OpenBSD: last.c,v 1.18 2002/02/04 17:40:59 mickey Exp $"; +static char rcsid[] = "$OpenBSD: last.c,v 1.19 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -96,15 +96,15 @@ static time_t snaptime; /* if != 0, we will only static int calculate = 0; static int seconds = 0; -void addarg __P((int, char *)); -TTY *addtty __P((char *)); -void hostconv __P((char *)); -void onintr __P((int)); -char *ttyconv __P((char *)); -time_t dateconv __P((char *)); -int want __P((struct utmp *, int)); -void wtmp __P((void)); -void checkargs __P((void)); +void addarg(int, char *); +TTY *addtty(char *); +void hostconv(char *); +void onintr(int); +char *ttyconv(char *); +time_t dateconv(char *); +int want(struct utmp *, int); +void wtmp(void); +void checkargs(void); #define NAME_WIDTH 8 #define HOST_WIDTH 24 diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c index 3201324fed3..62bee36377a 100644 --- a/usr.bin/lastcomm/lastcomm.c +++ b/usr.bin/lastcomm/lastcomm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lastcomm.c,v 1.9 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: lastcomm.c,v 1.10 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95"; #endif -static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.9 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.10 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -64,11 +64,11 @@ static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.9 2001/11/19 19:02:14 mpech Exp #include <utmp.h> #include "pathnames.h" -time_t expand __P((u_int)); -char *flagbits __P((int)); -char *getdev __P((dev_t)); -int requested __P((char *[], struct acct *)); -void usage __P((void)); +time_t expand(u_int); +char *flagbits(int); +char *getdev(dev_t); +int requested(char *[], struct acct *); +void usage(void); char *user_from_uid(); int diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c index ebcd162580d..74d41b6fa13 100644 --- a/usr.bin/leave/leave.c +++ b/usr.bin/leave/leave.c @@ -1,4 +1,4 @@ -/* $OpenBSD: leave.c,v 1.6 2001/11/19 19:02:14 mpech Exp $ */ +/* $OpenBSD: leave.c,v 1.7 2002/02/16 21:27:47 millert Exp $ */ /* $NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: leave.c,v 1.6 2001/11/19 19:02:14 mpech Exp $"; +static char rcsid[] = "$OpenBSD: leave.c,v 1.7 2002/02/16 21:27:47 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -54,8 +54,8 @@ static char rcsid[] = "$OpenBSD: leave.c,v 1.6 2001/11/19 19:02:14 mpech Exp $"; #include <stdio.h> #include <ctype.h> -void usage __P((void)); -void doalarm __P((u_int secs)); +void usage(void); +void doalarm(u_int secs); /* * leave [[+]hhmm] diff --git a/usr.bin/lex/libmain.c b/usr.bin/lex/libmain.c index 80b9169904e..d42014e02df 100644 --- a/usr.bin/lex/libmain.c +++ b/usr.bin/lex/libmain.c @@ -1,13 +1,13 @@ -/* $OpenBSD: libmain.c,v 1.4 1996/12/14 07:07:56 tholo Exp $ */ +/* $OpenBSD: libmain.c,v 1.5 2002/02/16 21:27:47 millert Exp $ */ /* libmain - flex run-time support library "main" function */ -/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.4 1996/12/14 07:07:56 tholo Exp $ */ +/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libmain.c,v 1.5 2002/02/16 21:27:47 millert Exp $ */ #include <sys/cdefs.h> -int yylex __P((void)); -int main __P((int, char **, char **)); +int yylex(void); +int main(int, char **, char **); /* ARGSUSED */ int diff --git a/usr.bin/lex/libyywrap.c b/usr.bin/lex/libyywrap.c index 0861ff80cc0..a45ac10dcc5 100644 --- a/usr.bin/lex/libyywrap.c +++ b/usr.bin/lex/libyywrap.c @@ -1,12 +1,12 @@ -/* $OpenBSD: libyywrap.c,v 1.4 1996/12/10 22:22:03 millert Exp $ */ +/* $OpenBSD: libyywrap.c,v 1.5 2002/02/16 21:27:47 millert Exp $ */ /* libyywrap - flex run-time support library "yywrap" function */ -/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.4 1996/12/10 22:22:03 millert Exp $ */ +/* $Header: /cvs/OpenBSD/src/usr.bin/lex/libyywrap.c,v 1.5 2002/02/16 21:27:47 millert Exp $ */ #include <sys/cdefs.h> -int yywrap __P((void)); +int yywrap(void); int yywrap() diff --git a/usr.bin/lndir/lndir.c b/usr.bin/lndir/lndir.c index fe46cc7a7ad..e8ccefd5f36 100644 --- a/usr.bin/lndir/lndir.c +++ b/usr.bin/lndir/lndir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lndir.c,v 1.6 2001/07/04 04:56:15 jasoni Exp $ */ +/* $OpenBSD: lndir.c,v 1.7 2002/02/16 21:27:47 millert Exp $ */ /* $XConsortium: lndir.c /main/15 1995/08/30 10:56:18 gildea $ */ /* @@ -67,10 +67,10 @@ int ignore_links = 0; /* -ignorelinks */ char *rcurdir; char *curdir; -int equivalent __P((char *, char *)); -void addexcept __P((char *)); -int dodir __P((char *, struct stat *, struct stat *, int)); -void usage __P((void)); +int equivalent(char *, char *); +void addexcept(char *); +int dodir(char *, struct stat *, struct stat *, int); +void usage(void); struct except { char *name; diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c index 26056bd23a7..a62002bde57 100644 --- a/usr.bin/locate/code/locate.code.c +++ b/usr.bin/locate/code/locate.code.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $ + * $OpenBSD: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $ * * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $ + * $Id: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $ */ #ifndef lint @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)locate.code.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: locate.code.c,v 1.8 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -119,11 +119,11 @@ bg_t big[UCHAR_MAX + 1][UCHAR_MAX + 1]; #else #define BGINDEX(x) bgindex(x) typedef int bg_t; -int bgindex __P((char *)); +int bgindex(char *); #endif /* LOOKUP */ -void usage __P((void)); +void usage(void); extern int optind; extern int optopt; diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c index c23a17fc04a..994055f1171 100644 --- a/usr.bin/locate/locate/locate.c +++ b/usr.bin/locate/locate/locate.c @@ -1,5 +1,5 @@ /* - * $OpenBSD: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $ + * $OpenBSD: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $ * * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. * Copyright (c) 1989, 1993 @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $ + * $Id: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $ */ #ifndef lint @@ -50,7 +50,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: locate.c,v 1.10 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: locate.c,v 1.11 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -126,23 +126,23 @@ int f_limit; /* limit number of output lines, 0 == infinite */ u_int counter; /* counter for matches [-c] */ -void usage __P((void)); -void statistic __P((FILE *, char *)); -void fastfind __P((FILE *, char *, char *)); -void fastfind_icase __P((FILE *, char *, char *)); -void fastfind_mmap __P((char *, caddr_t, int, char *)); -void fastfind_mmap_icase __P((char *, caddr_t, int, char *)); -void search_mmap __P((char *, char **)); -void search_fopen __P((char *, char **)); -unsigned long cputime __P((void)); - -extern char **colon __P((char **, char*, char*)); -extern void print_matches __P((u_int)); -extern int getwm __P((caddr_t)); -extern int getwf __P((FILE *)); -extern u_char *tolower_word __P((u_char *)); -extern int check_bigram_char __P((int)); -extern char *patprep __P((char *)); +void usage(void); +void statistic(FILE *, char *); +void fastfind(FILE *, char *, char *); +void fastfind_icase(FILE *, char *, char *); +void fastfind_mmap(char *, caddr_t, int, char *); +void fastfind_mmap_icase(char *, caddr_t, int, char *); +void search_mmap(char *, char **); +void search_fopen(char *, char **); +unsigned long cputime(void); + +extern char **colon(char **, char*, char*); +extern void print_matches(u_int); +extern int getwm(caddr_t); +extern int getwf(FILE *); +extern u_char *tolower_word(u_char *); +extern int check_bigram_char(int); +extern char *patprep(char *); extern char *optarg; extern int optind; diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c index cc0d7fed25f..839b03791e0 100644 --- a/usr.bin/locate/locate/util.c +++ b/usr.bin/locate/locate/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.4 2001/11/19 19:02:15 mpech Exp $ +/* $OpenBSD: util.c,v 1.5 2002/02/16 21:27:48 millert Exp $ * * Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. * Copyright (c) 1989, 1993 @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: util.c,v 1.4 2001/11/19 19:02:15 mpech Exp $ + * $Id: util.c,v 1.5 2002/02/16 21:27:48 millert Exp $ */ @@ -47,13 +47,13 @@ #include "locate.h" -char **colon __P((char **, char*, char*)); -char *patprep __P((char *)); -void print_matches __P((u_int)); -u_char *tolower_word __P((u_char *)); -int getwm __P((caddr_t)); -int getwf __P((FILE *)); -int check_bigram_char __P((int)); +char **colon(char **, char*, char*); +char *patprep(char *); +void print_matches(u_int); +u_char *tolower_word(u_char *); +int getwm(caddr_t); +int getwf(FILE *); +int check_bigram_char(int); /* * Validate bigram chars. If the test failed the database is corrupt diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 6ce6c456dc3..f226cc96a79 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.c,v 1.14 2001/11/02 16:25:11 deraadt Exp $ */ +/* $OpenBSD: lock.c,v 1.15 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: lock.c,v 1.14 2001/11/02 16:25:11 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lock.c,v 1.15 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ /* @@ -78,8 +78,8 @@ static char rcsid[] = "$OpenBSD: lock.c,v 1.14 2001/11/02 16:25:11 deraadt Exp $ #define TIMEOUT 15 -void bye __P((int)); -void hi __P((int)); +void bye(int); +void hi(int); struct timeval timeout; struct timeval zerotime; diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index 3bf67f0b0d4..a29b71472f9 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logger.c,v 1.4 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: logger.c,v 1.5 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: logger.c,v 1.4 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: logger.c,v 1.5 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ #include <errno.h> @@ -57,9 +57,9 @@ static char rcsid[] = "$OpenBSD: logger.c,v 1.4 2001/11/19 19:02:15 mpech Exp $" #define SYSLOG_NAMES #include <syslog.h> -int decode __P((char *, CODE *)); -int pencode __P((char *)); -void usage __P((void)); +int decode(char *, CODE *); +int pencode(char *); +void usage(void); /* * logger -- read and log utility diff --git a/usr.bin/login/failedlogin.c b/usr.bin/login/failedlogin.c index 7b3fd4e295c..b54dabf754a 100644 --- a/usr.bin/login/failedlogin.c +++ b/usr.bin/login/failedlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: failedlogin.c,v 1.10 2001/07/06 18:12:05 pvalchev Exp $ */ +/* $OpenBSD: failedlogin.c,v 1.11 2002/02/16 21:27:48 millert Exp $ */ /* * Copyright (c) 1996 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: failedlogin.c,v 1.10 2001/07/06 18:12:05 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: failedlogin.c,v 1.11 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ /* @@ -58,8 +58,8 @@ struct badlogin { size_t count; /* number of bad logins */ }; -void log_failedlogin __P((uid_t, char *, char *, char *)); -int check_failedlogin __P((uid_t)); +void log_failedlogin(uid_t, char *, char *, char *); +int check_failedlogin(uid_t); /* * Log a bad login to the failedlogin file. diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 3a2db0d9954..1eddd99d53e 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login.c,v 1.44 2002/01/06 21:59:15 millert Exp $ */ +/* $OpenBSD: login.c,v 1.45 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */ /*- @@ -77,7 +77,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94"; #endif -static char rcsid[] = "$OpenBSD: login.c,v 1.44 2002/01/06 21:59:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: login.c,v 1.45 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ /* @@ -120,21 +120,21 @@ static char rcsid[] = "$OpenBSD: login.c,v 1.44 2002/01/06 21:59:15 millert Exp #include "pathnames.h" -void badlogin __P((char *)); -void dolastlog __P((int)); -void getloginname __P((void)); -void motd __P((void)); -void quickexit __P((int)); -int rootterm __P((char *)); -void sigint __P((int)); -void sighup __P((int)); -void sleepexit __P((int)); -char *stypeof __P((char *)); -void timedout __P((int)); -int main __P((int, char **)); - -extern int check_failedlogin __P((uid_t)); -extern void log_failedlogin __P((uid_t, char *, char *, char *)); +void badlogin(char *); +void dolastlog(int); +void getloginname(void); +void motd(void); +void quickexit(int); +int rootterm(char *); +void sigint(int); +void sighup(int); +void sleepexit(int); +char *stypeof(char *); +void timedout(int); +int main(int, char **); + +extern int check_failedlogin(uid_t); +extern void log_failedlogin(uid_t, char *, char *, char *); #define TTYGRPNAME "tty" /* name of group to own ttys */ diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c index 3978fa9d225..cd4e189aa5b 100644 --- a/usr.bin/logname/logname.c +++ b/usr.bin/logname/logname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: logname.c,v 1.3 1997/01/15 23:42:47 millert Exp $ */ +/* $OpenBSD: logname.c,v 1.4 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94"; #endif -static char rcsid[] = "$OpenBSD: logname.c,v 1.3 1997/01/15 23:42:47 millert Exp $"; +static char rcsid[] = "$OpenBSD: logname.c,v 1.4 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: logname.c,v 1.3 1997/01/15 23:42:47 millert Exp #include <unistd.h> #include <err.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c index 7d223deb2e1..b8c3335fdd0 100644 --- a/usr.bin/look/look.c +++ b/usr.bin/look/look.c @@ -1,4 +1,4 @@ -/* $OpenBSD: look.c,v 1.6 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: look.c,v 1.7 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: look.c,v 1.6 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: look.c,v 1.7 2002/02/16 21:27:48 millert Exp $"; #endif /* not lint */ /* @@ -91,12 +91,12 @@ static char rcsid[] = "$OpenBSD: look.c,v 1.6 2001/11/19 19:02:15 mpech Exp $"; int dflag, fflag; -char *binary_search __P((char *, char *, char *)); -int compare __P((char *, char *, char *)); -char *linear_search __P((char *, char *, char *)); -int look __P((char *, char *, char *)); -void print_from __P((char *, char *, char *)); -void usage __P((void)); +char *binary_search(char *, char *, char *); +int compare(char *, char *, char *); +char *linear_search(char *, char *, char *); +int look(char *, char *, char *); +void print_from(char *, char *, char *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 1ee3d1ff244..870bffdeb89 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eval.c,v 1.42 2001/12/28 13:03:05 espie Exp $ */ +/* $OpenBSD: eval.c,v 1.43 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)eval.c 8.2 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: eval.c,v 1.42 2001/12/28 13:03:05 espie Exp $"; +static char rcsid[] = "$OpenBSD: eval.c,v 1.43 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -67,25 +67,25 @@ static char rcsid[] = "$OpenBSD: eval.c,v 1.42 2001/12/28 13:03:05 espie Exp $"; #define BUILTIN_MARKER "__builtin_" -static void dodefn __P((const char *)); -static void dopushdef __P((const char *, const char *)); -static void dodump __P((const char *[], int)); -static void dotrace __P((const char *[], int, int)); -static void doifelse __P((const char *[], int)); -static int doincl __P((const char *)); -static int dopaste __P((const char *)); -static void gnu_dochq __P((const char *[], int)); -static void dochq __P((const char *[], int)); -static void gnu_dochc __P((const char *[], int)); -static void dochc __P((const char *[], int)); -static void dodiv __P((int)); -static void doundiv __P((const char *[], int)); -static void dosub __P((const char *[], int)); -static void map __P((char *, const char *, const char *, const char *)); -static const char *handledash __P((char *, char *, const char *)); -static void expand_builtin __P((const char *[], int, int)); -static void expand_macro __P((const char *[], int)); -static void dump_one_def __P((ndptr)); +static void dodefn(const char *); +static void dopushdef(const char *, const char *); +static void dodump(const char *[], int); +static void dotrace(const char *[], int, int); +static void doifelse(const char *[], int); +static int doincl(const char *); +static int dopaste(const char *); +static void gnu_dochq(const char *[], int); +static void dochq(const char *[], int); +static void gnu_dochc(const char *[], int); +static void dochc(const char *[], int); +static void dodiv(int); +static void doundiv(const char *[], int); +static void dosub(const char *[], int); +static void map(char *, const char *, const char *, const char *); +static const char *handledash(char *, char *, const char *); +static void expand_builtin(const char *[], int, int); +static void expand_macro(const char *[], int); +static void dump_one_def(ndptr); unsigned long expansion_id; diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c index b6f280d40a6..d73e7123d8f 100644 --- a/usr.bin/m4/expr.c +++ b/usr.bin/m4/expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $ */ +/* $OpenBSD: expr.c,v 1.12 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95"; #else -static char rcsid[] = "$OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $"; +static char rcsid[] = "$OpenBSD: expr.c,v 1.12 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -110,22 +110,22 @@ static char rcsid[] = "$OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $"; static const char *nxtch; /* Parser scan pointer */ static const char *where; -static int query __P((void)); -static int lor __P((void)); -static int land __P((void)); -static int not __P((void)); -static int eqrel __P((void)); -static int shift __P((void)); -static int primary __P((void)); -static int term __P((void)); -static int exp __P((void)); -static int unary __P((void)); -static int factor __P((void)); -static int constant __P((void)); -static int num __P((void)); -static int geteqrel __P((void)); -static int skipws __P((void)); -static void experr __P((const char *)); +static int query(void); +static int lor(void); +static int land(void); +static int not(void); +static int eqrel(void); +static int shift(void); +static int primary(void); +static int term(void); +static int exp(void); +static int unary(void); +static int factor(void); +static int constant(void); +static int num(void); +static int geteqrel(void); +static int skipws(void); +static void experr(const char *); /* * For longjmp diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h index 7bf70527d8c..9170fa89c04 100644 --- a/usr.bin/m4/extern.h +++ b/usr.bin/m4/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.28 2001/10/10 18:12:00 espie Exp $ */ +/* $OpenBSD: extern.h,v 1.29 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */ /*- @@ -40,60 +40,60 @@ */ /* eval.c */ -extern void eval __P((const char *[], int, int)); -extern void dodefine __P((const char *, const char *)); +extern void eval(const char *[], int, int); +extern void dodefine(const char *, const char *); extern unsigned long expansion_id; /* expr.c */ -extern int expr __P((const char *)); +extern int expr(const char *); /* gnum4.c */ -extern void addtoincludepath __P((const char *)); -extern struct input_file *fopen_trypath __P((struct input_file *, const char *)); -extern void doindir __P((const char *[], int)); -extern void dobuiltin __P((const char *[], int)); -extern void dopatsubst __P((const char *[], int)); -extern void doregexp __P((const char *[], int)); +extern void addtoincludepath(const char *); +extern struct input_file *fopen_trypath(struct input_file *, const char *); +extern void doindir(const char *[], int); +extern void dobuiltin(const char *[], int); +extern void dopatsubst(const char *[], int); +extern void doregexp(const char *[], int); -extern void doprintlineno __P((struct input_file *)); -extern void doprintfilename __P((struct input_file *)); +extern void doprintlineno(struct input_file *); +extern void doprintfilename(struct input_file *); -extern void doesyscmd __P((const char *)); +extern void doesyscmd(const char *); /* look.c */ -extern ndptr addent __P((const char *)); -extern unsigned hash __P((const char *)); -extern ndptr lookup __P((const char *)); -extern void remhash __P((const char *, int)); +extern ndptr addent(const char *); +extern unsigned hash(const char *); +extern ndptr lookup(const char *); +extern void remhash(const char *, int); /* main.c */ -extern void outputstr __P((const char *)); -extern int builtin_type __P((const char *)); -extern char *builtin_realname __P((int)); +extern void outputstr(const char *); +extern int builtin_type(const char *); +extern char *builtin_realname(int); /* misc.c */ -extern void chrsave __P((int)); -extern char *compute_prevep __P((void)); -extern void getdiv __P((int)); -extern ptrdiff_t indx __P((const char *, const char *)); -extern void initspaces __P((void)); -extern void killdiv __P((void)); -extern void onintr __P((int)); -extern void pbnum __P((int)); -extern void pbunsigned __P((unsigned long)); -extern void pbstr __P((const char *)); -extern void putback __P((int)); -extern void *xalloc __P((size_t)); -extern char *xstrdup __P((const char *)); -extern void usage __P((void)); -extern void resizedivs __P((int)); -extern size_t buffer_mark __P((void)); -extern void dump_buffer __P((FILE *, size_t)); +extern void chrsave(int); +extern char *compute_prevep(void); +extern void getdiv(int); +extern ptrdiff_t indx(const char *, const char *); +extern void initspaces(void); +extern void killdiv(void); +extern void onintr(int); +extern void pbnum(int); +extern void pbunsigned(unsigned long); +extern void pbstr(const char *); +extern void putback(int); +extern void *xalloc(size_t); +extern char *xstrdup(const char *); +extern void usage(void); +extern void resizedivs(int); +extern size_t buffer_mark(void); +extern void dump_buffer(FILE *, size_t); -extern int obtain_char __P((struct input_file *)); -extern void set_input __P((struct input_file *, FILE *, const char *)); -extern void release_input __P((struct input_file *)); +extern int obtain_char(struct input_file *); +extern void set_input(struct input_file *, FILE *, const char *); +extern void release_input(struct input_file *); /* speeded-up versions of chrsave/putback */ #define PUTBACK(c) \ @@ -111,19 +111,19 @@ extern void release_input __P((struct input_file *)); } while(0) /* and corresponding exposure for local symbols */ -extern void enlarge_bufspace __P((void)); -extern void enlarge_strspace __P((void)); +extern void enlarge_bufspace(void); +extern void enlarge_strspace(void); extern char *endpbb; extern char *endest; /* trace.c */ -extern void mark_traced __P((const char *, int)); -extern int is_traced __P((const char *)); -extern void trace_file __P((const char *)); -extern ssize_t trace __P((const char **, int, struct input_file *)); -extern void finish_trace __P((size_t)); +extern void mark_traced(const char *, int); +extern int is_traced(const char *); +extern void trace_file(const char *); +extern ssize_t trace(const char **, int, struct input_file *); +extern void finish_trace(size_t); extern int traced_macros; -extern void set_trace_flags __P((const char *)); +extern void set_trace_flags(const char *); extern FILE *traceout; extern ndptr hashtab[]; /* hash table for macros etc. */ diff --git a/usr.bin/m4/gnum4.c b/usr.bin/m4/gnum4.c index 8a6eea343ad..782090d3a0e 100644 --- a/usr.bin/m4/gnum4.c +++ b/usr.bin/m4/gnum4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gnum4.c,v 1.15 2001/10/13 20:18:48 espie Exp $ */ +/* $OpenBSD: gnum4.c,v 1.16 2002/02/16 21:27:48 millert Exp $ */ /* * Copyright (c) 1999 Marc Espie @@ -62,9 +62,9 @@ struct path_entry { struct path_entry *next; } *first, *last; -static struct path_entry *new_path_entry __P((const char *)); -static void ensure_m4path __P((void)); -static struct input_file *dopath __P((struct input_file *, const char *)); +static struct path_entry *new_path_entry(const char *); +static void ensure_m4path(void); +static struct input_file *dopath(struct input_file *, const char *); static struct path_entry * new_path_entry(dirname) @@ -197,16 +197,16 @@ static char *buffer; static size_t bufsize = 0; static size_t current = 0; -static void addchars __P((const char *, size_t)); -static void addchar __P((char)); -static char *twiddle __P((const char *)); -static char *getstring __P((void)); -static void exit_regerror __P((int, regex_t *)); -static void do_subst __P((const char *, regex_t *, const char *, regmatch_t *)); -static void do_regexpindex __P((const char *, regex_t *, regmatch_t *)); -static void do_regexp __P((const char *, regex_t *, const char *, regmatch_t *)); -static void add_sub __P((int, const char *, regex_t *, regmatch_t *)); -static void add_replace __P((const char *, regex_t *, const char *, regmatch_t *)); +static void addchars(const char *, size_t); +static void addchar(char); +static char *twiddle(const char *); +static char *getstring(void); +static void exit_regerror(int, regex_t *); +static void do_subst(const char *, regex_t *, const char *, regmatch_t *); +static void do_regexpindex(const char *, regex_t *, regmatch_t *); +static void do_regexp(const char *, regex_t *, const char *, regmatch_t *); +static void add_sub(int, const char *, regex_t *, regmatch_t *); +static void add_replace(const char *, regex_t *, const char *, regmatch_t *); #define addconstantstring(s) addchars((s), sizeof(s)-1) static void diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c index b153e95e45c..ffb58e05167 100644 --- a/usr.bin/m4/look.c +++ b/usr.bin/m4/look.c @@ -1,4 +1,4 @@ -/* $OpenBSD: look.c,v 1.8 2001/09/17 08:11:13 espie Exp $ */ +/* $OpenBSD: look.c,v 1.9 2002/02/16 21:27:48 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -55,7 +55,7 @@ static char sccsid[] = "@(#)look.c 8.1 (Berkeley) 6/6/93"; #include "stdd.h" #include "extern.h" -static void freent __P((ndptr)); +static void freent(ndptr); unsigned hash(name) diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index d9d5503dc26..644b8978844 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.51 2001/10/06 10:52:25 espie Exp $ */ +/* $OpenBSD: main.c,v 1.52 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.51 2001/10/06 10:52:25 espie Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.52 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -159,17 +159,17 @@ static struct position { unsigned long line; } quotes[MAXRECORD], paren[MAXRECORD]; -static void record __P((struct position *, int)); -static void dump_stack __P((struct position *, int)); +static void record(struct position *, int); +static void dump_stack(struct position *, int); -static void macro __P((void)); -static void initkwds __P((void)); -static ndptr inspect __P((int, char *)); -static int do_look_ahead __P((int, const char *)); +static void macro(void); +static void initkwds(void); +static ndptr inspect(int, char *); +static int do_look_ahead(int, const char *); -static void enlarge_stack __P((void)); +static void enlarge_stack(void); -int main __P((int, char *[])); +int main(int, char *[]); int main(argc,argv) diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c index f24bcaa0613..231667edd36 100644 --- a/usr.bin/m4/trace.c +++ b/usr.bin/m4/trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trace.c,v 1.3 2001/09/29 15:47:18 espie Exp $ */ +/* $OpenBSD: trace.c,v 1.4 2002/02/16 21:27:48 millert Exp $ */ /* * Copyright (c) 2001 Marc Espie. * @@ -54,10 +54,10 @@ static struct t { int on; } *l; -static unsigned int letter_to_flag __P((int)); -static void print_header __P((struct input_file *)); -static struct t *find_trace_entry __P((const char *)); -static int frame_level __P((void)); +static unsigned int letter_to_flag(int); +static void print_header(struct input_file *); +static struct t *find_trace_entry(const char *); +static int frame_level(void); static unsigned int flags = TRACE_QUOTE | TRACE_EXPANSION; diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h index 0035ca9918d..6e2a80c53b9 100644 --- a/usr.bin/mail/def.h +++ b/usr.bin/mail/def.h @@ -1,4 +1,4 @@ -/* $OpenBSD: def.h,v 1.9 2001/11/21 15:26:39 millert Exp $ */ +/* $OpenBSD: def.h,v 1.10 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: def.h,v 1.9 1996/12/28 07:11:00 tls Exp $ */ /* @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)def.h 8.4 (Berkeley) 4/20/95 - * $OpenBSD: def.h,v 1.9 2001/11/21 15:26:39 millert Exp $ + * $OpenBSD: def.h,v 1.10 2002/02/16 21:27:48 millert Exp $ */ /* @@ -112,8 +112,8 @@ struct cmd { char *c_name; /* Name of command */ union { int (*c_func0)(); - int (*c_func1) __P((void *)); - int (*c_func2) __P((void *, void *)); + int (*c_func1)(void *); + int (*c_func2)(void *, void *); } cfunc; /* Implementor of the command */ #define c_func cfunc.c_func1 #define c_func2 cfunc.c_func2 diff --git a/usr.bin/man/config.h b/usr.bin/man/config.h index 6c64c037148..30cd97677bf 100644 --- a/usr.bin/man/config.h +++ b/usr.bin/man/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.2 1996/06/26 05:37:00 deraadt Exp $ */ +/* $OpenBSD: config.h,v 1.3 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: config.h,v 1.2 1995/09/28 06:05:28 tls Exp $ */ /*- @@ -54,7 +54,7 @@ typedef struct _entry { TAILQ_HEAD(_head, _tag); extern struct _head head; -TAG *addlist __P((char *)); -void config __P((char *)); -void debug __P((char *)); -TAG *getlist __P((char *)); +TAG *addlist(char *); +void config(char *); +void debug(char *); +TAG *getlist(char *); diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c index 96c277c39c8..dcb0ee8f612 100644 --- a/usr.bin/man/man.c +++ b/usr.bin/man/man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man.c,v 1.19 2001/11/17 03:09:44 deraadt Exp $ */ +/* $OpenBSD: man.c,v 1.20 2002/02/16 21:27:48 millert Exp $ */ /* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95"; #else -static char rcsid[] = "$OpenBSD: man.c,v 1.19 2001/11/17 03:09:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: man.c,v 1.20 2002/02/16 21:27:48 millert Exp $"; #endif #endif /* not lint */ @@ -72,15 +72,15 @@ static TAG *section; /* could be passed to cleanup() instead */ extern char *__progname; -static void build_page __P((char *, char **)); -static void cat __P((char *)); -static char *check_pager __P((char *)); -static int cleanup __P((void)); -static void how __P((char *)); -static void jump __P((char **, char *, char *)); -static int manual __P((char *, TAG *, glob_t *)); -static void onsig __P((int)); -static void usage __P((void)); +static void build_page(char *, char **); +static void cat(char *); +static char *check_pager(char *); +static int cleanup(void); +static void how(char *); +static void jump(char **, char *, char *); +static int manual(char *, TAG *, glob_t *); +static void onsig(int); +static void usage(void); sigset_t blocksigs; diff --git a/usr.bin/mg/basic.c b/usr.bin/mg/basic.c index e99ef337551..3ace2ab8540 100644 --- a/usr.bin/mg/basic.c +++ b/usr.bin/mg/basic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: basic.c,v 1.9 2002/02/14 22:50:43 vincent Exp $ */ +/* $OpenBSD: basic.c,v 1.10 2002/02/16 21:27:49 millert Exp $ */ /* * Basic cursor motion commands. @@ -11,7 +11,7 @@ */ #include "def.h" -void setgoal __P((void)); +void setgoal(void); /* * Go to beginning of line. diff --git a/usr.bin/mg/buffer.c b/usr.bin/mg/buffer.c index a18f0545e09..81d37423c8e 100644 --- a/usr.bin/mg/buffer.c +++ b/usr.bin/mg/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.21 2002/02/14 14:24:21 deraadt Exp $ */ +/* $OpenBSD: buffer.c,v 1.22 2002/02/16 21:27:49 millert Exp $ */ /* * Buffer handling. @@ -8,7 +8,7 @@ #include "kbd.h" /* needed for modes */ #include <stdarg.h> -static BUFFER *makelist __P((void)); +static BUFFER *makelist(void); /* * Attach a buffer to a window. The values of dot and mark come diff --git a/usr.bin/mg/def.h b/usr.bin/mg/def.h index 21378a2f94a..0ee13e9d86b 100644 --- a/usr.bin/mg/def.h +++ b/usr.bin/mg/def.h @@ -1,4 +1,4 @@ -/* $OpenBSD: def.h,v 1.28 2002/02/14 22:58:20 vincent Exp $ */ +/* $OpenBSD: def.h,v 1.29 2002/02/16 21:27:49 millert Exp $ */ /* * This file is the general header file for all parts @@ -256,293 +256,293 @@ typedef struct { */ /* tty.c X */ -void ttinit __P((void)); -void ttreinit __P((void)); -void tttidy __P((void)); -void ttmove __P((int, int)); -void tteeol __P((void)); -void tteeop __P((void)); -void ttbeep __P((void)); -void ttinsl __P((int, int, int)); -void ttdell __P((int, int, int)); -void ttwindow __P((int, int)); -void ttnowindow __P((void)); -void ttcolor __P((int)); -void ttresize __P((void)); +void ttinit(void); +void ttreinit(void); +void tttidy(void); +void ttmove(int, int); +void tteeol(void); +void tteeop(void); +void ttbeep(void); +void ttinsl(int, int, int); +void ttdell(int, int, int); +void ttwindow(int, int); +void ttnowindow(void); +void ttcolor(int); +void ttresize(void); /* ttyio.c */ -void ttopen __P((void)); -int ttraw __P((void)); -void ttclose __P((void)); -int ttcooked __P((void)); -int ttputc __P((int)); -void ttflush __P((void)); -int ttgetc __P((void)); -int ttwait __P((int)); -int typeahead __P((void)); +void ttopen(void); +int ttraw(void); +void ttclose(void); +int ttcooked(void); +int ttputc(int); +void ttflush(void); +int ttgetc(void); +int ttwait(int); +int typeahead(void); /* dir.c */ -void dirinit __P((void)); -int changedir __P((int, int)); -int showcwdir __P((int, int)); +void dirinit(void); +int changedir(int, int); +int showcwdir(int, int); /* dired.c */ -int dired __P((int, int)); -int d_otherwindow __P((int, int)); -int d_undel __P((int, int)); -int d_undelbak __P((int, int)); -int d_findfile __P((int, int)); -int d_ffotherwindow __P((int, int)); -int d_expunge __P((int, int)); -int d_copy __P((int, int)); -int d_del __P((int, int)); -int d_rename __P((int, int)); +int dired(int, int); +int d_otherwindow(int, int); +int d_undel(int, int); +int d_undelbak(int, int); +int d_findfile(int, int); +int d_ffotherwindow(int, int); +int d_expunge(int, int); +int d_copy(int, int); +int d_del(int, int); +int d_rename(int, int); /* file.c X */ -int fileinsert __P((int, int)); -int filevisit __P((int, int)); -int poptofile __P((int, int)); -BUFFER *findbuffer __P((char *)); -int readin __P((char *)); -int insertfile __P((char *, char *, int)); -int filewrite __P((int, int)); -int filesave __P((int, int)); -int buffsave __P((BUFFER *)); -int makebkfile __P((int, int)); -int writeout __P((BUFFER *, char *)); -void upmodes __P((BUFFER *)); +int fileinsert(int, int); +int filevisit(int, int); +int poptofile(int, int); +BUFFER *findbuffer(char *); +int readin(char *); +int insertfile(char *, char *, int); +int filewrite(int, int); +int filesave(int, int); +int buffsave(BUFFER *); +int makebkfile(int, int); +int writeout(BUFFER *, char *); +void upmodes(BUFFER *); /* line.c X */ -LINE *lalloc __P((int)); -int lrealloc __P((LINE *, int)); -void lfree __P((LINE *)); -void lchange __P((int)); -int linsert __P((int, int)); -int lnewline __P((void)); -int ldelete __P((RSIZE, int)); -int ldelnewline __P((void)); -int lreplace __P((RSIZE, char *, int)); -void kdelete __P((void)); -int kinsert __P((int, int)); -int kremove __P((int)); +LINE *lalloc(int); +int lrealloc(LINE *, int); +void lfree(LINE *); +void lchange(int); +int linsert(int, int); +int lnewline(void); +int ldelete(RSIZE, int); +int ldelnewline(void); +int lreplace(RSIZE, char *, int); +void kdelete(void); +int kinsert(int, int); +int kremove(int); /* window.c X */ -int reposition __P((int, int)); -int refresh __P((int, int)); -int nextwind __P((int, int)); -int prevwind __P((int, int)); -int onlywind __P((int, int)); -int splitwind __P((int, int)); -int enlargewind __P((int, int)); -int shrinkwind __P((int, int)); -int delwind __P((int, int)); -MGWIN *wpopup __P((void)); +int reposition(int, int); +int refresh(int, int); +int nextwind(int, int); +int prevwind(int, int); +int onlywind(int, int); +int splitwind(int, int); +int enlargewind(int, int); +int shrinkwind(int, int); +int delwind(int, int); +MGWIN *wpopup(void); /* buffer.c */ -BUFFER *bfind __P((char *, int)); -int poptobuffer __P((int, int)); -int killbuffer __P((int, int)); -int savebuffers __P((int, int)); -int listbuffers __P((int, int)); -int addlinef __P((BUFFER *, char *, ...)); +BUFFER *bfind(char *, int); +int poptobuffer(int, int); +int killbuffer(int, int); +int savebuffers(int, int); +int listbuffers(int, int); +int addlinef(BUFFER *, char *, ...); #define addline(bp, text) addlinef(bp, "%s", text) -int anycb __P((int)); -int bclear __P((BUFFER *)); -int showbuffer __P((BUFFER *, MGWIN *, int)); -MGWIN *popbuf __P((BUFFER *)); -int bufferinsert __P((int, int)); -int usebuffer __P((int, int)); -int notmodified __P((int, int)); -int popbuftop __P((BUFFER *)); +int anycb(int); +int bclear(BUFFER *); +int showbuffer(BUFFER *, MGWIN *, int); +MGWIN *popbuf(BUFFER *); +int bufferinsert(int, int); +int usebuffer(int, int); +int notmodified(int, int); +int popbuftop(BUFFER *); /* display.c */ -int vtresize __P((int, int, int)); -void vtinit __P((void)); -void vttidy __P((void)); -void update __P((void)); +int vtresize(int, int, int); +void vtinit(void); +void vttidy(void); +void update(void); /* echo.c X */ -void eerase __P((void)); -int eyorn __P((char *)); -int eyesno __P((char *)); -void ewprintf __P((const char *fmt, ...)); -int ereply __P((const char *, char *, int, ...)); -int eread __P((const char *, char *, int, int, ...)); -int getxtra __P((LIST *, LIST *, int, int)); -void free_file_list __P((LIST *)); +void eerase(void); +int eyorn(char *); +int eyesno(char *); +void ewprintf(const char *fmt, ...); +int ereply(const char *, char *, int, ...); +int eread(const char *, char *, int, int, ...); +int getxtra(LIST *, LIST *, int, int); +void free_file_list(LIST *); /* fileio.c */ -int ffropen __P((char *, BUFFER *)); -int ffwopen __P((char *, BUFFER *)); -int ffclose __P((BUFFER *)); -int ffputbuf __P((BUFFER *)); -int ffgetline __P((char *, int, int *)); -int fbackupfile __P((char *)); -char *adjustname __P((char *)); -char *startupfile __P((char *)); -int copy __P((char *, char *)); -BUFFER *dired_ __P((char *)); -int d_makename __P((LINE *, char *, int)); -LIST *make_file_list __P((char *)); +int ffropen(char *, BUFFER *); +int ffwopen(char *, BUFFER *); +int ffclose(BUFFER *); +int ffputbuf(BUFFER *); +int ffgetline(char *, int, int *); +int fbackupfile(char *); +char *adjustname(char *); +char *startupfile(char *); +int copy(char *, char *); +BUFFER *dired_(char *); +int d_makename(LINE *, char *, int); +LIST *make_file_list(char *); /* kbd.c X */ -int do_meta __P((int, int)); -int bsmap __P((int, int)); -void ungetkey __P((int)); -int getkey __P((int)); -int doin __P((void)); -int rescan __P((int, int)); -int universal_argument __P((int, int)); -int digit_argument __P((int, int)); -int negative_argument __P((int, int)); -int selfinsert __P((int, int)); -int quote __P((int, int)); +int do_meta(int, int); +int bsmap(int, int); +void ungetkey(int); +int getkey(int); +int doin(void); +int rescan(int, int); +int universal_argument(int, int); +int digit_argument(int, int); +int negative_argument(int, int); +int selfinsert(int, int); +int quote(int, int); /* main.c */ -int ctrlg __P((int, int)); -int quit __P((int, int)); +int ctrlg(int, int); +int quit(int, int); /* ttyio.c */ -void panic __P((char *)); +void panic(char *); /* cinfo.c */ -char *keyname __P((char *, size_t, int)); +char *keyname(char *, size_t, int); /* basic.c */ -int gotobol __P((int, int)); -int backchar __P((int, int)); -int gotoeol __P((int, int)); -int forwchar __P((int, int)); -int gotobob __P((int, int)); -int gotoeob __P((int, int)); -int forwline __P((int, int)); -int backline __P((int, int)); -void setgoal __P((void)); -int getgoal __P((LINE *)); -int forwpage __P((int, int)); -int backpage __P((int, int)); -int forw1page __P((int, int)); -int back1page __P((int, int)); -int pagenext __P((int, int)); -void isetmark __P((void)); -int setmark __P((int, int)); -int swapmark __P((int, int)); -int gotoline __P((int, int)); +int gotobol(int, int); +int backchar(int, int); +int gotoeol(int, int); +int forwchar(int, int); +int gotobob(int, int); +int gotoeob(int, int); +int forwline(int, int); +int backline(int, int); +void setgoal(void); +int getgoal(LINE *); +int forwpage(int, int); +int backpage(int, int); +int forw1page(int, int); +int back1page(int, int); +int pagenext(int, int); +void isetmark(void); +int setmark(int, int); +int swapmark(int, int); +int gotoline(int, int); /* random.c X */ -int showcpos __P((int, int)); -int getcolpos __P((void)); -int twiddle __P((int, int)); -int openline __P((int, int)); -int newline __P((int, int)); -int deblank __P((int, int)); -int justone __P((int, int)); -int delwhite __P((int, int)); -int indent __P((int, int)); -int forwdel __P((int, int)); -int backdel __P((int, int)); -int killline __P((int, int)); -int yank __P((int, int)); -int space_to_tabstop __P((int, int)); +int showcpos(int, int); +int getcolpos(void); +int twiddle(int, int); +int openline(int, int); +int newline(int, int); +int deblank(int, int); +int justone(int, int); +int delwhite(int, int); +int indent(int, int); +int forwdel(int, int); +int backdel(int, int); +int killline(int, int); +int yank(int, int); +int space_to_tabstop(int, int); /* extend.c X */ -int insert __P((int, int)); -int bindtokey __P((int, int)); -int localbind __P((int, int)); -int define_key __P((int, int)); -int unbindtokey __P((int, int)); -int localunbind __P((int, int)); -int extend __P((int, int)); -int evalexpr __P((int, int)); -int evalbuffer __P((int, int)); -int evalfile __P((int, int)); -int load __P((char *)); -int excline __P((char *)); +int insert(int, int); +int bindtokey(int, int); +int localbind(int, int); +int define_key(int, int); +int unbindtokey(int, int); +int localunbind(int, int); +int extend(int, int); +int evalexpr(int, int); +int evalbuffer(int, int); +int evalfile(int, int); +int load(char *); +int excline(char *); /* help.c X */ -int desckey __P((int, int)); -int wallchart __P((int, int)); -int help_help __P((int, int)); -int apropos_command __P((int, int)); +int desckey(int, int); +int wallchart(int, int); +int help_help(int, int); +int apropos_command(int, int); /* paragraph.c X */ -int gotobop __P((int, int)); -int gotoeop __P((int, int)); -int fillpara __P((int, int)); -int killpara __P((int, int)); -int fillword __P((int, int)); -int setfillcol __P((int, int)); +int gotobop(int, int); +int gotoeop(int, int); +int fillpara(int, int); +int killpara(int, int); +int fillword(int, int); +int setfillcol(int, int); /* word.c X */ -int backword __P((int, int)); -int forwword __P((int, int)); -int upperword __P((int, int)); -int lowerword __P((int, int)); -int capword __P((int, int)); -int delfword __P((int, int)); -int delbword __P((int, int)); -int inword __P((void)); +int backword(int, int); +int forwword(int, int); +int upperword(int, int); +int lowerword(int, int); +int capword(int, int); +int delfword(int, int); +int delbword(int, int); +int inword(void); /* region.c X */ -int killregion __P((int, int)); -int copyregion __P((int, int)); -int lowerregion __P((int, int)); -int upperregion __P((int, int)); -int prefixregion __P((int, int)); -int setprefix __P((int, int)); +int killregion(int, int); +int copyregion(int, int); +int lowerregion(int, int); +int upperregion(int, int); +int prefixregion(int, int); +int setprefix(int, int); /* search.c X */ -int forwsearch __P((int, int)); -int backsearch __P((int, int)); -int searchagain __P((int, int)); -int forwisearch __P((int, int)); -int backisearch __P((int, int)); -int queryrepl __P((int, int)); -int forwsrch __P((void)); -int backsrch __P((void)); -int readpattern __P((char *)); +int forwsearch(int, int); +int backsearch(int, int); +int searchagain(int, int); +int forwisearch(int, int); +int backisearch(int, int); +int queryrepl(int, int); +int forwsrch(void); +int backsrch(void); +int readpattern(char *); /* spawn.c X */ -int spawncli __P((int, int)); +int spawncli(int, int); /* ttykbd.c X */ -void ttykeymapinit __P((void)); -void ttykeymaptidy __P((void)); +void ttykeymapinit(void); +void ttykeymaptidy(void); /* match.c X */ -int showmatch __P((int, int)); +int showmatch(int, int); /* version.c X */ -int showversion __P((int, int)); +int showversion(int, int); #ifndef NO_MACRO /* macro.c X */ -int definemacro __P((int, int)); -int finishmacro __P((int, int)); -int executemacro __P((int, int)); +int definemacro(int, int); +int finishmacro(int, int); +int executemacro(int, int); #endif /* !NO_MACRO */ /* modes.c X */ -int indentmode __P((int, int)); -int fillmode __P((int, int)); -int blinkparen __P((int, int)); +int indentmode(int, int); +int fillmode(int, int); +int blinkparen(int, int); #ifdef NOTAB -int notabmode __P((int, int)); +int notabmode(int, int); #endif /* NOTAB */ -int overwrite __P((int, int)); -int set_default_mode __P((int,int)); +int overwrite(int, int); +int set_default_mode(int,int); #ifdef REGEX /* re_search.c X */ -int re_forwsearch __P((int, int)); -int re_backsearch __P((int, int)); -int re_searchagain __P((int, int)); -int re_queryrepl __P((int, int)); -int setcasefold __P((int, int)); -int delmatchlines __P((int, int)); -int delnonmatchlines __P((int, int)); -int cntmatchlines __P((int, int)); -int cntnonmatchlines __P((int, int)); +int re_forwsearch(int, int); +int re_backsearch(int, int); +int re_searchagain(int, int); +int re_queryrepl(int, int); +int setcasefold(int, int); +int delmatchlines(int, int); +int delnonmatchlines(int, int); +int cntmatchlines(int, int); +int cntnonmatchlines(int, int); #endif /* REGEX */ /* diff --git a/usr.bin/mg/display.c b/usr.bin/mg/display.c index c3c8d110bc0..b6ea970acad 100644 --- a/usr.bin/mg/display.c +++ b/usr.bin/mg/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.9 2002/02/14 14:24:21 deraadt Exp $ */ +/* $OpenBSD: display.c,v 1.10 2002/02/16 21:27:49 millert Exp $ */ /* * The functions in this file handle redisplay. The @@ -65,18 +65,18 @@ typedef struct { XSHORT s_cost; /* Display cost. */ } SCORE; -void vtmove __P((int, int)); -void vtputc __P((int)); -void vtpute __P((int)); -int vtputs __P((char *)); -void vteeol __P((void)); -void updext __P((int, int)); -void modeline __P((MGWIN *)); -void setscores __P((int, int)); -void traceback __P((int, int, int, int)); -void ucopy __P((VIDEO *, VIDEO *)); -void uline __P((int, VIDEO *, VIDEO *)); -void hash __P((VIDEO *)); +void vtmove(int, int); +void vtputc(int); +void vtpute(int); +int vtputs(char *); +void vteeol(void); +void updext(int, int); +void modeline(MGWIN *); +void setscores(int, int); +void traceback(int, int, int, int); +void ucopy(VIDEO *, VIDEO *); +void uline(int, VIDEO *, VIDEO *); +void hash(VIDEO *); int sgarbf = TRUE; /* TRUE if screen is garbage. */ diff --git a/usr.bin/mg/echo.c b/usr.bin/mg/echo.c index e899c942bda..21380e7babe 100644 --- a/usr.bin/mg/echo.c +++ b/usr.bin/mg/echo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: echo.c,v 1.19 2002/02/14 23:00:56 vincent Exp $ */ +/* $OpenBSD: echo.c,v 1.20 2002/02/16 21:27:49 millert Exp $ */ /* * Echo line reading and writing. @@ -17,15 +17,15 @@ #include <stdarg.h> -static int veread __P((const char *, char *buf, int, int, va_list)); -static int complt __P((int, int, char *, int)); -static int complt_list __P((int, int, char *, int)); -static void eformat __P((const char *, va_list)); -static void eputi __P((int, int)); -static void eputl __P((long, int)); -static void eputs __P((char *)); -static void eputc __P((char)); -static LIST *copy_list __P((LIST *)); +static int veread(const char *, char *buf, int, int, va_list); +static int complt(int, int, char *, int); +static int complt_list(int, int, char *, int); +static void eformat(const char *, va_list); +static void eputi(int, int); +static void eputl(long, int); +static void eputs(char *); +static void eputc(char); +static LIST *copy_list(LIST *); int epresf = FALSE; /* stuff in echo line flag */ diff --git a/usr.bin/mg/extend.c b/usr.bin/mg/extend.c index e34d6cafb72..12f7702170a 100644 --- a/usr.bin/mg/extend.c +++ b/usr.bin/mg/extend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: extend.c,v 1.20 2002/02/14 22:50:43 vincent Exp $ */ +/* $OpenBSD: extend.c,v 1.21 2002/02/16 21:27:49 millert Exp $ */ /* * Extended (M-X) commands, rebinding, and startup file processing. @@ -21,13 +21,13 @@ #endif /* !NO_STARTUP */ #endif /* FKEYS */ -static int remap __P((KEYMAP *, int, PF, KEYMAP *)); -static KEYMAP *realocmap __P((KEYMAP *)); -static void fixmap __P((KEYMAP *, KEYMAP *, KEYMAP *)); -static int dobind __P((KEYMAP *, char *, int)); -static char *skipwhite __P((char *)); -static char *parsetoken __P((char *)); -static int bindkey __P((KEYMAP **, char *, KCHAR *, int)); +static int remap(KEYMAP *, int, PF, KEYMAP *); +static KEYMAP *realocmap(KEYMAP *); +static void fixmap(KEYMAP *, KEYMAP *, KEYMAP *); +static int dobind(KEYMAP *, char *, int); +static char *skipwhite(char *); +static char *parsetoken(char *); +static int bindkey(KEYMAP **, char *, KCHAR *, int); /* * Insert a string, mainly for use from macros (created by selfinsert) diff --git a/usr.bin/mg/kbd.h b/usr.bin/mg/kbd.h index 62c2e0b296c..92ec0708784 100644 --- a/usr.bin/mg/kbd.h +++ b/usr.bin/mg/kbd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.h,v 1.12 2001/05/24 10:43:18 art Exp $ */ +/* $OpenBSD: kbd.h,v 1.13 2002/02/16 21:27:49 millert Exp $ */ /* * kbd.h: type definitions for symbol.c and kbd.c for mg experimental @@ -45,11 +45,11 @@ extern MAPS *maps; extern MAPS fundamental_mode; #define fundamental_map (fundamental_mode.p_map) -int dobindkey __P((KEYMAP *, char *, char *)); -KEYMAP *name_map __P((char *)); -MAPS *name_mode __P((char *)); -PF doscan __P((KEYMAP *, int, KEYMAP **)); -char *map_name __P((KEYMAP *)); +int dobindkey(KEYMAP *, char *, char *); +KEYMAP *name_map(char *); +MAPS *name_mode(char *); +PF doscan(KEYMAP *, int, KEYMAP **); +char *map_name(KEYMAP *); void maps_init(void); int maps_add(KEYMAP *, char *); diff --git a/usr.bin/mg/line.c b/usr.bin/mg/line.c index e3f6c4430a9..3c6c398b669 100644 --- a/usr.bin/mg/line.c +++ b/usr.bin/mg/line.c @@ -1,4 +1,4 @@ -/* $OpenBSD: line.c,v 1.11 2002/02/14 14:24:21 deraadt Exp $ */ +/* $OpenBSD: line.c,v 1.12 2002/02/16 21:27:49 millert Exp $ */ /* * Text line handling. @@ -40,7 +40,7 @@ static RSIZE kused = 0; /* # of bytes used in KB. */ static RSIZE ksize = 0; /* # of bytes allocated in KB. */ static RSIZE kstart = 0; /* # of first used byte in KB. */ -static int kgrow __P((int)); +static int kgrow(int); /* * Allocate a new line of size `used'. lrealloc() can be called if the line diff --git a/usr.bin/mg/main.c b/usr.bin/mg/main.c index 14f6b9a87dc..0d7f7ba1cf0 100644 --- a/usr.bin/mg/main.c +++ b/usr.bin/mg/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.14 2001/06/23 04:22:44 art Exp $ */ +/* $OpenBSD: main.c,v 1.15 2002/02/16 21:27:49 millert Exp $ */ /* * Mainline. @@ -21,7 +21,7 @@ MGWIN *curwp; /* current window */ MGWIN *wheadp; /* MGWIN listhead */ char pat[NPAT]; /* pattern */ -static void edinit __P((void)); +static void edinit(void); int main(argc, argv) diff --git a/usr.bin/mg/match.c b/usr.bin/mg/match.c index 3d2c528622a..8900ab10386 100644 --- a/usr.bin/mg/match.c +++ b/usr.bin/mg/match.c @@ -1,4 +1,4 @@ -/* $OpenBSD: match.c,v 1.7 2001/05/24 03:05:24 mickey Exp $ */ +/* $OpenBSD: match.c,v 1.8 2002/02/16 21:27:49 millert Exp $ */ /* * Limited parenthesis matching routines @@ -14,8 +14,8 @@ #include "def.h" #include "key.h" -static int balance __P((void)); -static void displaymatch __P((LINE *, int)); +static int balance(void); +static void displaymatch(LINE *, int); /* * Balance table. When balance() encounters a character that is to be diff --git a/usr.bin/mg/modes.c b/usr.bin/mg/modes.c index 0defd16c9a3..4dcd81cbb08 100644 --- a/usr.bin/mg/modes.c +++ b/usr.bin/mg/modes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modes.c,v 1.6 2001/05/24 10:43:21 art Exp $ */ +/* $OpenBSD: modes.c,v 1.7 2002/02/16 21:27:49 millert Exp $ */ /* * Commands to toggle modes. Without an argument, these functions will @@ -9,7 +9,7 @@ #include "def.h" #include "kbd.h" -static int changemode __P((int, int, char *)); +static int changemode(int, int, char *); int defb_nmodes = 0; MAPS *defb_modes[PBMODES] = { &fundamental_mode }; diff --git a/usr.bin/mg/re_search.c b/usr.bin/mg/re_search.c index a36ace58b71..855a5a85954 100644 --- a/usr.bin/mg/re_search.c +++ b/usr.bin/mg/re_search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: re_search.c,v 1.10 2002/02/13 03:03:49 vincent Exp $ */ +/* $OpenBSD: re_search.c,v 1.11 2002/02/16 21:27:49 millert Exp $ */ /* * regular expression search commands for Mg @@ -32,12 +32,12 @@ char re_pat[NPAT]; /* regex pattern */ int re_srch_lastdir = SRCH_NOPR; /* last search flags */ int casefoldsearch = TRUE; /* does search ignore case? */ -static int re_doreplace __P((RSIZE, char *, int)); -static int re_forwsrch __P((void)); -static int re_backsrch __P((void)); -static int re_readpattern __P((char *)); -static int killmatches __P((int)); -static int countmatches __P((int)); +static int re_doreplace(RSIZE, char *, int); +static int re_forwsrch(void); +static int re_backsrch(void); +static int re_readpattern(char *); +static int killmatches(int); +static int countmatches(int); /* * Search forward. diff --git a/usr.bin/mg/region.c b/usr.bin/mg/region.c index 2e79449d64a..34a1b621223 100644 --- a/usr.bin/mg/region.c +++ b/usr.bin/mg/region.c @@ -1,4 +1,4 @@ -/* $OpenBSD: region.c,v 1.7 2002/02/13 03:03:49 vincent Exp $ */ +/* $OpenBSD: region.c,v 1.8 2002/02/16 21:27:49 millert Exp $ */ /* * Region based commands. @@ -9,8 +9,8 @@ #include "def.h" -static int getregion __P((REGION *)); -static int setsize __P((REGION *, RSIZE)); +static int getregion(REGION *); +static int setsize(REGION *, RSIZE); /* * Kill the region. Ask "getregion" to figure out the bounds of the region. diff --git a/usr.bin/mg/search.c b/usr.bin/mg/search.c index 613c5342711..28b3057667a 100644 --- a/usr.bin/mg/search.c +++ b/usr.bin/mg/search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: search.c,v 1.8 2002/02/13 03:03:49 vincent Exp $ */ +/* $OpenBSD: search.c,v 1.9 2002/02/16 21:27:49 millert Exp $ */ /* * Search commands. @@ -28,16 +28,16 @@ typedef struct { int s_doto; } SRCHCOM; -static int isearch __P((int)); -static void is_cpush __P((int)); -static void is_lpush __P((void)); -static void is_pop __P((void)); -static int is_peek __P((void)); -static void is_undo __P((int *, int *)); -static int is_find __P((int)); -static void is_prompt __P((int, int, int)); -static void is_dspl __P((char *, int)); -static int eq __P((int, int)); +static int isearch(int); +static void is_cpush(int); +static void is_lpush(void); +static void is_pop(void); +static int is_peek(void); +static void is_undo(int *, int *); +static int is_find(int); +static void is_prompt(int, int, int); +static void is_dspl(char *, int); +static int eq(int, int); static SRCHCOM cmds[NSRCH]; static int cip; diff --git a/usr.bin/mg/tty.c b/usr.bin/mg/tty.c index b40b77cb23c..623a5fdd1aa 100644 --- a/usr.bin/mg/tty.c +++ b/usr.bin/mg/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.13 2002/02/14 14:24:21 deraadt Exp $ */ +/* $OpenBSD: tty.c,v 1.14 2002/02/16 21:27:49 millert Exp $ */ /* * Terminfo display driver @@ -33,7 +33,7 @@ #include <term.h> #include <signal.h> -static int charcost __P((char *)); +static int charcost(char *); static int cci; static int insdel; /* Do we have both insert & delete line? */ diff --git a/usr.bin/midiplay/midiplay.c b/usr.bin/midiplay/midiplay.c index d75e9c5e322..655f4f1df47 100644 --- a/usr.bin/midiplay/midiplay.c +++ b/usr.bin/midiplay/midiplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midiplay.c,v 1.1 1999/01/01 23:58:22 niklas Exp $ */ +/* $OpenBSD: midiplay.c,v 1.2 2002/02/16 21:27:49 millert Exp $ */ /* $NetBSD: midiplay.c,v 1.8 1998/11/25 22:17:07 augustss Exp $ */ /* @@ -82,15 +82,15 @@ static int midi_lengths[] = { 2,2,2,2,1,1,2,0 }; /* Number of bytes in a MIDI command */ #define MIDI_LENGTH(d) (midi_lengths[((d) >> 4) & 7]) -void usage __P((void)); -void send_event __P((seq_event_rec *)); -void dometa __P((u_int, u_char *, u_int)); -void midireset __P((void)); -void send_sysex __P((u_char *, u_int)); -u_long getvar __P((struct track *)); -void playfile __P((FILE *, char *)); -void playdata __P((u_char *, u_int, char *)); -int main __P((int argc, char **argv)); +void usage(void); +void send_event(seq_event_rec *); +void dometa(u_int, u_char *, u_int); +void midireset(void); +void send_sysex(u_char *, u_int); +u_long getvar(struct track *); +void playfile(FILE *, char *); +void playdata(u_char *, u_int, char *); +int main(int argc, char **argv); extern char *__progname; diff --git a/usr.bin/mixerctl/mixerctl.c b/usr.bin/mixerctl/mixerctl.c index 2482c4d0155..946e387ba33 100644 --- a/usr.bin/mixerctl/mixerctl.c +++ b/usr.bin/mixerctl/mixerctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mixerctl.c,v 1.6 2002/01/09 18:12:24 mickey Exp $ */ +/* $OpenBSD: mixerctl.c,v 1.7 2002/02/16 21:27:49 millert Exp $ */ /* $NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -45,10 +45,10 @@ #include <sys/ioctl.h> #include <sys/audioio.h> -char *catstr __P((char *p, char *q)); -struct field *findfield __P((char *name)); -void prfield __P((struct field *p, char *sep, int prvalset)); -int rdfield __P((struct field *p, char *q)); +char *catstr(char *p, char *q); +struct field *findfield(char *name); +void prfield(struct field *p, char *sep, int prvalset); +int rdfield(struct field *p, char *q); int main(int argc, char **argv); FILE *out = stdout; diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c index 034bd7b34c9..75ca8871605 100644 --- a/usr.bin/mkstr/mkstr.c +++ b/usr.bin/mkstr/mkstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkstr.c,v 1.4 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: mkstr.c,v 1.5 2002/02/16 21:27:49 millert Exp $ */ /* $NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: mkstr.c,v 1.4 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: mkstr.c,v 1.5 2002/02/16 21:27:49 millert Exp $"; #endif #endif /* not lint */ @@ -88,13 +88,13 @@ char *progname; char usagestr[] = "usage: %s [ - ] mesgfile prefix file ...\n"; char name[100], *np; -void inithash __P((void)); -void process __P((void)); -int match __P((char *)); -void copystr __P((void)); -int octdigit __P((char)); -unsigned hashit __P((char *, char, unsigned)); -int fgetNUL __P((char *, int, FILE *)); +void inithash(void); +void process(void); +int match(char *); +void copystr(void); +int octdigit(char); +unsigned hashit(char *, char, unsigned); +int fgetNUL(char *, int, FILE *); int main(argc, argv) diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c index f52d0c9feb4..63b36f2759f 100644 --- a/usr.bin/mktemp/mktemp.c +++ b/usr.bin/mktemp/mktemp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mktemp.c,v 1.7 2001/10/11 00:05:55 millert Exp $ */ +/* $OpenBSD: mktemp.c,v 1.8 2002/02/16 21:27:49 millert Exp $ */ /* * Copyright (c) 1996, 1997, 2001 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.7 2001/10/11 00:05:55 millert Exp $"; +static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.8 2002/02/16 21:27:49 millert Exp $"; #endif /* not lint */ #include <paths.h> @@ -38,7 +38,7 @@ static const char rcsid[] = "$OpenBSD: mktemp.c,v 1.7 2001/10/11 00:05:55 miller #include <unistd.h> #include <err.h> -__dead void usage __P((void)); +__dead void usage(void); int main(argc, argv) diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c index 1895a727358..9e5a3c0ebda 100644 --- a/usr.bin/msgs/msgs.c +++ b/usr.bin/msgs/msgs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msgs.c,v 1.20 2002/01/04 16:22:19 art Exp $ */ +/* $OpenBSD: msgs.c,v 1.21 2002/02/16 21:27:49 millert Exp $ */ /* $NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: msgs.c,v 1.20 2002/01/04 16:22:19 art Exp $"; +static char rcsid[] = "$OpenBSD: msgs.c,v 1.21 2002/02/16 21:27:49 millert Exp $"; #endif #endif /* not lint */ @@ -141,14 +141,14 @@ int Lpp = 0; time_t t; time_t keep; -void prmesg __P((int)); -void onintr __P((int)); -void onsusp __P((int)); -int linecnt __P((FILE *)); -int next __P((char *)); -void ask __P((char *)); -void gfrsub __P((FILE *)); -char *nxtfld __P((char *)); +void prmesg(int); +void onintr(int); +void onsusp(int); +int linecnt(FILE *); +int next(char *); +void ask(char *); +void gfrsub(FILE *); +char *nxtfld(char *); /* option initialization */ bool hdrs = NO; diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c index 0652c4c0b7e..a8e53fd5000 100644 --- a/usr.bin/nc/netcat.c +++ b/usr.bin/nc/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.39 2001/10/28 19:52:04 jakob Exp $ */ +/* $OpenBSD: netcat.c,v 1.40 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -69,14 +69,14 @@ int family = AF_UNSPEC; char *portlist[PORT_MAX]; ssize_t atomicio __P((ssize_t (*)(), int, void *, size_t)); -void atelnet __P((int, unsigned char *, unsigned int)); -void build_ports __P((char *)); -void help __P((void)); -int local_listen __P((char *, char *, struct addrinfo)); -void readwrite __P((int)); -int remote_connect __P((char *, char *, struct addrinfo)); -int udptest __P((int)); -void usage __P((int)); +void atelnet(int, unsigned char *, unsigned int); +void build_ports(char *); +void help(void); +int local_listen(char *, char *, struct addrinfo); +void readwrite(int); +int remote_connect(char *, char *, struct addrinfo); +int udptest(int); +void usage(int); int main(int argc, char *argv[]) diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c index 355f89f7711..fabe3eb1d43 100644 --- a/usr.bin/netstat/atalk.c +++ b/usr.bin/netstat/atalk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: atalk.c,v 1.7 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: atalk.c,v 1.2 1997/05/22 17:21:26 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from @(#)atalk.c 1.1 (Whistle) 6/6/96"; #else -static char rcsid[] = "$OpenBSD: atalk.c,v 1.6 2002/01/17 21:34:58 mickey Exp $"; +static char rcsid[] = "$OpenBSD: atalk.c,v 1.7 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -69,10 +69,10 @@ struct socket sockb; static int first = 1; -static char *at_pr_net __P((struct sockaddr_at *, int)); -static char *at_pr_host __P((struct sockaddr_at *, int)); -static char *at_pr_range __P((struct sockaddr_at *)); -static char *at_pr_port __P((struct sockaddr_at *)); +static char *at_pr_net(struct sockaddr_at *, int); +static char *at_pr_host(struct sockaddr_at *, int); +static char *at_pr_range(struct sockaddr_at *); +static char *at_pr_port(struct sockaddr_at *); /* * Print a summary of connections related to a Network Systems diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index b7256739193..b9f0b578a3c 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: if.c,v 1.29 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94"; #else -static char *rcsid = "$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: if.c,v 1.29 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -71,8 +71,8 @@ static char *rcsid = "$OpenBSD: if.c,v 1.28 2002/01/17 21:34:58 mickey Exp $"; #define YES 1 #define NO 0 -static void sidewaysintpr __P((u_int, u_long)); -static void catchalarm __P((int)); +static void sidewaysintpr(u_int, u_long); +static void catchalarm(int); /* * Print a description of the network interfaces. diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 118a5a97196..4c53d483109 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: inet.c,v 1.56 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -static char *rcsid = "$OpenBSD: inet.c,v 1.55 2002/01/17 21:34:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: inet.c,v 1.56 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -92,13 +92,13 @@ struct inpcb inpcb; struct tcpcb tcpcb; struct socket sockb; -static void protopr0 __P((u_long, char *, int)); +static void protopr0(u_long, char *, int); -char *inetname __P((struct in_addr *)); -void inetprint __P((struct in_addr *, int, char *, int)); +char *inetname(struct in_addr *); +void inetprint(struct in_addr *, int, char *, int); #ifdef INET6 -char *inet6name __P((struct in6_addr *)); -void inet6print __P((struct in6_addr *, int, char *, int)); +char *inet6name(struct in6_addr *); +void inet6print(struct in6_addr *, int, char *, int); #endif /* diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index 9233e93f54e..538b597795d 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: inet6.c,v 1.18 2002/02/16 21:27:50 millert Exp $ */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* * Copyright (c) 1983, 1988, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -/*__RCSID("$OpenBSD: inet6.c,v 1.17 2002/01/17 21:34:58 mickey Exp $");*/ +/*__RCSID("$OpenBSD: inet6.c,v 1.18 2002/02/16 21:27:50 millert Exp $");*/ /*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/ #endif #endif /* not lint */ @@ -79,8 +79,8 @@ static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; struct socket sockb; -char *inet6name __P((struct in6_addr *)); -void inet6print __P((struct in6_addr *, int, char *)); +char *inet6name(struct in6_addr *); +void inet6print(struct in6_addr *, int, char *); static char *ip6nh[] = { "hop by hop", diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c index b5b7e837000..bdfde5359bc 100644 --- a/usr.bin/netstat/ipx.c +++ b/usr.bin/netstat/ipx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: ipx.c,v 1.10 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: ipx.c,v 1.9 2002/01/17 21:34:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: ipx.c,v 1.10 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -77,8 +77,8 @@ struct ipxpcb ipxpcb; struct spxpcb spxpcb; struct socket sockb; -static char *ipx_prpr __P((struct ipx_addr *)); -static void ipx_erputil __P((int, int)); +static char *ipx_prpr(struct ipx_addr *); +static void ipx_erputil(int, int); static int first = 1; diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c index 55dc7880581..38f816e5c0a 100644 --- a/usr.bin/netstat/iso.c +++ b/usr.bin/netstat/iso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: iso.c,v 1.9 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)iso.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: iso.c,v 1.8 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: iso.c,v 1.9 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -111,10 +111,10 @@ SOFTWARE. #include <stdlib.h> #include "netstat.h" -static void tprintstat __P((struct tp_stat *, int)); -static void isonetprint __P((struct sockaddr_iso *, int)); -static void hexprint __P((int, char *, char *)); -extern void inetprint __P((struct in_addr *, int, char *)); +static void tprintstat(struct tp_stat *, int); +static void isonetprint(struct sockaddr_iso *, int); +static void hexprint(int, char *, char *); +extern void inetprint(struct in_addr *, int, char *); /* * Dump esis stats diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 396eae51ba3..e7a9ddd41dd 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.30 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ char copyright[] = #if 0 static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94"; #else -static char *rcsid = "$OpenBSD: main.c,v 1.29 2002/01/17 21:34:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.30 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -275,10 +275,10 @@ struct protox *protoprotox[] = { protox, ipxprotox, nsprotox, isoprotox, atalkpr struct protox *protoprotox[] = { protox, ip6protox, ipxprotox, nsprotox, isoprotox, atalkprotox, NULL }; #endif -static void printproto __P((struct protox *, char *)); -static void usage __P((void)); -static struct protox *name2protox __P((char *)); -static struct protox *knownname __P((char *)); +static void printproto(struct protox *, char *); +static void usage(void); +static struct protox *name2protox(char *); +static struct protox *knownname(char *); kvm_t *kvmd; diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index f6f3572b0f9..ffcd82ab76a 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netstat.h,v 1.19 2001/08/26 09:42:04 brian Exp $ */ +/* $OpenBSD: netstat.h,v 1.20 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $ */ /* @@ -66,90 +66,90 @@ int af; /* address family */ extern char *__progname; /* program name, from crt0.o */ -int kread __P((u_long addr, char *buf, int size)); -char *plural __P((int)); -char *plurales __P((int)); +int kread(u_long addr, char *buf, int size); +char *plural(int); +char *plurales(int); -void protopr __P((u_long, char *)); +void protopr(u_long, char *); #ifdef INET6 -void ip6protopr __P((u_long, char *)); +void ip6protopr(u_long, char *); #endif -void tcp_stats __P((u_long, char *)); -void udp_stats __P((u_long, char *)); -void ip_stats __P((u_long, char *)); -void icmp_stats __P((u_long, char *)); -void igmp_stats __P((u_long, char *)); -void ah_stats __P((u_long, char *)); -void esp_stats __P((u_long, char *)); -void ipip_stats __P((u_long, char *)); -void etherip_stats __P((u_long, char *)); -void protopr __P((u_long, char *)); -void ipcomp_stats __P((u_long, char *)); +void tcp_stats(u_long, char *); +void udp_stats(u_long, char *); +void ip_stats(u_long, char *); +void icmp_stats(u_long, char *); +void igmp_stats(u_long, char *); +void ah_stats(u_long, char *); +void esp_stats(u_long, char *); +void ipip_stats(u_long, char *); +void etherip_stats(u_long, char *); +void protopr(u_long, char *); +void ipcomp_stats(u_long, char *); void mbpr(u_long, u_long, u_long); -void hostpr __P((u_long, u_long)); -void impstats __P((u_long, u_long)); +void hostpr(u_long, u_long); +void impstats(u_long, u_long); -void intpr __P((int, u_long)); +void intpr(int, u_long); -void pr_rthdr __P((int)); -void pr_encaphdr __P(()); -void pr_family __P((int)); -void rt_stats __P((u_long)); -char *ns_phost __P((struct sockaddr *)); -char *ipx_phost __P((struct sockaddr *)); -void upHex __P((char *)); +void pr_rthdr(int); +void pr_encaphdr(); +void pr_family(int); +void rt_stats(u_long); +char *ns_phost(struct sockaddr *); +char *ipx_phost(struct sockaddr *); +void upHex(char *); #ifdef INET6 struct in6_addr; struct sockaddr_in6; -void ip6protopr __P((u_long, char *)); -void ip6_stats __P((u_long, char *)); -void ip6_ifstats __P((char *)); -void icmp6_stats __P((u_long, char *)); -void icmp6_ifstats __P((char *)); -void pim6_stats __P((u_long, char *)); -void mroute6pr __P((u_long, u_long, u_long)); -void mrt6_stats __P((u_long, u_long)); -char *routename6 __P((struct sockaddr_in6 *)); -char *netname6 __P((struct sockaddr_in6 *, struct in6_addr *)); +void ip6protopr(u_long, char *); +void ip6_stats(u_long, char *); +void ip6_ifstats(char *); +void icmp6_stats(u_long, char *); +void icmp6_ifstats(char *); +void pim6_stats(u_long, char *); +void mroute6pr(u_long, u_long, u_long); +void mrt6_stats(u_long, u_long); +char *routename6(struct sockaddr_in6 *); +char *netname6(struct sockaddr_in6 *, struct in6_addr *); #endif /*INET6*/ -char *routename __P((in_addr_t)); -char *netname __P((in_addr_t, in_addr_t)); -char *ns_print __P((struct sockaddr *)); -char *ipx_print __P((struct sockaddr *)); -void routepr __P((u_long)); - -void nsprotopr __P((u_long, char *)); -void spp_stats __P((u_long, char *)); -void idp_stats __P((u_long, char *)); -void nserr_stats __P((u_long, char *)); - -void ipxprotopr __P((u_long, char *)); -void spx_stats __P((u_long, char *)); -void ipx_stats __P((u_long, char *)); -void ipxerr_stats __P((u_long, char *)); - -void intpr __P((int, u_long)); - -void unixpr __P((u_long)); - -void esis_stats __P((u_long, char *)); -void clnp_stats __P((u_long, char *)); -void cltp_stats __P((u_long, char *)); -void iso_protopr __P((u_long, char *)); -void iso_protopr1 __P((u_long, int)); -void tp_protopr __P((u_long, char *)); -void tp_inproto __P((u_long)); -void tp_stats __P((caddr_t, caddr_t)); - -void mroutepr __P((u_long, u_long, u_long, u_long)); -void mrt_stats __P((u_long, u_long)); - -void atalkprotopr __P((u_long, char *)); -void ddp_stats __P((u_long, char *)); -char *atalk_print __P((const struct sockaddr *, int)); +char *routename(in_addr_t); +char *netname(in_addr_t, in_addr_t); +char *ns_print(struct sockaddr *); +char *ipx_print(struct sockaddr *); +void routepr(u_long); + +void nsprotopr(u_long, char *); +void spp_stats(u_long, char *); +void idp_stats(u_long, char *); +void nserr_stats(u_long, char *); + +void ipxprotopr(u_long, char *); +void spx_stats(u_long, char *); +void ipx_stats(u_long, char *); +void ipxerr_stats(u_long, char *); + +void intpr(int, u_long); + +void unixpr(u_long); + +void esis_stats(u_long, char *); +void clnp_stats(u_long, char *); +void cltp_stats(u_long, char *); +void iso_protopr(u_long, char *); +void iso_protopr1(u_long, int); +void tp_protopr(u_long, char *); +void tp_inproto(u_long); +void tp_stats(caddr_t, caddr_t); + +void mroutepr(u_long, u_long, u_long, u_long); +void mrt_stats(u_long, u_long); + +void atalkprotopr(u_long, char *); +void ddp_stats(u_long, char *); +char *atalk_print(const struct sockaddr *, int); char *atalk_print2 __P((const struct sockaddr *, const struct sockaddr *, int)); diff --git a/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c index 011d46d6d72..5e5363d896c 100644 --- a/usr.bin/netstat/ns.c +++ b/usr.bin/netstat/ns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: ns.c,v 1.7 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: ns.c,v 1.6 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: ns.c,v 1.7 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -76,8 +76,8 @@ struct nspcb nspcb; struct sppcb sppcb; struct socket sockb; -static char *ns_prpr __P((struct ns_addr *)); -static void ns_erputil __P((int, int)); +static char *ns_prpr(struct ns_addr *); +static void ns_erputil(int, int); static int first = 1; diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 4ba13dcaaf0..d59228d025f 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $ */ +/* $OpenBSD: route.c,v 1.45 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94"; #else -static char *rcsid = "$OpenBSD: route.c,v 1.44 2002/01/17 21:34:58 mickey Exp $"; +static char *rcsid = "$OpenBSD: route.c,v 1.45 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -127,15 +127,15 @@ struct radix_mask rmask; int NewTree = 0; -static struct sockaddr *kgetsa __P((struct sockaddr *)); -static void p_tree __P((struct radix_node *)); -static void p_rtnode __P(()); -static void ntreestuff __P(()); -static void np_rtentry __P((struct rt_msghdr *)); -static void p_sockaddr __P((struct sockaddr *, struct sockaddr *, int, int)); -static void p_flags __P((int, char *)); -static void p_rtentry __P((struct rtentry *)); -static void encap_print __P((struct rtentry *)); +static struct sockaddr *kgetsa(struct sockaddr *); +static void p_tree(struct radix_node *); +static void p_rtnode(); +static void ntreestuff(); +static void np_rtentry(struct rt_msghdr *); +static void p_sockaddr(struct sockaddr *, struct sockaddr *, int, int); +static void p_flags(int, char *); +static void p_rtentry(struct rtentry *); +static void encap_print(struct rtentry *); /* * Print routing tables. diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index 102e2981f83..63cc2c43014 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: unix.c,v 1.8 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)unix.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: unix.c,v 1.7 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: unix.c,v 1.8 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -66,7 +66,7 @@ struct proc; #include <kvm.h> #include "netstat.h" -static void unixdomainpr __P((struct socket *, caddr_t)); +static void unixdomainpr(struct socket *, caddr_t); static struct file *file, *fileNFILE; static int nfiles; diff --git a/usr.bin/newsyslog/newsyslog.c b/usr.bin/newsyslog/newsyslog.c index 28f2dd574ac..a11cfd62a27 100644 --- a/usr.bin/newsyslog/newsyslog.c +++ b/usr.bin/newsyslog/newsyslog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newsyslog.c,v 1.42 2001/11/27 18:17:38 millert Exp $ */ +/* $OpenBSD: newsyslog.c,v 1.43 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com> @@ -88,7 +88,7 @@ provided "as is" without express or implied warranty. */ #ifndef lint -static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.42 2001/11/27 18:17:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: newsyslog.c,v 1.43 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #ifndef CONF @@ -166,25 +166,25 @@ char hostname[MAXHOSTNAMELEN]; /* hostname */ char *daytime; /* timenow in human readable form */ -void do_entry __P((struct conf_entry *)); -void PRS __P((int, char **)); -void usage __P((void)); -struct conf_entry *parse_file __P((int *)); -char *missing_field __P((char *, char *)); -void dotrim __P((char *, int, int, int, uid_t, gid_t)); -int log_trim __P((char *)); -void compress_log __P((char *)); -int sizefile __P((char *)); -int age_old_log __P((char *)); -char *sob __P((char *)); -char *son __P((char *)); -int isnumberstr __P((char *)); -void domonitor __P((char *, char *)); -FILE *openmail __P((void)); -void closemail __P((FILE *)); -void child_killer __P((int)); -void run_command __P((char *)); -void send_signal __P((char *, int)); +void do_entry(struct conf_entry *); +void PRS(int, char **); +void usage(void); +struct conf_entry *parse_file(int *); +char *missing_field(char *, char *); +void dotrim(char *, int, int, int, uid_t, gid_t); +int log_trim(char *); +void compress_log(char *); +int sizefile(char *); +int age_old_log(char *); +char *sob(char *); +char *son(char *); +int isnumberstr(char *); +void domonitor(char *, char *); +FILE *openmail(void); +void closemail(FILE *); +void child_killer(int); +void run_command(char *); +void send_signal(char *, int); int main(argc, argv) diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index 2319f370d44..06d3d26a089 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsstat.c,v 1.12 2001/09/04 23:35:59 millert Exp $ */ +/* $OpenBSD: nfsstat.c,v 1.13 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */ /* @@ -48,7 +48,7 @@ static char copyright[] = static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93"; static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $"; #else -static char *rcsid = "$OpenBSD: nfsstat.c,v 1.12 2001/09/04 23:35:59 millert Exp $"; +static char *rcsid = "$OpenBSD: nfsstat.c,v 1.13 2002/02/16 21:27:50 millert Exp $"; #endif #endif /* not lint */ @@ -85,11 +85,11 @@ kvm_t *kd; volatile sig_atomic_t signalled; /* set if alarm goes off "early" */ int nfs_id; -void getnfsstats __P((struct nfsstats *)); -void printhdr __P((void)); -void intpr __P((u_int)); -void sidewaysintpr __P((u_int, u_int)); -void usage __P((void)); +void getnfsstats(struct nfsstats *); +void printhdr(void); +void intpr(u_int); +void sidewaysintpr(u_int, u_int); +void usage(void); int main(argc, argv) diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c index 1b5cf7a5ba1..ad498b1f9aa 100644 --- a/usr.bin/nice/nice.c +++ b/usr.bin/nice/nice.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nice.c,v 1.5 2001/09/16 22:40:10 pvalchev Exp $ */ +/* $OpenBSD: nice.c,v 1.6 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $ */ /* @@ -44,7 +44,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90"; #endif -static char rcsid[] = "$OpenBSD: nice.c,v 1.5 2001/09/16 22:40:10 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: nice.c,v 1.6 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: nice.c,v 1.5 2001/09/16 22:40:10 pvalchev Exp $ #define DEFNICE 10 -int main __P((int, char **)); -static void usage __P((void)); +int main(int, char **); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index ea757a0ca49..8cc42019538 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nm.c,v 1.15 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: nm.c,v 1.16 2002/02/16 21:27:50 millert Exp $ */ /* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: nm.c,v 1.15 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: nm.c,v 1.16 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -77,13 +77,13 @@ int show_extensions = 0; int fcount; int rev; -int fname __P((const void *, const void *)); -int rname __P((const void *, const void *)); -int value __P((const void *, const void *)); -int (*sfunc) __P((const void *, const void *)) = fname; -char *otherstring __P((struct nlist *)); -char *typestring __P((unsigned int)); -char typeletter __P((unsigned int)); +int fname(const void *, const void *); +int rname(const void *, const void *); +int value(const void *, const void *); +int (*sfunc)(const void *, const void *) = fname; +char *otherstring(struct nlist *); +char *typestring(unsigned int); +char typeletter(unsigned int); /* some macros for symbol type (nlist.n_type) handling */ @@ -91,11 +91,11 @@ char typeletter __P((unsigned int)); #define IS_EXTERNAL(x) ((x) & N_EXT) #define SYMBOL_TYPE(x) ((x) & (N_TYPE | N_STAB)) -void *emalloc __P((size_t)); -void pipe2cppfilt __P((void)); -void usage __P((void)); -char *symname __P((struct nlist *)); -void print_symbol __P((const char *, struct nlist *)); +void *emalloc(size_t); +void pipe2cppfilt(void); +void usage(void); +char *symname(struct nlist *); +void print_symbol(const char *, struct nlist *); /* * main() diff --git a/usr.bin/oldrdist/defs.h b/usr.bin/oldrdist/defs.h index e09a664270e..ba1eb915836 100644 --- a/usr.bin/oldrdist/defs.h +++ b/usr.bin/oldrdist/defs.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: defs.h,v 1.8 1999/08/17 09:13:16 millert Exp $*/ +/* * $OpenBSD: defs.h,v 1.9 2002/02/16 21:27:50 millert Exp $*/ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -154,31 +154,31 @@ extern char host[]; /* host name of master copy */ extern char buf[BUFSIZ]; /* general purpose buffer */ extern char target[BUFSIZ]; /* target/source directory name */ -int any __P((int, char *)); -char *colon __P((char *)); -void cleanup __P((int)); -void define __P((char *)); -void docmds __P((char **, int, char **)); -void error __P((const char *, ...)); -int except __P((char *)); +int any(int, char *); +char *colon(char *); +void cleanup(int); +void define(char *); +void docmds(char **, int, char **); +void error(const char *, ...); +int except(char *); struct namelist * - expand __P((struct namelist *, int)); -char *exptilde __P((char [], char *, int)); -void fatal __P((const char *, ...)); -int inlist __P((struct namelist *, char *)); + expand(struct namelist *, int); +char *exptilde(char [], char *, int); +void fatal(const char *, ...); +int inlist(struct namelist *, char *); void insert __P((char *, struct namelist *, struct namelist *, struct subcmd *)); -void install __P((char *, char *, int, int)); -void log __P((FILE *, const char *, ...)); +void install(char *, char *, int, int); +void log(FILE *, const char *, ...); struct namelist * - lookup __P((char *, int, struct namelist *)); -void lostconn __P((int)); + lookup(char *, int, struct namelist *); +void lostconn(int); struct namelist * - makenl __P((char *)); + makenl(char *); struct subcmd * - makesubcmd __P((int)); -void prnames __P((struct namelist *)); -void server __P((void)); -void yyerror __P((char *)); -int yyparse __P((void)); -char *xbasename __P((char *)); + makesubcmd(int); +void prnames(struct namelist *); +void server(void); +void yyerror(char *); +int yyparse(void); +char *xbasename(char *); diff --git a/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c index 099a2804040..aa7974b1b19 100644 --- a/usr.bin/oldrdist/docmd.c +++ b/usr.bin/oldrdist/docmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: docmd.c,v 1.14 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: docmd.c,v 1.15 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: docmd.c,v 1.14 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: docmd.c,v 1.15 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include "defs.h" @@ -47,16 +47,16 @@ FILE *lfp; /* log file for recording files updated */ struct subcmd *subcmds; /* list of sub-commands for current cmd */ jmp_buf env; -static int makeconn __P((char *)); -static int okname __P((char *)); -static void closeconn __P((void)); -static void cmptime __P((char *)); +static int makeconn(char *); +static int okname(char *); +static void closeconn(void); +static void cmptime(char *); static void doarrow __P((char **, struct namelist *, char *, struct subcmd *)); static void dodcolon __P((char **, struct namelist *, char *, struct subcmd *)); -static void notify __P((char *, char *, struct namelist *, time_t)); -static void rcmptime __P((struct stat *)); +static void notify(char *, char *, struct namelist *, time_t); +static void rcmptime(struct stat *); /* * Do the commands in cmds (initialized by yyparse). diff --git a/usr.bin/oldrdist/expand.c b/usr.bin/oldrdist/expand.c index 998439c707f..59b5c0fb914 100644 --- a/usr.bin/oldrdist/expand.c +++ b/usr.bin/oldrdist/expand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: expand.c,v 1.9 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: expand.c,v 1.8 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: expand.c,v 1.9 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include "defs.h" @@ -63,16 +63,16 @@ char **sortbase; #define sort() qsort((char *)sortbase, &eargv[eargc] - sortbase, \ sizeof(*sortbase), argcmp), sortbase = &eargv[eargc] -static void Cat __P((char *, char *)); -static void addpath __P((int)); -static int amatch __P((char *, char *)); -static int argcmp __P((const void *, const void *)); -static int execbrc __P((char *, char *)); -static void expsh __P((char *)); -static void expstr __P((char *)); -static int match __P((char *, char *)); -static void matchdir __P((char *)); -static int smatch __P((char *, char *)); +static void Cat(char *, char *); +static void addpath(int); +static int amatch(char *, char *); +static int argcmp(const void *, const void *); +static int execbrc(char *, char *); +static void expsh(char *); +static void expstr(char *); +static int match(char *, char *); +static void matchdir(char *); +static int smatch(char *, char *); /* * Take a list of names and expand any macros, etc. diff --git a/usr.bin/oldrdist/gram.y b/usr.bin/oldrdist/gram.y index 231e066f9bd..ec61939a4d9 100644 --- a/usr.bin/oldrdist/gram.y +++ b/usr.bin/oldrdist/gram.y @@ -34,7 +34,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$Id: gram.y,v 1.3 1996/09/10 23:20:21 millert Exp $"; +static char *rcsid = "$Id: gram.y,v 1.4 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include "defs.h" @@ -44,7 +44,7 @@ struct cmd *last_cmd; struct namelist *last_n; struct subcmd *last_sc; -static char *makestr __P((char *)); +static char *makestr(char *); %} diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c index faf358a20c3..40c3122ba4b 100644 --- a/usr.bin/oldrdist/main.c +++ b/usr.bin/oldrdist/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.10 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.11 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: main.c,v 1.10 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include "defs.h" @@ -75,8 +75,8 @@ int groupid; /* user's group ID */ struct passwd *pw; /* pointer to static area used by getpwent */ struct group *gr; /* pointer to static area used by getgrent */ -static void usage __P((void)); -static void docmdargs __P((int, char *[])); +static void usage(void); +static void docmdargs(int, char *[]); int main(argc, argv) diff --git a/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c index 372d3d670cf..51afafea5a4 100644 --- a/usr.bin/oldrdist/server.c +++ b/usr.bin/oldrdist/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.15 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: server.c,v 1.16 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */ -static char *rcsid = "$OpenBSD: server.c,v 1.15 2001/11/19 19:02:15 mpech Exp $"; +static char *rcsid = "$OpenBSD: server.c,v 1.16 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include <sys/wait.h> @@ -56,22 +56,22 @@ int oumask; /* old umask for creating files */ extern FILE *lfp; /* log file for mailing changes */ -static int chkparent __P((char *)); -static void clean __P((char *)); -static void comment __P((char *)); -static void dospecial __P((char *)); -static int fchog __P((int, char *, char *, char *, int)); -static void hardlink __P((char *)); -static void note __P((const char *, ...)); -static void query __P((char *)); -static void recvf __P((char *, int)); -static void removeit __P((struct stat *)); -static int response __P((void)); -static void rmchk __P((int)); +static int chkparent(char *); +static void clean(char *); +static void comment(char *); +static void dospecial(char *); +static int fchog(int, char *, char *, char *, int); +static void hardlink(char *); +static void note(const char *, ...); +static void query(char *); +static void recvf(char *, int); +static void removeit(struct stat *); +static int response(void); +static void rmchk(int); static struct linkbuf * - savelink __P((struct stat *)); -static void sendf __P((char *, int)); -static int update __P((char *, int, struct stat *)); + savelink(struct stat *); +static void sendf(char *, int); +static int update(char *, int, struct stat *); /* * Server routine to read requests and process them. diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index 3d215e9d6bd..970cc44279e 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: local_passwd.c,v 1.24 2001/12/07 04:15:08 millert Exp $ */ +/* $OpenBSD: local_passwd.c,v 1.25 2002/02/16 21:27:50 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static const char sccsid[] = "from: @(#)local_passwd.c 5.5 (Berkeley) 5/6/91";*/ -static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.24 2001/12/07 04:15:08 millert Exp $"; +static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.25 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -54,12 +54,12 @@ static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.24 2001/12/07 04:15:08 #include <login_cap.h> static uid_t uid; -extern int pwd_gensalt __P((char *, int, struct passwd *, login_cap_t *, char)); -extern int pwd_check __P((struct passwd *, login_cap_t *, char *)); -extern int pwd_gettries __P((struct passwd *, login_cap_t *)); +extern int pwd_gensalt(char *, int, struct passwd *, login_cap_t *, char); +extern int pwd_check(struct passwd *, login_cap_t *, char *); +extern int pwd_gettries(struct passwd *, login_cap_t *); -char *getnewpasswd __P((struct passwd *, login_cap_t *, int)); -void kbintr __P((int)); +char *getnewpasswd(struct passwd *, login_cap_t *, int); +void kbintr(int); int local_passwd(uname, authenticated) diff --git a/usr.bin/passwd/pwd_gensalt.c b/usr.bin/passwd/pwd_gensalt.c index d7c3bbc9d03..32bc61df8c4 100644 --- a/usr.bin/passwd/pwd_gensalt.c +++ b/usr.bin/passwd/pwd_gensalt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_gensalt.c,v 1.11 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: pwd_gensalt.c,v 1.12 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> * All rights reserved. @@ -41,7 +41,7 @@ #include <time.h> #include <login_cap.h> -void to64 __P((char *, int32_t, int n)); +void to64(char *, int32_t, int n); int pwd_gensalt(salt, max, pwd, lc, type) @@ -51,7 +51,7 @@ pwd_gensalt(salt, max, pwd, lc, type) login_cap_t *lc; char type; { - char *bcrypt_gensalt __P((u_int8_t)); + char *bcrypt_gensalt(u_int8_t); char option[LINE_MAX]; char *next, *now; char *cipher; diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c index d50eece54c7..7aa93c3d8ff 100644 --- a/usr.bin/passwd/yp_passwd.c +++ b/usr.bin/passwd/yp_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yp_passwd.c,v 1.19 2001/12/07 04:15:08 millert Exp $ */ +/* $OpenBSD: yp_passwd.c,v 1.20 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -34,7 +34,7 @@ */ #ifndef lint /*static const char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/ -static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.19 2001/12/07 04:15:08 millert Exp $"; +static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.20 2002/02/16 21:27:50 millert Exp $"; #endif /* not lint */ #ifdef YP @@ -61,13 +61,13 @@ static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.19 2001/12/07 04:15:08 mi #define _PASSWORD_LEN PASS_MAX #endif -extern int pwd_gensalt __P((char *, int, struct passwd *, login_cap_t *, char)); -extern int pwd_check __P((struct passwd *, login_cap_t *, char *)); -extern int pwd_gettries __P((struct passwd *, login_cap_t *)); -extern void kbintr __P((int)); +extern int pwd_gensalt(char *, int, struct passwd *, login_cap_t *, char); +extern int pwd_check(struct passwd *, login_cap_t *, char *); +extern int pwd_gettries(struct passwd *, login_cap_t *); +extern void kbintr(int); -char *ypgetnewpasswd __P((struct passwd *, login_cap_t *, char **)); -struct passwd *ypgetpwnam __P((char *)); +char *ypgetnewpasswd(struct passwd *, login_cap_t *, char **); +struct passwd *ypgetpwnam(char *); char *domain; diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 8b77b2b7268..f9faf8807ee 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: paste.c,v 1.9 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: paste.c,v 1.10 2002/02/16 21:27:51 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -44,7 +44,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/ -static char rcsid[] = "$OpenBSD: paste.c,v 1.9 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: paste.c,v 1.10 2002/02/16 21:27:51 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -58,10 +58,10 @@ static char rcsid[] = "$OpenBSD: paste.c,v 1.9 2001/11/19 19:02:15 mpech Exp $"; char *delim; int delimcnt; -int tr __P((char *)); -void usage __P((void)); -void parallel __P((char **)); -void sequential __P((char **)); +int tr(char *); +void usage(void); +void parallel(char **); +void sequential(char **); int main(argc, argv) diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h index 1eed3681315..d42b6a5bf2a 100644 --- a/usr.bin/pr/extern.h +++ b/usr.bin/pr/extern.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: extern.h,v 1.3 1997/04/23 08:08:30 grr Exp $*/ +/* * $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:51 millert Exp $*/ /*- * Copyright (c) 1991 Keith Muller. * Copyright (c) 1993 @@ -41,21 +41,21 @@ extern int eoptind; extern char *eoptarg; -void addnum __P((char *, int, int)); -int egetopt __P((int, char * const *, const char *)); -void flsh_errs __P((void)); -int horzcol __P((int, char **)); -int inln __P((FILE *, char *, int, int *, int *, int, int *)); -int inskip __P((FILE *, int, int)); -void mfail __P((void)); -int mulfile __P((int, char **)); -FILE *nxtfile __P((int, char **, char **, char *, int)); -int onecol __P((int, char **)); -int otln __P((char *, int, int *, int *, int)); -void pfail __P((void)); -int prhead __P((char *, char *, int)); -int prtail __P((int, int)); -int setup __P((int, char **)); -void terminate __P((int)); -void usage __P((void)); -int vertcol __P((int, char **)); +void addnum(char *, int, int); +int egetopt(int, char * const *, const char *); +void flsh_errs(void); +int horzcol(int, char **); +int inln(FILE *, char *, int, int *, int *, int, int *); +int inskip(FILE *, int, int); +void mfail(void); +int mulfile(int, char **); +FILE *nxtfile(int, char **, char **, char *, int); +int onecol(int, char **); +int otln(char *, int, int *, int *, int); +void pfail(void); +int prhead(char *, char *, int); +int prtail(int, int); +int setup(int, char **); +void terminate(int); +void usage(void); +int vertcol(int, char **); diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index a72b597572b..859be7d9ba0 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.5 2001/11/19 19:02:15 mpech Exp $ */ +/* $OpenBSD: printf.c,v 1.6 2002/02/16 21:27:51 millert Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -43,7 +43,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$OpenBSD: printf.c,v 1.5 2001/11/19 19:02:15 mpech Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.6 2002/02/16 21:27:51 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -55,18 +55,18 @@ static char rcsid[] = "$OpenBSD: printf.c,v 1.5 2001/11/19 19:02:15 mpech Exp $" #include <errno.h> #include <err.h> -static int print_escape_str __P((const char *)); -static int print_escape __P((const char *)); - -static int getchr __P((void)); -static double getdouble __P((void)); -static int getint __P((void)); -static long getlong __P((void)); -static unsigned long getulong __P ((void)); -static char *getstr __P((void)); -static char *mklong __P((const char *, int)); -static void check_conversion __P((const char *, const char *)); -static void usage __P((void)); +static int print_escape_str(const char *); +static int print_escape(const char *); + +static int getchr(void); +static double getdouble(void); +static int getint(void); +static long getlong(void); +static unsigned long getulong(void); +static char *getstr(void); +static char *mklong(const char *, int); +static void check_conversion(const char *, const char *); +static void usage(void); static int rval; static char **gargv; diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c index 455a410bb33..aff94f9d14a 100644 --- a/usr.bin/quota/quota.c +++ b/usr.bin/quota/quota.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quota.c,v 1.17 2001/12/01 19:00:34 deraadt Exp $ */ +/* $OpenBSD: quota.c,v 1.18 2002/02/16 21:27:51 millert Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -44,7 +44,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: quota.c,v 1.17 2001/12/01 19:00:34 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: quota.c,v 1.18 2002/02/16 21:27:51 millert Exp $"; #endif /* not lint */ /* @@ -86,24 +86,24 @@ struct quotause { }; #define FOUND 0x01 -int alldigits __P((char *)); +int alldigits(char *); int callaurpc __P((char *, int, int, int, xdrproc_t, void *, xdrproc_t, void *)); -int main __P((int, char **)); +int main(int, char **); int getnfsquota __P((struct statfs *, struct fstab *, struct quotause *, long, int)); -struct quotause *getprivs __P((long id, int quotatype)); +struct quotause *getprivs(long id, int quotatype); int getufsquota __P((struct statfs *, struct fstab *, struct quotause *, long, int)); -void heading __P((int, u_long, const char *, const char *)); -void showgid __P((gid_t)); -void showgrpname __P((const char *)); -void showquotas __P((int, u_long, const char *)); -void showuid __P((uid_t)); -void showusrname __P((const char *)); -char *timeprt __P((time_t seconds)); -int ufshasquota __P((struct fstab *, int, char **)); -void usage __P((void)); +void heading(int, u_long, const char *, const char *); +void showgid(gid_t); +void showgrpname(const char *); +void showquotas(int, u_long, const char *); +void showuid(uid_t); +void showusrname(const char *); +char *timeprt(time_t seconds); +int ufshasquota(struct fstab *, int, char **); +void usage(void); int qflag; int vflag; diff --git a/usr.bin/ranlib/extern.h b/usr.bin/ranlib/extern.h index b88aa81294c..2d8455e80e9 100644 --- a/usr.bin/ranlib/extern.h +++ b/usr.bin/ranlib/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.1 1999/09/21 13:15:43 espie Exp $ */ +/* $OpenBSD: extern.h,v 1.2 2002/02/16 21:27:51 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,19 +34,19 @@ */ /* misc.c */ -extern int tmp __P((void)); -extern void *emalloc __P((size_t)); -extern void badfmt __P((void)); -extern void error __P((const char *)); -extern const char *rname __P((const char *)); +extern int tmp(void); +extern void *emalloc(size_t); +extern void badfmt(void); +extern void error(const char *); +extern const char *rname(const char *); extern char *tname; /* temporary file "name" */ /* touch.c */ -extern int touch __P((void)); -extern void settime __P((int)); +extern int touch(void); +extern void settime(int); /* build.c */ -extern int build __P((void)); +extern int build(void); /* main.c */ extern char *archive; /* archive name */ diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c index aa5a90991ea..42c71d8373d 100644 --- a/usr.bin/renice/renice.c +++ b/usr.bin/renice/renice.c @@ -1,4 +1,4 @@ -/* $OpenBSD: renice.c,v 1.7 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: renice.c,v 1.8 2002/02/16 21:27:51 millert Exp $ */ /* * Copyright (c) 1983, 1989, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)renice.c 8.1 (Berkeley) 6/9/93"; #else -static char rcsid[] = "$OpenBSD: renice.c,v 1.7 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: renice.c,v 1.8 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -57,9 +57,9 @@ static char rcsid[] = "$OpenBSD: renice.c,v 1.7 2001/11/19 19:02:16 mpech Exp $" #include <err.h> #include <errno.h> -int main __P((int, char **)); -int donice __P((int, uid_t, int)); -void usage __P((void)); +int main(int, char **); +int donice(int, uid_t, int); +void usage(void); /* * Change the priority (nice) of processes diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c index 2be8b7885a2..fff4a4cb861 100644 --- a/usr.bin/rev/rev.c +++ b/usr.bin/rev/rev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rev.c,v 1.4 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: rev.c,v 1.5 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: rev.c,v 1.4 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rev.c,v 1.5 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: rev.c,v 1.4 2001/11/19 19:02:16 mpech Exp $"; #include <string.h> #include <unistd.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.bin/rlogin/des_rw.c b/usr.bin/rlogin/des_rw.c index 4515042706e..aec04db7ec2 100644 --- a/usr.bin/rlogin/des_rw.c +++ b/usr.bin/rlogin/des_rw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: des_rw.c,v 1.10 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)des_rw.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: des_rw.c,v 1.10 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -53,10 +53,10 @@ static char rcsid[] = "$OpenBSD: des_rw.c,v 1.9 2001/11/19 19:02:16 mpech Exp $" #include <time.h> #include <unistd.h> -void desrw_set_key __P((des_cblock *, des_key_schedule *)); -void desrw_clear_key __P((void)); -int des_read __P((int, char *, int)); -int des_write __P((int, char *, int)); +void desrw_set_key(des_cblock *, des_key_schedule *); +void desrw_clear_key(void); +int des_read(int, char *, int); +int des_write(int, char *, int); static unsigned char des_inbuf[10240], storage[10240], *store_ptr; static des_cblock *key; diff --git a/usr.bin/rlogin/kcmd.c b/usr.bin/rlogin/kcmd.c index 6217c3fd26a..400bc2e8668 100644 --- a/usr.bin/rlogin/kcmd.c +++ b/usr.bin/rlogin/kcmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $ */ +/* $OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $ */ /* @@ -39,7 +39,7 @@ static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88"; static char sccsid[] = "@(#)kcmd.c 8.2 (Berkeley) 8/19/93"; #else -static char rcsid[] = "$OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $"; +static char rcsid[] = "$OpenBSD: kcmd.c,v 1.14 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -72,7 +72,7 @@ static char rcsid[] = "$OpenBSD: kcmd.c,v 1.13 2001/09/04 23:35:59 millert Exp $ #define START_PORT 5120 /* arbitrary */ -int getport __P((int *)); +int getport(int *); int kcmd __P((int *, char **, u_short, char *, char *, char *, int *, KTEXT, char *, char *, CREDENTIALS *, Key_schedule, MSG_DAT *, struct sockaddr_in *, diff --git a/usr.bin/rlogin/krcmd.c b/usr.bin/rlogin/krcmd.c index fe0b87c3d52..fa0d85feeff 100644 --- a/usr.bin/rlogin/krcmd.c +++ b/usr.bin/rlogin/krcmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp $ */ +/* $OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)krcmd.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: krcmd.c,v 1.9 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: krcmd.c,v 1.8 2001/07/17 02:13:30 pvalchev Exp int kcmd __P((int *, char **, u_short, char *, char *, char *, int *, KTEXT, char *, char *, CREDENTIALS *, Key_schedule, MSG_DAT *, struct sockaddr_in *, struct sockaddr_in *, long)); -int krcmd __P((char **, u_short, char *, char *, int *, char *)); +int krcmd(char **, u_short, char *, char *, int *, char *); int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *, CREDENTIALS *, Key_schedule)); diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c index c58cb106d12..d0f04dccbd9 100644 --- a/usr.bin/rlogin/rlogin.c +++ b/usr.bin/rlogin/rlogin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rlogin.c,v 1.8 1995/10/05 09:07:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rlogin.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: rlogin.c,v 1.27 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rlogin.c,v 1.28 2002/02/16 21:27:51 millert Exp $"; #endif #endif /* not lint */ @@ -89,10 +89,10 @@ des_key_schedule schedule; int use_kerberos = 1, doencrypt; char dst_realm_buf[REALM_SZ], *dest_realm = NULL; -int des_read __P((int, char *, int)); -int des_write __P((int, char *, int)); +int des_read(int, char *, int); +int des_write(int, char *, int); -int krcmd __P((char **, u_short, char *, char *, int *, char *)); +int krcmd(char **, u_short, char *, char *, int *, char *); int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *, CREDENTIALS *, Key_schedule)); #endif @@ -126,32 +126,32 @@ struct winsize { #endif struct winsize winsize; -void catch_child __P((int)); -void copytochild __P((int)); -__dead void doit __P((sigset_t *)); -__dead void done __P((int)); -__dead void sig_done __P((int)); -void echo __P((char)); -u_int getescape __P((char *)); -void lostpeer __P((int)); -void mode __P((int)); -void msg __P((char *)); -void oob __P((int)); -int reader __P((sigset_t *)); -void sendwindow __P((void)); -void setsignal __P((int)); -void sigwinch __P((int)); -void stop __P((int)); -__dead void usage __P((void)) __attribute__((__noreturn__)); -void writer __P((void)); -void writeroob __P((int)); +void catch_child(int); +void copytochild(int); +__dead void doit(sigset_t *); +__dead void done(int); +__dead void sig_done(int); +void echo(char); +u_int getescape(char *); +void lostpeer(int); +void mode(int); +void msg(char *); +void oob(int); +int reader(sigset_t *); +void sendwindow(void); +void setsignal(int); +void sigwinch(int); +void stop(int); +__dead void usage(void) __attribute__((__noreturn__)); +void writer(void); +void writeroob(int); #ifdef KERBEROS -void warning __P((const char *, ...)); -void desrw_set_key __P((des_cblock *, des_key_schedule *)); +void warning(const char *, ...); +void desrw_set_key(des_cblock *, des_key_schedule *); #endif #ifdef OLDSUN -int get_window_size __P((int, struct winsize *)); +int get_window_size(int, struct winsize *); #endif int diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c index aabe048f71d..d2be67e1e3a 100644 --- a/usr.bin/rpcgen/rpc_clntout.c +++ b/usr.bin/rpcgen/rpc_clntout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_clntout.c,v 1.8 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_clntout.c,v 1.9 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_clntout.c,v 1.4 1995/06/11 21:49:52 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -44,8 +44,8 @@ static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI"; #include "rpc_parse.h" #include "rpc_util.h" -static void write_program __P((definition *)); -static void printbody __P((proc_list *)); +static void write_program(definition *); +static void printbody(proc_list *); extern void pdeclaration(); diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c index 7c241055a84..c15cee08fb2 100644 --- a/usr.bin/rpcgen/rpc_cout.c +++ b/usr.bin/rpcgen/rpc_cout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_cout.c,v 1.10 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_cout.c,v 1.11 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_cout.c,v 1.6 1996/10/01 04:13:53 cgd Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -45,26 +45,26 @@ static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI"; #include "rpc_parse.h" #include "rpc_util.h" -static int findtype __P((definition *, char *)); -static int undefined __P((char *)); -static void print_generic_header __P((char *, int)); -static void print_header __P((definition *)); -static void print_prog_header __P((proc_list *)); -static void print_trailer __P((void)); -static void print_ifopen __P((int, char *)); -static void print_ifarg __P((char *)); -static void print_ifsizeof __P((char *, char *)); -static void print_ifclose __P((int)); -static void print_ifstat __P((int, char *, char *, relation, char *, char *, char *)); -static void emit_num __P((definition *)); -static void emit_program __P((definition *)); -static void emit_enum __P((definition *)); -static void emit_union __P((definition *)); -static void emit_struct __P((definition *)); -static void emit_typedef __P((definition *)); -static void print_stat __P((int, declaration *)); -void emit_inline __P((declaration *, int)); -void emit_single_in_line __P((declaration *, int, relation)); +static int findtype(definition *, char *); +static int undefined(char *); +static void print_generic_header(char *, int); +static void print_header(definition *); +static void print_prog_header(proc_list *); +static void print_trailer(void); +static void print_ifopen(int, char *); +static void print_ifarg(char *); +static void print_ifsizeof(char *, char *); +static void print_ifclose(int); +static void print_ifstat(int, char *, char *, relation, char *, char *, char *); +static void emit_num(definition *); +static void emit_program(definition *); +static void emit_enum(definition *); +static void emit_union(definition *); +static void emit_struct(definition *); +static void emit_typedef(definition *); +static void print_stat(int, declaration *); +void emit_inline(declaration *, int); +void emit_single_in_line(declaration *, int, relation); /* * Emit the C-routine for the given definition @@ -631,7 +631,7 @@ print_stat(indent, dec) print_ifstat(indent, prefix, type, rel, amax, name, dec->name); } -char *upcase __P((char *)); +char *upcase(char *); void emit_inline(decl, flag) diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c index 8bbc81fe6ba..39760647361 100644 --- a/usr.bin/rpcgen/rpc_hout.c +++ b/usr.bin/rpcgen/rpc_hout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_hout.c,v 1.9 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_hout.c,v 1.10 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_hout.c,v 1.4 1995/06/11 21:49:55 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -43,18 +43,18 @@ static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI"; #include "rpc_parse.h" #include "rpc_util.h" -static void pconstdef __P((definition *)); -static void pargdef __P((definition *)); -static void pstructdef __P((definition *)); -static void puniondef __P((definition *)); -static void pprogramdef __P((definition *)); -static void penumdef __P((definition *)); -static void ptypedef __P((definition *)); -static void pdefine __P((char *, char *)); -static void puldefine __P((char *, char *)); -static int define_printed __P((proc_list *, version_list *)); -static int undefined2 __P((char *, char *)); -static void parglist __P((proc_list *, char *)); +static void pconstdef(definition *); +static void pargdef(definition *); +static void pstructdef(definition *); +static void puniondef(definition *); +static void pprogramdef(definition *); +static void penumdef(definition *); +static void ptypedef(definition *); +static void pdefine(char *, char *); +static void puldefine(char *, char *); +static int define_printed(proc_list *, version_list *); +static int undefined2(char *, char *); +static void parglist(proc_list *, char *); void pxdrfuncdecl(char *, int); void pprocdef(proc_list *, version_list *, char *, int, int); void pdeclaration(char *, declaration *, int, char *); diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c index 9a006c4711c..46209dbdf88 100644 --- a/usr.bin/rpcgen/rpc_main.c +++ b/usr.bin/rpcgen/rpc_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_main.c,v 1.11 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_main.c,v 1.9 1996/02/19 11:12:43 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -32,7 +32,7 @@ #ifndef lint static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI"; -static char cvsid[] = "$OpenBSD: rpc_main.c,v 1.11 2001/12/05 09:50:31 deraadt Exp $"; +static char cvsid[] = "$OpenBSD: rpc_main.c,v 1.12 2002/02/16 21:27:51 millert Exp $"; #endif /* @@ -130,20 +130,20 @@ int tirpcflag = 0; /* generating code for tirpc, by default */ static char *dos_cppfile = NULL; #endif -static c_output __P((char *, char *, int, char *)); -static h_output __P((char *, char *, int, char *)); -static s_output __P((int, char **, char *, char *, int, char *, int, int)); -static l_output __P((char *, char *, int, char *)); -static t_output __P((char *, char *, int, char *)); -static svc_output __P((char *, char *, int, char *)); -static clnt_output __P((char *, char *, int, char *)); -static do_registers __P((int, char **)); -static void addarg __P((char *)); -static void putarg __P((int, char *)); -static void clear_args __P((void)); -static void checkfiles __P((char *, char *)); -static int parseargs __P((int, char **, struct commandline *)); -static usage __P((void)); +static c_output(char *, char *, int, char *); +static h_output(char *, char *, int, char *); +static s_output(int, char **, char *, char *, int, char *, int, int); +static l_output(char *, char *, int, char *); +static t_output(char *, char *, int, char *); +static svc_output(char *, char *, int, char *); +static clnt_output(char *, char *, int, char *); +static do_registers(int, char **); +static void addarg(char *); +static void putarg(int, char *); +static void clear_args(void); +static void checkfiles(char *, char *); +static int parseargs(int, char **, struct commandline *); +static usage(void); int diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c index d5ab9cd0072..84c2882dc80 100644 --- a/usr.bin/rpcgen/rpc_parse.c +++ b/usr.bin/rpcgen/rpc_parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_parse.c,v 1.8 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_parse.c,v 1.9 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_parse.c,v 1.5 1995/08/29 23:05:55 cgd Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -48,17 +48,17 @@ static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI"; #define ARGNAME "arg" -static isdefined __P((definition *)); -static def_struct __P((definition *)); -static def_program __P((definition *)); -static def_enum __P((definition *)); -static def_const __P((definition *)); -static def_union __P((definition *)); -static def_typedef __P((definition *)); -static get_declaration __P((declaration *, defkind)); -static get_prog_declaration __P((declaration *, defkind, int)); -static get_type __P((char **, char **, defkind)); -static unsigned_dec __P((char **)); +static isdefined(definition *); +static def_struct(definition *); +static def_program(definition *); +static def_enum(definition *); +static def_const(definition *); +static def_union(definition *); +static def_typedef(definition *); +static get_declaration(declaration *, defkind); +static get_prog_declaration(declaration *, defkind, int); +static get_type(char **, char **, defkind); +static unsigned_dec(char **); /* * return the next definition you see diff --git a/usr.bin/rpcgen/rpc_sample.c b/usr.bin/rpcgen/rpc_sample.c index a4a41fe0cfc..50d31758dd6 100644 --- a/usr.bin/rpcgen/rpc_sample.c +++ b/usr.bin/rpcgen/rpc_sample.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_sample.c,v 1.10 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_sample.c,v 1.11 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_sample.c,v 1.2 1995/06/11 21:50:01 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -48,9 +48,9 @@ static char sccsid[] = "@(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI"; static char RQSTP[] = "rqstp"; void printarglist(); -static void write_sample_client __P((char *, version_list *)); -static void write_sample_server __P((definition *)); -static void return_type __P((proc_list *)); +static void write_sample_client(char *, version_list *); +static void write_sample_server(definition *); +static void return_type(proc_list *); void write_sample_svc(def) diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c index 08cb93305f9..70f00549750 100644 --- a/usr.bin/rpcgen/rpc_scan.c +++ b/usr.bin/rpcgen/rpc_scan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_scan.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_scan.c,v 1.8 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_scan.c,v 1.4 1995/06/11 21:50:02 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -47,15 +47,15 @@ static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI"; #include "rpc_parse.h" #include "rpc_util.h" -static unget_token __P((token *tokp)); -static findstrconst __P((char **, char **)); -static findchrconst __P((char **, char **)); -static findconst __P((char **, char **)); -static findkind __P((char **, token *)); -static cppline __P((char *)); -static directive __P((char *)); -static printdirective __P((char *)); -static docppline __P((char *, int *, char **)); +static unget_token(token *tokp); +static findstrconst(char **, char **); +static findchrconst(char **, char **); +static findconst(char **, char **); +static findkind(char **, token *); +static cppline(char *); +static directive(char *); +static printdirective(char *); +static docppline(char *, int *, char **); #define startcomment(where) (where[0] == '/' && where[1] == '*') #define endcomment(where) (where[-1] == '*' && where[0] == '/') diff --git a/usr.bin/rpcgen/rpc_scan.h b/usr.bin/rpcgen/rpc_scan.h index 7bdc7c22a13..55df4778187 100644 --- a/usr.bin/rpcgen/rpc_scan.h +++ b/usr.bin/rpcgen/rpc_scan.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_scan.h,v 1.2 1996/06/26 05:38:39 deraadt Exp $ */ +/* $OpenBSD: rpc_scan.h,v 1.3 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_scan.h,v 1.3 1995/06/11 21:50:04 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -94,14 +94,14 @@ typedef struct token token; /* * routine interface */ -void scan __P((tok_kind, token *)); -void scan2 __P((tok_kind, tok_kind, token *)); -void scan3 __P((tok_kind, tok_kind, tok_kind, token *)); -void scan_num __P((token *)); -void peek __P((token *)); -int peekscan __P((tok_kind, token *)); -void get_token __P((token *)); +void scan(tok_kind, token *); +void scan2(tok_kind, tok_kind, token *); +void scan3(tok_kind, tok_kind, tok_kind, token *); +void scan_num(token *); +void peek(token *); +int peekscan(tok_kind, token *); +void get_token(token *); -void expected1 __P((tok_kind)); -void expected2 __P((tok_kind, tok_kind)); -void expected3 __P((tok_kind, tok_kind, tok_kind)); +void expected1(tok_kind); +void expected2(tok_kind, tok_kind); +void expected3(tok_kind, tok_kind, tok_kind); diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c index b5def6125a9..c626ddf02d4 100644 --- a/usr.bin/rpcgen/rpc_svcout.c +++ b/usr.bin/rpcgen/rpc_svcout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_svcout.c,v 1.10 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_svcout.c,v 1.11 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_svcout.c,v 1.7 1995/06/24 14:59:59 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -51,20 +51,20 @@ static char ROUTINE[] = "local"; char _errbuf[256]; /* For all messages */ -void internal_proctype __P((proc_list *)); -static write_real_program __P((definition *)); -static write_program __P((definition *, char *)); -static printerr __P((char *, char *)); -static printif __P((char *, char *, char *, char *)); -static write_inetmost __P((char *)); -static print_return __P((char *)); -static print_pmapunset __P((char *)); -static print_err_message __P((char *)); -static write_timeout_func __P((void)); -static write_pm_most __P((char *, int)); -static write_caller_func __P((void)); -static write_rpc_svc_fg __P((char *, char *)); -static open_log_file __P((char *, char *)); +void internal_proctype(proc_list *); +static write_real_program(definition *); +static write_program(definition *, char *); +static printerr(char *, char *); +static printif(char *, char *, char *, char *); +static write_inetmost(char *); +static print_return(char *); +static print_pmapunset(char *); +static print_err_message(char *); +static write_timeout_func(void); +static write_pm_most(char *, int); +static write_caller_func(void); +static write_rpc_svc_fg(char *, char *); +static open_log_file(char *, char *); static p_xdrfunc(rname, typename) diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c index 3bf257ba556..d2eeb4140ff 100644 --- a/usr.bin/rpcgen/rpc_tblout.c +++ b/usr.bin/rpcgen/rpc_tblout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_tblout.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_tblout.c,v 1.8 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_tblout.c,v 1.3 1995/06/24 15:00:15 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -58,8 +58,8 @@ static char null_entry[] = "\n\t(char *(*)())0,\n\ static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n"; -static void write_table __P((definition *)); -static void printit __P((char *, char *)); +static void write_table(definition *); +static void printit(char *, char *); void write_tables() diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c index 4751e9e3c81..527590c07fc 100644 --- a/usr.bin/rpcgen/rpc_util.c +++ b/usr.bin/rpcgen/rpc_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_util.c,v 1.7 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_util.c,v 1.8 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_util.c,v 1.6 1995/08/29 23:05:57 cgd Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI"; #define ARGEXT "argument" -static void printwhere __P((void)); +static void printwhere(void); char curline[MAXLINESIZE]; /* current read line */ char *where = curline; /* current point in line */ diff --git a/usr.bin/rpcgen/rpc_util.h b/usr.bin/rpcgen/rpc_util.h index 6d8b95e8c82..e1ad01fad29 100644 --- a/usr.bin/rpcgen/rpc_util.h +++ b/usr.bin/rpcgen/rpc_util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_util.h,v 1.8 2001/12/05 09:50:31 deraadt Exp $ */ +/* $OpenBSD: rpc_util.h,v 1.9 2002/02/16 21:27:51 millert Exp $ */ /* $NetBSD: rpc_util.h,v 1.3 1995/06/11 21:50:10 pk Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -104,56 +104,56 @@ definition *findval(); #define FINDVAL(list,item,finder) \ findval(list, item, finder) -void crash __P((void)); -char *fixtype __P((char *)); -char *stringfix __P((char *)); -char *locase __P((char *)); -void pvname_svc __P((char *, char *)); -void pvname __P((char *, char *)); -void ptype __P((char *, char *, int)); -int isvectordef __P((char *, relation)); -int streq __P((char *, char *)); -void error __P((char *)); -void tabify __P((FILE *, int)); -void record_open __P((char *)); -bas_type *find_type __P((char *)); -char *make_argname __P((char *, char *)); +void crash(void); +char *fixtype(char *); +char *stringfix(char *); +char *locase(char *); +void pvname_svc(char *, char *); +void pvname(char *, char *); +void ptype(char *, char *, int); +int isvectordef(char *, relation); +int streq(char *, char *); +void error(char *); +void tabify(FILE *, int); +void record_open(char *); +bas_type *find_type(char *); +char *make_argname(char *, char *); /* * rpc_cout routines */ -void emit __P((definition *)); +void emit(definition *); /* * rpc_hout routines */ -void print_datadef __P((definition *)); -void print_funcdef __P((definition *)); +void print_datadef(definition *); +void print_funcdef(definition *); /* * rpc_svcout routines */ -void write_most __P((char *, int, int)); -void write_rest __P((void)); -void write_programs __P((char *)); -void write_svc_aux __P((int)); -void write_inetd_register __P((char *)); -void write_netid_register __P((char *)); -void write_nettype_register __P((char *)); +void write_most(char *, int, int); +void write_rest(void); +void write_programs(char *); +void write_svc_aux(int); +void write_inetd_register(char *); +void write_netid_register(char *); +void write_nettype_register(char *); /* * rpc_clntout routines */ -void write_stubs __P((void)); -void printarglist __P((proc_list *, char *, char *)); +void write_stubs(void); +void printarglist(proc_list *, char *, char *); /* * rpc_tblout routines */ -void write_tables __P((void)); +void write_tables(void); /* * rpc_sample routines */ -void write_sample_svc __P((definition *)); -int write_sample_clnt __P((definition *)); -void write_sample_clnt_main __P((void)); +void write_sample_svc(definition *); +int write_sample_clnt(definition *); +void write_sample_clnt_main(void); diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c index a0453ff00e7..16ed7a2e7b9 100644 --- a/usr.bin/rs/rs.c +++ b/usr.bin/rs/rs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rs.c,v 1.6 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: rs.c,v 1.7 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -92,16 +92,16 @@ int propgutter; char isep = ' ', osep = ' '; int owidth = 80, gutter = 2; -void usage __P((char *, char *)); -void getargs __P((int, char *[])); -void getfile __P((void)); -int getline __P((void)); -char *getlist __P((short **, char *)); -char *getnum __P((int *, char *, int)); -char **getptrs __P((char **)); -void prepfile __P((void)); -void prints __P((char *, int)); -void putfile __P((void)); +void usage(char *, char *); +void getargs(int, char *[]); +void getfile(void); +int getline(void); +char *getlist(short **, char *); +char *getnum(int *, char *, int); +char **getptrs(char **); +void prepfile(void); +void prints(char *, int); +void putfile(void); #define INCR(ep) do { \ if (++ep >= endelem) \ diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c index 343d8d47057..df220cb2d4c 100644 --- a/usr.bin/rsh/rsh.c +++ b/usr.bin/rsh/rsh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsh.c,v 1.22 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: rsh.c,v 1.23 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1983, 1990 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$OpenBSD: rsh.c,v 1.22 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rsh.c,v 1.23 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -75,19 +75,19 @@ Key_schedule schedule; int use_kerberos = 1, doencrypt; char dst_realm_buf[REALM_SZ], *dest_realm; -void warning __P((const char *, ...)); -void desrw_set_key __P((des_cblock *, des_key_schedule *)); -int des_read __P((int, char *, int)); -int des_write __P((int, char *, int)); +void warning(const char *, ...); +void desrw_set_key(des_cblock *, des_key_schedule *); +int des_read(int, char *, int); +int des_write(int, char *, int); -int krcmd __P((char **, u_short, char *, char *, int *, char *)); +int krcmd(char **, u_short, char *, char *, int *, char *); int krcmd_mutual __P((char **, u_short, char *, char *, int *, char *, CREDENTIALS *, Key_schedule)); #endif -void usage __P((void)); +void usage(void); -void talk __P((int, sigset_t *, int, int)); +void talk(int, sigset_t *, int, int); /* * rsh - remote shell diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index bac2055ebc8..2eb4bd80fef 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rup.c,v 1.14 2001/10/02 18:06:47 deraadt Exp $ */ +/* $OpenBSD: rup.c,v 1.15 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993, John Brezak @@ -34,7 +34,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: rup.c,v 1.14 2001/10/02 18:06:47 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rup.c,v 1.15 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -62,8 +62,8 @@ struct host_list { struct in_addr addr; } *hosts; -void usage __P((void)); -int print_rup_data __P((char *, statstime *host_stat)); +void usage(void); +int print_rup_data(char *, statstime *host_stat); int search_host(addr) diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c index 202c079e639..deac54b8b34 100644 --- a/usr.bin/ruptime/ruptime.c +++ b/usr.bin/ruptime/ruptime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ruptime.c,v 1.6 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: ruptime.c,v 1.7 2002/02/16 21:27:52 millert Exp $ */ /* * Copyright (c) 1983 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)ruptime.c 5.8 (Berkeley) 7/21/90";*/ -static char rcsid[] = "$OpenBSD: ruptime.c,v 1.6 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: ruptime.c,v 1.7 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -68,7 +68,7 @@ time_t now; int rflg = 1; int hscmp(), ucmp(), lcmp(), tcmp(); -void morehosts __P((void)); +void morehosts(void); int main(argc, argv) diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c index f530a6cdd73..55fa8308566 100644 --- a/usr.bin/script/script.c +++ b/usr.bin/script/script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: script.c,v 1.16 2001/11/18 23:51:57 deraadt Exp $ */ +/* $OpenBSD: script.c,v 1.17 2002/02/16 21:27:52 millert Exp $ */ /* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */ /* @@ -69,7 +69,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: script.c,v 1.16 2001/11/18 23:51:57 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: script.c,v 1.17 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -103,13 +103,13 @@ volatile sig_atomic_t flush; struct termios tt; -__dead void done __P((int)); -void dooutput __P((void)); -void doshell __P((void)); -void fail __P((void)); -void finish __P((int)); -void scriptflush __P((int)); -void handlesigwinch __P((int)); +__dead void done(int); +void dooutput(void); +void doshell(void); +void fail(void); +void finish(int); +void scriptflush(int); +void handlesigwinch(int); int main(argc, argv) diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c index ca9308d591e..e47135b6ae7 100644 --- a/usr.bin/sed/compile.c +++ b/usr.bin/sed/compile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compile.c,v 1.10 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: compile.c,v 1.11 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95"; */ -static char *rcsid = "$OpenBSD: compile.c,v 1.10 2001/11/19 19:02:16 mpech Exp $"; +static char *rcsid = "$OpenBSD: compile.c,v 1.11 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -66,22 +66,22 @@ static struct labhash { int lh_ref; } *labels[LHSZ]; -static char *compile_addr __P((char *, struct s_addr *)); -static char *compile_ccl __P((char **, char *)); -static char *compile_delimited __P((char *, char *)); -static char *compile_flags __P((char *, struct s_subst *)); -static char *compile_re __P((char *, regex_t **)); -static char *compile_subst __P((char *, struct s_subst *)); -static char *compile_text __P((void)); -static char *compile_tr __P((char *, char **)); +static char *compile_addr(char *, struct s_addr *); +static char *compile_ccl(char **, char *); +static char *compile_delimited(char *, char *); +static char *compile_flags(char *, struct s_subst *); +static char *compile_re(char *, regex_t **); +static char *compile_subst(char *, struct s_subst *); +static char *compile_text(void); +static char *compile_tr(char *, char **); static struct s_command - **compile_stream __P((struct s_command **)); -static char *duptoeol __P((char *, char *)); -static void enterlabel __P((struct s_command *)); + **compile_stream(struct s_command **); +static char *duptoeol(char *, char *); +static void enterlabel(struct s_command *); static struct s_command - *findlabel __P((char *)); -static void fixuplabel __P((struct s_command *, struct s_command *)); -static void uselabel __P((void)); + *findlabel(char *); +static void fixuplabel(struct s_command *, struct s_command *); +static void uselabel(void); /* * Command specification. This is used to drive the command parser. diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h index 259a3a9568e..a1c4b0f4c5d 100644 --- a/usr.bin/sed/extern.h +++ b/usr.bin/sed/extern.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: extern.h,v 1.2 1996/06/26 05:39:06 deraadt Exp $*/ +/* * $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:52 millert Exp $*/ /*- * Copyright (c) 1992 Diomidis Spinellis. * Copyright (c) 1992, 1993 @@ -48,13 +48,13 @@ extern int lastline; extern int aflag, eflag, nflag; extern char *fname; -void cfclose __P((struct s_command *, struct s_command *)); -void compile __P((void)); -void cspace __P((SPACE *, char *, size_t, enum e_spflag)); -char *cu_fgets __P((char *, int)); -void err __P((int, const char *, ...)); -int mf_fgets __P((SPACE *, enum e_spflag)); -void process __P((void)); -char *strregerror __P((int, regex_t *)); -void *xmalloc __P((u_int)); -void *xrealloc __P((void *, u_int)); +void cfclose(struct s_command *, struct s_command *); +void compile(void); +void cspace(SPACE *, char *, size_t, enum e_spflag); +char *cu_fgets(char *, int); +void err(int, const char *, ...); +int mf_fgets(SPACE *, enum e_spflag); +void process(void); +char *strregerror(int, regex_t *); +void *xmalloc(u_int); +void *xrealloc(void *, u_int); diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index 757ef476cf8..505f20cebe4 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.5 1998/06/23 22:40:42 millert Exp $ */ +/* $OpenBSD: main.c,v 1.6 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; */ -static char *rcsid = "$OpenBSD: main.c,v 1.5 1998/06/23 22:40:42 millert Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.6 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -102,8 +102,8 @@ char *fname; /* File name. */ u_long linenum; int lastline; /* TRUE on the last line of the last file */ -static void add_compunit __P((enum e_cut, char *)); -static void add_file __P((char *)); +static void add_compunit(enum e_cut, char *); +static void add_file(char *); int main(argc, argv) diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c index 145ea13eeb0..2020f5f2c74 100644 --- a/usr.bin/sed/process.c +++ b/usr.bin/sed/process.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process.c,v 1.6 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: process.c,v 1.7 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1992 Diomidis Spinellis. @@ -39,7 +39,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)process.c 8.1 (Berkeley) 6/6/93"; */ -static char *rcsid = "$OpenBSD: process.c,v 1.6 2001/11/19 19:02:16 mpech Exp $"; +static char *rcsid = "$OpenBSD: process.c,v 1.7 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -67,12 +67,12 @@ static SPACE HS, PS, SS; #define hs HS.space #define hsl HS.len -static inline int applies __P((struct s_command *)); -static void flush_appends __P((void)); -static void lputs __P((char *)); -static inline int regexec_e __P((regex_t *, const char *, int, int, size_t)); -static void regsub __P((SPACE *, char *, char *)); -static int substitute __P((struct s_command *)); +static inline int applies(struct s_command *); +static void flush_appends(void); +static void lputs(char *); +static inline int regexec_e(regex_t *, const char *, int, int, size_t); +static void regsub(SPACE *, char *, char *); +static int substitute(struct s_command *); struct s_appends *appends; /* Array of pointers to strings to append. */ static int appendx; /* Index into appends array. */ diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c index 0410ce3683d..0d048ad7c08 100644 --- a/usr.bin/showmount/showmount.c +++ b/usr.bin/showmount/showmount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: showmount.c,v 1.9 2001/12/02 02:05:59 deraadt Exp $ */ +/* $OpenBSD: showmount.c,v 1.10 2002/02/16 21:27:52 millert Exp $ */ /* $NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95"; #endif -static char rcsid[] = "$OpenBSD: showmount.c,v 1.9 2001/12/02 02:05:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: showmount.c,v 1.10 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -96,10 +96,10 @@ static struct mountlist *mntdump; static struct exportslist *exports; static int type = 0; -void print_dump __P((struct mountlist *)); -void usage __P((void)); -int xdr_mntdump __P((XDR *, struct mountlist **)); -int xdr_exports __P((XDR *, struct exportslist **)); +void print_dump(struct mountlist *); +void usage(void); +int xdr_mntdump(XDR *, struct mountlist **); +int xdr_exports(XDR *, struct exportslist **); /* * This command queries the NFS mount daemon for it's mount list and/or diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c index 2581ded0ca5..433426200d2 100644 --- a/usr.bin/size/size.c +++ b/usr.bin/size/size.c @@ -1,4 +1,4 @@ -/* $OpenBSD: size.c,v 1.13 2001/07/18 17:17:39 pvalchev Exp $ */ +/* $OpenBSD: size.c,v 1.14 2002/02/16 21:27:52 millert Exp $ */ /* $NetBSD: size.c,v 1.7 1996/01/14 23:07:12 pk Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)size.c 8.2 (Berkeley) 12/9/93"; #endif -static char rcsid[] = "$OpenBSD: size.c,v 1.13 2001/07/18 17:17:39 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: size.c,v 1.14 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -69,10 +69,10 @@ unsigned long total_text, total_data, total_bss, total_total; int ignore_bad_archive_entries = 1; int print_totals = 0; -int process_file __P((int, char *)); -int show_archive __P((int, char *, FILE *)); -int show_objfile __P((int, char *, FILE *)); -void usage __P((void)); +int process_file(int, char *); +int show_archive(int, char *, FILE *); +int show_objfile(int, char *, FILE *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c index 0e706a8cbad..591ff04bbc4 100644 --- a/usr.bin/skey/skey.c +++ b/usr.bin/skey/skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: skey.c,v 1.16 2001/12/28 17:32:04 millert Exp $ */ +/* $OpenBSD: skey.c,v 1.17 2002/02/16 21:27:52 millert Exp $ */ /* * OpenBSD S/Key (skey.c) * @@ -29,7 +29,7 @@ #include <unistd.h> #include <skey.h> -void usage __P((char *)); +void usage(char *); int main(argc, argv) diff --git a/usr.bin/skeyaudit/skeyaudit.c b/usr.bin/skeyaudit/skeyaudit.c index 84b2e183fc5..9a8f576fdf9 100644 --- a/usr.bin/skeyaudit/skeyaudit.c +++ b/usr.bin/skeyaudit/skeyaudit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: skeyaudit.c,v 1.11 2001/07/09 07:04:52 deraadt Exp $ */ +/* $OpenBSD: skeyaudit.c,v 1.12 2002/02/16 21:27:52 millert Exp $ */ /* * Copyright (c) 1997, 2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -44,9 +44,9 @@ extern char *__progname; -void notify __P((struct passwd *, int, int)); -FILE *runsendmail __P((struct passwd *, int *)); -void usage __P((void)); +void notify(struct passwd *, int, int); +FILE *runsendmail(struct passwd *, int *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/skeyinit/skeyinit.c b/usr.bin/skeyinit/skeyinit.c index 8f2a993629b..791bc429e73 100644 --- a/usr.bin/skeyinit/skeyinit.c +++ b/usr.bin/skeyinit/skeyinit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: skeyinit.c,v 1.30 2001/11/01 18:26:58 miod Exp $ */ +/* $OpenBSD: skeyinit.c,v 1.31 2002/02/16 21:27:52 millert Exp $ */ /* OpenBSD S/Key (skeyinit.c) * @@ -36,11 +36,11 @@ #define SKEY_NAMELEN 4 #endif -void lockeof __P((struct skey *, char *)); -void usage __P((char *)); -void secure_mode __P((int *, char *, char *, char *, char *, size_t)); -void normal_mode __P((char *, int, char *, char *, char *)); -void timedout __P((int)); +void lockeof(struct skey *, char *); +void usage(char *); +void secure_mode(int *, char *, char *, char *, char *, size_t); +void normal_mode(char *, int, char *, char *, char *); +void timedout(int); int main(argc, argv) diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c index 236fa5f6b2d..1b41da0c6ae 100644 --- a/usr.bin/soelim/soelim.c +++ b/usr.bin/soelim/soelim.c @@ -1,4 +1,4 @@ -/* $OpenBSD: soelim.c,v 1.4 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: soelim.c,v 1.5 2002/02/16 21:27:52 millert Exp $ */ /* $NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: soelim.c,v 1.4 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: soelim.c,v 1.5 2002/02/16 21:27:52 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -66,7 +66,7 @@ static char rcsid[] = "$OpenBSD: soelim.c,v 1.4 2001/11/19 19:02:16 mpech Exp $" */ #define STDIN_NAME "-" -int process __P((char *file)); +int process(char *file); int main(argc, argv) diff --git a/usr.bin/sort/extern.h b/usr.bin/sort/extern.h index 1a468b346d1..a5d5e332fe5 100644 --- a/usr.bin/sort/extern.h +++ b/usr.bin/sort/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2001/02/04 21:27:00 ericj Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -39,15 +39,15 @@ */ void append __P((u_char **, int, int, FILE *, void (*)(), struct field *)); -void concat __P((FILE *, FILE *)); +void concat(FILE *, FILE *); length_t enterkey __P((RECHEADER *, DBT *, int, struct field *)); -void fixit __P((int *, char **)); -void fldreset __P((struct field *)); -FILE *ftmp __P((void)); +void fixit(int *, char **); +void fldreset(struct field *); +FILE *ftmp(void); void fmerge __P((int, union f_handle, int, int (*)(), FILE *, void (*)(), struct field *)); -void fsort __P((int, int, union f_handle, int, FILE *, struct field *)); +void fsort(int, int, union f_handle, int, FILE *, struct field *); int geteasy __P((int, union f_handle, int, RECHEADER *, u_char *, struct field *)); int getnext __P((int, union f_handle, @@ -57,12 +57,12 @@ int makekey __P((int, union f_handle, int makeline __P((int, union f_handle, int, RECHEADER *, u_char *, struct field *)); void merge __P((int, int, int (*)(), FILE *, void (*)(), struct field *)); -void num_init __P((void)); -void onepass __P((u_char **, int, long, long *, u_char *, FILE *)); -int optval __P((int, int)); +void num_init(void); +void onepass(u_char **, int, long, long *, u_char *, FILE *); +int optval(int, int); void order __P((union f_handle, int (*)(), struct field *)); -void putline __P((RECHEADER *, FILE *)); -void putrec __P((RECHEADER *, FILE *)); -void rd_append __P((int, union f_handle, int, FILE *, u_char *, u_char *)); -int setfield __P((char *, struct field *, int)); -void settables __P((int)); +void putline(RECHEADER *, FILE *); +void putrec(RECHEADER *, FILE *); +void rd_append(int, union f_handle, int, FILE *, u_char *, u_char *); +int setfield(char *, struct field *, int); +void settables(int); diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c index 74387e0eebe..b48affe434a 100644 --- a/usr.bin/sort/fields.c +++ b/usr.bin/sort/fields.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fields.c,v 1.5 2001/02/04 21:27:00 ericj Exp $ */ +/* $OpenBSD: fields.c,v 1.6 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)fields.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: fields.c,v 1.5 2001/02/04 21:27:00 ericj Exp $"; +static char rcsid[] = "$OpenBSD: fields.c,v 1.6 2002/02/16 21:27:52 millert Exp $"; #endif #endif /* not lint */ @@ -59,9 +59,9 @@ static char rcsid[] = "$OpenBSD: fields.c,v 1.5 2001/02/04 21:27:00 ericj Exp $" while (!((FLD_D | REC_D_F) & l_d_mask[*++pos])); \ } -extern u_char *enterfield __P((u_char *, u_char *, struct field *, int)); +extern u_char *enterfield(u_char *, u_char *, struct field *, int); -extern u_char *number __P((u_char *, u_char *, u_char *, u_char *, int)); +extern u_char *number(u_char *, u_char *, u_char *, u_char *, int); extern struct coldesc *clist; extern int ncols; diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c index 20056cdea47..6835782101f 100644 --- a/usr.bin/sort/files.c +++ b/usr.bin/sort/files.c @@ -1,4 +1,4 @@ -/* $OpenBSD: files.c,v 1.7 2001/02/04 21:27:00 ericj Exp $ */ +/* $OpenBSD: files.c,v 1.8 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)files.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: files.c,v 1.7 2001/02/04 21:27:00 ericj Exp $"; +static char rcsid[] = "$OpenBSD: files.c,v 1.8 2002/02/16 21:27:52 millert Exp $"; #endif #endif /* not lint */ @@ -49,7 +49,7 @@ static char rcsid[] = "$OpenBSD: files.c,v 1.7 2001/02/04 21:27:00 ericj Exp $"; #include <string.h> -static int seq __P((FILE *, DBT *, DBT *)); +static int seq(FILE *, DBT *, DBT *); /* * this is the subroutine for file management for fsort(). diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c index 097f069bf5d..ddaa8e52d14 100644 --- a/usr.bin/sort/msort.c +++ b/usr.bin/sort/msort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msort.c,v 1.10 2002/01/04 16:33:14 art Exp $ */ +/* $OpenBSD: msort.c,v 1.11 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)msort.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: msort.c,v 1.10 2002/01/04 16:33:14 art Exp $"; +static char rcsid[] = "$OpenBSD: msort.c,v 1.11 2002/02/16 21:27:52 millert Exp $"; #endif #endif /* not lint */ @@ -68,8 +68,8 @@ typedef struct tmfile { u_char *wts, *wts1 = 0; struct mfile *cfilebuf; -static int cmp __P((RECHEADER *, RECHEADER *)); -static int insert __P((struct mfile **, struct mfile **, int, int)); +static int cmp(RECHEADER *, RECHEADER *); +static int insert(struct mfile **, struct mfile **, int, int); void fmerge(binno, files, nfiles, get, outfp, fput, ftbl) diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 32ad3bb83b6..830e17f4e24 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sort.c,v 1.17 2001/11/17 19:51:34 millert Exp $ */ +/* $OpenBSD: sort.c,v 1.18 2002/02/16 21:27:52 millert Exp $ */ /*- * Copyright (c) 1993 @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sort.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: sort.c,v 1.17 2001/11/17 19:51:34 millert Exp $"; +static char rcsid[] = "$OpenBSD: sort.c,v 1.18 2002/02/16 21:27:52 millert Exp $"; #endif #endif /* not lint */ @@ -93,9 +93,9 @@ char devstdin[] = _PATH_STDIN; char toutpath[_POSIX_PATH_MAX]; char *tmpdir = _PATH_VARTMP; -static void cleanup __P((void)); -static void onsig __P((int)); -static void usage __P((char *)); +static void cleanup(void); +static void onsig(int); +static void usage(char *); #define CHECK_NFIELDS \ if (++nfields == ND) { \ diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 520f500cebe..d052b919235 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -1,4 +1,4 @@ -/* $OpenBSD: split.c,v 1.5 1999/12/04 21:16:05 deraadt Exp $ */ +/* $OpenBSD: split.c,v 1.6 2002/02/16 21:27:53 millert Exp $ */ /* $NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94"; #else -static char rcsid[] = "$OpenBSD: split.c,v 1.5 1999/12/04 21:16:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: split.c,v 1.6 2002/02/16 21:27:53 millert Exp $"; #endif #endif /* not lint */ @@ -72,10 +72,10 @@ char fname[MAXPATHLEN]; /* File name prefix. */ regex_t rgx; int pflag; -void newfile __P((void)); -void split1 __P((void)); -void split2 __P((void)); -void usage __P((void)); +void newfile(void); +void split1(void); +void split2(void); +void usage(void); int main(argc, argv) diff --git a/usr.bin/ssh/auth.h b/usr.bin/ssh/auth.h index 45d5135d110..4bb8f81f46a 100644 --- a/usr.bin/ssh/auth.h +++ b/usr.bin/ssh/auth.h @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $OpenBSD: auth.h,v 1.26 2001/12/27 19:54:53 markus Exp $ + * $OpenBSD: auth.h,v 1.27 2002/02/16 21:27:53 millert Exp $ */ #ifndef AUTH_H #define AUTH_H @@ -79,12 +79,12 @@ struct Authctxt { struct KbdintDevice { const char *name; - void* (*init_ctx) __P((Authctxt*)); + void* (*init_ctx)(Authctxt*); int (*query) __P((void *ctx, char **name, char **infotxt, u_int *numprompts, char ***prompts, u_int **echo_on)); - int (*respond) __P((void *ctx, u_int numresp, char **responses)); - void (*free_ctx) __P((void *ctx)); + int (*respond)(void *ctx, u_int numresp, char **responses); + void (*free_ctx)(void *ctx); }; int auth_rhosts(struct passwd *, const char *); diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c index 63352cf992e..52812d9cd33 100644 --- a/usr.bin/strings/strings.c +++ b/usr.bin/strings/strings.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strings.c,v 1.6 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: strings.c,v 1.7 2002/02/16 21:27:53 millert Exp $ */ /* $NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)strings.c 8.2 (Berkeley) 1/28/94"; #endif -static char rcsid[] = "$OpenBSD: strings.c,v 1.6 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: strings.c,v 1.7 2002/02/16 21:27:53 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -74,8 +74,8 @@ static int hcnt, /* head count */ read_len; /* length to read */ static u_char hbfr[sizeof(EXEC)]; /* buffer for struct exec */ -static void usage __P((void)); -int getch __P((void)); +static void usage(void); +int getch(void); int main(argc, argv) diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c index 56b218abbc0..509a5f0c49b 100644 --- a/usr.bin/strip/strip.c +++ b/usr.bin/strip/strip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strip.c,v 1.15 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: strip.c,v 1.16 2002/02/16 21:27:53 millert Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)strip.c 5.8 (Berkeley) 11/6/91";*/ -static char rcsid[] = "$OpenBSD: strip.c,v 1.15 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: strip.c,v 1.16 2002/02/16 21:27:53 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -69,9 +69,9 @@ typedef struct nlist NLIST; #define strx n_un.n_strx -int s_stab __P((const char *, int, EXEC *, struct stat *)); -int s_sym __P((const char *, int, EXEC *, struct stat *)); -void usage __P((void)); +int s_stab(const char *, int, EXEC *, struct stat *); +int s_sym(const char *, int, EXEC *, struct stat *); +void usage(void); int xflag = 0; @@ -83,7 +83,7 @@ main(argc, argv) int fd; EXEC *ep; struct stat sb; - int (*sfcn)__P((const char *, int, EXEC *, struct stat *)); + int (*sfcn)(const char *, int, EXEC *, struct stat *); int ch, errors; char *fn; diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c index 775d38c890c..c9eba97b477 100644 --- a/usr.bin/su/su.c +++ b/usr.bin/su/su.c @@ -1,4 +1,4 @@ -/* $OpenBSD: su.c,v 1.42 2001/09/18 16:37:59 millert Exp $ */ +/* $OpenBSD: su.c,v 1.43 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -43,7 +43,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91"; #else -static const char rcsid[] = "$OpenBSD: su.c,v 1.42 2001/09/18 16:37:59 millert Exp $"; +static const char rcsid[] = "$OpenBSD: su.c,v 1.43 2002/02/16 21:27:54 millert Exp $"; #endif #endif /* not lint */ @@ -69,11 +69,11 @@ static const char rcsid[] = "$OpenBSD: su.c,v 1.42 2001/09/18 16:37:59 millert E #endif #include <bsd_auth.h> -char *ontty __P((void)); -int chshell __P((char *)); -void usage __P((void)); -void auth_err __P((auth_session_t *, int, const char *, ...)); -void auth_errx __P((auth_session_t *, int, const char *, ...)); +char *ontty(void); +int chshell(char *); +void usage(void); +void auth_err(auth_session_t *, int, const char *, ...); +void auth_errx(auth_session_t *, int, const char *, ...); int main(argc, argv) diff --git a/usr.bin/sup/src/errmsg.c b/usr.bin/sup/src/errmsg.c index 52b611acefd..94a73263b8b 100644 --- a/usr.bin/sup/src/errmsg.c +++ b/usr.bin/sup/src/errmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: errmsg.c,v 1.7 2001/05/04 22:16:15 millert Exp $ */ +/* $OpenBSD: errmsg.c,v 1.8 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -37,7 +37,7 @@ #include "supextern.h" #ifndef HAS_STRERROR -static char *itoa __P((char *, unsigned int)); +static char *itoa(char *, unsigned int); static char *itoa(p, n) char *p; diff --git a/usr.bin/sup/src/expand.c b/usr.bin/sup/src/expand.c index 798052f96b9..82e93d67310 100644 --- a/usr.bin/sup/src/expand.c +++ b/usr.bin/sup/src/expand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expand.c,v 1.11 2001/05/05 15:56:04 millert Exp $ */ +/* $OpenBSD: expand.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -97,15 +97,15 @@ static int bufcnt; /* current number in buffer */ #endif #endif -int expand __P((char *, char **, int)); -static void glob __P((char *)); -static void matchdir __P((char *)); -static int execbrc __P((char *, char *)); -static int match __P((char *, char *)); -static int amatch __P((char *, char *)); -static void addone __P((char *, char *)); -static int addpath __P((int)); -static int gethdir __P((char *, int)); +int expand(char *, char **, int); +static void glob(char *); +static void matchdir(char *); +static int execbrc(char *, char *); +static int match(char *, char *); +static int amatch(char *, char *); +static void addone(char *, char *); +static int addpath(int); +static int gethdir(char *, int); int expand(spec, buffer, bufsize) diff --git a/usr.bin/sup/src/run.c b/usr.bin/sup/src/run.c index 48adefb7fb5..63113d3c71f 100644 --- a/usr.bin/sup/src/run.c +++ b/usr.bin/sup/src/run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: run.c,v 1.10 2001/07/25 16:54:11 deraadt Exp $ */ +/* $OpenBSD: run.c,v 1.11 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1991 Carnegie Mellon University @@ -101,8 +101,8 @@ #endif #endif -static int dorun __P((char *, char **, int)); -static char **makearglist __P((va_list)); +static int dorun(char *, char **, int); +static char **makearglist(va_list); static char ** makearglist(ap) diff --git a/usr.bin/sup/src/scan.c b/usr.bin/sup/src/scan.c index 8439a338a20..f69c92e6c63 100644 --- a/usr.bin/sup/src/scan.c +++ b/usr.bin/sup/src/scan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scan.c,v 1.12 2001/05/04 22:16:16 millert Exp $ */ +/* $OpenBSD: scan.c,v 1.13 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -176,25 +176,25 @@ extern int candorcs; /************************************************* *** STATIC R O U T I N E S *** *************************************************/ -static void passdelim __P((char **, int )); -static char *parserelease __P((TREELIST **, char *, char *)); -static int scanone __P((TREE *, void *)); -static void makescan __P((char *, char *)); -static void getscan __P((char *, char *)); -static void doscan __P((char *)); -static void readlistfile __P((char *)); -static void expTinsert __P((char *, TREE **, int, char *)); -static int listone __P((TREE *, void *)); -static void listentry __P((char *, char *, char *, int)); -static void listname __P((char *, struct stat *)); -static void listdir __P((char *, int)); -static int omitanyone __P((TREE *, void *)); -static int anyglob __P((char *, char *)); -static int getscanfile __P((char *)); -static void chkscanfile __P((char *)); -static void makescanfile __P((char *)); -static int recordone __P((TREE *, void *)); -static int recordexec __P((TREE *, void *)); +static void passdelim(char **, int ); +static char *parserelease(TREELIST **, char *, char *); +static int scanone(TREE *, void *); +static void makescan(char *, char *); +static void getscan(char *, char *); +static void doscan(char *); +static void readlistfile(char *); +static void expTinsert(char *, TREE **, int, char *); +static int listone(TREE *, void *); +static void listentry(char *, char *, char *, int); +static void listname(char *, struct stat *); +static void listdir(char *, int); +static int omitanyone(TREE *, void *); +static int anyglob(char *, char *); +static int getscanfile(char *); +static void chkscanfile(char *); +static void makescanfile(char *); +static int recordone(TREE *, void *); +static int recordexec(TREE *, void *); /************************************************* diff --git a/usr.bin/sup/src/scm.c b/usr.bin/sup/src/scm.c index 6e5d108074f..c1b8702b573 100644 --- a/usr.bin/sup/src/scm.c +++ b/usr.bin/sup/src/scm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scm.c,v 1.13 2001/05/05 15:56:04 millert Exp $ */ +/* $OpenBSD: scm.c,v 1.14 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -217,7 +217,7 @@ static char *remotename = NULL; /* remote host name */ static int swapmode; /* byte-swapping needed on server? */ -static char *myhost __P((void)); +static char *myhost(void); /*************************************************** *** C O N N E C T I O N R O U T I N E S *** diff --git a/usr.bin/sup/src/scmio.c b/usr.bin/sup/src/scmio.c index 6c1ae8afe69..cf37d40b1db 100644 --- a/usr.bin/sup/src/scmio.c +++ b/usr.bin/sup/src/scmio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scmio.c,v 1.10 2001/05/15 15:31:09 millert Exp $ */ +/* $OpenBSD: scmio.c,v 1.11 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -197,10 +197,10 @@ struct buf { } buffers[2]; struct buf *bufptr; /* buffer pointer */ -static int writedata __P((int, char *)); -static int writeblock __P((int, char *)); -static int readdata __P((int, char *)); -static int readcount __P((int *)); +static int writedata(int, char *); +static int writeblock(int, char *); +static int readdata(int, char *); +static int readcount(int *); /*********************************************** diff --git a/usr.bin/sup/src/stree.c b/usr.bin/sup/src/stree.c index 11e088261c1..bb9958eb4c9 100644 --- a/usr.bin/sup/src/stree.c +++ b/usr.bin/sup/src/stree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stree.c,v 1.8 2001/05/04 22:16:16 millert Exp $ */ +/* $OpenBSD: stree.c,v 1.9 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -60,15 +60,15 @@ #define Static static /* comment for debugging */ -Static TREE *Tmake __P((char *)); -Static TREE *Trotll __P((TREE *, TREE *)); -Static TREE *Trotlh __P((TREE *, TREE *)); -Static TREE *Trothl __P((TREE *, TREE *)); -Static TREE *Trothh __P((TREE *, TREE *)); -Static void Tbalance __P((TREE **)); -Static TREE *Tinsertavl __P((TREE **, char *, int, int *)); +Static TREE *Tmake(char *); +Static TREE *Trotll(TREE *, TREE *); +Static TREE *Trotlh(TREE *, TREE *); +Static TREE *Trothl(TREE *, TREE *); +Static TREE *Trothh(TREE *, TREE *); +Static void Tbalance(TREE **); +Static TREE *Tinsertavl(TREE **, char *, int, int *); Static int Tsubprocess __P((TREE *, int, int (*f )(TREE *, void *), void *)); -Static int Tprintone __P((TREE *, void *)); +Static int Tprintone(TREE *, void *); /************************************************************* @@ -322,7 +322,7 @@ Static int Tsubprocess (t, reverse, f, argp) TREE *t; int reverse; - int (*f) __P((TREE *, void *)); + int (*f)(TREE *, void *); void *argp; { int x = SCMOK; @@ -346,7 +346,7 @@ Tsubprocess (t, reverse, f, argp) int Trprocess(t, f, args) TREE *t; - int (*f) __P((TREE *, void *)); + int (*f)(TREE *, void *); void *args; { if (t == NULL) @@ -359,7 +359,7 @@ Trprocess(t, f, args) int Tprocess(t, f, args) TREE *t; - int (*f) __P((TREE *, void *)); + int (*f)(TREE *, void *); void *args; { if (t == NULL) diff --git a/usr.bin/sup/src/supcmain.c b/usr.bin/sup/src/supcmain.c index 50a64503b48..227bcec87b4 100644 --- a/usr.bin/sup/src/supcmain.c +++ b/usr.bin/sup/src/supcmain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmain.c,v 1.12 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: supcmain.c,v 1.13 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -346,10 +346,10 @@ int rpauseflag; /* don't disable resource pausing */ int xpatchflag; /* crosspatched with remote system */ int portdebug; /* network debugging ports */ -int main __P((int, char **)); -static int checkcoll __P((TREE *, void *)); -static void doswitch __P((char *, TREE **, int *, int *)); -static char *init __P((int, char **)); +int main(int, char **); +static int checkcoll(TREE *, void *); +static void doswitch(char *, TREE **, int *, int *); +static char *init(int, char **); /************************************* *** M A I N R O U T I N E *** diff --git a/usr.bin/sup/src/supcmeat.c b/usr.bin/sup/src/supcmeat.c index 5540baeb9ae..63b80e153b5 100644 --- a/usr.bin/sup/src/supcmeat.c +++ b/usr.bin/sup/src/supcmeat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmeat.c,v 1.14 2001/05/04 22:16:16 millert Exp $ */ +/* $OpenBSD: supcmeat.c,v 1.15 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -133,13 +133,13 @@ extern int noutime; /* don't set utimes */ *** U P G R A D E C O L L E C T I O N *** *************************************************/ -static int needone __P((TREE *, void *)); -static int recvone __P((TREE *, va_list)); -static int denyone __P((TREE *, void *)); -static int deleteone __P((TREE *, void *)); -static int linkone __P((TREE *, void *)); -static int execone __P((TREE *, void *)); -static int finishone __P((TREE *, void *)); +static int needone(TREE *, void *); +static int recvone(TREE *, va_list); +static int denyone(TREE *, void *); +static int deleteone(TREE *, void *); +static int linkone(TREE *, void *); +static int execone(TREE *, void *); +static int finishone(TREE *, void *); /* diff --git a/usr.bin/sup/src/supcmisc.c b/usr.bin/sup/src/supcmisc.c index dd8bdbdc466..ebafbc7979e 100644 --- a/usr.bin/sup/src/supcmisc.c +++ b/usr.bin/sup/src/supcmisc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcmisc.c,v 1.11 2001/05/07 02:08:02 millert Exp $ */ +/* $OpenBSD: supcmisc.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -73,9 +73,9 @@ static LIST *gidL[LISTSIZE]; extern COLLECTION *thisC; /* collection list pointer */ -static int Lhash __P((char *)); -static void Linsert __P((LIST **, char *, int)); -static LIST *Llookup __P((LIST **, char *)); +static int Lhash(char *); +static void Linsert(LIST **, char *, int); +static LIST *Llookup(LIST **, char *); /************************************************* *** P R I N T U P D A T E T I M E S *** diff --git a/usr.bin/sup/src/supcparse.c b/usr.bin/sup/src/supcparse.c index f8676b2c7c3..c4ec08fd8b6 100644 --- a/usr.bin/sup/src/supcparse.c +++ b/usr.bin/sup/src/supcparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supcparse.c,v 1.7 2001/05/04 22:16:16 millert Exp $ */ +/* $OpenBSD: supcparse.c,v 1.8 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -99,7 +99,7 @@ struct option { { "compress", OCOMPRESS } }; -static void passdelim __P((char **, int )); +static void passdelim(char **, int ); static void passdelim(ptr, delim) /* skip over delimiter */ diff --git a/usr.bin/sup/src/supextern.h b/usr.bin/sup/src/supextern.h index 662deeb7960..b2e234e8fa4 100644 --- a/usr.bin/sup/src/supextern.h +++ b/usr.bin/sup/src/supextern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: supextern.h,v 1.5 2001/05/05 15:56:04 millert Exp $ */ +/* $OpenBSD: supextern.h,v 1.6 2002/02/16 21:27:54 millert Exp $ */ #ifndef __P #ifdef __STDC__ @@ -9,181 +9,181 @@ #endif /* atoo.c */ -unsigned int atoo __P((char *)); +unsigned int atoo(char *); #if 0 /* ci.c */ -int ci __P((char *, FILE *, int, CIENTRY *, char *, char *)); +int ci(char *, FILE *, int, CIENTRY *, char *, char *); #endif /* errmsg.c */ -const char *errmsg __P((int)); +const char *errmsg(int); /* expand.c */ -int expand __P((char *, char **, int)); +int expand(char *, char **, int); /* ffilecopy.c */ -int ffilecopy __P((FILE *, FILE *)); +int ffilecopy(FILE *, FILE *); /* filecopy.c */ -int filecopy __P((int, int )); +int filecopy(int, int ); /* log.c */ -void logopen __P((char *)); -void logquit __P((int, char *, ...)); -void logerr __P((char *, ...)); -void loginfo __P((char *, ...)); +void logopen(char *); +void logquit(int, char *, ...); +void logerr(char *, ...); +void loginfo(char *, ...); #ifdef LIBWRAP -void logdeny __P((char *, ...)); -void logallow __P((char *, ...)); +void logdeny(char *, ...); +void logallow(char *, ...); #endif /* netcryptvoid.c */ -int netcrypt __P((char *)); -int getcryptbuf __P((int)); -void decode __P((char *, char *, int)); -void encode __P((char *, char *, int)); +int netcrypt(char *); +int getcryptbuf(int); +void decode(char *, char *, int); +void encode(char *, char *, int); /* nxtarg.c */ -char *nxtarg __P((char **, char *)); +char *nxtarg(char **, char *); /* path.c */ -void path __P((char *, char *, char *, int)); +void path(char *, char *, char *, int); /* quit.c */ -void quit __P((int, char *, ...)); +void quit(int, char *, ...); /* read_line.c */ -char *read_line __P((FILE *, size_t *, size_t *, const char[3], int)); +char *read_line(FILE *, size_t *, size_t *, const char[3], int); /* run.c */ -int run __P((char *, ...)); -int runv __P((char *, char **)); -int runp __P((char *, ...)); -int runvp __P((char *, char **)); -int runio __P((char *const[], const char *, const char *, const char *)); -int runiofd __P((char *const[], const int, const int, const int)); +int run(char *, ...); +int runv(char *, char **); +int runp(char *, ...); +int runvp(char *, char **); +int runio(char *const[], const char *, const char *, const char *); +int runiofd(char *const[], const int, const int, const int); /* scan.c */ -int getrelease __P((char *)); -void makescanlists __P((void)); -void getscanlists __P((void)); -void cdprefix __P((char *)); +int getrelease(char *); +void makescanlists(void); +void getscanlists(void); +void cdprefix(char *); /* scm.c */ -int lock_host_file __P((char *)); -int servicesetup __P((char *)); -int service __P((void)); -int serviceprep __P((void)); -int servicekill __P((void)); -int serviceend __P((void)); -int dobackoff __P((int *, int *)); -int request __P((char *, char *, int *)); -int requestend __P((void)); -char *remotehost __P((void)); -int thishost __P((char *)); -int samehost __P((void)); -int matchhost __P((char *)); -int scmerr __P((int, char *, ...)); -int byteswap __P((int)); +int lock_host_file(char *); +int servicesetup(char *); +int service(void); +int serviceprep(void); +int servicekill(void); +int serviceend(void); +int dobackoff(int *, int *); +int request(char *, char *, int *); +int requestend(void); +char *remotehost(void); +int thishost(char *); +int samehost(void); +int matchhost(char *); +int scmerr(int, char *, ...); +int byteswap(int); /* scmio.c */ -int writemsg __P((int)); -int writemend __P((void)); -int writeint __P((int)); -int writestring __P((char *)); -int writefile __P((int)); -int writemnull __P((int)); -int writemint __P((int, int )); -int writemstr __P((int, char *)); -int prereadcount __P((int *)); -int readflush __P((void)); -int readmsg __P((int)); -int readmend __P((void)); -int readskip __P((void)); -int readint __P((int *)); -int readstring __P((char **)); -int readfile __P((int)); -int readmnull __P((int)); -int readmint __P((int, int *)); -int readmstr __P((int, char **)); -void crosspatch __P((void)); +int writemsg(int); +int writemend(void); +int writeint(int); +int writestring(char *); +int writefile(int); +int writemnull(int); +int writemint(int, int ); +int writemstr(int, char *); +int prereadcount(int *); +int readflush(void); +int readmsg(int); +int readmend(void); +int readskip(void); +int readint(int *); +int readstring(char **); +int readfile(int); +int readmnull(int); +int readmint(int, int *); +int readmstr(int, char **); +void crosspatch(void); /* skipto.c */ -char *skipto __P((char *, char *)); -char *skipover __P((char *, char *)); +char *skipto(char *, char *); +char *skipover(char *, char *); /* stree.c */ -void Tfree __P((TREE **)); -TREE *Tinsert __P((TREE **, char *, int)); -TREE *Tsearch __P((TREE *, char *)); -TREE *Tlookup __P((TREE *, char *)); +void Tfree(TREE **); +TREE *Tinsert(TREE **, char *, int); +TREE *Tsearch(TREE *, char *); +TREE *Tlookup(TREE *, char *); int Trprocess __P((TREE *, int (*)(TREE *, void *), void *)); int Tprocess __P((TREE *, int (*)(TREE *, void *), void *)); -void Tprint __P((TREE *, char *)); +void Tprint(TREE *, char *); /* supcmeat.c */ -int getonehost __P((TREE *, void *)); -TREE *getcollhost __P((int *, int *, long *, int *)); -void getcoll __P((void)); -int signon __P((TREE *, int, int *)); -int setup __P((TREE *)); -void suplogin __P((void)); -void listfiles __P((void)); -void recvfiles __P((void)); -int prepare __P((char *, int, int *, struct stat *)); -int recvdir __P((TREE *, int, struct stat *)); -int recvsym __P((TREE *, int, struct stat *)); -int recvreg __P((TREE *, int, struct stat *)); -int copyfile __P((char *, char *)); -void finishup __P((int)); -void done __P((int, char *, ...)); -void goaway __P((char *, ...)); +int getonehost(TREE *, void *); +TREE *getcollhost(int *, int *, long *, int *); +void getcoll(void); +int signon(TREE *, int, int *); +int setup(TREE *); +void suplogin(void); +void listfiles(void); +void recvfiles(void); +int prepare(char *, int, int *, struct stat *); +int recvdir(TREE *, int, struct stat *); +int recvsym(TREE *, int, struct stat *); +int recvreg(TREE *, int, struct stat *); +int copyfile(char *, char *); +void finishup(int); +void done(int, char *, ...); +void goaway(char *, ...); /* supcmisc.c */ -void prtime __P((void)); -int establishdir __P((char *)); -int makedir __P((char *, int, struct stat *)); -int estabd __P((char *, char *)); -void ugconvert __P((char *, char *, uid_t *, gid_t *, int *)); -void notify __P((char *, ...)); -void lockout __P((int)); -char *fmttime __P((time_t)); +void prtime(void); +int establishdir(char *); +int makedir(char *, int, struct stat *); +int estabd(char *, char *); +void ugconvert(char *, char *, uid_t *, gid_t *, int *); +void notify(char *, ...); +void lockout(int); +char *fmttime(time_t); /* supcname.c */ -void getnams __P((void)); +void getnams(void); /* supcparse.c */ -int parsecoll __P((COLLECTION *, char *, char *)); -time_t getwhen __P((char *, char *)); -int putwhen __P((char *, time_t)); +int parsecoll(COLLECTION *, char *, char *); +time_t getwhen(char *, char *); +int putwhen(char *, time_t); /* supmsg.c */ -int msgsignon __P((void)); -int msgsignonack __P((void)); -int msgsetup __P((void)); -int msgsetupack __P((void)); -int msgcrypt __P((void)); -int msgcryptok __P((void)); -int msglogin __P((void)); -int msglogack __P((void)); -int msgrefuse __P((void)); -int msglist __P((void)); -int msgneed __P((void)); -int msgdeny __P((void)); -int msgsend __P((void)); +int msgsignon(void); +int msgsignonack(void); +int msgsetup(void); +int msgsetupack(void); +int msgcrypt(void); +int msgcryptok(void); +int msglogin(void); +int msglogack(void); +int msgrefuse(void); +int msglist(void); +int msgneed(void); +int msgdeny(void); +int msgsend(void); int msgrecv __P((int (*)(TREE *, va_list), ...)); -int msgdone __P((void)); -int msggoaway __P((void)); -int msgxpatch __P((void)); -int msgcompress __P((void)); +int msgdone(void); +int msggoaway(void); +int msgxpatch(void); +int msgcompress(void); /* vprintf.c */ /* XXX already in system headers included already - but with different argument declarations! */ #if 0 -int vprintf __P((const char *, va_list)); -int vfprintf __P((FILE *, const char *, va_list)); -int vsprintf __P((char *, const char *, va_list)); -int vsnprintf __P((char *, size_t, const char *, va_list)); +int vprintf(const char *, va_list); +int vfprintf(FILE *, const char *, va_list); +int vsprintf(char *, const char *, va_list); +int vsnprintf(char *, size_t, const char *, va_list); #endif diff --git a/usr.bin/sup/src/supfilesrv.c b/usr.bin/sup/src/supfilesrv.c index 63d1db40b5b..d29774fbe29 100644 --- a/usr.bin/sup/src/supfilesrv.c +++ b/usr.bin/sup/src/supfilesrv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supfilesrv.c,v 1.26 2001/08/23 19:31:28 camield Exp $ */ +/* $OpenBSD: supfilesrv.c,v 1.27 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -363,35 +363,35 @@ HASH *inodeH[HASHSIZE]; /* for inode lookup for linked file check */ /* supfilesrv.c */ -int main __P((int, char **)); -void chldsig __P((int)); -void usage __P((void)); -void init __P((int, char **)); -void answer __P((void)); -void srvsignon __P((void)); -void srvsetup __P((void)); -void docrypt __P((void)); -void srvlogin __P((void)); -void listfiles __P((void)); -int denyone __P((TREE *, void *)); -void sendfiles __P((void)); -int sendone __P((TREE *, void *)); -int senddir __P((TREE *, void *)); -int sendfile __P((TREE *, va_list)); -void srvfinishup __P((time_t)); -void Hfree __P((HASH **)); -HASH *Hlookup __P((HASH **, int, int )); -void Hinsert __P((HASH **, int, int, char *, TREE *)); -TREE *linkcheck __P((TREE *, int, int )); -char *uconvert __P((uid_t)); -char *gconvert __P((gid_t)); -char *changeuid __P((char *, char *, uid_t, gid_t)); -void goaway __P((char *, ...)); -char *fmttime __P((time_t)); -int local_file __P((int, struct stat *)); -int stat_info_ok __P((struct stat *, struct stat *)); -int link_nofollow __P((int)); -int link_nofollow __P((int)); +int main(int, char **); +void chldsig(int); +void usage(void); +void init(int, char **); +void answer(void); +void srvsignon(void); +void srvsetup(void); +void docrypt(void); +void srvlogin(void); +void listfiles(void); +int denyone(TREE *, void *); +void sendfiles(void); +int sendone(TREE *, void *); +int senddir(TREE *, void *); +int sendfile(TREE *, va_list); +void srvfinishup(time_t); +void Hfree(HASH **); +HASH *Hlookup(HASH **, int, int ); +void Hinsert(HASH **, int, int, char *, TREE *); +TREE *linkcheck(TREE *, int, int ); +char *uconvert(uid_t); +char *gconvert(gid_t); +char *changeuid(char *, char *, uid_t, gid_t); +void goaway(char *, ...); +char *fmttime(time_t); +int local_file(int, struct stat *); +int stat_info_ok(struct stat *, struct stat *); +int link_nofollow(int); +int link_nofollow(int); /************************************* *** M A I N R O U T I N E *** diff --git a/usr.bin/sup/src/supmsg.c b/usr.bin/sup/src/supmsg.c index edd636184c8..c639d637792 100644 --- a/usr.bin/sup/src/supmsg.c +++ b/usr.bin/sup/src/supmsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supmsg.c,v 1.8 2001/11/29 18:21:23 mpech Exp $ */ +/* $OpenBSD: supmsg.c,v 1.9 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -69,11 +69,11 @@ extern int pgmversion; /* my program version */ extern char *scmver; /* scm version of partner */ extern int fspid; /* process id of fileserver */ -static int refuseone __P((TREE *, void *)); -static int listone __P((TREE *, void *)); -static int needone __P((TREE *, void *)); -static int denyone __P((TREE *, void *)); -static int writeone __P((TREE *, void *)); +static int refuseone(TREE *, void *); +static int listone(TREE *, void *); +static int needone(TREE *, void *); +static int denyone(TREE *, void *); +static int writeone(TREE *, void *); int msgsignon() diff --git a/usr.bin/sup/src/supscan.c b/usr.bin/sup/src/supscan.c index 1dd03e77702..8c6a516e334 100644 --- a/usr.bin/sup/src/supscan.c +++ b/usr.bin/sup/src/supscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: supscan.c,v 1.11 2001/05/04 22:16:17 millert Exp $ */ +/* $OpenBSD: supscan.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ /* * Copyright (c) 1992 Carnegie Mellon University @@ -160,11 +160,11 @@ TREE *listT; /* final list of files in collection */ TREE *refuseT = NULL; /* list of all files specified by <coll>.list */ -void usage __P((void)); -void init __P((int, char **)); -static SCAN_COLLECTION *getscancoll __P((char *, char *, char *)); -int localhost __P((char *)); -int main __P((int, char **)); +void usage(void); +void init(int, char **); +static SCAN_COLLECTION *getscancoll(char *, char *, char *); +int localhost(char *); +int main(int, char **); /************************************* *** M A I N R O U T I N E *** diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h index b944833121c..9949bd728ad 100644 --- a/usr.bin/systat/extern.h +++ b/usr.bin/systat/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.9 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.10 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1996/05/10 23:16:34 thorpej Exp $ */ /*- @@ -62,67 +62,67 @@ extern int verbose; struct inpcb; -int checkhost __P((struct inpcb *)); -int checkport __P((struct inpcb *)); -void closeiostat __P((WINDOW *)); -void closekre __P((WINDOW *)); -void closembufs __P((WINDOW *)); -void closenetstat __P((WINDOW *)); -void closepigs __P((WINDOW *)); -void closeswap __P((WINDOW *)); -int cmdiostat __P((char *, char *)); -int cmdkre __P((char *, char *)); -int cmdnetstat __P((char *, char *)); -struct cmdtab *lookup __P((char *)); -void command __P((char *)); -void sigdie __P((int)); -void die __P((void)); -void sigdisplay __P((int)); -void display __P((void)); -int dkinit __P((int)); -int dkcmd __P((char *, char *)); -void error __P((const char *fmt, ...)); -void fetchiostat __P((void)); -void fetchkre __P((void)); -void fetchmbufs __P((void)); -void fetchnetstat __P((void)); -void fetchpigs __P((void)); -void fetchswap __P((void)); -int initiostat __P((void)); -int initkre __P((void)); -int initmbufs __P((void)); -int initnetstat __P((void)); -int initpigs __P((void)); -int initswap __P((void)); -void keyboard __P((void)); -int kvm_ckread __P((void *, void *, int)); -void labeliostat __P((void)); -void labelkre __P((void)); -void labelmbufs __P((void)); -void labelnetstat __P((void)); -void labelpigs __P((void)); -void labels __P((void)); -void labelswap __P((void)); -void load __P((void)); -int netcmd __P((char *, char *)); -void nlisterr __P((struct nlist [])); -WINDOW *openiostat __P((void)); -WINDOW *openkre __P((void)); -WINDOW *openmbufs __P((void)); -WINDOW *opennetstat __P((void)); -WINDOW *openpigs __P((void)); -WINDOW *openswap __P((void)); -int prefix __P((char *, char *)); -void sigwinch __P((int)); -void showiostat __P((void)); -void showkre __P((void)); -void showmbufs __P((void)); -void shownetstat __P((void)); -void showpigs __P((void)); -void showswap __P((void)); -void status __P((void)); -void suspend __P((int)); -void gethz __P((void)); +int checkhost(struct inpcb *); +int checkport(struct inpcb *); +void closeiostat(WINDOW *); +void closekre(WINDOW *); +void closembufs(WINDOW *); +void closenetstat(WINDOW *); +void closepigs(WINDOW *); +void closeswap(WINDOW *); +int cmdiostat(char *, char *); +int cmdkre(char *, char *); +int cmdnetstat(char *, char *); +struct cmdtab *lookup(char *); +void command(char *); +void sigdie(int); +void die(void); +void sigdisplay(int); +void display(void); +int dkinit(int); +int dkcmd(char *, char *); +void error(const char *fmt, ...); +void fetchiostat(void); +void fetchkre(void); +void fetchmbufs(void); +void fetchnetstat(void); +void fetchpigs(void); +void fetchswap(void); +int initiostat(void); +int initkre(void); +int initmbufs(void); +int initnetstat(void); +int initpigs(void); +int initswap(void); +void keyboard(void); +int kvm_ckread(void *, void *, int); +void labeliostat(void); +void labelkre(void); +void labelmbufs(void); +void labelnetstat(void); +void labelpigs(void); +void labels(void); +void labelswap(void); +void load(void); +int netcmd(char *, char *); +void nlisterr(struct nlist []); +WINDOW *openiostat(void); +WINDOW *openkre(void); +WINDOW *openmbufs(void); +WINDOW *opennetstat(void); +WINDOW *openpigs(void); +WINDOW *openswap(void); +int prefix(char *, char *); +void sigwinch(int); +void showiostat(void); +void showkre(void); +void showmbufs(void); +void shownetstat(void); +void showpigs(void); +void showswap(void); +void status(void); +void suspend(int); +void gethz(void); extern volatile sig_atomic_t gotdie; extern volatile sig_atomic_t gotdisplay; diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index 74c1d286c8c..eab413a7db9 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iostat.c,v 1.16 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: iostat.c,v 1.17 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: iostat.c,v 1.16 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: iostat.c,v 1.17 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -60,11 +60,11 @@ static double etime; static int numbers = 0; /* default display bar graphs */ static int secs = 0; /* default seconds shown */ -static int barlabels __P((int)); -static void histogram __P((double, int, double)); -static int numlabels __P((int)); -static int stats __P((int, int, int)); -static void stat1 __P((int, int)); +static int barlabels(int); +static void histogram(double, int, double); +static int numlabels(int); +static int stats(int, int, int); +static void stat1(int, int); WINDOW * diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 363240cd79a..add50f59b9a 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.21 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.22 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.21 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.22 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -82,7 +82,7 @@ long CMDLINE; WINDOW *wload; /* one line window for load average */ -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 978063cccf1..08a08790ac1 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcmds.c,v 1.9 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: netcmds.c,v 1.10 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: netcmds.c,v 1.9 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: netcmds.c,v 1.10 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ /* @@ -74,14 +74,14 @@ static struct hitem { int nports, nhosts, protos; -static void changeitems __P((char *, int)); -static int selectproto __P((char *)); -static void showprotos __P((void)); -static int selectport __P((long, int)); -static void showports __P((void)); -static int addrcmp __P((struct sockaddr *, struct sockaddr *)); -static int selecthost __P((struct sockaddr *, int)); -static void showhosts __P((void)); +static void changeitems(char *, int); +static int selectproto(char *); +static void showprotos(void); +static int selectport(long, int); +static void showports(void); +static int addrcmp(struct sockaddr *, struct sockaddr *); +static int selecthost(struct sockaddr *, int); +static void showhosts(void); int netcmd(cmd, args) diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 309a86d8af2..952e28ecf38 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netstat.c,v 1.20 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: netstat.c,v 1.21 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: netstat.c,v 1.20 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: netstat.c,v 1.21 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ /* @@ -79,12 +79,12 @@ static char rcsid[] = "$OpenBSD: netstat.c,v 1.20 2001/12/07 09:18:08 deraadt Ex #include "systat.h" #include "extern.h" -static void enter __P((struct inpcb *, struct socket *, int, char *)); -static const char *inetname __P((struct in_addr)); -static void inetprint __P((struct in_addr *, int, char *)); +static void enter(struct inpcb *, struct socket *, int, char *); +static const char *inetname(struct in_addr); +static void inetprint(struct in_addr *, int, char *); #ifdef INET6 -static const char *inet6name __P((struct in6_addr *)); -static void inet6print __P((struct in6_addr *, int, char *)); +static const char *inet6name(struct in6_addr *); +static void inet6print(struct in6_addr *, int, char *); #endif #define streq(a,b) (strcmp(a,b)==0) diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c index ba8f7ce65b3..822648d3b80 100644 --- a/usr.bin/systat/pigs.c +++ b/usr.bin/systat/pigs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pigs.c,v 1.12 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: pigs.c,v 1.13 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93"; #endif -static char rcsid[] = "$OpenBSD: pigs.c,v 1.12 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pigs.c,v 1.13 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ /* @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: pigs.c,v 1.12 2001/12/07 09:18:08 deraadt Exp $ #include "extern.h" #include "systat.h" -int compar __P((const void *, const void *)); +int compar(const void *, const void *); static int nproc; static struct p_times { diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c index 6e23d5e5d6d..30d0e007514 100644 --- a/usr.bin/systat/swap.c +++ b/usr.bin/systat/swap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swap.c,v 1.14 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: swap.c,v 1.15 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: swap.c,v 1.9 1998/12/26 07:05:08 marc Exp $ */ /*- @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95"; #endif -static char rcsid[] = "$OpenBSD: swap.c,v 1.14 2001/12/07 09:18:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: swap.c,v 1.15 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -59,7 +59,7 @@ static char rcsid[] = "$OpenBSD: swap.c,v 1.14 2001/12/07 09:18:08 deraadt Exp $ #include "systat.h" #include "extern.h" -void showspace __P((char *header, int hlen, long blocksize)); +void showspace(char *header, int hlen, long blocksize); static long blocksize; static int hlen, nswap, rnswap; diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h index 62e898adf36..597b756c16d 100644 --- a/usr.bin/systat/systat.h +++ b/usr.bin/systat/systat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systat.h,v 1.6 2001/12/07 09:18:08 deraadt Exp $ */ +/* $OpenBSD: systat.h,v 1.7 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: systat.h,v 1.2 1995/01/20 08:52:14 jtc Exp $ */ /*- @@ -40,13 +40,13 @@ struct cmdtab { char *c_name; /* command name */ - void (*c_refresh) __P((void)); /* display refresh */ - void (*c_fetch) __P((void)); /* sets up data structures */ - void (*c_label) __P((void)); /* label display */ - int (*c_init) __P((void)); /* initialize namelist, etc. */ - WINDOW *(*c_open) __P((void)); /* open display */ - void (*c_close) __P((WINDOW *)); /* close display */ - int (*c_cmd) __P((char *, char *)); /* display command interpreter */ + void (*c_refresh)(void); /* display refresh */ + void (*c_fetch)(void); /* sets up data structures */ + void (*c_label)(void); /* label display */ + int (*c_init)(void); /* initialize namelist, etc. */ + WINDOW *(*c_open)(void); /* open display */ + void (*c_close)(WINDOW *); /* close display */ + int (*c_cmd)(char *, char *); /* display command interpreter */ char c_flags; /* see below */ }; diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index 096951a989c..feb7d2a625f 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmstat.c,v 1.32 2002/02/16 00:18:09 tdeval Exp $ */ +/* $OpenBSD: vmstat.c,v 1.33 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94"; #endif -static char rcsid[] = "$OpenBSD: vmstat.c,v 1.32 2002/02/16 00:18:09 tdeval Exp $"; +static char rcsid[] = "$OpenBSD: vmstat.c,v 1.33 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ /* @@ -96,14 +96,14 @@ extern struct _disk cur; static enum state { BOOT, TIME, RUN } state = TIME; -static void allocinfo __P((struct Info *)); -static void copyinfo __P((struct Info *, struct Info *)); -static float cputime __P((int)); -static void dinfo __P((int, int)); -static void getinfo __P((struct Info *, enum state)); -static void putint __P((int, int, int, int)); -static void putfloat __P((double, int, int, int, int, int)); -static int ucount __P((void)); +static void allocinfo(struct Info *); +static void copyinfo(struct Info *, struct Info *); +static float cputime(int); +static void dinfo(int, int); +static void getinfo(struct Info *, enum state); +static void putint(int, int, int, int); +static void putfloat(double, int, int, int, int, int); +static int ucount(void); static int ut; static char buf[26]; diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h index a35a4fb93af..bdd043380cd 100644 --- a/usr.bin/tail/extern.h +++ b/usr.bin/tail/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.6 2000/11/21 22:01:47 art Exp $ */ +/* $OpenBSD: extern.h,v 1.7 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1994/11/23 07:42:00 jtc Exp $ */ /*- @@ -42,15 +42,15 @@ enum STYLE { NOTSET = 0, FBYTES, FLINES, RBYTES, RLINES, REVERSE }; -void forward __P((FILE *, enum STYLE, long, struct stat *)); -void reverse __P((FILE *, enum STYLE, long, struct stat *)); +void forward(FILE *, enum STYLE, long, struct stat *); +void reverse(FILE *, enum STYLE, long, struct stat *); -int bytes __P((FILE *, off_t)); -int lines __P((FILE *, off_t)); +int bytes(FILE *, off_t); +int lines(FILE *, off_t); -void ierr __P((void)); -void oerr __P((void)); +void ierr(void); +void oerr(void); extern int fflag, rflag, rval; extern char *fname; -extern int is_stdin;
\ No newline at end of file +extern int is_stdin; diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index f7d1d248bf7..3dfd18c0792 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: forward.c,v 1.13 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: forward.c,v 1.14 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: forward.c,v 1.13 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: forward.c,v 1.14 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: forward.c,v 1.13 2001/11/19 19:02:16 mpech Exp #include "extern.h" -static int rlines __P((FILE *, long, struct stat *)); +static int rlines(FILE *, long, struct stat *); /* * forward -- display the file, from an offset, forward. diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c index 3a03bbc0073..20e908cf451 100644 --- a/usr.bin/tail/reverse.c +++ b/usr.bin/tail/reverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reverse.c,v 1.11 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: reverse.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: reverse.c,v 1.11 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: reverse.c,v 1.12 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -58,8 +58,8 @@ static char rcsid[] = "$OpenBSD: reverse.c,v 1.11 2001/11/19 19:02:16 mpech Exp #include "extern.h" -static void r_buf __P((FILE *)); -static int r_reg __P((FILE *, enum STYLE, long, struct stat *)); +static void r_buf(FILE *); +static int r_reg(FILE *, enum STYLE, long, struct stat *); /* * reverse -- display input in reverse order by line. diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index dd26ca4d7e7..c483e823a29 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tail.c,v 1.7 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: tail.c,v 1.8 2002/02/16 21:27:54 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: tail.c,v 1.7 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: tail.c,v 1.8 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -65,8 +65,8 @@ int fflag, rflag, rval; char *fname; int is_stdin; -static void obsolete __P((char **)); -static void usage __P((void)); +static void obsolete(char **); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h index 352a5eb1ad6..672b925c710 100644 --- a/usr.bin/talk/talk.h +++ b/usr.bin/talk/talk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: talk.h,v 1.6 2000/12/31 00:24:51 hugh Exp $ */ +/* $OpenBSD: talk.h,v 1.7 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: talk.h,v 1.3 1994/12/09 02:14:27 jtc Exp $ */ /* @@ -67,28 +67,28 @@ extern xwin_t my_win; extern xwin_t his_win; extern WINDOW *line_win; -void announce_invite __P((void)); -int check_local __P((void)); -void ctl_transact __P((struct in_addr, CTL_MSG, int, CTL_RESPONSE *)); -void display __P((xwin_t *, char *, int)); -void disp_msg __P((int)); -void end_msgs __P((void)); -void get_addrs __P((char *, char *)); -void get_names __P((int, char **)); -void init_display __P((void)); -void invite_remote __P((void)); -int look_for_invite __P((CTL_RESPONSE *)); -int max __P((int, int)); -void message __P((char *)); -void open_ctl __P((void)); -void open_sockt __P((void)); -void print_addr __P((struct sockaddr_in)); -void quit __P((char *, int)); -int readwin __P((WINDOW *, int, int)); -void re_invite __P((int)); -void send_delete __P((void)); -void set_edit_chars __P((void)); -void sig_sent __P((int)); -void start_msgs __P((void)); -void talk __P((void)); -void xscroll __P((xwin_t *, int)); +void announce_invite(void); +int check_local(void); +void ctl_transact(struct in_addr, CTL_MSG, int, CTL_RESPONSE *); +void display(xwin_t *, char *, int); +void disp_msg(int); +void end_msgs(void); +void get_addrs(char *, char *); +void get_names(int, char **); +void init_display(void); +void invite_remote(void); +int look_for_invite(CTL_RESPONSE *); +int max(int, int); +void message(char *); +void open_ctl(void); +void open_sockt(void); +void print_addr(struct sockaddr_in); +void quit(char *, int); +int readwin(WINDOW *, int, int); +void re_invite(int); +void send_delete(void); +void set_edit_chars(void); +void sig_sent(int); +void start_msgs(void); +void talk(void); +void xscroll(xwin_t *, int); diff --git a/usr.bin/tcfs/tcfserrors.h b/usr.bin/tcfs/tcfserrors.h index dd38ac421b1..3a1e042c7a6 100644 --- a/usr.bin/tcfs/tcfserrors.h +++ b/usr.bin/tcfs/tcfserrors.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcfserrors.h,v 1.4 2000/06/19 20:35:48 fgsch Exp $ */ +/* $OpenBSD: tcfserrors.h,v 1.5 2002/02/16 21:27:54 millert Exp $ */ /* * Transparent Cryptographic File System (TCFS) for NetBSD @@ -30,6 +30,6 @@ enum ER_COUNT /* Error calling TCFS_IOC_COUNT ioctl */ }; -void tcfs_error __P((int, char *)); +void tcfs_error(int, char *); #endif diff --git a/usr.bin/tcfs/tcfslib.h b/usr.bin/tcfs/tcfslib.h index 9f038b4f256..12f2ba705f0 100644 --- a/usr.bin/tcfs/tcfslib.h +++ b/usr.bin/tcfs/tcfslib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcfslib.h,v 1.8 2000/06/20 07:40:17 fgsch Exp $ */ +/* $OpenBSD: tcfslib.h,v 1.9 2002/02/16 21:27:54 millert Exp $ */ /* * Transparent Cryptographic File System (TCFS) for NetBSD @@ -16,41 +16,41 @@ #include "tcfsdefines.h" #include "tcfspwdb.h" -extern int tcfspwdbr_new __P((tcfspwdb **)); -extern int tcfspwdbr_edit __P((tcfspwdb **, int, ...)); -extern int tcfspwdbr_read __P((tcfspwdb *, int, ...)); -extern void tcfspwdbr_dispose __P((tcfspwdb *)); -extern int tcfsgpwdbr_new __P((tcfsgpwdb **)); -extern int tcfsgpwdbr_edit __P((tcfsgpwdb **, int, ...)); -extern int tcfsgpwdbr_read __P((tcfsgpwdb *, int, ...)); -extern void tcfsgpwdbr_dispose __P((tcfsgpwdb *)); -extern int tcfs_chgpwd __P((char *, char *, char *)); -extern int tcfs_group_chgpwd __P((char *, gid_t, char *, char *)); -extern int tcfs_chgpassword __P((char *, char *, char *)); -extern int tcfs_decrypt_key __P((char *, u_char *, u_char *, int)); -extern int tcfs_encrypt_key __P((char *, u_char *, int, u_char *, int)); -extern char *tcfs_decode __P((char *, int *)); -extern char *tcfs_encode __P((char *, int )); -extern char *gentcfskey __P((void)); - -extern int tcfs_getstatus __P((char *, struct tcfs_status *)); -extern int tcfs_getfspath __P((char *, char *)); - -extern int tcfs_proc_enable __P((char *, uid_t, pid_t, char *)); -extern int tcfs_proc_disable __P((char *, uid_t, pid_t)); -extern int tcfs_user_enable __P((char *, uid_t, u_char *)); -extern int tcfs_user_disable __P((char *, uid_t)); -extern int tcfs_group_enable __P((char *, uid_t, gid_t, int, char *)); -extern int tcfs_group_disable __P((char *, uid_t, gid_t)); +extern int tcfspwdbr_new(tcfspwdb **); +extern int tcfspwdbr_edit(tcfspwdb **, int, ...); +extern int tcfspwdbr_read(tcfspwdb *, int, ...); +extern void tcfspwdbr_dispose(tcfspwdb *); +extern int tcfsgpwdbr_new(tcfsgpwdb **); +extern int tcfsgpwdbr_edit(tcfsgpwdb **, int, ...); +extern int tcfsgpwdbr_read(tcfsgpwdb *, int, ...); +extern void tcfsgpwdbr_dispose(tcfsgpwdb *); +extern int tcfs_chgpwd(char *, char *, char *); +extern int tcfs_group_chgpwd(char *, gid_t, char *, char *); +extern int tcfs_chgpassword(char *, char *, char *); +extern int tcfs_decrypt_key(char *, u_char *, u_char *, int); +extern int tcfs_encrypt_key(char *, u_char *, int, u_char *, int); +extern char *tcfs_decode(char *, int *); +extern char *tcfs_encode(char *, int ); +extern char *gentcfskey(void); + +extern int tcfs_getstatus(char *, struct tcfs_status *); +extern int tcfs_getfspath(char *, char *); + +extern int tcfs_proc_enable(char *, uid_t, pid_t, char *); +extern int tcfs_proc_disable(char *, uid_t, pid_t); +extern int tcfs_user_enable(char *, uid_t, u_char *); +extern int tcfs_user_disable(char *, uid_t); +extern int tcfs_group_enable(char *, uid_t, gid_t, int, char *); +extern int tcfs_group_disable(char *, uid_t, gid_t); extern tcfspwdb * - tcfs_getpwnam __P((char *, tcfspwdb **)); -extern int tcfs_putpwnam __P((char *, tcfspwdb *, int)); + tcfs_getpwnam(char *, tcfspwdb **); +extern int tcfs_putpwnam(char *, tcfspwdb *, int); -extern int unix_auth __P((char **, char **, int)); +extern int unix_auth(char **, char **, int); extern tcfsgpwdb * - tcfs_ggetpwnam __P((char *, gid_t, tcfsgpwdb **)); -extern int tcfs_gputpwnam __P((char *, tcfsgpwdb *, int)); -extern int tcfs_get_label __P((char *, char *, int *)); -extern int tcfs_verify_fs __P((char *)); -extern int tcfs_callfunction __P((char *, struct tcfs_args *)); + tcfs_ggetpwnam(char *, gid_t, tcfsgpwdb **); +extern int tcfs_gputpwnam(char *, tcfsgpwdb *, int); +extern int tcfs_get_label(char *, char *, int *); +extern int tcfs_verify_fs(char *); +extern int tcfs_callfunction(char *, struct tcfs_args *); diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index abb0d166731..7bcf62437e7 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcopy.c,v 1.6 2001/07/12 05:17:21 deraadt Exp $ */ +/* $OpenBSD: tcopy.c,v 1.7 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: tcopy.c,v 1.5 1997/04/15 07:23:08 lukem Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95"; #endif -static char rcsid[] = "$OpenBSD: tcopy.c,v 1.6 2001/07/12 05:17:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tcopy.c,v 1.7 2002/02/16 21:27:54 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -70,11 +70,11 @@ long lastrec, record; off_t size, tsize; FILE *msg = stdout; -void *getspace __P((int)); -void intr __P((int)); -void usage __P((void)); -void verify __P((int, int, char *)); -void writeop __P((int, int)); +void *getspace(int); +void intr(int); +void usage(void); +void verify(int, int, char *); +void writeop(int, int); int main(argc, argv) diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c index c5b7818e7f5..4d2554ba826 100644 --- a/usr.bin/tee/tee.c +++ b/usr.bin/tee/tee.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tee.c,v 1.3 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: tee.c,v 1.4 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: tee.c,v 1.3 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: tee.c,v 1.4 2002/02/16 21:27:54 millert Exp $"; #endif #include <sys/types.h> @@ -66,7 +66,7 @@ typedef struct _list { } LIST; LIST *head; -void add __P((int, char *)); +void add(int, char *); int main(argc, argv) diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c index 523e9481c82..a4654846439 100644 --- a/usr.bin/telnet/commands.c +++ b/usr.bin/telnet/commands.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commands.c,v 1.39 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: commands.c,v 1.40 2002/02/16 21:27:54 millert Exp $ */ /* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */ /* @@ -45,7 +45,7 @@ char *hostname; static char _hostname[MAXHOSTNAMELEN]; typedef int (*intrtn_t)(int, char**); -static int call __P((intrtn_t, ...)); +static int call(intrtn_t, ...); typedef struct { char *name; /* command name */ @@ -1128,7 +1128,7 @@ struct modelist { int arg1; }; -static int modehelp __P((void)); +static int modehelp(void); static struct modelist ModeList[] = { { "character", "Disable LINEMODE option", docharmode, 1 }, @@ -2536,7 +2536,7 @@ static char envhelp[] = "change environment variables ('environ ?' for more)", modestring[] = "try to enter line or character mode ('mode ?' for more)"; -static int help __P((int, char**)); +static int help(int, char**); static Command cmdtab[] = { { "close", closehelp, bye, 1 }, diff --git a/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h index faddc0b22dd..043d9a8a2a7 100644 --- a/usr.bin/tftp/extern.h +++ b/usr.bin/tftp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:40:33 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1994/12/08 09:51:24 jtc Exp $ */ /* @@ -36,5 +36,5 @@ * @(#)extern.h 8.1 (Berkeley) 6/6/93 */ -void recvfile __P((int, char *, char *)); -void sendfile __P((int, char *, char *)); +void recvfile(int, char *, char *); +void sendfile(int, char *, char *); diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 4e5b8c5fcb0..574b1983aba 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.10 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: main.c,v 1.9 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.10 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */ @@ -92,33 +92,33 @@ jmp_buf toplevel; void intr(); struct servent *sp; -void get __P((int, char **)); -void help __P((int, char **)); -void modecmd __P((int, char **)); -void put __P((int, char **)); -void quit __P((int, char **)); -void setascii __P((int, char **)); -void setbinary __P((int, char **)); -void setpeer __P((int, char **)); -void setrexmt __P((int, char **)); -void settimeout __P((int, char **)); -void settrace __P((int, char **)); -void setverbose __P((int, char **)); -void status __P((int, char **)); - -static __dead void command __P((void)); - -static void getusage __P((char *)); -static int makeargv __P((void)); -static void putusage __P((char *)); -static void settftpmode __P((char *)); +void get(int, char **); +void help(int, char **); +void modecmd(int, char **); +void put(int, char **); +void quit(int, char **); +void setascii(int, char **); +void setbinary(int, char **); +void setpeer(int, char **); +void setrexmt(int, char **); +void settimeout(int, char **); +void settrace(int, char **); +void setverbose(int, char **); +void status(int, char **); + +static __dead void command(void); + +static void getusage(char *); +static int makeargv(void); +static void putusage(char *); +static void settftpmode(char *); #define HELPINDENT (sizeof("connect")) struct cmd { char *name; char *help; - void (*handler) __P((int, char **)); + void (*handler)(int, char **); }; char vhelp[] = "toggle verbose mode"; diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index f2c024b0957..8809155d4cd 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftp.c,v 1.9 2001/11/19 19:02:16 mpech Exp $ */ +/* $OpenBSD: tftp.c,v 1.10 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: tftp.c,v 1.9 2001/11/19 19:02:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: tftp.c,v 1.10 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */ @@ -79,13 +79,13 @@ int timeout; jmp_buf toplevel; jmp_buf timeoutbuf; -static void nak __P((int)); -static int makerequest __P((int, const char *, struct tftphdr *, const char *)); -static void printstats __P((const char *, unsigned long)); -static void startclock __P((void)); -static void stopclock __P((void)); -static void timer __P((int)); -static void tpacket __P((const char *, struct tftphdr *, int)); +static void nak(int); +static int makerequest(int, const char *, struct tftphdr *, const char *); +static void printstats(const char *, unsigned long); +static void startclock(void); +static void stopclock(void); +static void timer(int); +static void tpacket(const char *, struct tftphdr *, int); /* * Send the requested file. diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h index 626f6c09999..d32b5c0d15c 100644 --- a/usr.bin/tftp/tftpsubs.h +++ b/usr.bin/tftp/tftpsubs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tftpsubs.h,v 1.2 1996/06/26 05:40:37 deraadt Exp $ */ +/* $OpenBSD: tftpsubs.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: tftpsubs.h,v 1.2 1994/12/08 09:51:32 jtc Exp $ */ /* @@ -40,12 +40,12 @@ * Prototypes for read-ahead/write-behind subroutines for tftp user and * server. */ -struct tftphdr *r_init __P((void)); -void read_ahead __P((FILE *, int)); -int readit __P((FILE *, struct tftphdr **, int)); +struct tftphdr *r_init(void); +void read_ahead(FILE *, int); +int readit(FILE *, struct tftphdr **, int); -int synchnet __P((int)); +int synchnet(int); -struct tftphdr *w_init __P((void)); -int write_behind __P((FILE *, int)); -int writeit __P((FILE *, struct tftphdr **, int, int)); +struct tftphdr *w_init(void); +int write_behind(FILE *, int); +int writeit(FILE *, struct tftphdr **, int, int); diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c index 7b1c5f46cee..f240cae5759 100644 --- a/usr.bin/time/time.c +++ b/usr.bin/time/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.11 2001/11/22 10:42:39 mpech Exp $ */ +/* $OpenBSD: time.c,v 1.12 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: time.c,v 1.11 2001/11/22 10:42:39 mpech Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.12 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: time.c,v 1.11 2001/11/22 10:42:39 mpech Exp $"; int lflag; int portableflag; -__dead void usage __P((void)); +__dead void usage(void); int main(argc, argv) diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c index 728ccc9f437..bfed40cf670 100644 --- a/usr.bin/tip/aculib/courier.c +++ b/usr.bin/tip/aculib/courier.c @@ -1,4 +1,4 @@ -/* $OpenBSD: courier.c,v 1.9 2001/10/24 18:38:58 millert Exp $ */ +/* $OpenBSD: courier.c,v 1.10 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: courier.c,v 1.9 2001/10/24 18:38:58 millert Exp $"; +static char rcsid[] = "$OpenBSD: courier.c,v 1.10 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ /* @@ -58,7 +58,7 @@ static jmp_buf timeoutbuf, intbuf; static int coursync(), cour_connect(), cour_swallow(); void cour_nap(); -void cour_disconnect __P((void)); +void cour_disconnect(void); int cour_dialer(num, acu) diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h index 4c5ab2064ee..cb750a62015 100644 --- a/usr.bin/tip/tip.h +++ b/usr.bin/tip/tip.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tip.h,v 1.11 2001/09/09 19:30:49 millert Exp $ */ +/* $OpenBSD: tip.h,v 1.12 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */ /* @@ -274,39 +274,39 @@ extern char *ctrl(); extern char *vinterp(); extern char *connect(); -char *sname __P((char *s)); -int any __P((int cc, char *p)); -int anyof __P((char *s1, char *s2)); -int args __P((char *buf, char *a[], int num)); -int escape __P((void)); -int prompt __P((char *s, char *p, size_t sz)); -int size __P((char *s)); -int speed __P((int n)); -int uu_lock __P((char *ttyname)); -int uu_unlock __P((char *ttyname)); -int vstring __P((char *s, char *v)); -long hunt __P((char *name)); -void cumain __P((int argc, char *argv[])); -void daemon_uid __P((void)); -void disconnect __P((char *reason)); -void execute __P((char *s)); -void logent __P((char *group, char *num, char *acu, char *message)); -void loginit __P((void)); -void prtime __P((char *s, time_t a)); -void parwrite __P((int fd, char *buf, int n)); -void raw __P((void)); -void send __P((int c)); -void setparity __P((char *defparity)); -void setscript __P((void)); -void shell_uid __P((void)); -void tandem __P((char *option)); -void tipabort __P((char *msg)); -void tipin __P((void)); -void tipout __P((void)); -void transfer __P((char *buf, int fd, char *eofchars)); -void transmit __P((FILE *fd, char *eofchars, char *command)); -void ttysetup __P((int speed)); -void unraw __P((void)); -void user_uid __P((void)); -void vinit __P((void)); -void vlex __P((char *s)); +char *sname(char *s); +int any(int cc, char *p); +int anyof(char *s1, char *s2); +int args(char *buf, char *a[], int num); +int escape(void); +int prompt(char *s, char *p, size_t sz); +int size(char *s); +int speed(int n); +int uu_lock(char *ttyname); +int uu_unlock(char *ttyname); +int vstring(char *s, char *v); +long hunt(char *name); +void cumain(int argc, char *argv[]); +void daemon_uid(void); +void disconnect(char *reason); +void execute(char *s); +void logent(char *group, char *num, char *acu, char *message); +void loginit(void); +void prtime(char *s, time_t a); +void parwrite(int fd, char *buf, int n); +void raw(void); +void send(int c); +void setparity(char *defparity); +void setscript(void); +void shell_uid(void); +void tandem(char *option); +void tipabort(char *msg); +void tipin(void); +void tipout(void); +void transfer(char *buf, int fd, char *eofchars); +void transmit(FILE *fd, char *eofchars, char *command); +void ttysetup(int speed); +void unraw(void); +void user_uid(void); +void vinit(void); +void vlex(char *s); diff --git a/usr.bin/top/commands.c b/usr.bin/top/commands.c index 7ab0927aa35..c7875883deb 100644 --- a/usr.bin/top/commands.c +++ b/usr.bin/top/commands.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commands.c,v 1.3 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: commands.c,v 1.4 2002/02/16 21:27:55 millert Exp $ */ /* * Top users/processes display for Unix @@ -36,12 +36,12 @@ #include "utils.h" #include "machine.h" -static char *next_field __P((char *)); -static int scanint __P((char *, int *)); -static char *err_string __P((void)); -static int str_adderr __P((char *, int, int)); -static int str_addarg __P((char *, int, char *, int)); -static int err_compar __P((const void *, const void *)); +static char *next_field(char *); +static int scanint(char *, int *); +static char *err_string(void); +static int str_adderr(char *, int, int); +static int str_addarg(char *, int, char *, int); +static int err_compar(const void *, const void *); /* * show_help() - display the help screen; invoked in response to diff --git a/usr.bin/top/display.c b/usr.bin/top/display.c index 5cde4fe3aae..9609d8e149d 100644 --- a/usr.bin/top/display.c +++ b/usr.bin/top/display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: display.c,v 1.8 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: display.c,v 1.9 2002/02/16 21:27:55 millert Exp $ */ /* * Top users/processes display for Unix @@ -55,10 +55,10 @@ static int last_hi = 0; /* used in u_process and u_endscreen */ static int lastline = 0; static int display_width = MAX_COLS; -static char *cpustates_tag __P((void)); -static int string_count __P((char **)); -static void summary_format __P((char *, int *, char **)); -static void line_update __P((char *, char *, int, int)); +static char *cpustates_tag(void); +static int string_count(char **); +static void summary_format(char *, int *, char **); +static void line_update(char *, char *, int, int); #define lineindex(l) ((l)*display_width) diff --git a/usr.bin/top/display.h b/usr.bin/top/display.h index eb403510f22..defd3078e8f 100644 --- a/usr.bin/top/display.h +++ b/usr.bin/top/display.h @@ -1,4 +1,4 @@ -/* $OpenBSD: display.h,v 1.2 1997/08/22 07:16:27 downsj Exp $ */ +/* $OpenBSD: display.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* constants needed for display.c */ @@ -8,26 +8,26 @@ #define MT_delayed 2 /* prototypes */ -extern int display_resize __P((void)); -extern void i_loadave __P((int, double *)); -extern void u_loadave __P((int, double *)); -extern void i_timeofday __P((time_t *)); -extern void i_procstates __P((int, int *)); -extern void u_procstates __P((int, int *)); -extern void i_cpustates __P((int *)); -extern void u_cpustates __P((int *)); -extern void z_cpustates __P((void)); -extern void i_memory __P((int *)); -extern void u_memory __P((int *)); -extern void i_message __P((void)); -extern void u_message __P((void)); -extern void i_header __P((char *)); -extern void u_header __P((char *)); -extern void i_process __P((int, char *)); -extern void u_process __P((int, char *)); -extern void u_endscreen __P((int)); -extern void display_header __P((int)); +extern int display_resize(void); +extern void i_loadave(int, double *); +extern void u_loadave(int, double *); +extern void i_timeofday(time_t *); +extern void i_procstates(int, int *); +extern void u_procstates(int, int *); +extern void i_cpustates(int *); +extern void u_cpustates(int *); +extern void z_cpustates(void); +extern void i_memory(int *); +extern void u_memory(int *); +extern void i_message(void); +extern void u_message(void); +extern void i_header(char *); +extern void u_header(char *); +extern void i_process(int, char *); +extern void u_process(int, char *); +extern void u_endscreen(int); +extern void display_header(int); extern void new_message(); /* XXX */ -extern void clear_message __P((void)); -extern int readline __P((char *, int, int)); -extern char *printable __P((char *)); +extern void clear_message(void); +extern int readline(char *, int, int); +extern char *printable(char *); diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index d9213793960..ba88fea8508 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machine.c,v 1.26 2001/12/05 02:29:19 art Exp $ */ +/* $OpenBSD: machine.c,v 1.27 2002/02/16 21:27:55 millert Exp $ */ /* * top - a top users display for Unix @@ -47,7 +47,7 @@ #include <err.h> #endif -static int swapmode __P((int *, int *)); +static int swapmode(int *, int *); #include "top.h" #include "display.h" @@ -312,7 +312,7 @@ caddr_t get_process_info(si, sel, compare) struct system_info *si; struct process_select *sel; - int (*compare) __P((const void *, const void *)); + int (*compare)(const void *, const void *); { int show_idle, show_system, show_uid, show_command; diff --git a/usr.bin/top/machine.h b/usr.bin/top/machine.h index e5a5334eee2..15671cad50a 100644 --- a/usr.bin/top/machine.h +++ b/usr.bin/top/machine.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machine.h,v 1.2 1997/08/22 07:16:28 downsj Exp $ */ +/* $OpenBSD: machine.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* * This file defines the interface between top and the machine-dependent @@ -52,15 +52,15 @@ struct process_select }; /* prototypes */ -extern int display_init __P((struct statics *)); +extern int display_init(struct statics *); /* machine.c */ -extern int machine_init __P((struct statics *)); -extern char *format_header __P((char *)); -extern void get_system_info __P((struct system_info *)); +extern int machine_init(struct statics *); +extern char *format_header(char *); +extern void get_system_info(struct system_info *); extern caddr_t get_process_info __P((struct system_info *, struct process_select *, int (*)(const void *, const void *))); extern char *format_next_process __P((caddr_t, char *(*)())); -extern int proc_compate __P((const void *, const void *)); -extern int proc_owner __P((pid_t)); +extern int proc_compate(const void *, const void *); +extern int proc_owner(pid_t); diff --git a/usr.bin/top/screen.h b/usr.bin/top/screen.h index c20a5054e11..4a95060626b 100644 --- a/usr.bin/top/screen.h +++ b/usr.bin/top/screen.h @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.h,v 1.2 1997/08/22 07:16:30 downsj Exp $ */ +/* $OpenBSD: screen.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* * top - a top users display for Unix 4.2 @@ -26,13 +26,13 @@ extern int screen_length; extern int screen_width; /* prototypes from screen.c */ -extern void init_termcap __P((int)); -extern void init_screen __P((void)); -extern void end_screen __P((void)); -extern void reinit_screen __P((void)); -extern void get_screensize __P((void)); -extern void standout __P((char *)); -extern void clear __P((void)); -extern int clear_eol __P((int)); -extern void go_home __P((void)); -extern int putstdout __P((int)); +extern void init_termcap(int); +extern void init_screen(void); +extern void end_screen(void); +extern void reinit_screen(void); +extern void get_screensize(void); +extern void standout(char *); +extern void clear(void); +extern int clear_eol(int); +extern void go_home(void); +extern int putstdout(int); diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c index 330929c7664..35dfc5ee229 100644 --- a/usr.bin/top/top.c +++ b/usr.bin/top/top.c @@ -1,4 +1,4 @@ -/* $OpenBSD: top.c,v 1.14 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: top.c,v 1.15 2002/02/16 21:27:55 millert Exp $ */ const char copyright[] = "Copyright (c) 1984 through 1996, William LeFebvre"; @@ -58,18 +58,18 @@ char stdoutbuf[Buffersize]; extern int overstrike; /* signal handling routines */ -static void leave __P((int)); -static void onalrm __P((int)); -static void tstop __P((int)); +static void leave(int); +static void onalrm(int); +static void tstop(int); #ifdef SIGWINCH -static void winch __P((int)); +static void winch(int); #endif volatile sig_atomic_t leaveflag; volatile sig_atomic_t tstopflag; volatile sig_atomic_t winchflag; -static void reset_display __P((void)); +static void reset_display(void); /* values which need to be accessed by signal handlers */ static int max_topn; /* maximum displayable processes */ diff --git a/usr.bin/top/top.h b/usr.bin/top/top.h index 99b05ccc693..93857eff9f2 100644 --- a/usr.bin/top/top.h +++ b/usr.bin/top/top.h @@ -1,4 +1,4 @@ -/* $OpenBSD: top.h,v 1.2 1997/08/22 07:16:30 downsj Exp $ */ +/* $OpenBSD: top.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */ /* * Top - a top users display for Berkeley Unix @@ -39,19 +39,19 @@ extern const char copyright[]; extern int overstrike; /* commands.c */ -extern void show_help __P((void)); -extern int error_count __P((void)); -extern void show_errors __P((void)); -extern char *kill_procs __P((char *)); -extern char *renice_procs __P((char *)); +extern void show_help(void); +extern int error_count(void); +extern void show_errors(void); +extern char *kill_procs(char *); +extern char *renice_procs(char *); /* top.c */ -extern void quit __P((int)); +extern void quit(int); /* username.c */ -extern void init_hash __P((void)); -extern char *username __P((uid_t)); -extern uid_t userid __P((char *)); +extern void init_hash(void); +extern char *username(uid_t); +extern uid_t userid(char *); /* version.c */ -extern char *version_string __P((void)); +extern char *version_string(void); diff --git a/usr.bin/top/username.c b/usr.bin/top/username.c index 09871f2f65b..4178304e733 100644 --- a/usr.bin/top/username.c +++ b/usr.bin/top/username.c @@ -1,4 +1,4 @@ -/* $OpenBSD: username.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: username.c,v 1.5 2002/02/16 21:27:55 millert Exp $ */ /* * Top users/processes display for Unix @@ -43,8 +43,8 @@ struct hash_el { char name[9]; }; -static int enter_user __P((uid_t, char *, int)); -static int get_user __P((uid_t)); +static int enter_user(uid_t, char *, int); +static int get_user(uid_t); #define is_empty_hash(x) (hash_table[x].name[0] == 0) diff --git a/usr.bin/top/utils.h b/usr.bin/top/utils.h index 0ca824cad6b..5ecec05a59a 100644 --- a/usr.bin/top/utils.h +++ b/usr.bin/top/utils.h @@ -1,4 +1,4 @@ -/* $OpenBSD: utils.h,v 1.3 1998/09/20 06:19:14 niklas Exp $ */ +/* $OpenBSD: utils.h,v 1.4 2002/02/16 21:27:55 millert Exp $ */ /* * Top users/processes display for Unix @@ -13,13 +13,13 @@ /* prototypes for functions found in utils.c */ -int atoiwi __P((char *)); -char *itoa __P((int)); -char *itoa7 __P((int)); -int digits __P((int)); -char *strecpy __P((char *, char *)); -int string_index __P((char *, char **)); -char **argparse __P((char *, int *)); -int percentages __P((int, int *, long *, long *, long *)); -char *format_time __P((time_t)); -char *format_k __P((int)); +int atoiwi(char *); +char *itoa(int); +char *itoa7(int); +int digits(int); +char *strecpy(char *, char *); +int string_index(char *, char **); +char **argparse(char *, int *); +int percentages(int, int *, long *, long *, long *); +char *format_time(time_t); +char *format_k(int); diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 75641702c6c..191cd87cb52 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: touch.c,v 1.6 2000/10/13 13:54:59 pjanzen Exp $ */ +/* $OpenBSD: touch.c,v 1.7 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: touch.c,v 1.6 2000/10/13 13:54:59 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: touch.c,v 1.7 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -62,11 +62,11 @@ static char rcsid[] = "$OpenBSD: touch.c,v 1.6 2000/10/13 13:54:59 pjanzen Exp $ #include <tzfile.h> #include <unistd.h> -int rw __P((char *, struct stat *, int)); -void stime_arg1 __P((char *, struct timeval *)); -void stime_arg2 __P((char *, int, struct timeval *)); -void stime_file __P((char *, struct timeval *)); -void usage __P((void)); +int rw(char *, struct stat *, int); +void stime_arg1(char *, struct timeval *); +void stime_arg2(char *, int, struct timeval *); +void stime_file(char *, struct timeval *); +void usage(void); int main(argc, argv) diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c index 26f42b9bf46..1adb1ffe14c 100644 --- a/usr.bin/tput/tput.c +++ b/usr.bin/tput/tput.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tput.c,v 1.11 2001/07/09 07:04:56 deraadt Exp $ */ +/* $OpenBSD: tput.c,v 1.12 2002/02/16 21:27:55 millert Exp $ */ /* * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com> @@ -69,7 +69,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: tput.c,v 1.11 2001/07/09 07:04:56 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tput.c,v 1.12 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -86,11 +86,11 @@ static char rcsid[] = "$OpenBSD: tput.c,v 1.11 2001/07/09 07:04:56 deraadt Exp $ #include <sys/wait.h> -static void init __P((void)); -static char **process __P((char *, char *, char **)); -static void reset __P((void)); -static void set_margins __P((void)); -static void usage __P((void)); +static void init(void); +static char **process(char *, char *, char **); +static void reset(void); +static void set_margins(void); +static void usage(void); extern char *__progname; diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h index fe97a8db28a..23ff5186f72 100644 --- a/usr.bin/tr/extern.h +++ b/usr.bin/tr/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1997/07/25 21:14:03 mickey Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: extern.h,v 1.4 1995/11/01 00:45:22 pk Exp $ */ /*- @@ -50,4 +50,4 @@ typedef struct { #define NCHARS (UCHAR_MAX + 1) /* Number of possible characters. */ #define OOBCH (UCHAR_MAX + 1) /* Out of band character value. */ -int next __P((STR *)); +int next(STR *); diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index 690713585d9..c0c228af9e2 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -1,4 +1,4 @@ -/* $OpenBSD: str.c,v 1.6 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: str.c,v 1.7 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: str.c,v 1.6 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: str.c,v 1.7 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -54,13 +54,13 @@ static char rcsid[] = "$OpenBSD: str.c,v 1.6 2001/11/19 19:02:17 mpech Exp $"; #include "extern.h" -static int backslash __P((STR *)); -static int bracket __P((STR *)); -static int c_class __P((const void *, const void *)); -static void genclass __P((STR *)); -static void genequiv __P((STR *)); -static int genrange __P((STR *)); -static void genseq __P((STR *)); +static int backslash(STR *); +static int bracket(STR *); +static int c_class(const void *, const void *); +static void genclass(STR *); +static void genequiv(STR *); +static int genrange(STR *); +static void genseq(STR *); int next(s) @@ -155,7 +155,7 @@ bracket(s) typedef struct { char *name; - int (*func) __P((int)); + int (*func)(int); int *set; } CLASS; @@ -178,7 +178,7 @@ static void genclass(s) STR *s; { - int cnt, (*func) __P((int)); + int cnt, (*func)(int); CLASS *cp, tmp; int *p; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 9cd1d1e99be..c15f40700f0 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tr.c,v 1.7 2002/02/09 02:03:28 deraadt Exp $ */ +/* $OpenBSD: tr.c,v 1.8 2002/02/16 21:27:55 millert Exp $ */ /* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: tr.c,v 1.7 2002/02/09 02:03:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tr.c,v 1.8 2002/02/16 21:27:55 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -95,8 +95,8 @@ static int string1[NCHARS] = { STR s1 = { STRING1, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL }; STR s2 = { STRING2, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL }; -static void setup __P((int *, char *, STR *, int)); -static void usage __P((void)); +static void setup(int *, char *, STR *, int); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c index 0a474d738a2..8deb52474f3 100644 --- a/usr.bin/tsort/tsort.c +++ b/usr.bin/tsort/tsort.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tsort.c,v 1.11 2002/02/14 12:11:49 espie Exp $ */ +/* $OpenBSD: tsort.c,v 1.12 2002/02/16 21:27:55 millert Exp $ */ /* ex:ts=8 sw=4: */ @@ -127,51 +127,51 @@ struct array { struct node **t; }; -static void nodes_init __P((struct ohash *)); -static struct node *node_lookup __P((struct ohash *, const char *, const char *)); -static void usage __P((void)); -static struct node *new_node __P((const char *, const char *)); +static void nodes_init(struct ohash *); +static struct node *node_lookup(struct ohash *, const char *, const char *); +static void usage(void); +static struct node *new_node(const char *, const char *); static unsigned int read_pairs __P((FILE *, struct ohash *, int, const char *, unsigned int, int)); -static void split_nodes __P((struct ohash *, struct array *, struct array *)); -static void make_transparent __P((struct ohash *)); -static void insert_arc __P((struct node *, struct node *)); +static void split_nodes(struct ohash *, struct array *, struct array *); +static void make_transparent(struct ohash *); +static void insert_arc(struct node *, struct node *); #ifdef DEBUG -static void dump_node __P((struct node *)); -static void dump_array __P((struct array *)); -static void dump_hash __P((struct ohash *)); +static void dump_node(struct node *); +static void dump_array(struct array *); +static void dump_hash(struct ohash *); #endif static unsigned int read_hints __P((FILE *, struct ohash *, int, const char *, unsigned int)); -static struct node *find_smallest_node __P((struct array *)); -static struct node *find_good_cycle_break __P((struct array *)); -static void print_cycle __P((struct array *)); -static struct node *find_cycle_from __P((struct node *, struct array *)); -static struct node *find_predecessor __P((struct array *, struct node *)); -static unsigned int traverse_node __P((struct node *, unsigned int, struct array *)); -static struct node *find_longest_cycle __P((struct array *, struct array *)); +static struct node *find_smallest_node(struct array *); +static struct node *find_good_cycle_break(struct array *); +static void print_cycle(struct array *); +static struct node *find_cycle_from(struct node *, struct array *); +static struct node *find_predecessor(struct array *, struct node *); +static unsigned int traverse_node(struct node *, unsigned int, struct array *); +static struct node *find_longest_cycle(struct array *, struct array *); -static void heap_down __P((struct array *, unsigned int)); -static void heapify __P((struct array *, int)); -static struct node *dequeue __P((struct array *)); -static void enqueue __P((struct array *, struct node *)); +static void heap_down(struct array *, unsigned int); +static void heapify(struct array *, int); +static struct node *dequeue(struct array *); +static void enqueue(struct array *, struct node *); #define erealloc(n, s) emem(realloc(n, s)) -static void *hash_alloc __P((size_t, void *)); -static void hash_free __P((void *, size_t, void *)); -static void* entry_alloc __P((size_t, void *)); -static void *emalloc __P((size_t)); -static void *emem __P((void *)); +static void *hash_alloc(size_t, void *); +static void hash_free(void *, size_t, void *); +static void* entry_alloc(size_t, void *); +static void *emalloc(size_t); +static void *emem(void *); #define DEBUG_TRAVERSE 0 static struct ohash_info node_info = { offsetof(struct node, k), NULL, hash_alloc, hash_free, entry_alloc }; -int main __P((int, char *[])); +int main(int, char *[]); /*** diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c index 881b749244c..ca98c05e2c2 100644 --- a/usr.bin/tty/tty.c +++ b/usr.bin/tty/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.2 1996/06/26 05:42:03 deraadt Exp $ */ +/* $OpenBSD: tty.c,v 1.3 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $ */ /* @@ -44,14 +44,14 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: tty.c,v 1.2 1996/06/26 05:42:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tty.c,v 1.3 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <stdio.h> #include <stdlib.h> #include <unistd.h> -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index 993b4112856..b011134b15d 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unexpand.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: unexpand.c,v 1.5 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: unexpand.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: unexpand.c,v 1.5 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ /* @@ -57,7 +57,7 @@ char genbuf[BUFSIZ]; char linebuf[BUFSIZ]; int all; -void tabify __P((char)); +void tabify(char); int main(argc, argv) diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c index e4f1acbee26..213e956fe55 100644 --- a/usr.bin/unifdef/unifdef.c +++ b/usr.bin/unifdef/unifdef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unifdef.c,v 1.3 1998/11/16 21:58:29 deraadt Exp $ */ +/* $OpenBSD: unifdef.c,v 1.4 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: unifdef.c,v 1.6 1998/10/08 01:31:59 wsanchez Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)unifdef.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: unifdef.c,v 1.3 1998/11/16 21:58:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: unifdef.c,v 1.4 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ /* @@ -101,14 +101,14 @@ char incomment BSS; /* inside C comment */ char inquote BSS; /* inside single or double quotes */ int exitstat BSS; -int error __P((int, int, int)); -int findsym __P((char *)); -void flushline __P((Bool)); -int getlin __P((char *, int, FILE *, int)); -void pfile __P((void)); -void prname __P((void)); -char *skipcomment __P((char *)); -char *skipquote __P((char *, int)); +int error(int, int, int); +int findsym(char *); +void flushline(Bool); +int getlin(char *, int, FILE *, int); +void pfile(void); +void prname(void); +char *skipcomment(char *); +char *skipquote(char *, int); int main(argc, argv) @@ -208,14 +208,14 @@ typedef int Linetype; #define LT_ELSE 5 /* #else */ #define LT_ENDIF 6 /* #endif */ #define LT_LEOF 7 /* end of file */ -Linetype checkline __P((int *)); +Linetype checkline(int *); typedef int Reject_level; Reject_level reject BSS; /* 0 or 1: pass thru; 1 or 2: ignore comments */ #define REJ_NO 0 #define REJ_IGNORE 1 #define REJ_YES 2 -int doif __P((int, int, Reject_level, int)); +int doif(int, int, Reject_level, int); int linenum BSS; /* current line number */ int stqcline BSS; /* start of current coment or quote */ diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c index b5ff668a7ee..0c3409923ae 100644 --- a/usr.bin/uniq/uniq.c +++ b/usr.bin/uniq/uniq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uniq.c,v 1.8 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: uniq.c,v 1.9 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95"; #endif -static char rcsid[] = "$OpenBSD: uniq.c,v 1.8 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: uniq.c,v 1.9 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <errno.h> @@ -63,11 +63,11 @@ static char rcsid[] = "$OpenBSD: uniq.c,v 1.8 2001/11/19 19:02:17 mpech Exp $"; int cflag, dflag, uflag; int numchars, numfields, repeats; -FILE *file __P((char *, char *)); -void show __P((FILE *, char *)); -char *skip __P((char *)); -void obsolete __P((char *[])); -void usage __P((void)); +FILE *file(char *, char *); +void show(FILE *, char *); +char *skip(char *); +void obsolete(char *[]); +void usage(void); int main (argc, argv) diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c index 1144ce587f6..e0532cd616b 100644 --- a/usr.bin/unvis/unvis.c +++ b/usr.bin/unvis/unvis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unvis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: unvis.c,v 1.5 2002/02/16 21:27:56 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: unvis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: unvis.c,v 1.5 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: unvis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; #include <err.h> #include <vis.h> -void process __P((FILE *fp, const char *filename)); +void process(FILE *fp, const char *filename); int main(argc, argv) diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c index 69b7e6b4dcd..02b23a9530a 100644 --- a/usr.bin/users/users.c +++ b/usr.bin/users/users.c @@ -1,4 +1,4 @@ -/* $OpenBSD: users.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: users.c,v 1.5 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: users.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: users.c,v 1.5 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -56,7 +56,7 @@ static char rcsid[] = "$OpenBSD: users.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; typedef char namebuf[UT_NAMESIZE]; -int scmp __P((const void *, const void *)); +int scmp(const void *, const void *); int main(argc, argv) diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c index a4e52176ab9..df8edaa2e31 100644 --- a/usr.bin/vacation/vacation.c +++ b/usr.bin/vacation/vacation.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vacation.c,v 1.16 2002/02/07 07:17:38 mpech Exp $ */ +/* $OpenBSD: vacation.c,v 1.17 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94"; #endif -static char rcsid[] = "$OpenBSD: vacation.c,v 1.16 2002/02/07 07:17:38 mpech Exp $"; +static char rcsid[] = "$OpenBSD: vacation.c,v 1.17 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ /* @@ -92,14 +92,14 @@ DB *db; char from[MAXLINE]; char subj[MAXLINE]; -int junkmail __P((void)); -int nsearch __P((char *, char *)); -void readheaders __P((void)); -int recent __P((void)); -void sendmessage __P((char *)); -void setinterval __P((time_t)); -void setreply __P((void)); -void usage __P((void)); +int junkmail(void); +int nsearch(char *, char *); +void readheaders(void); +int recent(void); +void sendmessage(char *); +void setinterval(time_t); +void setreply(void); +void usage(void); int main(argc, argv) diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h index 48da3dae355..a0823eb799c 100644 --- a/usr.bin/vgrind/extern.h +++ b/usr.bin/vgrind/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:42:28 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1994/11/17 08:27:59 jtc Exp $ */ /* @@ -61,8 +61,8 @@ extern char *language; /* the language indicator */ #include <sys/cdefs.h> __BEGIN_DECLS -extern int STRNCMP __P((char *, char *, int)); -extern char *convexp __P((char *)); -extern char *expmatch __P((char *, char *, char *)); +extern int STRNCMP(char *, char *, int); +extern char *convexp(char *); +extern char *expmatch(char *, char *, char *); __END_DECLS diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c index 90476142d4c..b88d1688eca 100644 --- a/usr.bin/vgrind/regexp.c +++ b/usr.bin/vgrind/regexp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: regexp.c,v 1.4 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: regexp.c,v 1.4 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: regexp.c,v 1.3 2001/11/19 19:02:17 mpech Exp $" #define TRUE !(FALSE) #define NIL 0 -static void expconv __P((void)); +static void expconv(void); boolean _escaped; /* true if we are currently _escaped */ char *_start; /* start of string */ diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c index ddda22a9d72..e1e97a5ef8f 100644 --- a/usr.bin/vgrind/vfontedpr.c +++ b/usr.bin/vgrind/vfontedpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfontedpr.c,v 1.5 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: vfontedpr.c,v 1.6 2002/02/16 21:27:56 millert Exp $ */ /* $NetBSD: vfontedpr.c,v 1.4 1996/03/21 18:08:30 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.5 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.6 2002/02/16 21:27:56 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -74,13 +74,13 @@ static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.5 2001/11/19 19:02:17 mpech Exp #define PNAMELEN 40 /* length of a function/procedure name */ #define PSMAX 20 /* size of procedure name stacking */ -static int iskw __P((char *)); -static boolean isproc __P((char *)); -static void putKcp __P((char *, char *, boolean)); -static void putScp __P((char *)); -static void putcp __P((int)); -static int tabs __P((char *, char *)); -static int width __P((char *, char *)); +static int iskw(char *); +static boolean isproc(char *); +static void putKcp(char *, char *, boolean); +static void putScp(char *); +static void putcp(int); +static int tabs(char *, char *); +static int width(char *, char *); /* * The state variables 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) 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__ diff --git a/usr.bin/vi/ex/ex.c b/usr.bin/vi/ex/ex.c index 6f116c8c535..0fda351ba1e 100644 --- a/usr.bin/vi/ex/ex.c +++ b/usr.bin/vi/ex/ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex.c,v 1.10 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex.c,v 1.11 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -34,20 +34,20 @@ static const char sccsid[] = "@(#)ex.c 10.57 (Berkeley) 10/10/96"; #include "../vi/vi.h" #if defined(DEBUG) && defined(COMLOG) -static void ex_comlog __P((SCR *, EXCMD *)); +static void ex_comlog(SCR *, EXCMD *); #endif static EXCMDLIST const * - ex_comm_search __P((char *, size_t)); -static int ex_discard __P((SCR *)); -static int ex_line __P((SCR *, EXCMD *, MARK *, int *, int *)); -static int ex_load __P((SCR *)); -static void ex_unknown __P((SCR *, char *, size_t)); + ex_comm_search(char *, size_t); +static int ex_discard(SCR *); +static int ex_line(SCR *, EXCMD *, MARK *, int *, int *); +static int ex_load(SCR *); +static void ex_unknown(SCR *, char *, size_t); /* * ex -- * Main ex loop. * - * PUBLIC: int ex __P((SCR **)); + * PUBLIC: int ex(SCR **); */ int ex(spp) @@ -191,7 +191,7 @@ ex(spp) * * For extra credit, try them in a startup .exrc file. * - * PUBLIC: int ex_cmd __P((SCR *)); + * PUBLIC: int ex_cmd(SCR *); */ int ex_cmd(sp) @@ -1608,7 +1608,7 @@ rsuccess: tmp = 0; * ex_range -- * Get a line range for ex commands, or perform a vi ex address search. * - * PUBLIC: int ex_range __P((SCR *, EXCMD *, int *)); + * PUBLIC: int ex_range(SCR *, EXCMD *, int *); */ int ex_range(sp, ecp, errp) @@ -1824,7 +1824,7 @@ ex_line(sp, ecp, mp, isaddrp, errp) GS *gp; long total, val; int isneg; - int (*sf) __P((SCR *, MARK *, MARK *, char *, size_t, char **, u_int)); + int (*sf)(SCR *, MARK *, MARK *, char *, size_t, char **, u_int); char *endp; gp = sp->gp; @@ -2213,7 +2213,7 @@ alloc_err: * [un]abbreviate command, so it can turn off abbreviations. See * the usual ranting in the vi/v_txt_ev.c:txt_abbrev() routine. * - * PUBLIC: int ex_is_abbrev __P((char *, size_t)); + * PUBLIC: int ex_is_abbrev(char *, size_t); */ int ex_is_abbrev(name, len) @@ -2232,7 +2232,7 @@ ex_is_abbrev(name, len) * unmap command, so it can turn off input mapping. See the usual * ranting in the vi/v_txt_ev.c:txt_unmap() routine. * - * PUBLIC: int ex_is_unmap __P((char *, size_t)); + * PUBLIC: int ex_is_unmap(char *, size_t); */ int ex_is_unmap(name, len) @@ -2279,7 +2279,7 @@ ex_comm_search(name, len) * Display a bad address message. * * PUBLIC: void ex_badaddr - * PUBLIC: __P((SCR *, EXCMDLIST const *, enum badaddr, enum nresult)); + * PUBLIC:(SCR *, EXCMDLIST const *, enum badaddr, enum nresult); */ void ex_badaddr(sp, cp, ba, nret) diff --git a/usr.bin/vi/ex/ex.h b/usr.bin/vi/ex/ex.h index c5d8fd514ba..5f0ea3183ea 100644 --- a/usr.bin/vi/ex/ex.h +++ b/usr.bin/vi/ex/ex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ex.h,v 1.4 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex.h,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -15,7 +15,7 @@ typedef struct _excmdlist { /* Ex command table structure. */ char *name; /* Command name, underlying function. */ - int (*fn) __P((SCR *, EXCMD *)); + int (*fn)(SCR *, EXCMD *); #define E_ADDR1 0x00000001 /* One address. */ #define E_ADDR2 0x00000002 /* Two addresses. */ diff --git a/usr.bin/vi/ex/ex_abbrev.c b/usr.bin/vi/ex/ex_abbrev.c index f1ff01d1682..a5a9d6c2e71 100644 --- a/usr.bin/vi/ex/ex_abbrev.c +++ b/usr.bin/vi/ex/ex_abbrev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_abbrev.c,v 1.3 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex_abbrev.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)ex_abbrev.c 10.7 (Berkeley) 3/6/96"; * ex_abbr -- :abbreviate [key replacement] * Create an abbreviation or display abbreviations. * - * PUBLIC: int ex_abbr __P((SCR *, EXCMD *)); + * PUBLIC: int ex_abbr(SCR *, EXCMD *); */ int ex_abbr(sp, cmdp) @@ -99,7 +99,7 @@ ex_abbr(sp, cmdp) * ex_unabbr -- :unabbreviate key * Delete an abbreviation. * - * PUBLIC: int ex_unabbr __P((SCR *, EXCMD *)); + * PUBLIC: int ex_unabbr(SCR *, EXCMD *); */ int ex_unabbr(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_append.c b/usr.bin/vi/ex/ex_append.c index 344c7b8e548..88e2a8c5344 100644 --- a/usr.bin/vi/ex/ex_append.c +++ b/usr.bin/vi/ex/ex_append.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_append.c,v 1.5 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex_append.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -28,14 +28,14 @@ static const char sccsid[] = "@(#)ex_append.c 10.30 (Berkeley) 10/23/96"; enum which {APPEND, CHANGE, INSERT}; -static int ex_aci __P((SCR *, EXCMD *, enum which)); +static int ex_aci(SCR *, EXCMD *, enum which); /* * ex_append -- :[line] a[ppend][!] * Append one or more lines of new text after the specified line, * or the current line if no address is specified. * - * PUBLIC: int ex_append __P((SCR *, EXCMD *)); + * PUBLIC: int ex_append(SCR *, EXCMD *); */ int ex_append(sp, cmdp) @@ -49,7 +49,7 @@ ex_append(sp, cmdp) * ex_change -- :[line[,line]] c[hange][!] [count] * Change one or more lines to the input text. * - * PUBLIC: int ex_change __P((SCR *, EXCMD *)); + * PUBLIC: int ex_change(SCR *, EXCMD *); */ int ex_change(sp, cmdp) @@ -64,7 +64,7 @@ ex_change(sp, cmdp) * Insert one or more lines of new text before the specified line, * or the current line if no address is specified. * - * PUBLIC: int ex_insert __P((SCR *, EXCMD *)); + * PUBLIC: int ex_insert(SCR *, EXCMD *); */ int ex_insert(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_args.c b/usr.bin/vi/ex/ex_args.c index ba51cd30f82..b26fce7d67a 100644 --- a/usr.bin/vi/ex/ex_args.c +++ b/usr.bin/vi/ex/ex_args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_args.c,v 1.4 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex_args.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_args.c 10.16 (Berkeley) 7/13/96"; #include "../common/common.h" #include "../vi/vi.h" -static int ex_N_next __P((SCR *, EXCMD *)); +static int ex_N_next(SCR *, EXCMD *); /* * ex_next -- :next [+cmd] [files] @@ -41,7 +41,7 @@ static int ex_N_next __P((SCR *, EXCMD *)); * idea was that it ignored the force flag if the autowrite flag was * set. This implementation handles them all identically. * - * PUBLIC: int ex_next __P((SCR *, EXCMD *)); + * PUBLIC: int ex_next(SCR *, EXCMD *); */ int ex_next(sp, cmdp) @@ -168,7 +168,7 @@ ex_N_next(sp, cmdp) * ex_prev -- :prev * Edit the previous file. * - * PUBLIC: int ex_prev __P((SCR *, EXCMD *)); + * PUBLIC: int ex_prev(SCR *, EXCMD *); */ int ex_prev(sp, cmdp) @@ -215,7 +215,7 @@ ex_prev(sp, cmdp) * anyone noticing, but if they do, we'll have to put information into the SCR * structure so we can keep track of it. * - * PUBLIC: int ex_rew __P((SCR *, EXCMD *)); + * PUBLIC: int ex_rew(SCR *, EXCMD *); */ int ex_rew(sp, cmdp) @@ -255,7 +255,7 @@ ex_rew(sp, cmdp) * ex_args -- :args * Display the list of files. * - * PUBLIC: int ex_args __P((SCR *, EXCMD *)); + * PUBLIC: int ex_args(SCR *, EXCMD *); */ int ex_args(sp, cmdp) @@ -298,7 +298,7 @@ ex_args(sp, cmdp) * ex_buildargv -- * Build a new file argument list. * - * PUBLIC: char **ex_buildargv __P((SCR *, EXCMD *, char *)); + * PUBLIC: char **ex_buildargv(SCR *, EXCMD *, char *); */ char ** ex_buildargv(sp, cmdp, name) diff --git a/usr.bin/vi/ex/ex_argv.c b/usr.bin/vi/ex/ex_argv.c index 1058ec05d09..adbef09c463 100644 --- a/usr.bin/vi/ex/ex_argv.c +++ b/usr.bin/vi/ex/ex_argv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_argv.c,v 1.8 2001/07/09 07:04:57 deraadt Exp $ */ +/* $OpenBSD: ex_argv.c,v 1.9 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -30,18 +30,18 @@ static const char sccsid[] = "@(#)ex_argv.c 10.26 (Berkeley) 9/20/96"; #include "../common/common.h" -static int argv_alloc __P((SCR *, size_t)); -static int argv_comp __P((const void *, const void *)); +static int argv_alloc(SCR *, size_t); +static int argv_comp(const void *, const void *); static int argv_fexp __P((SCR *, EXCMD *, char *, size_t, char *, size_t *, char **, size_t *, int)); -static int argv_lexp __P((SCR *, EXCMD *, char *)); -static int argv_sexp __P((SCR *, char **, size_t *, size_t *)); +static int argv_lexp(SCR *, EXCMD *, char *); +static int argv_sexp(SCR *, char **, size_t *, size_t *); /* * argv_init -- * Build a prototype arguments list. * - * PUBLIC: int argv_init __P((SCR *, EXCMD *)); + * PUBLIC: int argv_init(SCR *, EXCMD *); */ int argv_init(sp, excp) @@ -63,7 +63,7 @@ argv_init(sp, excp) * argv_exp0 -- * Append a string to the argument list. * - * PUBLIC: int argv_exp0 __P((SCR *, EXCMD *, char *, size_t)); + * PUBLIC: int argv_exp0(SCR *, EXCMD *, char *, size_t); */ int argv_exp0(sp, excp, cmd, cmdlen) @@ -90,7 +90,7 @@ argv_exp0(sp, excp, cmd, cmdlen) * Do file name expansion on a string, and append it to the * argument list. * - * PUBLIC: int argv_exp1 __P((SCR *, EXCMD *, char *, size_t, int)); + * PUBLIC: int argv_exp1(SCR *, EXCMD *, char *, size_t, int); */ int argv_exp1(sp, excp, cmd, cmdlen, is_bang) @@ -134,7 +134,7 @@ ret: FREE_SPACE(sp, bp, blen); * Do file name and shell expansion on a string, and append it to * the argument list. * - * PUBLIC: int argv_exp2 __P((SCR *, EXCMD *, char *, size_t)); + * PUBLIC: int argv_exp2(SCR *, EXCMD *, char *, size_t); */ int argv_exp2(sp, excp, cmd, cmdlen) @@ -246,7 +246,7 @@ err: FREE_SPACE(sp, bp, blen); * Take a string and break it up into an argv, which is appended * to the argument list. * - * PUBLIC: int argv_exp3 __P((SCR *, EXCMD *, char *, size_t)); + * PUBLIC: int argv_exp3(SCR *, EXCMD *, char *, size_t); */ int argv_exp3(sp, excp, cmd, cmdlen) @@ -482,7 +482,7 @@ mem: msgq(sp, M_SYSERR, NULL); * argv_free -- * Free up argument structures. * - * PUBLIC: int argv_free __P((SCR *)); + * PUBLIC: int argv_free(SCR *); */ int argv_free(sp) diff --git a/usr.bin/vi/ex/ex_at.c b/usr.bin/vi/ex/ex_at.c index 2b6049c6d5e..ec51fb28dc1 100644 --- a/usr.bin/vi/ex/ex_at.c +++ b/usr.bin/vi/ex/ex_at.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_at.c,v 1.5 2001/01/29 01:58:41 niklas Exp $ */ +/* $OpenBSD: ex_at.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)ex_at.c 10.12 (Berkeley) 9/15/96"; * * Execute the contents of the buffer. * - * PUBLIC: int ex_at __P((SCR *, EXCMD *)); + * PUBLIC: int ex_at(SCR *, EXCMD *); */ int ex_at(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_bang.c b/usr.bin/vi/ex/ex_bang.c index 2be9d2329ab..e80c7594746 100644 --- a/usr.bin/vi/ex/ex_bang.c +++ b/usr.bin/vi/ex/ex_bang.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_bang.c,v 1.4 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_bang.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)ex_bang.c 10.33 (Berkeley) 9/23/96"; * ways of getting here display the right things. It took a long time to * get it right (wrong?), so be careful. * - * PUBLIC: int ex_bang __P((SCR *, EXCMD *)); + * PUBLIC: int ex_bang(SCR *, EXCMD *); */ int ex_bang(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_cd.c b/usr.bin/vi/ex/ex_cd.c index d0d15653511..38cbfd4bbec 100644 --- a/usr.bin/vi/ex/ex_cd.c +++ b/usr.bin/vi/ex/ex_cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_cd.c,v 1.5 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_cd.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)ex_cd.c 10.10 (Berkeley) 8/12/96"; * ex_cd -- :cd[!] [directory] * Change directories. * - * PUBLIC: int ex_cd __P((SCR *, EXCMD *)); + * PUBLIC: int ex_cd(SCR *, EXCMD *); */ int ex_cd(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_cscope.c b/usr.bin/vi/ex/ex_cscope.c index a81bad41a28..3d8c7324095 100644 --- a/usr.bin/vi/ex/ex_cscope.c +++ b/usr.bin/vi/ex/ex_cscope.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_cscope.c,v 1.6 2001/07/09 07:04:57 deraadt Exp $ */ +/* $OpenBSD: ex_cscope.c,v 1.7 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1994, 1996 @@ -64,15 +64,15 @@ find c|d|e|f|g|i|s|t buffer|pattern\n\ s: find all uses of name\n\ t: find assignments to name" -static int cscope_add __P((SCR *, EXCMD *, char *)); -static int cscope_find __P((SCR *, EXCMD*, char *)); -static int cscope_help __P((SCR *, EXCMD *, char *)); -static int cscope_kill __P((SCR *, EXCMD *, char *)); -static int cscope_reset __P((SCR *, EXCMD *, char *)); +static int cscope_add(SCR *, EXCMD *, char *); +static int cscope_find(SCR *, EXCMD*, char *); +static int cscope_help(SCR *, EXCMD *, char *); +static int cscope_kill(SCR *, EXCMD *, char *); +static int cscope_reset(SCR *, EXCMD *, char *); typedef struct _cc { char *name; - int (*function) __P((SCR *, EXCMD *, char *)); + int (*function)(SCR *, EXCMD *, char *); char *help_msg; char *usage_msg; } CC; @@ -91,23 +91,23 @@ static CC const cscope_cmds[] = { { NULL } }; -static TAGQ *create_cs_cmd __P((SCR *, char *, size_t *)); -static int csc_help __P((SCR *, char *)); +static TAGQ *create_cs_cmd(SCR *, char *, size_t *); +static int csc_help(SCR *, char *); static void csc_file __P((SCR *, CSC *, char *, char **, size_t *, int *)); -static int get_paths __P((SCR *, CSC *)); -static CC const *lookup_ccmd __P((char *)); -static int parse __P((SCR *, CSC *, TAGQ *, int *)); -static int read_prompt __P((SCR *, CSC *)); -static int run_cscope __P((SCR *, CSC *, char *)); -static int start_cscopes __P((SCR *, EXCMD *)); -static int terminate __P((SCR *, CSC *, int)); +static int get_paths(SCR *, CSC *); +static CC const *lookup_ccmd(char *); +static int parse(SCR *, CSC *, TAGQ *, int *); +static int read_prompt(SCR *, CSC *); +static int run_cscope(SCR *, CSC *, char *); +static int start_cscopes(SCR *, EXCMD *); +static int terminate(SCR *, CSC *, int); /* * ex_cscope -- * Perform an ex cscope. * - * PUBLIC: int ex_cscope __P((SCR *, EXCMD *)); + * PUBLIC: int ex_cscope(SCR *, EXCMD *); */ int ex_cscope(sp, cmdp) @@ -936,7 +936,7 @@ cscope_reset(sp, cmdp, notusedp) * cscope_display -- * Display current connections. * - * PUBLIC: int cscope_display __P((SCR *)); + * PUBLIC: int cscope_display(SCR *); */ int cscope_display(sp) @@ -962,7 +962,7 @@ cscope_display(sp) * cscope_search -- * Search a file for a cscope entry. * - * PUBLIC: int cscope_search __P((SCR *, TAGQ *, TAG *)); + * PUBLIC: int cscope_search(SCR *, TAGQ *, TAG *); */ int cscope_search(sp, tqp, tp) diff --git a/usr.bin/vi/ex/ex_delete.c b/usr.bin/vi/ex/ex_delete.c index e5e49690ec4..f57b8d3bbb1 100644 --- a/usr.bin/vi/ex/ex_delete.c +++ b/usr.bin/vi/ex/ex_delete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_delete.c,v 1.4 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_delete.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_delete.c 10.9 (Berkeley) 10/23/96"; * * Delete lines from the file. * - * PUBLIC: int ex_delete __P((SCR *, EXCMD *)); + * PUBLIC: int ex_delete(SCR *, EXCMD *); */ int ex_delete(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_display.c b/usr.bin/vi/ex/ex_display.c index 513f7c59f23..64b9333bca8 100644 --- a/usr.bin/vi/ex/ex_display.c +++ b/usr.bin/vi/ex/ex_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_display.c,v 1.3 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_display.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -27,15 +27,15 @@ static const char sccsid[] = "@(#)ex_display.c 10.12 (Berkeley) 4/10/96"; #include "../common/common.h" #include "tag.h" -static int bdisplay __P((SCR *)); -static void db __P((SCR *, CB *, CHAR_T *)); +static int bdisplay(SCR *); +static void db(SCR *, CB *, CHAR_T *); /* * ex_display -- :display b[uffers] | c[onnections] | s[creens] | t[ags] * * Display cscope connections, buffers, tags or screens. * - * PUBLIC: int ex_display __P((SCR *, EXCMD *)); + * PUBLIC: int ex_display(SCR *, EXCMD *); */ int ex_display(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_edit.c b/usr.bin/vi/ex/ex_edit.c index 07200dd41d9..1ff292994a8 100644 --- a/usr.bin/vi/ex/ex_edit.c +++ b/usr.bin/vi/ex/ex_edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_edit.c,v 1.3 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_edit.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_edit.c 10.10 (Berkeley) 4/27/96"; #include "../common/common.h" #include "../vi/vi.h" -static int ex_N_edit __P((SCR *, EXCMD *, FREF *, int)); +static int ex_N_edit(SCR *, EXCMD *, FREF *, int); /* * ex_edit -- :e[dit][!] [+cmd] [file] @@ -45,7 +45,7 @@ static int ex_N_edit __P((SCR *, EXCMD *, FREF *, int)); * a file name as well. This seems unreasonable, so we support it * regardless. * - * PUBLIC: int ex_edit __P((SCR *, EXCMD *)); + * PUBLIC: int ex_edit(SCR *, EXCMD *); */ int ex_edit(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_equal.c b/usr.bin/vi/ex/ex_equal.c index 96ad378d757..6a1be656e4f 100644 --- a/usr.bin/vi/ex/ex_equal.c +++ b/usr.bin/vi/ex/ex_equal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_equal.c,v 1.3 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_equal.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -27,7 +27,7 @@ static const char sccsid[] = "@(#)ex_equal.c 10.10 (Berkeley) 3/6/96"; /* * ex_equal -- :address = * - * PUBLIC: int ex_equal __P((SCR *, EXCMD *)); + * PUBLIC: int ex_equal(SCR *, EXCMD *); */ int ex_equal(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_file.c b/usr.bin/vi/ex/ex_file.c index b24ce5cbfbb..ae5b79e5d5e 100644 --- a/usr.bin/vi/ex/ex_file.c +++ b/usr.bin/vi/ex/ex_file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_file.c,v 1.4 2001/01/29 01:58:42 niklas Exp $ */ +/* $OpenBSD: ex_file.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)ex_file.c 10.12 (Berkeley) 7/12/96"; * ex_file -- :f[ile] [name] * Change the file's name and display the status line. * - * PUBLIC: int ex_file __P((SCR *, EXCMD *)); + * PUBLIC: int ex_file(SCR *, EXCMD *); */ int ex_file(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_filter.c b/usr.bin/vi/ex/ex_filter.c index 4f111788177..79de29a70d3 100644 --- a/usr.bin/vi/ex/ex_filter.c +++ b/usr.bin/vi/ex/ex_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_filter.c,v 1.4 2001/07/09 07:04:57 deraadt Exp $ */ +/* $OpenBSD: ex_filter.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_filter.c 10.34 (Berkeley) 10/23/96"; #include "../common/common.h" -static int filter_ldisplay __P((SCR *, FILE *)); +static int filter_ldisplay(SCR *, FILE *); /* * ex_filter -- diff --git a/usr.bin/vi/ex/ex_global.c b/usr.bin/vi/ex/ex_global.c index 4a6e3c7678d..eae27259fcb 100644 --- a/usr.bin/vi/ex/ex_global.c +++ b/usr.bin/vi/ex/ex_global.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_global.c,v 1.5 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_global.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,13 +31,13 @@ static const char sccsid[] = "@(#)ex_global.c 10.22 (Berkeley) 10/10/96"; enum which {GLOBAL, V}; -static int ex_g_setup __P((SCR *, EXCMD *, enum which)); +static int ex_g_setup(SCR *, EXCMD *, enum which); /* * ex_global -- [line [,line]] g[lobal][!] /pattern/ [commands] * Exec on lines matching a pattern. * - * PUBLIC: int ex_global __P((SCR *, EXCMD *)); + * PUBLIC: int ex_global(SCR *, EXCMD *); */ int ex_global(sp, cmdp) @@ -52,7 +52,7 @@ ex_global(sp, cmdp) * ex_v -- [line [,line]] v /pattern/ [commands] * Exec on lines not matching a pattern. * - * PUBLIC: int ex_v __P((SCR *, EXCMD *)); + * PUBLIC: int ex_v(SCR *, EXCMD *); */ int ex_v(sp, cmdp) @@ -256,7 +256,7 @@ usage: ex_emsg(sp, cmdp->cmd->usage, EXM_USAGE); * ex_g_insdel -- * Update the ranges based on an insertion or deletion. * - * PUBLIC: int ex_g_insdel __P((SCR *, lnop_t, recno_t)); + * PUBLIC: int ex_g_insdel(SCR *, lnop_t, recno_t); */ int ex_g_insdel(sp, op, lno) diff --git a/usr.bin/vi/ex/ex_init.c b/usr.bin/vi/ex/ex_init.c index 396a8857b58..d679a4a5f93 100644 --- a/usr.bin/vi/ex/ex_init.c +++ b/usr.bin/vi/ex/ex_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_init.c,v 1.6 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_init.c,v 1.7 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,15 +33,15 @@ static const char sccsid[] = "@(#)ex_init.c 10.26 (Berkeley) 8/12/96"; #include "pathnames.h" enum rc { NOEXIST, NOPERM, RCOK }; -static enum rc exrc_isok __P((SCR *, struct stat *, char *, int, int)); +static enum rc exrc_isok(SCR *, struct stat *, char *, int, int); -static int ex_run_file __P((SCR *, char *)); +static int ex_run_file(SCR *, char *); /* * ex_screen_copy -- * Copy ex screen. * - * PUBLIC: int ex_screen_copy __P((SCR *, SCR *)); + * PUBLIC: int ex_screen_copy(SCR *, SCR *); */ int ex_screen_copy(orig, sp) @@ -77,7 +77,7 @@ ex_screen_copy(orig, sp) * ex_screen_end -- * End a vi screen. * - * PUBLIC: int ex_screen_end __P((SCR *)); + * PUBLIC: int ex_screen_end(SCR *); */ int ex_screen_end(sp) @@ -118,7 +118,7 @@ ex_screen_end(sp) * ex_optchange -- * Handle change of options for ex. * - * PUBLIC: int ex_optchange __P((SCR *, int, char *, u_long *)); + * PUBLIC: int ex_optchange(SCR *, int, char *, u_long *); */ int ex_optchange(sp, offset, str, valp) @@ -139,7 +139,7 @@ ex_optchange(sp, offset, str, valp) * Read the EXINIT environment variable and the startup exrc files, * and execute their commands. * - * PUBLIC: int ex_exrc __P((SCR *)); + * PUBLIC: int ex_exrc(SCR *); */ int ex_exrc(sp) @@ -269,7 +269,7 @@ ex_run_file(sp, name) * ex_run_str -- * Set up a string of ex commands to run. * - * PUBLIC: int ex_run_str __P((SCR *, char *, char *, size_t, int, int)); + * PUBLIC: int ex_run_str(SCR *, char *, char *, size_t, int, int); */ int ex_run_str(sp, name, str, len, ex_flags, nocopy) diff --git a/usr.bin/vi/ex/ex_join.c b/usr.bin/vi/ex/ex_join.c index b49bd705182..2629f967db7 100644 --- a/usr.bin/vi/ex/ex_join.c +++ b/usr.bin/vi/ex/ex_join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_join.c,v 1.4 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_join.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)ex_join.c 10.10 (Berkeley) 9/15/96"; * ex_join -- :[line [,line]] j[oin][!] [count] [flags] * Join lines. * - * PUBLIC: int ex_join __P((SCR *, EXCMD *)); + * PUBLIC: int ex_join(SCR *, EXCMD *); */ int ex_join(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_map.c b/usr.bin/vi/ex/ex_map.c index 41740cdec48..5389374a917 100644 --- a/usr.bin/vi/ex/ex_map.c +++ b/usr.bin/vi/ex/ex_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_map.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_map.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)ex_map.c 10.9 (Berkeley) 3/6/96"; * put the map in a .exrc file, things would often work much better. * No clue why. * - * PUBLIC: int ex_map __P((SCR *, EXCMD *)); + * PUBLIC: int ex_map(SCR *, EXCMD *); */ int ex_map(sp, cmdp) @@ -106,7 +106,7 @@ nofunc: if (stype == SEQ_COMMAND && input[1] == '\0') * ex_unmap -- (:unmap[!] key) * Unmap a key. * - * PUBLIC: int ex_unmap __P((SCR *, EXCMD *)); + * PUBLIC: int ex_unmap(SCR *, EXCMD *); */ int ex_unmap(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_mark.c b/usr.bin/vi/ex/ex_mark.c index 4caec676c80..0bc0795afbf 100644 --- a/usr.bin/vi/ex/ex_mark.c +++ b/usr.bin/vi/ex/ex_mark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_mark.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_mark.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)ex_mark.c 10.8 (Berkeley) 3/6/96"; * Mark lines. * * - * PUBLIC: int ex_mark __P((SCR *, EXCMD *)); + * PUBLIC: int ex_mark(SCR *, EXCMD *); */ int ex_mark(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_mkexrc.c b/usr.bin/vi/ex/ex_mkexrc.c index a1b015073c3..35347750e0f 100644 --- a/usr.bin/vi/ex/ex_mkexrc.c +++ b/usr.bin/vi/ex/ex_mkexrc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_mkexrc.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_mkexrc.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)ex_mkexrc.c 10.11 (Berkeley) 3/6/96"; * * Create (or overwrite) a .exrc file with the current info. * - * PUBLIC: int ex_mkexrc __P((SCR *, EXCMD *)); + * PUBLIC: int ex_mkexrc(SCR *, EXCMD *); */ int ex_mkexrc(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_move.c b/usr.bin/vi/ex/ex_move.c index e4459599da6..be901fcf888 100644 --- a/usr.bin/vi/ex/ex_move.c +++ b/usr.bin/vi/ex/ex_move.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_move.c,v 1.5 2002/01/31 11:10:39 hugh Exp $ */ +/* $OpenBSD: ex_move.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)ex_move.c 10.10 (Berkeley) 9/15/96"; * ex_copy -- :[line [,line]] co[py] line [flags] * Copy selected lines. * - * PUBLIC: int ex_copy __P((SCR *, EXCMD *)); + * PUBLIC: int ex_copy(SCR *, EXCMD *); */ int ex_copy(sp, cmdp) @@ -85,7 +85,7 @@ err: text_lfree(&cb.textq); * ex_move -- :[line [,line]] mo[ve] line * Move selected lines. * - * PUBLIC: int ex_move __P((SCR *, EXCMD *)); + * PUBLIC: int ex_move(SCR *, EXCMD *); */ int ex_move(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_open.c b/usr.bin/vi/ex/ex_open.c index d692c9eb5c4..b21e3899c54 100644 --- a/usr.bin/vi/ex/ex_open.c +++ b/usr.bin/vi/ex/ex_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_open.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_open.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_open.c 10.7 (Berkeley) 3/6/96"; * * Switch to single line "open" mode. * - * PUBLIC: int ex_open __P((SCR *, EXCMD *)); + * PUBLIC: int ex_open(SCR *, EXCMD *); */ int ex_open(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_perl.c b/usr.bin/vi/ex/ex_perl.c index cce8c5e1a1c..b47341abb50 100644 --- a/usr.bin/vi/ex/ex_perl.c +++ b/usr.bin/vi/ex/ex_perl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_perl.c,v 1.4 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_perl.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -40,7 +40,7 @@ static const char sccsid[] = "@(#)ex_perl.c 8.10 (Berkeley) 9/15/96"; * ex_perldo -- :[line [,line]] perldo [command] * Run a set of lines through the perl interpreter. * - * PUBLIC: int ex_perl __P((SCR*, EXCMD *)); + * PUBLIC: int ex_perl(SCR*, EXCMD *); */ int ex_perl(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_preserve.c b/usr.bin/vi/ex/ex_preserve.c index e0764c7a50c..129e93d728d 100644 --- a/usr.bin/vi/ex/ex_preserve.c +++ b/usr.bin/vi/ex/ex_preserve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_preserve.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_preserve.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)ex_preserve.c 10.12 (Berkeley) 4/27/96"; * ex_preserve -- :pre[serve] * Push the file to recovery. * - * PUBLIC: int ex_preserve __P((SCR *, EXCMD *)); + * PUBLIC: int ex_preserve(SCR *, EXCMD *); */ int ex_preserve(sp, cmdp) @@ -66,7 +66,7 @@ ex_preserve(sp, cmdp) * ex_recover -- :rec[over][!] file * Recover the file. * - * PUBLIC: int ex_recover __P((SCR *, EXCMD *)); + * PUBLIC: int ex_recover(SCR *, EXCMD *); */ int ex_recover(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_print.c b/usr.bin/vi/ex/ex_print.c index b7a1327fc45..1091668a0ec 100644 --- a/usr.bin/vi/ex/ex_print.c +++ b/usr.bin/vi/ex/ex_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_print.c,v 1.4 2001/08/18 20:35:13 millert Exp $ */ +/* $OpenBSD: ex_print.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -32,14 +32,14 @@ static const char sccsid[] = "@(#)ex_print.c 10.18 (Berkeley) 5/12/96"; #include "../common/common.h" -static int ex_prchars __P((SCR *, const char *, size_t *, size_t, u_int, int)); +static int ex_prchars(SCR *, const char *, size_t *, size_t, u_int, int); /* * ex_list -- :[line [,line]] l[ist] [count] [flags] * * Display the addressed lines such that the output is unambiguous. * - * PUBLIC: int ex_list __P((SCR *, EXCMD *)); + * PUBLIC: int ex_list(SCR *, EXCMD *); */ int ex_list(sp, cmdp) @@ -59,7 +59,7 @@ ex_list(sp, cmdp) * * Display the addressed lines with a leading line number. * - * PUBLIC: int ex_number __P((SCR *, EXCMD *)); + * PUBLIC: int ex_number(SCR *, EXCMD *); */ int ex_number(sp, cmdp) @@ -79,7 +79,7 @@ ex_number(sp, cmdp) * * Display the addressed lines. * - * PUBLIC: int ex_pr __P((SCR *, EXCMD *)); + * PUBLIC: int ex_pr(SCR *, EXCMD *); */ int ex_pr(sp, cmdp) @@ -97,7 +97,7 @@ ex_pr(sp, cmdp) * ex_print -- * Print the selected lines. * - * PUBLIC: int ex_print __P((SCR *, EXCMD *, MARK *, MARK *, u_int32_t)); + * PUBLIC: int ex_print(SCR *, EXCMD *, MARK *, MARK *, u_int32_t); */ int ex_print(sp, cmdp, fp, tp, flags) @@ -155,7 +155,7 @@ ex_print(sp, cmdp, fp, tp, flags) * ex_ldisplay -- * Display a line without any preceding number. * - * PUBLIC: int ex_ldisplay __P((SCR *, const char *, size_t, size_t, u_int)); + * PUBLIC: int ex_ldisplay(SCR *, const char *, size_t, size_t, u_int); */ int ex_ldisplay(sp, p, len, col, flags) @@ -180,7 +180,7 @@ ex_ldisplay(sp, p, len, col, flags) * ex_scprint -- * Display a line for the substitute with confirmation routine. * - * PUBLIC: int ex_scprint __P((SCR *, MARK *, MARK *)); + * PUBLIC: int ex_scprint(SCR *, MARK *, MARK *); */ int ex_scprint(sp, fp, tp) @@ -270,7 +270,7 @@ intr: *colp = col; * ex_printf -- * Ex's version of printf. * - * PUBLIC: int ex_printf __P((SCR *, const char *, ...)); + * PUBLIC: int ex_printf(SCR *, const char *, ...); */ int #ifdef __STDC__ @@ -311,7 +311,7 @@ ex_printf(sp, fmt, va_alist) * ex_puts -- * Ex's version of puts. * - * PUBLIC: int ex_puts __P((SCR *, const char *)); + * PUBLIC: int ex_puts(SCR *, const char *); */ int ex_puts(sp, str) @@ -339,7 +339,7 @@ ex_puts(sp, str) * ex_fflush -- * Ex's version of fflush. * - * PUBLIC: int ex_fflush __P((SCR *sp)); + * PUBLIC: int ex_fflush(SCR *sp); */ int ex_fflush(sp) diff --git a/usr.bin/vi/ex/ex_put.c b/usr.bin/vi/ex/ex_put.c index 0123ed7350f..6af96f2ec38 100644 --- a/usr.bin/vi/ex/ex_put.c +++ b/usr.bin/vi/ex/ex_put.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_put.c,v 1.3 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_put.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)ex_put.c 10.7 (Berkeley) 3/6/96"; * ex_put -- [line] pu[t] [buffer] * Append a cut buffer into the file. * - * PUBLIC: int ex_put __P((SCR *, EXCMD *)); + * PUBLIC: int ex_put(SCR *, EXCMD *); */ int ex_put(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_quit.c b/usr.bin/vi/ex/ex_quit.c index 7a9ce190b91..5a2006a74d9 100644 --- a/usr.bin/vi/ex/ex_quit.c +++ b/usr.bin/vi/ex/ex_quit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_quit.c,v 1.2 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_quit.c,v 1.3 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -28,7 +28,7 @@ static const char sccsid[] = "@(#)ex_quit.c 10.7 (Berkeley) 4/27/96"; * ex_quit -- :quit[!] * Quit. * - * PUBLIC: int ex_quit __P((SCR *, EXCMD *)); + * PUBLIC: int ex_quit(SCR *, EXCMD *); */ int ex_quit(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_read.c b/usr.bin/vi/ex/ex_read.c index ac473843892..7a104885994 100644 --- a/usr.bin/vi/ex/ex_read.c +++ b/usr.bin/vi/ex/ex_read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_read.c,v 1.6 2001/01/29 01:58:43 niklas Exp $ */ +/* $OpenBSD: ex_read.c,v 1.7 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)ex_read.c 10.38 (Berkeley) 8/12/96"; * !!! * Historical vi wouldn't undo a filter read, for no apparent reason. * - * PUBLIC: int ex_read __P((SCR *, EXCMD *)); + * PUBLIC: int ex_read(SCR *, EXCMD *); */ int ex_read(sp, cmdp) @@ -290,7 +290,7 @@ ex_read(sp, cmdp) * ex_readfp -- * Read lines into the file. * - * PUBLIC: int ex_readfp __P((SCR *, char *, FILE *, MARK *, recno_t *, int)); + * PUBLIC: int ex_readfp(SCR *, char *, FILE *, MARK *, recno_t *, int); */ int ex_readfp(sp, name, fp, fm, nlinesp, silent) diff --git a/usr.bin/vi/ex/ex_screen.c b/usr.bin/vi/ex/ex_screen.c index 64f063280a3..70361d936cf 100644 --- a/usr.bin/vi/ex/ex_screen.c +++ b/usr.bin/vi/ex/ex_screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_screen.c,v 1.4 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_screen.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)ex_screen.c 10.11 (Berkeley) 6/29/96"; * ex_bg -- :bg * Hide the screen. * - * PUBLIC: int ex_bg __P((SCR *, EXCMD *)); + * PUBLIC: int ex_bg(SCR *, EXCMD *); */ int ex_bg(sp, cmdp) @@ -46,7 +46,7 @@ ex_bg(sp, cmdp) * ex_fg -- :fg [file] * Show the screen. * - * PUBLIC: int ex_fg __P((SCR *, EXCMD *)); + * PUBLIC: int ex_fg(SCR *, EXCMD *); */ int ex_fg(sp, cmdp) @@ -72,7 +72,7 @@ ex_fg(sp, cmdp) * ex_resize -- :resize [+-]rows * Change the screen size. * - * PUBLIC: int ex_resize __P((SCR *, EXCMD *)); + * PUBLIC: int ex_resize(SCR *, EXCMD *); */ int ex_resize(sp, cmdp) @@ -103,7 +103,7 @@ ex_resize(sp, cmdp) * ex_sdisplay -- * Display the list of screens. * - * PUBLIC: int ex_sdisplay __P((SCR *)); + * PUBLIC: int ex_sdisplay(SCR *); */ int ex_sdisplay(sp) diff --git a/usr.bin/vi/ex/ex_script.c b/usr.bin/vi/ex/ex_script.c index df7139b60cd..c7f1f887e76 100644 --- a/usr.bin/vi/ex/ex_script.c +++ b/usr.bin/vi/ex/ex_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_script.c,v 1.7 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: ex_script.c,v 1.8 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -47,19 +47,19 @@ static const char sccsid[] = "@(#)ex_script.c 10.30 (Berkeley) 9/24/96"; #include "script.h" #include "pathnames.h" -static void sscr_check __P((SCR *)); -static int sscr_getprompt __P((SCR *)); -static int sscr_init __P((SCR *)); -static int sscr_insert __P((SCR *)); -static int sscr_matchprompt __P((SCR *, char *, size_t, size_t *)); -static int sscr_pty __P((int *, int *, char *, struct termios *, void *)); -static int sscr_setprompt __P((SCR *, char *, size_t)); +static void sscr_check(SCR *); +static int sscr_getprompt(SCR *); +static int sscr_init(SCR *); +static int sscr_insert(SCR *); +static int sscr_matchprompt(SCR *, char *, size_t, size_t *); +static int sscr_pty(int *, int *, char *, struct termios *, void *); +static int sscr_setprompt(SCR *, char *, size_t); /* * ex_script -- : sc[ript][!] [file] * Switch to script mode. * - * PUBLIC: int ex_script __P((SCR *, EXCMD *)); + * PUBLIC: int ex_script(SCR *, EXCMD *); */ int ex_script(sp, cmdp) @@ -299,7 +299,7 @@ prompterr: sscr_end(sp); * sscr_exec -- * Take a line and hand it off to the shell. * - * PUBLIC: int sscr_exec __P((SCR *, recno_t)); + * PUBLIC: int sscr_exec(SCR *, recno_t); */ int sscr_exec(sp, lno) @@ -372,7 +372,7 @@ err1: rval = 1; * sscr_input -- * Read any waiting shell input. * - * PUBLIC: int sscr_input __P((SCR *)); + * PUBLIC: int sscr_input(SCR *); */ int sscr_input(sp) @@ -577,7 +577,7 @@ sscr_matchprompt(sp, lp, line_len, lenp) * sscr_end -- * End the pipe to a shell. * - * PUBLIC: int sscr_end __P((SCR *)); + * PUBLIC: int sscr_end(SCR *); */ int sscr_end(sp) @@ -629,8 +629,8 @@ sscr_check(sp) } #ifdef HAVE_SYS5_PTY -static int ptys_open __P((int, char *)); -static int ptym_open __P((char *)); +static int ptys_open(int, char *); +static int ptym_open(char *); static int sscr_pty(amaster, aslave, name, termp, winp) diff --git a/usr.bin/vi/ex/ex_set.c b/usr.bin/vi/ex/ex_set.c index 5db57545bac..7902db985d1 100644 --- a/usr.bin/vi/ex/ex_set.c +++ b/usr.bin/vi/ex/ex_set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_set.c,v 1.3 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_set.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -28,7 +28,7 @@ static const char sccsid[] = "@(#)ex_set.c 10.7 (Berkeley) 3/6/96"; * ex_set -- :set * Ex set option. * - * PUBLIC: int ex_set __P((SCR *, EXCMD *)); + * PUBLIC: int ex_set(SCR *, EXCMD *); */ int ex_set(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_shell.c b/usr.bin/vi/ex/ex_shell.c index 0acd8992083..0ae30bc9cd4 100644 --- a/usr.bin/vi/ex/ex_shell.c +++ b/usr.bin/vi/ex/ex_shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_shell.c,v 1.7 2001/07/09 07:04:57 deraadt Exp $ */ +/* $OpenBSD: ex_shell.c,v 1.8 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,14 +30,14 @@ static const char sccsid[] = "@(#)ex_shell.c 10.38 (Berkeley) 8/19/96"; #include "../common/common.h" -static const char *sigmsg __P((int)); +static const char *sigmsg(int); /* * ex_shell -- :sh[ell] * Invoke the program named in the SHELL environment variable * with the argument -i. * - * PUBLIC: int ex_shell __P((SCR *, EXCMD *)); + * PUBLIC: int ex_shell(SCR *, EXCMD *); */ int ex_shell(sp, cmdp) @@ -80,7 +80,7 @@ ex_shell(sp, cmdp) * ex_exec_proc -- * Run a separate process. * - * PUBLIC: int ex_exec_proc __P((SCR *, EXCMD *, char *, const char *, int)); + * PUBLIC: int ex_exec_proc(SCR *, EXCMD *, char *, const char *, int); */ int ex_exec_proc(sp, cmdp, cmd, msg, need_newline) @@ -148,7 +148,7 @@ ex_exec_proc(sp, cmdp, cmd, msg, need_newline) * rules get you. I'm using a long based on the belief that nobody is * going to make it unsigned and it's unlikely to be a quad. * - * PUBLIC: int proc_wait __P((SCR *, long, const char *, int, int)); + * PUBLIC: int proc_wait(SCR *, long, const char *, int, int); */ int proc_wait(sp, pid, cmd, silent, okpipe) diff --git a/usr.bin/vi/ex/ex_shift.c b/usr.bin/vi/ex/ex_shift.c index 3ab587e7ab8..523fa875d6f 100644 --- a/usr.bin/vi/ex/ex_shift.c +++ b/usr.bin/vi/ex/ex_shift.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_shift.c,v 1.4 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_shift.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -27,13 +27,13 @@ static const char sccsid[] = "@(#)ex_shift.c 10.11 (Berkeley) 9/15/96"; #include "../common/common.h" enum which {LEFT, RIGHT}; -static int shift __P((SCR *, EXCMD *, enum which)); +static int shift(SCR *, EXCMD *, enum which); /* * ex_shiftl -- :<[<...] * * - * PUBLIC: int ex_shiftl __P((SCR *, EXCMD *)); + * PUBLIC: int ex_shiftl(SCR *, EXCMD *); */ int ex_shiftl(sp, cmdp) @@ -46,7 +46,7 @@ ex_shiftl(sp, cmdp) /* * ex_shiftr -- :>[>...] * - * PUBLIC: int ex_shiftr __P((SCR *, EXCMD *)); + * PUBLIC: int ex_shiftr(SCR *, EXCMD *); */ int ex_shiftr(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_source.c b/usr.bin/vi/ex/ex_source.c index 909af4e5f33..c046a33bb6e 100644 --- a/usr.bin/vi/ex/ex_source.c +++ b/usr.bin/vi/ex/ex_source.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_source.c,v 1.5 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_source.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -34,7 +34,7 @@ static const char sccsid[] = "@(#)ex_source.c 10.12 (Berkeley) 8/10/96"; * ex_source -- :source file * Execute ex commands from a file. * - * PUBLIC: int ex_source __P((SCR *, EXCMD *)); + * PUBLIC: int ex_source(SCR *, EXCMD *); */ int ex_source(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_stop.c b/usr.bin/vi/ex/ex_stop.c index 77bb1e88519..8f62be4aa22 100644 --- a/usr.bin/vi/ex/ex_stop.c +++ b/usr.bin/vi/ex/ex_stop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_stop.c,v 1.3 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_stop.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -32,7 +32,7 @@ static const char sccsid[] = "@(#)ex_stop.c 10.10 (Berkeley) 3/6/96"; * :suspend[!] * Suspend execution. * - * PUBLIC: int ex_stop __P((SCR *, EXCMD *)); + * PUBLIC: int ex_stop(SCR *, EXCMD *); */ int ex_stop(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_subst.c b/usr.bin/vi/ex/ex_subst.c index 790c82301d3..f2dee8a61d6 100644 --- a/usr.bin/vi/ex/ex_subst.c +++ b/usr.bin/vi/ex/ex_subst.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_subst.c,v 1.10 2001/01/29 01:58:44 niklas Exp $ */ +/* $OpenBSD: ex_subst.c,v 1.11 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -34,12 +34,12 @@ static const char sccsid[] = "@(#)ex_subst.c 10.37 (Berkeley) 9/15/96"; #define SUB_FIRST 0x01 /* The 'r' flag isn't reasonable. */ #define SUB_MUSTSETR 0x02 /* The 'r' flag is required. */ -static int re_conv __P((SCR *, char **, size_t *, int *)); -static int re_cscope_conv __P((SCR *, char **, size_t *, int *)); +static int re_conv(SCR *, char **, size_t *, int *); +static int re_cscope_conv(SCR *, char **, size_t *, int *); static int re_sub __P((SCR *, char *, char **, size_t *, size_t *, regmatch_t [10])); -static int re_tag_conv __P((SCR *, char **, size_t *, int *)); -static int s __P((SCR *, EXCMD *, char *, regex_t *, u_int)); +static int re_tag_conv(SCR *, char **, size_t *, int *); +static int s(SCR *, EXCMD *, char *, regex_t *, u_int); /* * ex_s -- @@ -47,7 +47,7 @@ static int s __P((SCR *, EXCMD *, char *, regex_t *, u_int)); * * Substitute on lines matching a pattern. * - * PUBLIC: int ex_s __P((SCR *, EXCMD *)); + * PUBLIC: int ex_s(SCR *, EXCMD *); */ int ex_s(sp, cmdp) @@ -253,7 +253,7 @@ tilde: ++p; * * Substitute using the last substitute RE and replacement pattern. * - * PUBLIC: int ex_subagain __P((SCR *, EXCMD *)); + * PUBLIC: int ex_subagain(SCR *, EXCMD *); */ int ex_subagain(sp, cmdp) @@ -277,7 +277,7 @@ ex_subagain(sp, cmdp) * * Substitute using the last RE and last substitute replacement pattern. * - * PUBLIC: int ex_subtilde __P((SCR *, EXCMD *)); + * PUBLIC: int ex_subtilde(SCR *, EXCMD *); */ int ex_subtilde(sp, cmdp) @@ -1301,7 +1301,7 @@ re_cscope_conv(sp, ptrnp, plenp, replacedp) * re_error -- * Report a regular expression error. * - * PUBLIC: void re_error __P((SCR *, int, regex_t *)); + * PUBLIC: void re_error(SCR *, int, regex_t *); */ void re_error(sp, errcode, preg) diff --git a/usr.bin/vi/ex/ex_tag.c b/usr.bin/vi/ex/ex_tag.c index c6757ae18c5..21188ed30f2 100644 --- a/usr.bin/vi/ex/ex_tag.c +++ b/usr.bin/vi/ex/ex_tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_tag.c,v 1.9 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: ex_tag.c,v 1.10 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -44,24 +44,24 @@ static const char sccsid[] = "@(#)ex_tag.c 10.36 (Berkeley) 9/15/96"; #include "../vi/vi.h" #include "tag.h" -static char *binary_search __P((char *, char *, char *)); -static int compare __P((char *, char *, char *)); -static void ctag_file __P((SCR *, TAGF *, char *, char **, size_t *)); -static int ctag_search __P((SCR *, char *, size_t, char *)); -static int ctag_sfile __P((SCR *, TAGF *, TAGQ *, char *)); -static TAGQ *ctag_slist __P((SCR *, char *)); -static char *linear_search __P((char *, char *, char *)); -static int tag_copy __P((SCR *, TAG *, TAG **)); -static int tag_pop __P((SCR *, TAGQ *, int)); -static int tagf_copy __P((SCR *, TAGF *, TAGF **)); -static int tagf_free __P((SCR *, TAGF *)); -static int tagq_copy __P((SCR *, TAGQ *, TAGQ **)); +static char *binary_search(char *, char *, char *); +static int compare(char *, char *, char *); +static void ctag_file(SCR *, TAGF *, char *, char **, size_t *); +static int ctag_search(SCR *, char *, size_t, char *); +static int ctag_sfile(SCR *, TAGF *, TAGQ *, char *); +static TAGQ *ctag_slist(SCR *, char *); +static char *linear_search(char *, char *, char *); +static int tag_copy(SCR *, TAG *, TAG **); +static int tag_pop(SCR *, TAGQ *, int); +static int tagf_copy(SCR *, TAGF *, TAGF **); +static int tagf_free(SCR *, TAGF *); +static int tagq_copy(SCR *, TAGQ *, TAGQ **); /* * ex_tag_first -- * The tag code can be entered from main, e.g., "vi -t tag". * - * PUBLIC: int ex_tag_first __P((SCR *, char *)); + * PUBLIC: int ex_tag_first(SCR *, char *); */ int ex_tag_first(sp, tagarg) @@ -97,7 +97,7 @@ ex_tag_first(sp, tagarg) * * Enter a new TAGQ context based on a ctag string. * - * PUBLIC: int ex_tag_push __P((SCR *, EXCMD *)); + * PUBLIC: int ex_tag_push(SCR *, EXCMD *); */ int ex_tag_push(sp, cmdp) @@ -234,7 +234,7 @@ alloc_err: * ex_tag_next -- * Switch context to the next TAG. * - * PUBLIC: int ex_tag_next __P((SCR *, EXCMD *)); + * PUBLIC: int ex_tag_next(SCR *, EXCMD *); */ int ex_tag_next(sp, cmdp) @@ -269,7 +269,7 @@ ex_tag_next(sp, cmdp) * ex_tag_prev -- * Switch context to the next TAG. * - * PUBLIC: int ex_tag_prev __P((SCR *, EXCMD *)); + * PUBLIC: int ex_tag_prev(SCR *, EXCMD *); */ int ex_tag_prev(sp, cmdp) @@ -304,7 +304,7 @@ ex_tag_prev(sp, cmdp) * ex_tag_nswitch -- * Switch context to the specified TAG. * - * PUBLIC: int ex_tag_nswitch __P((SCR *, TAG *, int)); + * PUBLIC: int ex_tag_nswitch(SCR *, TAG *, int); */ int ex_tag_nswitch(sp, tp, force) @@ -341,7 +341,7 @@ ex_tag_nswitch(sp, tp, force) * ex_tag_Nswitch -- * Switch context to the specified TAG in a new screen. * - * PUBLIC: int ex_tag_Nswitch __P((SCR *, TAG *, int)); + * PUBLIC: int ex_tag_Nswitch(SCR *, TAG *, int); */ int ex_tag_Nswitch(sp, tp, force) @@ -398,7 +398,7 @@ ex_tag_Nswitch(sp, tp, force) * * Pop to a previous TAGQ context. * - * PUBLIC: int ex_tag_pop __P((SCR *, EXCMD *)); + * PUBLIC: int ex_tag_pop(SCR *, EXCMD *); */ int ex_tag_pop(sp, cmdp) @@ -479,7 +479,7 @@ filearg: arglen = strlen(arg); * ex_tag_top -- :tagt[op][!] * Clear the tag stack. * - * PUBLIC: int ex_tag_top __P((SCR *, EXCMD *)); + * PUBLIC: int ex_tag_top(SCR *, EXCMD *); */ int ex_tag_top(sp, cmdp) @@ -559,7 +559,7 @@ tag_pop(sp, dtqp, force) * ex_tag_display -- * Display the list of tags. * - * PUBLIC: int ex_tag_display __P((SCR *)); + * PUBLIC: int ex_tag_display(SCR *); */ int ex_tag_display(sp) @@ -638,7 +638,7 @@ ex_tag_display(sp) * ex_tag_copy -- * Copy a screen's tag structures. * - * PUBLIC: int ex_tag_copy __P((SCR *, SCR *)); + * PUBLIC: int ex_tag_copy(SCR *, SCR *); */ int ex_tag_copy(orig, sp) @@ -786,7 +786,7 @@ tagf_free(sp, tfp) * tagq_free -- * Free a TAGQ structure (and associated TAG structures). * - * PUBLIC: int tagq_free __P((SCR *, TAGQ *)); + * PUBLIC: int tagq_free(SCR *, TAGQ *); */ int tagq_free(sp, tqp) @@ -816,7 +816,7 @@ tagq_free(sp, tqp) * tag_msg * A few common messages. * - * PUBLIC: void tag_msg __P((SCR *, tagmsg_t, char *)); + * PUBLIC: void tag_msg(SCR *, tagmsg_t, char *); */ void tag_msg(sp, msg, tag) @@ -844,7 +844,7 @@ tag_msg(sp, msg, tag) * ex_tagf_alloc -- * Create a new list of ctag files. * - * PUBLIC: int ex_tagf_alloc __P((SCR *, char *)); + * PUBLIC: int ex_tagf_alloc(SCR *, char *); */ int ex_tagf_alloc(sp, str) @@ -888,7 +888,7 @@ ex_tagf_alloc(sp, str) * ex_tag_free -- * Free the ex tag information. * - * PUBLIC: int ex_tag_free __P((SCR *)); + * PUBLIC: int ex_tag_free(SCR *); */ int ex_tag_free(sp) diff --git a/usr.bin/vi/ex/ex_tcl.c b/usr.bin/vi/ex/ex_tcl.c index 58179db84d2..6538638da48 100644 --- a/usr.bin/vi/ex/ex_tcl.c +++ b/usr.bin/vi/ex/ex_tcl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_tcl.c,v 1.3 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_tcl.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)ex_tcl.c 8.10 (Berkeley) 9/15/96"; * ex_tcl -- :[line [,line]] tcl [command] * Run a command through the tcl interpreter. * - * PUBLIC: int ex_tcl __P((SCR*, EXCMD *)); + * PUBLIC: int ex_tcl(SCR*, EXCMD *); */ int ex_tcl(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_txt.c b/usr.bin/vi/ex/ex_txt.c index b9bcebe67f8..84f6fac05fc 100644 --- a/usr.bin/vi/ex/ex_txt.c +++ b/usr.bin/vi/ex/ex_txt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_txt.c,v 1.6 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_txt.c,v 1.7 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -44,14 +44,14 @@ static const char sccsid[] = "@(#)ex_txt.c 10.17 (Berkeley) 10/10/96"; * characters remaining when failure occurred. */ -static int txt_dent __P((SCR *, TEXT *)); -static void txt_prompt __P((SCR *, TEXT *, ARG_CHAR_T, u_int32_t)); +static int txt_dent(SCR *, TEXT *); +static void txt_prompt(SCR *, TEXT *, ARG_CHAR_T, u_int32_t); /* * ex_txt -- * Get lines from the terminal for ex. * - * PUBLIC: int ex_txt __P((SCR *, TEXTH *, ARG_CHAR_T, u_int32_t)); + * PUBLIC: int ex_txt(SCR *, TEXTH *, ARG_CHAR_T, u_int32_t); */ int ex_txt(sp, tiqh, prompt, flags) diff --git a/usr.bin/vi/ex/ex_undo.c b/usr.bin/vi/ex/ex_undo.c index cd012d290d7..d7a5cd3bf43 100644 --- a/usr.bin/vi/ex/ex_undo.c +++ b/usr.bin/vi/ex/ex_undo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_undo.c,v 1.3 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_undo.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_undo.c 10.6 (Berkeley) 3/6/96"; * ex_undo -- u * Undo the last change. * - * PUBLIC: int ex_undo __P((SCR *, EXCMD *)); + * PUBLIC: int ex_undo(SCR *, EXCMD *); */ int ex_undo(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_usage.c b/usr.bin/vi/ex/ex_usage.c index 72dbd20724c..389b012bc1c 100644 --- a/usr.bin/vi/ex/ex_usage.c +++ b/usr.bin/vi/ex/ex_usage.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_usage.c,v 1.3 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_usage.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)ex_usage.c 10.13 (Berkeley) 5/3/96"; * ex_help -- :help * Display help message. * - * PUBLIC: int ex_help __P((SCR *, EXCMD *)); + * PUBLIC: int ex_help(SCR *, EXCMD *); */ int ex_help(sp, cmdp) @@ -56,7 +56,7 @@ ex_help(sp, cmdp) * ex_usage -- :exusage [cmd] * Display ex usage strings. * - * PUBLIC: int ex_usage __P((SCR *, EXCMD *)); + * PUBLIC: int ex_usage(SCR *, EXCMD *); */ int ex_usage(sp, cmdp) @@ -139,7 +139,7 @@ ex_usage(sp, cmdp) * ex_viusage -- :viusage [key] * Display vi usage strings. * - * PUBLIC: int ex_viusage __P((SCR *, EXCMD *)); + * PUBLIC: int ex_viusage(SCR *, EXCMD *); */ int ex_viusage(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_util.c b/usr.bin/vi/ex/ex_util.c index 2c5b97c137b..ffb807f4466 100644 --- a/usr.bin/vi/ex/ex_util.c +++ b/usr.bin/vi/ex/ex_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_util.c,v 1.4 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_util.c,v 1.5 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -60,7 +60,7 @@ ex_cinit(cmdp, cmd_id, naddr, lno1, lno2, force, ap) * ex_cadd -- * Add an argument to an EX command structure. * - * PUBLIC: void ex_cadd __P((EXCMD *, ARGS *, char *, size_t)); + * PUBLIC: void ex_cadd(EXCMD *, ARGS *, char *, size_t); */ void ex_cadd(cmdp, ap, arg, len) @@ -79,7 +79,7 @@ ex_cadd(cmdp, ap, arg, len) * ex_getline -- * Return a line from the file. * - * PUBLIC: int ex_getline __P((SCR *, FILE *, size_t *)); + * PUBLIC: int ex_getline(SCR *, FILE *, size_t *); */ int ex_getline(sp, fp, lenp) @@ -122,7 +122,7 @@ ex_getline(sp, fp, lenp) * ex_ncheck -- * Check for more files to edit. * - * PUBLIC: int ex_ncheck __P((SCR *, int)); + * PUBLIC: int ex_ncheck(SCR *, int); */ int ex_ncheck(sp, force) @@ -153,7 +153,7 @@ ex_ncheck(sp, force) * ex_init -- * Init the screen for ex. * - * PUBLIC: int ex_init __P((SCR *)); + * PUBLIC: int ex_init(SCR *); */ int ex_init(sp) @@ -179,7 +179,7 @@ ex_init(sp) * ex_emsg -- * Display a few common ex and vi error messages. * - * PUBLIC: void ex_emsg __P((SCR *, char *, exm_t)); + * PUBLIC: void ex_emsg(SCR *, char *, exm_t); */ void ex_emsg(sp, p, which) diff --git a/usr.bin/vi/ex/ex_version.c b/usr.bin/vi/ex/ex_version.c index 0aaf17a720a..3f503eba13f 100644 --- a/usr.bin/vi/ex/ex_version.c +++ b/usr.bin/vi/ex/ex_version.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_version.c,v 1.7 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_version.c,v 1.8 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -29,7 +29,7 @@ static const char sccsid[] = "@(#)ex_version.c 10.31 (Berkeley) 8/22/96"; * ex_version -- :version * Display the program version. * - * PUBLIC: int ex_version __P((SCR *, EXCMD *)); + * PUBLIC: int ex_version(SCR *, EXCMD *); */ int ex_version(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_visual.c b/usr.bin/vi/ex/ex_visual.c index a845ad20eca..be9aeb81d3b 100644 --- a/usr.bin/vi/ex/ex_visual.c +++ b/usr.bin/vi/ex/ex_visual.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_visual.c,v 1.5 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_visual.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)ex_visual.c 10.13 (Berkeley) 6/28/96"; * ex_visual -- :[line] vi[sual] [^-.+] [window_size] [flags] * Switch to visual mode. * - * PUBLIC: int ex_visual __P((SCR *, EXCMD *)); + * PUBLIC: int ex_visual(SCR *, EXCMD *); */ int ex_visual(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_write.c b/usr.bin/vi/ex/ex_write.c index 0e1f611b935..0f2921c593a 100644 --- a/usr.bin/vi/ex/ex_write.c +++ b/usr.bin/vi/ex/ex_write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_write.c,v 1.5 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_write.c,v 1.6 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -32,13 +32,13 @@ static const char sccsid[] = "@(#)ex_write.c 10.30 (Berkeley) 7/12/96"; #include "../common/common.h" enum which {WN, WQ, WRITE, XIT}; -static int exwr __P((SCR *, EXCMD *, enum which)); +static int exwr(SCR *, EXCMD *, enum which); /* * ex_wn -- :wn[!] [>>] [file] * Write to a file and switch to the next one. * - * PUBLIC: int ex_wn __P((SCR *, EXCMD *)); + * PUBLIC: int ex_wn(SCR *, EXCMD *); */ int ex_wn(sp, cmdp) @@ -60,7 +60,7 @@ ex_wn(sp, cmdp) * ex_wq -- :wq[!] [>>] [file] * Write to a file and quit. * - * PUBLIC: int ex_wq __P((SCR *, EXCMD *)); + * PUBLIC: int ex_wq(SCR *, EXCMD *); */ int ex_wq(sp, cmdp) @@ -88,7 +88,7 @@ ex_wq(sp, cmdp) * :write [!] [cmd] * Write to a file. * - * PUBLIC: int ex_write __P((SCR *, EXCMD *)); + * PUBLIC: int ex_write(SCR *, EXCMD *); */ int ex_write(sp, cmdp) @@ -103,7 +103,7 @@ ex_write(sp, cmdp) * ex_xit -- :x[it]! [file] * Write out any modifications and quit. * - * PUBLIC: int ex_xit __P((SCR *, EXCMD *)); + * PUBLIC: int ex_xit(SCR *, EXCMD *); */ int ex_xit(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_yank.c b/usr.bin/vi/ex/ex_yank.c index 39163c044a0..408d9e9ca41 100644 --- a/usr.bin/vi/ex/ex_yank.c +++ b/usr.bin/vi/ex/ex_yank.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_yank.c,v 1.3 2001/01/29 01:58:45 niklas Exp $ */ +/* $OpenBSD: ex_yank.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -28,7 +28,7 @@ static const char sccsid[] = "@(#)ex_yank.c 10.7 (Berkeley) 3/6/96"; * ex_yank -- :[line [,line]] ya[nk] [buffer] [count] * Yank the lines into a buffer. * - * PUBLIC: int ex_yank __P((SCR *, EXCMD *)); + * PUBLIC: int ex_yank(SCR *, EXCMD *); */ int ex_yank(sp, cmdp) diff --git a/usr.bin/vi/ex/ex_z.c b/usr.bin/vi/ex/ex_z.c index 077307e3267..522e7f41985 100644 --- a/usr.bin/vi/ex/ex_z.c +++ b/usr.bin/vi/ex/ex_z.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ex_z.c,v 1.3 2001/01/29 01:58:46 niklas Exp $ */ +/* $OpenBSD: ex_z.c,v 1.4 2002/02/16 21:27:57 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)ex_z.c 10.10 (Berkeley) 3/6/96"; * ex_z -- :[line] z [^-.+=] [count] [flags] * Adjust window. * - * PUBLIC: int ex_z __P((SCR *, EXCMD *)); + * PUBLIC: int ex_z(SCR *, EXCMD *); */ int ex_z(sp, cmdp) diff --git a/usr.bin/vi/include/cl_extern.h b/usr.bin/vi/include/cl_extern.h index fb7f3ac2e90..af565eda8b9 100644 --- a/usr.bin/vi/include/cl_extern.h +++ b/usr.bin/vi/include/cl_extern.h @@ -1,62 +1,62 @@ -/* $OpenBSD: cl_extern.h,v 1.5 2001/01/29 01:58:46 niklas Exp $ */ +/* $OpenBSD: cl_extern.h,v 1.6 2002/02/16 21:27:57 millert Exp $ */ #ifndef HAVE_CURSES_ADDNSTR -int addnstr __P((char *, int)); +int addnstr(char *, int); #endif #ifndef HAVE_CURSES_BEEP -void beep __P((void)); +void beep(void); #endif #ifndef HAVE_CURSES_FLASH -void flash __P((void)); +void flash(void); #endif #ifndef HAVE_CURSES_IDLOK -void idlok __P((WINDOW *, int)); +void idlok(WINDOW *, int); #endif #ifndef HAVE_CURSES_KEYPAD -int keypad __P((void *, int)); +int keypad(void *, int); #endif #ifndef HAVE_CURSES_NEWTERM -void *newterm __P((const char *, FILE *, FILE *)); +void *newterm(const char *, FILE *, FILE *); #endif #ifndef HAVE_CURSES_SETUPTERM -void setupterm __P((char *, int, int *)); +void setupterm(char *, int, int *); #endif #ifdef HAVE_CURSES_TIGETSTR char *tigetstr(); #else -char *tigetstr __P((char *)); +char *tigetstr(char *); #endif #ifndef HAVE_CURSES_TIGETSTR -int tigetnum __P((char *)); -#endif -int cl_addstr __P((SCR *, const char *, size_t)); -int cl_attr __P((SCR *, scr_attr_t, int)); -int cl_baud __P((SCR *, u_long *)); -int cl_bell __P((SCR *)); -int cl_clrtoeol __P((SCR *)); -int cl_cursor __P((SCR *, size_t *, size_t *)); -int cl_deleteln __P((SCR *)); -int cl_ex_adjust __P((SCR *, exadj_t)); -int cl_insertln __P((SCR *)); -int cl_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); -int cl_move __P((SCR *, size_t, size_t)); -int cl_refresh __P((SCR *, int)); -int cl_rename __P((SCR *, char *, int)); -int cl_suspend __P((SCR *, int *)); -void cl_usage __P((void)); -int sig_init __P((GS *, SCR *)); -int cl_event __P((SCR *, EVENT *, u_int32_t, int)); -int cl_screen __P((SCR *, u_int32_t)); -int cl_quit __P((GS *)); -int cl_getcap __P((SCR *, char *, char **)); -int cl_term_init __P((SCR *)); -int cl_term_end __P((GS *)); -int cl_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); -int cl_optchange __P((SCR *, int, char *, u_long *)); -int cl_omesg __P((SCR *, CL_PRIVATE *, int)); -int cl_ssize __P((SCR *, int, size_t *, size_t *, int *)); +int tigetnum(char *); +#endif +int cl_addstr(SCR *, const char *, size_t); +int cl_attr(SCR *, scr_attr_t, int); +int cl_baud(SCR *, u_long *); +int cl_bell(SCR *); +int cl_clrtoeol(SCR *); +int cl_cursor(SCR *, size_t *, size_t *); +int cl_deleteln(SCR *); +int cl_ex_adjust(SCR *, exadj_t); +int cl_insertln(SCR *); +int cl_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); +int cl_move(SCR *, size_t, size_t); +int cl_refresh(SCR *, int); +int cl_rename(SCR *, char *, int); +int cl_suspend(SCR *, int *); +void cl_usage(void); +int sig_init(GS *, SCR *); +int cl_event(SCR *, EVENT *, u_int32_t, int); +int cl_screen(SCR *, u_int32_t); +int cl_quit(GS *); +int cl_getcap(SCR *, char *, char **); +int cl_term_init(SCR *); +int cl_term_end(GS *); +int cl_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); +int cl_optchange(SCR *, int, char *, u_long *); +int cl_omesg(SCR *, CL_PRIVATE *, int); +int cl_ssize(SCR *, int, size_t *, size_t *, int *); #ifdef USE_OCURSES -void cl_putchar __P((int)); +void cl_putchar(int); #else -int cl_putchar __P((int)); +int cl_putchar(int); #endif diff --git a/usr.bin/vi/include/com_extern.h b/usr.bin/vi/include/com_extern.h index 73cc83e9626..cd9735dcb4d 100644 --- a/usr.bin/vi/include/com_extern.h +++ b/usr.bin/vi/include/com_extern.h @@ -1,201 +1,201 @@ -/* $OpenBSD: com_extern.h,v 1.3 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: com_extern.h,v 1.4 2002/02/16 21:27:57 millert Exp $ */ #ifndef HAVE_BSEARCH void *bsearch __P((const void *, const void *, size_t, size_t, int (*)(const void *, const void *))); #endif #ifndef HAVE_SETENV -int setenv __P((const char *, const char *, int)); +int setenv(const char *, const char *, int); #endif #ifndef HAVE_UNSETENV -void unsetenv __P((const char *)); +void unsetenv(const char *); #endif #ifndef HAVE_GETHOSTNAME -int gethostname __P((char *, int)); +int gethostname(char *, int); #endif #ifndef HAVE_GETOPT -int getopt __P((int, char * const *, const char *)); +int getopt(int, char * const *, const char *); #endif #ifndef HAVE_MEMCHR -void *memchr __P((const void *, int, size_t)); +void *memchr(const void *, int, size_t); #endif #ifndef HAVE_MEMCPY -void *memcpy __P((void *, const void *, size_t)); +void *memcpy(void *, const void *, size_t); #endif #ifndef HAVE_MEMMOVE -void *memmove __P((void *, const void *, size_t)); +void *memmove(void *, const void *, size_t); #endif #ifndef HAVE_MEMSET -void *memset __P((void *, int, size_t)); +void *memset(void *, int, size_t); #endif #ifndef HAVE_MKSTEMP -int mkstemp __P((char *)); +int mkstemp(char *); #endif #ifndef HAVE_MMAP -char *mmap __P((char *, size_t, int, int, int, off_t)); +char *mmap(char *, size_t, int, int, int, off_t); #endif #ifndef HAVE_MMAP -int munmap __P((char *, size_t)); +int munmap(char *, size_t); #endif #ifndef HAVE_SNPRINTF -int snprintf __P((char *, size_t, const char *, ...)); +int snprintf(char *, size_t, const char *, ...); #endif #ifndef HAVE_STRDUP -char *strdup __P((const char *)); +char *strdup(const char *); #endif #ifndef HAVE_STRERROR -char *strerror __P((int)); +char *strerror(int); #endif #ifndef HAVE_STRPBRK -char *strpbrk __P((const char *, const char *)); +char *strpbrk(const char *, const char *); #endif #ifndef HAVE_STRSEP -char *strsep __P((char **, const char *)); +char *strsep(char **, const char *); #endif #ifndef HAVE_STRTOL -long strtol __P((const char *, char **, int)); +long strtol(const char *, char **, int); #endif #ifndef HAVE_STRTOUL -unsigned long strtoul __P((const char *, char **, int)); +unsigned long strtoul(const char *, char **, int); #endif #ifndef HAVE_VSNPRINTF -int vsnprintf __P((char *, size_t, const char *, ...)); -#endif -SCR *api_fscreen __P((int, char *)); -int api_aline __P((SCR *, recno_t, char *, size_t)); -int api_dline __P((SCR *, recno_t)); -int api_gline __P((SCR *, recno_t, char **, size_t *)); -int api_iline __P((SCR *, recno_t, char *, size_t)); -int api_lline __P((SCR *, recno_t *)); -int api_sline __P((SCR *, recno_t, char *, size_t)); -int api_getmark __P((SCR *, int, MARK *)); -int api_setmark __P((SCR *, int, MARK *)); -int api_nextmark __P((SCR *, int, char *)); -int api_getcursor __P((SCR *, MARK *)); -int api_setcursor __P((SCR *, MARK *)); -void api_emessage __P((SCR *, char *)); -void api_imessage __P((SCR *, char *)); -int api_edit __P((SCR *, char *, SCR **, int)); -int api_escreen __P((SCR *)); -int api_swscreen __P((SCR *, SCR *)); -int api_map __P((SCR *, char *, char *, size_t)); -int api_unmap __P((SCR *, char *)); -int api_opts_get __P((SCR *, char *, char **, int *)); -int api_opts_set __P((SCR *, char *, char *, u_long, int)); -int api_run_str __P((SCR *, char *)); -int cut __P((SCR *, CHAR_T *, MARK *, MARK *, int)); -int cut_line __P((SCR *, recno_t, size_t, size_t, CB *)); -void cut_close __P((GS *)); -TEXT *text_init __P((SCR *, const char *, size_t, size_t)); -void text_lfree __P((TEXTH *)); -void text_free __P((TEXT *)); -int del __P((SCR *, MARK *, MARK *, int)); -FREF *file_add __P((SCR *, CHAR_T *)); -int file_init __P((SCR *, FREF *, char *, int)); -int file_end __P((SCR *, EXF *, int)); -int file_write __P((SCR *, MARK *, MARK *, char *, int)); -int file_m1 __P((SCR *, int, int)); -int file_m2 __P((SCR *, int)); -int file_m3 __P((SCR *, int)); -int file_aw __P((SCR *, int)); -void set_alt_name __P((SCR *, char *)); -lockr_t file_lock __P((SCR *, char *, int *, int, int)); -int v_key_init __P((SCR *)); -void v_key_ilookup __P((SCR *)); -size_t v_key_len __P((SCR *, ARG_CHAR_T)); -CHAR_T *v_key_name __P((SCR *, ARG_CHAR_T)); -int v_key_val __P((SCR *, ARG_CHAR_T)); -int v_event_push __P((SCR *, EVENT *, CHAR_T *, size_t, u_int)); -int v_event_get __P((SCR *, EVENT *, int, u_int32_t)); -void v_event_err __P((SCR *, EVENT *)); -int v_event_flush __P((SCR *, u_int)); -int db_eget __P((SCR *, recno_t, char **, size_t *, int *)); -int db_get __P((SCR *, recno_t, u_int32_t, char **, size_t *)); -int db_delete __P((SCR *, recno_t)); -int db_append __P((SCR *, int, recno_t, char *, size_t)); -int db_insert __P((SCR *, recno_t, char *, size_t)); -int db_set __P((SCR *, recno_t, char *, size_t)); -int db_exist __P((SCR *, recno_t)); -int db_last __P((SCR *, recno_t *)); -void db_err __P((SCR *, recno_t)); -int log_init __P((SCR *, EXF *)); -int log_end __P((SCR *, EXF *)); -int log_cursor __P((SCR *)); -int log_line __P((SCR *, recno_t, u_int)); -int log_mark __P((SCR *, LMARK *)); -int log_backward __P((SCR *, MARK *)); -int log_setline __P((SCR *)); -int log_forward __P((SCR *, MARK *)); -int editor __P((GS *, int, char *[])); -void v_end __P((GS *)); -int mark_init __P((SCR *, EXF *)); -int mark_end __P((SCR *, EXF *)); -int mark_get __P((SCR *, ARG_CHAR_T, MARK *, mtype_t)); -int mark_set __P((SCR *, ARG_CHAR_T, MARK *, int)); -int mark_insdel __P((SCR *, lnop_t, recno_t)); -void msgq __P((SCR *, mtype_t, const char *, ...)); -void msgq_str __P((SCR *, mtype_t, char *, char *)); -void mod_rpt __P((SCR *)); -void msgq_status __P((SCR *, recno_t, u_int)); -int msg_open __P((SCR *, char *)); -void msg_close __P((GS *)); -const char *msg_cmsg __P((SCR *, cmsg_t, size_t *)); -const char *msg_cat __P((SCR *, const char *, size_t *)); -char *msg_print __P((SCR *, const char *, int *)); -int opts_init __P((SCR *, int *)); -int opts_set __P((SCR *, ARGS *[], char *)); -int o_set __P((SCR *, int, u_int, char *, u_long)); -int opts_empty __P((SCR *, int, int)); -void opts_dump __P((SCR *, enum optdisp)); -int opts_save __P((SCR *, FILE *)); -OPTLIST const *opts_search __P((char *)); -void opts_nomatch __P((SCR *, char *)); -int opts_copy __P((SCR *, SCR *)); -void opts_free __P((SCR *)); -int f_altwerase __P((SCR *, OPTION *, char *, u_long *)); -int f_columns __P((SCR *, OPTION *, char *, u_long *)); -int f_lines __P((SCR *, OPTION *, char *, u_long *)); -int f_lisp __P((SCR *, OPTION *, char *, u_long *)); -int f_msgcat __P((SCR *, OPTION *, char *, u_long *)); -int f_paragraph __P((SCR *, OPTION *, char *, u_long *)); -int f_print __P((SCR *, OPTION *, char *, u_long *)); -int f_readonly __P((SCR *, OPTION *, char *, u_long *)); -int f_recompile __P((SCR *, OPTION *, char *, u_long *)); -int f_reformat __P((SCR *, OPTION *, char *, u_long *)); -int f_section __P((SCR *, OPTION *, char *, u_long *)); -int f_ttywerase __P((SCR *, OPTION *, char *, u_long *)); -int f_w300 __P((SCR *, OPTION *, char *, u_long *)); -int f_w1200 __P((SCR *, OPTION *, char *, u_long *)); -int f_w9600 __P((SCR *, OPTION *, char *, u_long *)); -int f_window __P((SCR *, OPTION *, char *, u_long *)); -int put __P((SCR *, CB *, CHAR_T *, MARK *, MARK *, int)); -int rcv_tmp __P((SCR *, EXF *, char *)); -int rcv_init __P((SCR *)); -int rcv_sync __P((SCR *, u_int)); -int rcv_list __P((SCR *)); -int rcv_read __P((SCR *, FREF *)); -int screen_init __P((GS *, SCR *, SCR **)); -int screen_end __P((SCR *)); -SCR *screen_next __P((SCR *)); +int vsnprintf(char *, size_t, const char *, ...); +#endif +SCR *api_fscreen(int, char *); +int api_aline(SCR *, recno_t, char *, size_t); +int api_dline(SCR *, recno_t); +int api_gline(SCR *, recno_t, char **, size_t *); +int api_iline(SCR *, recno_t, char *, size_t); +int api_lline(SCR *, recno_t *); +int api_sline(SCR *, recno_t, char *, size_t); +int api_getmark(SCR *, int, MARK *); +int api_setmark(SCR *, int, MARK *); +int api_nextmark(SCR *, int, char *); +int api_getcursor(SCR *, MARK *); +int api_setcursor(SCR *, MARK *); +void api_emessage(SCR *, char *); +void api_imessage(SCR *, char *); +int api_edit(SCR *, char *, SCR **, int); +int api_escreen(SCR *); +int api_swscreen(SCR *, SCR *); +int api_map(SCR *, char *, char *, size_t); +int api_unmap(SCR *, char *); +int api_opts_get(SCR *, char *, char **, int *); +int api_opts_set(SCR *, char *, char *, u_long, int); +int api_run_str(SCR *, char *); +int cut(SCR *, CHAR_T *, MARK *, MARK *, int); +int cut_line(SCR *, recno_t, size_t, size_t, CB *); +void cut_close(GS *); +TEXT *text_init(SCR *, const char *, size_t, size_t); +void text_lfree(TEXTH *); +void text_free(TEXT *); +int del(SCR *, MARK *, MARK *, int); +FREF *file_add(SCR *, CHAR_T *); +int file_init(SCR *, FREF *, char *, int); +int file_end(SCR *, EXF *, int); +int file_write(SCR *, MARK *, MARK *, char *, int); +int file_m1(SCR *, int, int); +int file_m2(SCR *, int); +int file_m3(SCR *, int); +int file_aw(SCR *, int); +void set_alt_name(SCR *, char *); +lockr_t file_lock(SCR *, char *, int *, int, int); +int v_key_init(SCR *); +void v_key_ilookup(SCR *); +size_t v_key_len(SCR *, ARG_CHAR_T); +CHAR_T *v_key_name(SCR *, ARG_CHAR_T); +int v_key_val(SCR *, ARG_CHAR_T); +int v_event_push(SCR *, EVENT *, CHAR_T *, size_t, u_int); +int v_event_get(SCR *, EVENT *, int, u_int32_t); +void v_event_err(SCR *, EVENT *); +int v_event_flush(SCR *, u_int); +int db_eget(SCR *, recno_t, char **, size_t *, int *); +int db_get(SCR *, recno_t, u_int32_t, char **, size_t *); +int db_delete(SCR *, recno_t); +int db_append(SCR *, int, recno_t, char *, size_t); +int db_insert(SCR *, recno_t, char *, size_t); +int db_set(SCR *, recno_t, char *, size_t); +int db_exist(SCR *, recno_t); +int db_last(SCR *, recno_t *); +void db_err(SCR *, recno_t); +int log_init(SCR *, EXF *); +int log_end(SCR *, EXF *); +int log_cursor(SCR *); +int log_line(SCR *, recno_t, u_int); +int log_mark(SCR *, LMARK *); +int log_backward(SCR *, MARK *); +int log_setline(SCR *); +int log_forward(SCR *, MARK *); +int editor(GS *, int, char *[]); +void v_end(GS *); +int mark_init(SCR *, EXF *); +int mark_end(SCR *, EXF *); +int mark_get(SCR *, ARG_CHAR_T, MARK *, mtype_t); +int mark_set(SCR *, ARG_CHAR_T, MARK *, int); +int mark_insdel(SCR *, lnop_t, recno_t); +void msgq(SCR *, mtype_t, const char *, ...); +void msgq_str(SCR *, mtype_t, char *, char *); +void mod_rpt(SCR *); +void msgq_status(SCR *, recno_t, u_int); +int msg_open(SCR *, char *); +void msg_close(GS *); +const char *msg_cmsg(SCR *, cmsg_t, size_t *); +const char *msg_cat(SCR *, const char *, size_t *); +char *msg_print(SCR *, const char *, int *); +int opts_init(SCR *, int *); +int opts_set(SCR *, ARGS *[], char *); +int o_set(SCR *, int, u_int, char *, u_long); +int opts_empty(SCR *, int, int); +void opts_dump(SCR *, enum optdisp); +int opts_save(SCR *, FILE *); +OPTLIST const *opts_search(char *); +void opts_nomatch(SCR *, char *); +int opts_copy(SCR *, SCR *); +void opts_free(SCR *); +int f_altwerase(SCR *, OPTION *, char *, u_long *); +int f_columns(SCR *, OPTION *, char *, u_long *); +int f_lines(SCR *, OPTION *, char *, u_long *); +int f_lisp(SCR *, OPTION *, char *, u_long *); +int f_msgcat(SCR *, OPTION *, char *, u_long *); +int f_paragraph(SCR *, OPTION *, char *, u_long *); +int f_print(SCR *, OPTION *, char *, u_long *); +int f_readonly(SCR *, OPTION *, char *, u_long *); +int f_recompile(SCR *, OPTION *, char *, u_long *); +int f_reformat(SCR *, OPTION *, char *, u_long *); +int f_section(SCR *, OPTION *, char *, u_long *); +int f_ttywerase(SCR *, OPTION *, char *, u_long *); +int f_w300(SCR *, OPTION *, char *, u_long *); +int f_w1200(SCR *, OPTION *, char *, u_long *); +int f_w9600(SCR *, OPTION *, char *, u_long *); +int f_window(SCR *, OPTION *, char *, u_long *); +int put(SCR *, CB *, CHAR_T *, MARK *, MARK *, int); +int rcv_tmp(SCR *, EXF *, char *); +int rcv_init(SCR *); +int rcv_sync(SCR *, u_int); +int rcv_list(SCR *); +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)); -void search_busy __P((SCR *, busy_t)); +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_delete __P((SCR *, CHAR_T *, size_t, seq_t)); -int seq_mdel __P((SEQ *)); +int seq_delete(SCR *, CHAR_T *, size_t, seq_t); +int seq_mdel(SEQ *); SEQ *seq_find - __P((SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *)); -void seq_close __P((GS *)); -int seq_dump __P((SCR *, seq_t, int)); -int seq_save __P((SCR *, FILE *, char *, seq_t)); -int e_memcmp __P((CHAR_T *, EVENT *, size_t)); -void *binc __P((SCR *, void *, size_t *, size_t)); -int nonblank __P((SCR *, recno_t, size_t *)); -char *tail __P((char *)); -CHAR_T *v_strdup __P((SCR *, const CHAR_T *, size_t)); -enum nresult nget_uslong __P((u_long *, const char *, char **, int)); -enum nresult nget_slong __P((long *, const char *, char **, int)); -void TRACE __P((SCR *, const char *, ...)); +(SCR *, SEQ **, EVENT *, CHAR_T *, size_t, seq_t, int *); +void seq_close(GS *); +int seq_dump(SCR *, seq_t, int); +int seq_save(SCR *, FILE *, char *, seq_t); +int e_memcmp(CHAR_T *, EVENT *, size_t); +void *binc(SCR *, void *, size_t *, size_t); +int nonblank(SCR *, recno_t, size_t *); +char *tail(char *); +CHAR_T *v_strdup(SCR *, const CHAR_T *, size_t); +enum nresult nget_uslong(u_long *, const char *, char **, int); +enum nresult nget_slong(long *, const char *, char **, int); +void TRACE(SCR *, const char *, ...); diff --git a/usr.bin/vi/include/ex_extern.h b/usr.bin/vi/include/ex_extern.h index 8bdc9de7c25..9372d714eda 100644 --- a/usr.bin/vi/include/ex_extern.h +++ b/usr.bin/vi/include/ex_extern.h @@ -1,129 +1,129 @@ -/* $OpenBSD: ex_extern.h,v 1.5 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: ex_extern.h,v 1.6 2002/02/16 21:27:58 millert Exp $ */ -int ex __P((SCR **)); -int ex_cmd __P((SCR *)); -int ex_range __P((SCR *, EXCMD *, int *)); -int ex_is_abbrev __P((char *, size_t)); -int ex_is_unmap __P((char *, size_t)); +int ex(SCR **); +int ex_cmd(SCR *); +int ex_range(SCR *, EXCMD *, int *); +int ex_is_abbrev(char *, size_t); +int ex_is_unmap(char *, size_t); void ex_badaddr - __P((SCR *, EXCMDLIST const *, enum badaddr, enum nresult)); -int ex_abbr __P((SCR *, EXCMD *)); -int ex_unabbr __P((SCR *, EXCMD *)); -int ex_append __P((SCR *, EXCMD *)); -int ex_change __P((SCR *, EXCMD *)); -int ex_insert __P((SCR *, EXCMD *)); -int ex_next __P((SCR *, EXCMD *)); -int ex_prev __P((SCR *, EXCMD *)); -int ex_rew __P((SCR *, EXCMD *)); -int ex_args __P((SCR *, EXCMD *)); -char **ex_buildargv __P((SCR *, EXCMD *, char *)); -int argv_init __P((SCR *, EXCMD *)); -int argv_exp0 __P((SCR *, EXCMD *, char *, size_t)); -int argv_exp1 __P((SCR *, EXCMD *, char *, size_t, int)); -int argv_exp2 __P((SCR *, EXCMD *, char *, size_t)); -int argv_exp3 __P((SCR *, EXCMD *, char *, size_t)); -int argv_free __P((SCR *)); -int ex_at __P((SCR *, EXCMD *)); -int ex_bang __P((SCR *, EXCMD *)); -int ex_cd __P((SCR *, EXCMD *)); -int ex_cscope __P((SCR *, EXCMD *)); -int cscope_display __P((SCR *)); -int cscope_search __P((SCR *, TAGQ *, TAG *)); -int ex_delete __P((SCR *, EXCMD *)); -int ex_display __P((SCR *, EXCMD *)); -int ex_edit __P((SCR *, EXCMD *)); -int ex_equal __P((SCR *, EXCMD *)); -int ex_file __P((SCR *, EXCMD *)); +(SCR *, EXCMDLIST const *, enum badaddr, enum nresult); +int ex_abbr(SCR *, EXCMD *); +int ex_unabbr(SCR *, EXCMD *); +int ex_append(SCR *, EXCMD *); +int ex_change(SCR *, EXCMD *); +int ex_insert(SCR *, EXCMD *); +int ex_next(SCR *, EXCMD *); +int ex_prev(SCR *, EXCMD *); +int ex_rew(SCR *, EXCMD *); +int ex_args(SCR *, EXCMD *); +char **ex_buildargv(SCR *, EXCMD *, char *); +int argv_init(SCR *, EXCMD *); +int argv_exp0(SCR *, EXCMD *, char *, size_t); +int argv_exp1(SCR *, EXCMD *, char *, size_t, int); +int argv_exp2(SCR *, EXCMD *, char *, size_t); +int argv_exp3(SCR *, EXCMD *, char *, size_t); +int argv_free(SCR *); +int ex_at(SCR *, EXCMD *); +int ex_bang(SCR *, EXCMD *); +int ex_cd(SCR *, EXCMD *); +int ex_cscope(SCR *, EXCMD *); +int cscope_display(SCR *); +int cscope_search(SCR *, TAGQ *, TAG *); +int ex_delete(SCR *, EXCMD *); +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_global __P((SCR *, EXCMD *)); -int ex_v __P((SCR *, EXCMD *)); -int ex_g_insdel __P((SCR *, lnop_t, recno_t)); -int ex_screen_copy __P((SCR *, SCR *)); -int ex_screen_end __P((SCR *)); -int ex_optchange __P((SCR *, int, char *, u_long *)); -int ex_exrc __P((SCR *)); -int ex_run_str __P((SCR *, char *, char *, size_t, int, int)); -int ex_join __P((SCR *, EXCMD *)); -int ex_map __P((SCR *, EXCMD *)); -int ex_unmap __P((SCR *, EXCMD *)); -int ex_mark __P((SCR *, EXCMD *)); -int ex_mkexrc __P((SCR *, EXCMD *)); -int ex_copy __P((SCR *, EXCMD *)); -int ex_move __P((SCR *, EXCMD *)); -int ex_open __P((SCR *, EXCMD *)); -int ex_perl __P((SCR*, EXCMD *)); -int ex_preserve __P((SCR *, EXCMD *)); -int ex_recover __P((SCR *, EXCMD *)); -int ex_list __P((SCR *, EXCMD *)); -int ex_number __P((SCR *, EXCMD *)); -int ex_pr __P((SCR *, EXCMD *)); -int ex_print __P((SCR *, EXCMD *, MARK *, MARK *, u_int32_t)); -int ex_ldisplay __P((SCR *, const char *, size_t, size_t, u_int)); -int ex_scprint __P((SCR *, MARK *, MARK *)); -int ex_printf __P((SCR *, const char *, ...)); -int ex_puts __P((SCR *, const char *)); -int ex_fflush __P((SCR *sp)); -int ex_put __P((SCR *, EXCMD *)); -int ex_quit __P((SCR *, EXCMD *)); -int ex_read __P((SCR *, EXCMD *)); -int ex_readfp __P((SCR *, char *, FILE *, MARK *, recno_t *, int)); -int ex_bg __P((SCR *, EXCMD *)); -int ex_fg __P((SCR *, EXCMD *)); -int ex_resize __P((SCR *, EXCMD *)); -int ex_sdisplay __P((SCR *)); -int ex_script __P((SCR *, EXCMD *)); -int sscr_exec __P((SCR *, recno_t)); -int sscr_input __P((SCR *)); -int sscr_end __P((SCR *)); -int ex_set __P((SCR *, EXCMD *)); -int ex_shell __P((SCR *, EXCMD *)); -int ex_exec_proc __P((SCR *, EXCMD *, char *, const char *, int)); -int proc_wait __P((SCR *, long, const char *, int, int)); -int ex_shiftl __P((SCR *, EXCMD *)); -int ex_shiftr __P((SCR *, EXCMD *)); -int ex_source __P((SCR *, EXCMD *)); -int ex_stop __P((SCR *, EXCMD *)); -int ex_s __P((SCR *, EXCMD *)); -int ex_subagain __P((SCR *, EXCMD *)); -int ex_subtilde __P((SCR *, EXCMD *)); +int ex_global(SCR *, EXCMD *); +int ex_v(SCR *, EXCMD *); +int ex_g_insdel(SCR *, lnop_t, recno_t); +int ex_screen_copy(SCR *, SCR *); +int ex_screen_end(SCR *); +int ex_optchange(SCR *, int, char *, u_long *); +int ex_exrc(SCR *); +int ex_run_str(SCR *, char *, char *, size_t, int, int); +int ex_join(SCR *, EXCMD *); +int ex_map(SCR *, EXCMD *); +int ex_unmap(SCR *, EXCMD *); +int ex_mark(SCR *, EXCMD *); +int ex_mkexrc(SCR *, EXCMD *); +int ex_copy(SCR *, EXCMD *); +int ex_move(SCR *, EXCMD *); +int ex_open(SCR *, EXCMD *); +int ex_perl(SCR*, EXCMD *); +int ex_preserve(SCR *, EXCMD *); +int ex_recover(SCR *, EXCMD *); +int ex_list(SCR *, EXCMD *); +int ex_number(SCR *, EXCMD *); +int ex_pr(SCR *, EXCMD *); +int ex_print(SCR *, EXCMD *, MARK *, MARK *, u_int32_t); +int ex_ldisplay(SCR *, const char *, size_t, size_t, u_int); +int ex_scprint(SCR *, MARK *, MARK *); +int ex_printf(SCR *, const char *, ...); +int ex_puts(SCR *, const char *); +int ex_fflush(SCR *sp); +int ex_put(SCR *, EXCMD *); +int ex_quit(SCR *, EXCMD *); +int ex_read(SCR *, EXCMD *); +int ex_readfp(SCR *, char *, FILE *, MARK *, recno_t *, int); +int ex_bg(SCR *, EXCMD *); +int ex_fg(SCR *, EXCMD *); +int ex_resize(SCR *, EXCMD *); +int ex_sdisplay(SCR *); +int ex_script(SCR *, EXCMD *); +int sscr_exec(SCR *, recno_t); +int sscr_input(SCR *); +int sscr_end(SCR *); +int ex_set(SCR *, EXCMD *); +int ex_shell(SCR *, EXCMD *); +int ex_exec_proc(SCR *, EXCMD *, char *, const char *, int); +int proc_wait(SCR *, long, const char *, int, int); +int ex_shiftl(SCR *, EXCMD *); +int ex_shiftr(SCR *, EXCMD *); +int ex_source(SCR *, EXCMD *); +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)); -void re_error __P((SCR *, int, regex_t *)); -int ex_tag_first __P((SCR *, char *)); -int ex_tag_push __P((SCR *, EXCMD *)); -int ex_tag_next __P((SCR *, EXCMD *)); -int ex_tag_prev __P((SCR *, EXCMD *)); -int ex_tag_nswitch __P((SCR *, TAG *, int)); -int ex_tag_Nswitch __P((SCR *, TAG *, int)); -int ex_tag_pop __P((SCR *, EXCMD *)); -int ex_tag_top __P((SCR *, EXCMD *)); -int ex_tag_display __P((SCR *)); -int ex_tag_copy __P((SCR *, SCR *)); -int tagq_free __P((SCR *, TAGQ *)); -void tag_msg __P((SCR *, tagmsg_t, char *)); -int ex_tagf_alloc __P((SCR *, char *)); -int ex_tag_free __P((SCR *)); -int ex_tcl __P((SCR*, EXCMD *)); -int ex_txt __P((SCR *, TEXTH *, ARG_CHAR_T, u_int32_t)); -int ex_undo __P((SCR *, EXCMD *)); -int ex_help __P((SCR *, EXCMD *)); -int ex_usage __P((SCR *, EXCMD *)); -int ex_viusage __P((SCR *, EXCMD *)); +void re_error(SCR *, int, regex_t *); +int ex_tag_first(SCR *, char *); +int ex_tag_push(SCR *, EXCMD *); +int ex_tag_next(SCR *, EXCMD *); +int ex_tag_prev(SCR *, EXCMD *); +int ex_tag_nswitch(SCR *, TAG *, int); +int ex_tag_Nswitch(SCR *, TAG *, int); +int ex_tag_pop(SCR *, EXCMD *); +int ex_tag_top(SCR *, EXCMD *); +int ex_tag_display(SCR *); +int ex_tag_copy(SCR *, SCR *); +int tagq_free(SCR *, TAGQ *); +void tag_msg(SCR *, tagmsg_t, char *); +int ex_tagf_alloc(SCR *, char *); +int ex_tag_free(SCR *); +int ex_tcl(SCR*, EXCMD *); +int ex_txt(SCR *, TEXTH *, ARG_CHAR_T, u_int32_t); +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_cadd __P((EXCMD *, ARGS *, char *, size_t)); -int ex_getline __P((SCR *, FILE *, size_t *)); -int ex_ncheck __P((SCR *, int)); -int ex_init __P((SCR *)); -void ex_emsg __P((SCR *, char *, exm_t)); -int ex_version __P((SCR *, EXCMD *)); -int ex_visual __P((SCR *, EXCMD *)); -int ex_wn __P((SCR *, EXCMD *)); -int ex_wq __P((SCR *, EXCMD *)); -int ex_write __P((SCR *, EXCMD *)); -int ex_xit __P((SCR *, EXCMD *)); +void ex_cadd(EXCMD *, ARGS *, char *, size_t); +int ex_getline(SCR *, FILE *, size_t *); +int ex_ncheck(SCR *, int); +int ex_init(SCR *); +void ex_emsg(SCR *, char *, exm_t); +int ex_version(SCR *, EXCMD *); +int ex_visual(SCR *, EXCMD *); +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_yank __P((SCR *, EXCMD *)); -int ex_z __P((SCR *, EXCMD *)); +int ex_yank(SCR *, EXCMD *); +int ex_z(SCR *, EXCMD *); diff --git a/usr.bin/vi/include/ip_extern.h b/usr.bin/vi/include/ip_extern.h index 15a45d96bdb..fcb5d124ecb 100644 --- a/usr.bin/vi/include/ip_extern.h +++ b/usr.bin/vi/include/ip_extern.h @@ -1,25 +1,25 @@ -/* $OpenBSD: ip_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: ip_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */ -int ip_addstr __P((SCR *, const char *, size_t)); -int ip_attr __P((SCR *, scr_attr_t, int)); -int ip_baud __P((SCR *, u_long *)); -int ip_bell __P((SCR *)); -void ip_busy __P((SCR *, const char *, busy_t)); -int ip_clrtoeol __P((SCR *)); -int ip_cursor __P((SCR *, size_t *, size_t *)); -int ip_deleteln __P((SCR *)); -int ip_ex_adjust __P((SCR *, exadj_t)); -int ip_insertln __P((SCR *)); -int ip_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); -int ip_move __P((SCR *, size_t, size_t)); -int ip_refresh __P((SCR *, int)); -int ip_rename __P((SCR *)); -int ip_suspend __P((SCR *, int *)); -void ip_usage __P((void)); -int ip_event __P((SCR *, EVENT *, u_int32_t, int)); -int ip_screen __P((SCR *, u_int32_t)); -int ip_quit __P((GS *)); -int ip_term_init __P((SCR *)); -int ip_term_end __P((GS *)); -int ip_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); -int ip_optchange __P((SCR *, int, char *, u_long *)); +int ip_addstr(SCR *, const char *, size_t); +int ip_attr(SCR *, scr_attr_t, int); +int ip_baud(SCR *, u_long *); +int ip_bell(SCR *); +void ip_busy(SCR *, const char *, busy_t); +int ip_clrtoeol(SCR *); +int ip_cursor(SCR *, size_t *, size_t *); +int ip_deleteln(SCR *); +int ip_ex_adjust(SCR *, exadj_t); +int ip_insertln(SCR *); +int ip_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); +int ip_move(SCR *, size_t, size_t); +int ip_refresh(SCR *, int); +int ip_rename(SCR *); +int ip_suspend(SCR *, int *); +void ip_usage(void); +int ip_event(SCR *, EVENT *, u_int32_t, int); +int ip_screen(SCR *, u_int32_t); +int ip_quit(GS *); +int ip_term_init(SCR *); +int ip_term_end(GS *); +int ip_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); +int ip_optchange(SCR *, int, char *, u_long *); diff --git a/usr.bin/vi/include/perl_extern.h b/usr.bin/vi/include/perl_extern.h index 614abbe622b..b0545440e1f 100644 --- a/usr.bin/vi/include/perl_extern.h +++ b/usr.bin/vi/include/perl_extern.h @@ -1,10 +1,10 @@ -/* $OpenBSD: perl_extern.h,v 1.4 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: perl_extern.h,v 1.5 2002/02/16 21:27:58 millert Exp $ */ -int perl_end __P((GS *)); -int perl_init __P((SCR *)); -int perl_screen_end __P((SCR*)); -int perl_ex_perl __P((SCR*, CHAR_T *, size_t, recno_t, recno_t)); -int perl_ex_perldo __P((SCR*, CHAR_T *, size_t, recno_t, recno_t)); +int perl_end(GS *); +int perl_init(SCR *); +int perl_screen_end(SCR*); +int perl_ex_perl(SCR*, CHAR_T *, size_t, recno_t, recno_t); +int perl_ex_perldo(SCR*, CHAR_T *, size_t, recno_t, recno_t); #ifdef USE_SFIO -Sfdisc_t* sfdcnewnvi __P((SCR*)); +Sfdisc_t* sfdcnewnvi(SCR*); #endif diff --git a/usr.bin/vi/include/tcl_extern.h b/usr.bin/vi/include/tcl_extern.h index 073b878f4a2..c7fe2724f64 100644 --- a/usr.bin/vi/include/tcl_extern.h +++ b/usr.bin/vi/include/tcl_extern.h @@ -1,3 +1,3 @@ -/* $OpenBSD: tcl_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: tcl_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */ -int tcl_init __P((GS *)); +int tcl_init(GS *); diff --git a/usr.bin/vi/include/tk_extern.h b/usr.bin/vi/include/tk_extern.h index 8e4de1f7d70..6a697df4eb2 100644 --- a/usr.bin/vi/include/tk_extern.h +++ b/usr.bin/vi/include/tk_extern.h @@ -1,31 +1,31 @@ -/* $OpenBSD: tk_extern.h,v 1.2 2001/01/29 01:58:47 niklas Exp $ */ +/* $OpenBSD: tk_extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */ -int tk_addstr __P((SCR *, const char *, size_t)); -int tk_attr __P((SCR *, scr_attr_t, int)); -int tk_baud __P((SCR *, u_long *)); -int tk_bell __P((SCR *)); -int tk_clrtoeol __P((SCR *)); -int tk_cursor __P((SCR *, size_t *, size_t *)); -int tk_deleteln __P((SCR *)); -int tk_ex_adjust __P((SCR *, exadj_t)); -int tk_insertln __P((SCR *)); -int tk_keyval __P((SCR *, scr_keyval_t, CHAR_T *, int *)); -int tk_move __P((SCR *, size_t, size_t)); -int tk_refresh __P((SCR *, int)); -int tk_rename __P((SCR *)); -int tk_suspend __P((SCR *, int *)); -void tk_usage __P((void)); -int tk_event __P((SCR *, EVENT *, u_int32_t, int)); -int tk_key __P((ClientData, Tcl_Interp *, int, char *[])); -int tk_screen __P((SCR *, u_int32_t)); -int tk_quit __P((GS *)); -int tk_term_init __P((SCR *)); -int tk_term_end __P((GS *)); -int tk_fmap __P((SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t)); -int tk_optchange __P((SCR *, int, char *, u_long *)); -int tk_ssize __P((SCR *, int, size_t *, size_t *, int *)); -int tk_op __P((ClientData, Tcl_Interp *, int, char *[])); -int tk_opt_init __P((ClientData, Tcl_Interp *, int, char *[])); -int tk_opt_set __P((ClientData, Tcl_Interp *, int, char *[])); -int tk_version __P((ClientData, Tcl_Interp *, int, char *[])); -void tk_msg __P((SCR *, mtype_t, char *, size_t)); +int tk_addstr(SCR *, const char *, size_t); +int tk_attr(SCR *, scr_attr_t, int); +int tk_baud(SCR *, u_long *); +int tk_bell(SCR *); +int tk_clrtoeol(SCR *); +int tk_cursor(SCR *, size_t *, size_t *); +int tk_deleteln(SCR *); +int tk_ex_adjust(SCR *, exadj_t); +int tk_insertln(SCR *); +int tk_keyval(SCR *, scr_keyval_t, CHAR_T *, int *); +int tk_move(SCR *, size_t, size_t); +int tk_refresh(SCR *, int); +int tk_rename(SCR *); +int tk_suspend(SCR *, int *); +void tk_usage(void); +int tk_event(SCR *, EVENT *, u_int32_t, int); +int tk_key(ClientData, Tcl_Interp *, int, char *[]); +int tk_screen(SCR *, u_int32_t); +int tk_quit(GS *); +int tk_term_init(SCR *); +int tk_term_end(GS *); +int tk_fmap(SCR *, seq_t, CHAR_T *, size_t, CHAR_T *, size_t); +int tk_optchange(SCR *, int, char *, u_long *); +int tk_ssize(SCR *, int, size_t *, size_t *, int *); +int tk_op(ClientData, Tcl_Interp *, int, char *[]); +int tk_opt_init(ClientData, Tcl_Interp *, int, char *[]); +int tk_opt_set(ClientData, Tcl_Interp *, int, char *[]); +int tk_version(ClientData, Tcl_Interp *, int, char *[]); +void tk_msg(SCR *, mtype_t, char *, size_t); diff --git a/usr.bin/vi/include/vi_extern.h b/usr.bin/vi/include/vi_extern.h index c327568ecb0..ebc1d721a62 100644 --- a/usr.bin/vi/include/vi_extern.h +++ b/usr.bin/vi/include/vi_extern.h @@ -1,144 +1,144 @@ -/* $OpenBSD: vi_extern.h,v 1.6 2001/01/29 01:58:48 niklas Exp $ */ +/* $OpenBSD: vi_extern.h,v 1.7 2002/02/16 21:27:58 millert Exp $ */ -int cs_init __P((SCR *, VCS *)); -int cs_next __P((SCR *, VCS *)); -int cs_fspace __P((SCR *, VCS *)); -int cs_fblank __P((SCR *, VCS *)); -int cs_prev __P((SCR *, VCS *)); -int cs_bblank __P((SCR *, VCS *)); -int v_at __P((SCR *, VICMD *)); -int v_chrepeat __P((SCR *, VICMD *)); -int v_chrrepeat __P((SCR *, VICMD *)); -int v_cht __P((SCR *, VICMD *)); -int v_chf __P((SCR *, VICMD *)); -int v_chT __P((SCR *, VICMD *)); -int v_chF __P((SCR *, VICMD *)); -int v_delete __P((SCR *, VICMD *)); -int v_again __P((SCR *, VICMD *)); -int v_exmode __P((SCR *, VICMD *)); -int v_join __P((SCR *, VICMD *)); -int v_shiftl __P((SCR *, VICMD *)); -int v_shiftr __P((SCR *, VICMD *)); -int v_suspend __P((SCR *, VICMD *)); -int v_switch __P((SCR *, VICMD *)); -int v_tagpush __P((SCR *, VICMD *)); -int v_tagpop __P((SCR *, VICMD *)); -int v_filter __P((SCR *, VICMD *)); -int v_event_exec __P((SCR *, VICMD *)); -int v_ex __P((SCR *, VICMD *)); -int v_ecl_exec __P((SCR *)); -int v_increment __P((SCR *, VICMD *)); -int v_screen_copy __P((SCR *, SCR *)); -int v_screen_end __P((SCR *)); -int v_optchange __P((SCR *, int, char *, u_long *)); -int v_iA __P((SCR *, VICMD *)); -int v_ia __P((SCR *, VICMD *)); -int v_iI __P((SCR *, VICMD *)); -int v_ii __P((SCR *, VICMD *)); -int v_iO __P((SCR *, VICMD *)); -int v_io __P((SCR *, VICMD *)); -int v_change __P((SCR *, VICMD *)); -int v_Replace __P((SCR *, VICMD *)); -int v_subst __P((SCR *, VICMD *)); -int v_left __P((SCR *, VICMD *)); -int v_cfirst __P((SCR *, VICMD *)); -int v_first __P((SCR *, VICMD *)); -int v_ncol __P((SCR *, VICMD *)); -int v_zero __P((SCR *, VICMD *)); -int v_mark __P((SCR *, VICMD *)); -int v_bmark __P((SCR *, VICMD *)); -int v_fmark __P((SCR *, VICMD *)); -int v_match __P((SCR *, VICMD *)); -int v_paragraphf __P((SCR *, VICMD *)); -int v_paragraphb __P((SCR *, VICMD *)); -int v_buildps __P((SCR *, char *, char *)); -int v_Put __P((SCR *, VICMD *)); -int v_put __P((SCR *, VICMD *)); -int v_redraw __P((SCR *, VICMD *)); -int v_replace __P((SCR *, VICMD *)); -int v_right __P((SCR *, VICMD *)); -int v_dollar __P((SCR *, VICMD *)); -int v_screen __P((SCR *, VICMD *)); -int v_lgoto __P((SCR *, VICMD *)); -int v_home __P((SCR *, VICMD *)); -int v_middle __P((SCR *, VICMD *)); -int v_bottom __P((SCR *, VICMD *)); -int v_up __P((SCR *, VICMD *)); -int v_cr __P((SCR *, VICMD *)); -int v_down __P((SCR *, VICMD *)); -int v_hpageup __P((SCR *, VICMD *)); -int v_hpagedown __P((SCR *, VICMD *)); -int v_pagedown __P((SCR *, VICMD *)); -int v_pageup __P((SCR *, VICMD *)); -int v_lineup __P((SCR *, VICMD *)); -int v_linedown __P((SCR *, VICMD *)); -int v_searchb __P((SCR *, VICMD *)); -int v_searchf __P((SCR *, VICMD *)); -int v_searchN __P((SCR *, VICMD *)); -int v_searchn __P((SCR *, VICMD *)); -int v_searchw __P((SCR *, VICMD *)); -int v_correct __P((SCR *, VICMD *, int)); -int v_sectionf __P((SCR *, VICMD *)); -int v_sectionb __P((SCR *, VICMD *)); -int v_sentencef __P((SCR *, VICMD *)); -int v_sentenceb __P((SCR *, VICMD *)); -int v_status __P((SCR *, VICMD *)); -int v_tcmd __P((SCR *, VICMD *, ARG_CHAR_T, u_int)); +int cs_init(SCR *, VCS *); +int cs_next(SCR *, VCS *); +int cs_fspace(SCR *, VCS *); +int cs_fblank(SCR *, VCS *); +int cs_prev(SCR *, VCS *); +int cs_bblank(SCR *, VCS *); +int v_at(SCR *, VICMD *); +int v_chrepeat(SCR *, VICMD *); +int v_chrrepeat(SCR *, VICMD *); +int v_cht(SCR *, VICMD *); +int v_chf(SCR *, VICMD *); +int v_chT(SCR *, VICMD *); +int v_chF(SCR *, VICMD *); +int v_delete(SCR *, VICMD *); +int v_again(SCR *, VICMD *); +int v_exmode(SCR *, VICMD *); +int v_join(SCR *, VICMD *); +int v_shiftl(SCR *, VICMD *); +int v_shiftr(SCR *, VICMD *); +int v_suspend(SCR *, VICMD *); +int v_switch(SCR *, VICMD *); +int v_tagpush(SCR *, VICMD *); +int v_tagpop(SCR *, VICMD *); +int v_filter(SCR *, VICMD *); +int v_event_exec(SCR *, VICMD *); +int v_ex(SCR *, VICMD *); +int v_ecl_exec(SCR *); +int v_increment(SCR *, VICMD *); +int v_screen_copy(SCR *, SCR *); +int v_screen_end(SCR *); +int v_optchange(SCR *, int, char *, u_long *); +int v_iA(SCR *, VICMD *); +int v_ia(SCR *, VICMD *); +int v_iI(SCR *, VICMD *); +int v_ii(SCR *, VICMD *); +int v_iO(SCR *, VICMD *); +int v_io(SCR *, VICMD *); +int v_change(SCR *, VICMD *); +int v_Replace(SCR *, VICMD *); +int v_subst(SCR *, VICMD *); +int v_left(SCR *, VICMD *); +int v_cfirst(SCR *, VICMD *); +int v_first(SCR *, VICMD *); +int v_ncol(SCR *, VICMD *); +int v_zero(SCR *, VICMD *); +int v_mark(SCR *, VICMD *); +int v_bmark(SCR *, VICMD *); +int v_fmark(SCR *, VICMD *); +int v_match(SCR *, VICMD *); +int v_paragraphf(SCR *, VICMD *); +int v_paragraphb(SCR *, VICMD *); +int v_buildps(SCR *, char *, char *); +int v_Put(SCR *, VICMD *); +int v_put(SCR *, VICMD *); +int v_redraw(SCR *, VICMD *); +int v_replace(SCR *, VICMD *); +int v_right(SCR *, VICMD *); +int v_dollar(SCR *, VICMD *); +int v_screen(SCR *, VICMD *); +int v_lgoto(SCR *, VICMD *); +int v_home(SCR *, VICMD *); +int v_middle(SCR *, VICMD *); +int v_bottom(SCR *, VICMD *); +int v_up(SCR *, VICMD *); +int v_cr(SCR *, VICMD *); +int v_down(SCR *, VICMD *); +int v_hpageup(SCR *, VICMD *); +int v_hpagedown(SCR *, VICMD *); +int v_pagedown(SCR *, VICMD *); +int v_pageup(SCR *, VICMD *); +int v_lineup(SCR *, VICMD *); +int v_linedown(SCR *, VICMD *); +int v_searchb(SCR *, VICMD *); +int v_searchf(SCR *, VICMD *); +int v_searchN(SCR *, VICMD *); +int v_searchn(SCR *, VICMD *); +int v_searchw(SCR *, VICMD *); +int v_correct(SCR *, VICMD *, int); +int v_sectionf(SCR *, VICMD *); +int v_sectionb(SCR *, VICMD *); +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_auto __P((SCR *, recno_t, TEXT *, size_t, TEXT *)); -int v_ulcase __P((SCR *, VICMD *)); -int v_mulcase __P((SCR *, VICMD *)); -int v_Undo __P((SCR *, VICMD *)); -int v_undo __P((SCR *, VICMD *)); -void v_eof __P((SCR *, MARK *)); -void v_eol __P((SCR *, MARK *)); -void v_nomove __P((SCR *)); -void v_sof __P((SCR *, MARK *)); -void v_sol __P((SCR *)); -int v_isempty __P((char *, size_t)); -void v_emsg __P((SCR *, char *, vim_t)); -int v_wordW __P((SCR *, VICMD *)); -int v_wordw __P((SCR *, VICMD *)); -int v_wordE __P((SCR *, VICMD *)); -int v_worde __P((SCR *, VICMD *)); -int v_wordB __P((SCR *, VICMD *)); -int v_wordb __P((SCR *, VICMD *)); -int v_xchar __P((SCR *, VICMD *)); -int v_Xchar __P((SCR *, VICMD *)); -int v_yank __P((SCR *, VICMD *)); -int v_z __P((SCR *, VICMD *)); -int vs_crel __P((SCR *, long)); -int v_zexit __P((SCR *, VICMD *)); -int vi __P((SCR **)); -int vs_line __P((SCR *, SMAP *, size_t *, size_t *)); -int vs_number __P((SCR *)); -void vs_busy __P((SCR *, const char *, busy_t)); -void vs_home __P((SCR *)); -void vs_update __P((SCR *, const char *, const char *)); -void vs_msg __P((SCR *, mtype_t, char *, size_t)); -int vs_ex_resolve __P((SCR *, int *)); -int vs_resolve __P((SCR *, SCR *, int)); -int vs_repaint __P((SCR *, EVENT *)); -int vs_refresh __P((SCR *, int)); -int vs_column __P((SCR *, size_t *)); -size_t vs_screens __P((SCR *, recno_t, size_t *)); -size_t vs_columns __P((SCR *, char *, recno_t, size_t *, size_t *)); -size_t vs_rcm __P((SCR *, recno_t, int)); -size_t vs_colpos __P((SCR *, recno_t, size_t)); -int vs_change __P((SCR *, recno_t, lnop_t)); -int vs_sm_fill __P((SCR *, recno_t, pos_t)); -int vs_sm_scroll __P((SCR *, MARK *, recno_t, scroll_t)); -int vs_sm_1up __P((SCR *)); -int vs_sm_1down __P((SCR *)); -int vs_sm_next __P((SCR *, SMAP *, SMAP *)); -int vs_sm_prev __P((SCR *, SMAP *, SMAP *)); -int vs_sm_cursor __P((SCR *, SMAP **)); -int vs_sm_position __P((SCR *, MARK *, u_long, pos_t)); -recno_t vs_sm_nlines __P((SCR *, SMAP *, recno_t, size_t)); -int vs_split __P((SCR *, SCR *, int)); -int vs_discard __P((SCR *, SCR **)); -int vs_fg __P((SCR *, SCR **, CHAR_T *, int)); -int vs_bg __P((SCR *)); -int vs_swap __P((SCR *, SCR **, char *)); -int vs_resize __P((SCR *, long, adj_t)); +int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *); +int v_ulcase(SCR *, VICMD *); +int v_mulcase(SCR *, VICMD *); +int v_Undo(SCR *, VICMD *); +int v_undo(SCR *, VICMD *); +void v_eof(SCR *, MARK *); +void v_eol(SCR *, MARK *); +void v_nomove(SCR *); +void v_sof(SCR *, MARK *); +void v_sol(SCR *); +int v_isempty(char *, size_t); +void v_emsg(SCR *, char *, vim_t); +int v_wordW(SCR *, VICMD *); +int v_wordw(SCR *, VICMD *); +int v_wordE(SCR *, VICMD *); +int v_worde(SCR *, VICMD *); +int v_wordB(SCR *, VICMD *); +int v_wordb(SCR *, VICMD *); +int v_xchar(SCR *, VICMD *); +int v_Xchar(SCR *, VICMD *); +int v_yank(SCR *, VICMD *); +int v_z(SCR *, VICMD *); +int vs_crel(SCR *, long); +int v_zexit(SCR *, VICMD *); +int vi(SCR **); +int vs_line(SCR *, SMAP *, size_t *, size_t *); +int vs_number(SCR *); +void vs_busy(SCR *, const char *, busy_t); +void vs_home(SCR *); +void vs_update(SCR *, const char *, const char *); +void vs_msg(SCR *, mtype_t, char *, size_t); +int vs_ex_resolve(SCR *, int *); +int vs_resolve(SCR *, SCR *, int); +int vs_repaint(SCR *, EVENT *); +int vs_refresh(SCR *, int); +int vs_column(SCR *, size_t *); +size_t vs_screens(SCR *, recno_t, size_t *); +size_t vs_columns(SCR *, char *, recno_t, size_t *, size_t *); +size_t vs_rcm(SCR *, recno_t, int); +size_t vs_colpos(SCR *, recno_t, size_t); +int vs_change(SCR *, recno_t, lnop_t); +int vs_sm_fill(SCR *, recno_t, pos_t); +int vs_sm_scroll(SCR *, MARK *, recno_t, scroll_t); +int vs_sm_1up(SCR *); +int vs_sm_1down(SCR *); +int vs_sm_next(SCR *, SMAP *, SMAP *); +int vs_sm_prev(SCR *, SMAP *, SMAP *); +int vs_sm_cursor(SCR *, SMAP **); +int vs_sm_position(SCR *, MARK *, u_long, pos_t); +recno_t vs_sm_nlines(SCR *, SMAP *, recno_t, size_t); +int vs_split(SCR *, SCR *, int); +int vs_discard(SCR *, SCR **); +int vs_fg(SCR *, SCR **, CHAR_T *, int); +int vs_bg(SCR *); +int vs_swap(SCR *, SCR **, char *); +int vs_resize(SCR *, long, adj_t); diff --git a/usr.bin/vi/perl_api/perl.xs b/usr.bin/vi/perl_api/perl.xs index 40921f8e51d..2c41b1f5563 100644 --- a/usr.bin/vi/perl_api/perl.xs +++ b/usr.bin/vi/perl_api/perl.xs @@ -1,4 +1,4 @@ -/* $OpenBSD: perl.xs,v 1.2 2001/01/29 01:58:48 niklas Exp $ */ +/* $OpenBSD: perl.xs,v 1.3 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)perl.xs 8.27 (Berkeley) 10/16/96"; #include "perl_extern.h" -static void msghandler __P((SCR *, mtype_t, char *, size_t)); +static void msghandler(SCR *, mtype_t, char *, size_t); extern GS *__global_list; /* XXX */ @@ -58,13 +58,13 @@ static char *errmsg = 0; __global_list->scr_msg = scr_msg; \ if (rval) croak(errmsg); -static void xs_init __P((void)); +static void xs_init(void); /* * perl_end -- * Clean up perl interpreter * - * PUBLIC: int perl_end __P((GS *)); + * PUBLIC: int perl_end(GS *); */ int perl_end(gp) @@ -111,7 +111,7 @@ perl_eval(string) * perl_init -- * Create the perl commands used by nvi. * - * PUBLIC: int perl_init __P((SCR *)); + * PUBLIC: int perl_init(SCR *); */ int perl_init(scrp) @@ -165,7 +165,7 @@ perl_init(scrp) * perl_screen_end * Remove all refences to the screen to be destroyed * - * PUBLIC: int perl_screen_end __P((SCR*)); + * PUBLIC: int perl_screen_end(SCR*); */ int perl_screen_end(scrp) @@ -214,7 +214,7 @@ newVIrv(rv, screen) * perl_ex_perl -- :[line [,line]] perl [command] * Run a command through the perl interpreter. * - * PUBLIC: int perl_ex_perl __P((SCR*, CHAR_T *, size_t, recno_t, recno_t)); + * PUBLIC: int perl_ex_perl(SCR*, CHAR_T *, size_t, recno_t, recno_t); */ int perl_ex_perl(scrp, cmdp, cmdlen, f_lno, t_lno) @@ -301,7 +301,7 @@ replace_line(scrp, line, t_lno) * perl_ex_perldo -- :[line [,line]] perl [command] * Run a set of lines through the perl interpreter. * - * PUBLIC: int perl_ex_perldo __P((SCR*, CHAR_T *, size_t, recno_t, recno_t)); + * PUBLIC: int perl_ex_perldo(SCR*, CHAR_T *, size_t, recno_t, recno_t); */ int perl_ex_perldo(scrp, cmdp, cmdlen, f_lno, t_lno) @@ -465,7 +465,7 @@ EndScreen(screen) VI screen PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -489,7 +489,7 @@ Edit(screen, ...) PROTOTYPE: $;$ PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; char *file; SCR *nsp; @@ -533,7 +533,7 @@ AppendLine(screen, linenumber, text) char *text PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; STRLEN length; @@ -555,7 +555,7 @@ DelLine(screen, linenumber) int linenumber PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -576,7 +576,7 @@ GetLine(screen, linenumber) PREINIT: size_t len; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; char *line, *p; @@ -601,7 +601,7 @@ SetLine(screen, linenumber, text) char *text PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; STRLEN length; @@ -624,7 +624,7 @@ InsertLine(screen, linenumber, text) char *text PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; STRLEN length; @@ -646,7 +646,7 @@ LastLine(screen) PREINIT: recno_t last; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -672,7 +672,7 @@ GetMark(screen, mark) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; PPCODE: @@ -699,7 +699,7 @@ SetMark(screen, mark, line, column) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -722,7 +722,7 @@ GetCursor(screen) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; PPCODE: @@ -748,7 +748,7 @@ SetCursor(screen, line, column) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -770,7 +770,7 @@ SwitchScreen(screenFrom, screenTo) VI screenTo PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -791,7 +791,7 @@ MapKey(screen, key, perlproc) SV *perlproc PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; int length; char *command; @@ -817,7 +817,7 @@ UnmapKey(screen, key) char *key PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -837,7 +837,7 @@ SetOpt(screen, setting) char *setting PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; SV *svc; @@ -860,7 +860,7 @@ GetOpt(screen, option) char *option PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; char *value; @@ -885,7 +885,7 @@ Run(screen, command) char *command; PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -963,7 +963,7 @@ FETCH(screen, key) char *key PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; char *value; int boolvalue; @@ -987,7 +987,7 @@ STORE(screen, key, value) SV *value PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -1013,7 +1013,7 @@ STORE(screen, key, perlproc) SV *perlproc PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; int length; char *command; @@ -1033,7 +1033,7 @@ DELETE(screen, key) char *key PREINIT: - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -1058,7 +1058,7 @@ FETCH(screen, mark) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -1080,7 +1080,7 @@ STORE(screen, mark, pos) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int rval; CODE: @@ -1103,7 +1103,7 @@ FIRSTKEY(screen, ...) PREINIT: struct _mark cursor; - void (*scr_msg) __P((SCR *, mtype_t, char *, size_t)); + void (*scr_msg)(SCR *, mtype_t, char *, size_t); int next; char key[] = {0, 0}; diff --git a/usr.bin/vi/perl_api/perlsfio.c b/usr.bin/vi/perl_api/perlsfio.c index 28a9b5f9507..94abbd3814c 100644 --- a/usr.bin/vi/perl_api/perlsfio.c +++ b/usr.bin/vi/perl_api/perlsfio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: perlsfio.c,v 1.2 2001/01/29 01:58:48 niklas Exp $ */ +/* $OpenBSD: perlsfio.c,v 1.3 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1996 @@ -62,7 +62,7 @@ Sfdisc_t* disc; /* discipline */ * sfdcnewnvi -- * Create nvi discipline * - * PUBLIC: Sfdisc_t* sfdcnewnvi __P((SCR*)); + * PUBLIC: Sfdisc_t* sfdcnewnvi(SCR*); */ Sfdisc_t * diff --git a/usr.bin/vi/vi/getc.c b/usr.bin/vi/vi/getc.c index 4257d35ee2a..8ef4ddec901 100644 --- a/usr.bin/vi/vi/getc.c +++ b/usr.bin/vi/vi/getc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getc.c,v 1.5 2001/01/29 01:58:49 niklas Exp $ */ +/* $OpenBSD: getc.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -42,7 +42,7 @@ static const char sccsid[] = "@(#)getc.c 10.10 (Berkeley) 3/6/96"; * cs_init -- * Initialize character stream routines. * - * PUBLIC: int cs_init __P((SCR *, VCS *)); + * PUBLIC: int cs_init(SCR *, VCS *); */ int cs_init(sp, csp) @@ -71,7 +71,7 @@ cs_init(sp, csp) * cs_next -- * Retrieve the next character. * - * PUBLIC: int cs_next __P((SCR *, VCS *)); + * PUBLIC: int cs_next(SCR *, VCS *); */ int cs_next(sp, csp) @@ -123,7 +123,7 @@ cs_next(sp, csp) * function -- once the other word routines are converted, they may have * to change. * - * PUBLIC: int cs_fspace __P((SCR *, VCS *)); + * PUBLIC: int cs_fspace(SCR *, VCS *); */ int cs_fspace(sp, csp) @@ -145,7 +145,7 @@ cs_fspace(sp, csp) * cs_fblank -- * Eat forward to the next non-whitespace character. * - * PUBLIC: int cs_fblank __P((SCR *, VCS *)); + * PUBLIC: int cs_fblank(SCR *, VCS *); */ int cs_fblank(sp, csp) @@ -167,7 +167,7 @@ cs_fblank(sp, csp) * cs_prev -- * Retrieve the previous character. * - * PUBLIC: int cs_prev __P((SCR *, VCS *)); + * PUBLIC: int cs_prev(SCR *, VCS *); */ int cs_prev(sp, csp) @@ -219,7 +219,7 @@ cs_prev(sp, csp) * cs_bblank -- * Eat backward to the next non-whitespace character. * - * PUBLIC: int cs_bblank __P((SCR *, VCS *)); + * PUBLIC: int cs_bblank(SCR *, VCS *); */ int cs_bblank(sp, csp) diff --git a/usr.bin/vi/vi/v_at.c b/usr.bin/vi/vi/v_at.c index 7d176317526..10674d2d893 100644 --- a/usr.bin/vi/vi/v_at.c +++ b/usr.bin/vi/vi/v_at.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_at.c,v 1.3 2001/01/29 01:58:50 niklas Exp $ */ +/* $OpenBSD: v_at.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_at.c 10.8 (Berkeley) 4/27/96"; * v_at -- @ * Execute a buffer. * - * PUBLIC: int v_at __P((SCR *, VICMD *)); + * PUBLIC: int v_at(SCR *, VICMD *); */ int v_at(sp, vp) diff --git a/usr.bin/vi/vi/v_ch.c b/usr.bin/vi/vi/v_ch.c index 9a3ddd1a48e..8329aa58e96 100644 --- a/usr.bin/vi/vi/v_ch.c +++ b/usr.bin/vi/vi/v_ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_ch.c,v 1.3 2001/01/29 01:58:50 niklas Exp $ */ +/* $OpenBSD: v_ch.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -27,14 +27,14 @@ static const char sccsid[] = "@(#)v_ch.c 10.8 (Berkeley) 3/6/96"; #include "../common/common.h" #include "vi.h" -static void notfound __P((SCR *, ARG_CHAR_T)); -static void noprev __P((SCR *)); +static void notfound(SCR *, ARG_CHAR_T); +static void noprev(SCR *); /* * v_chrepeat -- [count]; * Repeat the last F, f, T or t search. * - * PUBLIC: int v_chrepeat __P((SCR *, VICMD *)); + * PUBLIC: int v_chrepeat(SCR *, VICMD *); */ int v_chrepeat(sp, vp) @@ -65,7 +65,7 @@ v_chrepeat(sp, vp) * v_chrrepeat -- [count], * Repeat the last F, f, T or t search in the reverse direction. * - * PUBLIC: int v_chrrepeat __P((SCR *, VICMD *)); + * PUBLIC: int v_chrrepeat(SCR *, VICMD *); */ int v_chrrepeat(sp, vp) @@ -106,7 +106,7 @@ v_chrrepeat(sp, vp) * Search forward in the line for the character before the next * occurrence of the specified character. * - * PUBLIC: int v_cht __P((SCR *, VICMD *)); + * PUBLIC: int v_cht(SCR *, VICMD *); */ int v_cht(sp, vp) @@ -139,7 +139,7 @@ v_cht(sp, vp) * Search forward in the line for the next occurrence of the * specified character. * - * PUBLIC: int v_chf __P((SCR *, VICMD *)); + * PUBLIC: int v_chf(SCR *, VICMD *); */ int v_chf(sp, vp) @@ -197,7 +197,7 @@ empty: notfound(sp, key); * Search backward in the line for the character after the next * occurrence of the specified character. * - * PUBLIC: int v_chT __P((SCR *, VICMD *)); + * PUBLIC: int v_chT(SCR *, VICMD *); */ int v_chT(sp, vp) @@ -224,7 +224,7 @@ v_chT(sp, vp) * Search backward in the line for the next occurrence of the * specified character. * - * PUBLIC: int v_chF __P((SCR *, VICMD *)); + * PUBLIC: int v_chF(SCR *, VICMD *); */ int v_chF(sp, vp) diff --git a/usr.bin/vi/vi/v_delete.c b/usr.bin/vi/vi/v_delete.c index dd828dc51f3..b446d0f9bd6 100644 --- a/usr.bin/vi/vi/v_delete.c +++ b/usr.bin/vi/vi/v_delete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_delete.c,v 1.5 2001/01/29 01:58:50 niklas Exp $ */ +/* $OpenBSD: v_delete.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_delete.c 10.9 (Berkeley) 10/23/96"; * [buffer][count]D * Delete a range of text. * - * PUBLIC: int v_delete __P((SCR *, VICMD *)); + * PUBLIC: int v_delete(SCR *, VICMD *); */ int v_delete(sp, vp) diff --git a/usr.bin/vi/vi/v_ex.c b/usr.bin/vi/vi/v_ex.c index 2e94642126b..42fbb6cbb94 100644 --- a/usr.bin/vi/vi/v_ex.c +++ b/usr.bin/vi/vi/v_ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_ex.c,v 1.4 2001/01/29 01:58:50 niklas Exp $ */ +/* $OpenBSD: v_ex.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -29,17 +29,17 @@ static const char sccsid[] = "@(#)v_ex.c 10.42 (Berkeley) 6/28/96"; #include "../common/common.h" #include "vi.h" -static int v_ecl __P((SCR *)); -static int v_ecl_init __P((SCR *)); -static int v_ecl_log __P((SCR *, TEXT *)); -static int v_ex_done __P((SCR *, VICMD *)); -static int v_exec_ex __P((SCR *, VICMD *, EXCMD *)); +static int v_ecl(SCR *); +static int v_ecl_init(SCR *); +static int v_ecl_log(SCR *, TEXT *); +static int v_ex_done(SCR *, VICMD *); +static int v_exec_ex(SCR *, VICMD *, EXCMD *); /* * v_again -- & * Repeat the previous substitution. * - * PUBLIC: int v_again __P((SCR *, VICMD *)); + * PUBLIC: int v_again(SCR *, VICMD *); */ int v_again(sp, vp) @@ -59,7 +59,7 @@ v_again(sp, vp) * v_exmode -- Q * Switch the editor into EX mode. * - * PUBLIC: int v_exmode __P((SCR *, VICMD *)); + * PUBLIC: int v_exmode(SCR *, VICMD *); */ int v_exmode(sp, vp) @@ -97,7 +97,7 @@ v_exmode(sp, vp) * v_join -- [count]J * Join lines together. * - * PUBLIC: int v_join __P((SCR *, VICMD *)); + * PUBLIC: int v_join(SCR *, VICMD *); */ int v_join(sp, vp) @@ -128,7 +128,7 @@ v_join(sp, vp) * v_shiftl -- [count]<motion * Shift lines left. * - * PUBLIC: int v_shiftl __P((SCR *, VICMD *)); + * PUBLIC: int v_shiftl(SCR *, VICMD *); */ int v_shiftl(sp, vp) @@ -147,7 +147,7 @@ v_shiftl(sp, vp) * v_shiftr -- [count]>motion * Shift lines right. * - * PUBLIC: int v_shiftr __P((SCR *, VICMD *)); + * PUBLIC: int v_shiftr(SCR *, VICMD *); */ int v_shiftr(sp, vp) @@ -166,7 +166,7 @@ v_shiftr(sp, vp) * v_suspend -- ^Z * Suspend vi. * - * PUBLIC: int v_suspend __P((SCR *, VICMD *)); + * PUBLIC: int v_suspend(SCR *, VICMD *); */ int v_suspend(sp, vp) @@ -185,7 +185,7 @@ v_suspend(sp, vp) * v_switch -- ^^ * Switch to the previous file. * - * PUBLIC: int v_switch __P((SCR *, VICMD *)); + * PUBLIC: int v_switch(SCR *, VICMD *); */ int v_switch(sp, vp) @@ -218,7 +218,7 @@ v_switch(sp, vp) * v_tagpush -- ^[ * Do a tag search on the cursor keyword. * - * PUBLIC: int v_tagpush __P((SCR *, VICMD *)); + * PUBLIC: int v_tagpush(SCR *, VICMD *); */ int v_tagpush(sp, vp) @@ -237,7 +237,7 @@ v_tagpush(sp, vp) * v_tagpop -- ^T * Pop the tags stack. * - * PUBLIC: int v_tagpop __P((SCR *, VICMD *)); + * PUBLIC: int v_tagpop(SCR *, VICMD *); */ int v_tagpop(sp, vp) @@ -254,7 +254,7 @@ v_tagpop(sp, vp) * v_filter -- [count]!motion command(s) * Run range through shell commands, replacing text. * - * PUBLIC: int v_filter __P((SCR *, VICMD *)); + * PUBLIC: int v_filter(SCR *, VICMD *); */ int v_filter(sp, vp) @@ -332,7 +332,7 @@ v_filter(sp, vp) * v_event_exec -- * Execute some command(s) based on an event. * - * PUBLIC: int v_event_exec __P((SCR *, VICMD *)); + * PUBLIC: int v_event_exec(SCR *, VICMD *); */ int v_event_exec(sp, vp) @@ -374,7 +374,7 @@ v_exec_ex(sp, vp, exp) * v_ex -- : * Execute a colon command line. * - * PUBLIC: int v_ex __P((SCR *, VICMD *)); + * PUBLIC: int v_ex(SCR *, VICMD *); */ int v_ex(sp, vp) @@ -594,7 +594,7 @@ v_ecl(sp) * v_ecl_exec -- * Execute a command from a colon command-line window. * - * PUBLIC: int v_ecl_exec __P((SCR *)); + * PUBLIC: int v_ecl_exec(SCR *); */ int v_ecl_exec(sp) diff --git a/usr.bin/vi/vi/v_increment.c b/usr.bin/vi/vi/v_increment.c index 30cabe984f6..e4939cb94ba 100644 --- a/usr.bin/vi/vi/v_increment.c +++ b/usr.bin/vi/vi/v_increment.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_increment.c,v 1.4 2001/01/29 01:58:50 niklas Exp $ */ +/* $OpenBSD: v_increment.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -43,13 +43,13 @@ static char * const fmt[] = { "%#0*lo", }; -static void inc_err __P((SCR *, enum nresult)); +static void inc_err(SCR *, enum nresult); /* * v_increment -- [count]#[#+-] * Increment/decrement a keyword number. * - * PUBLIC: int v_increment __P((SCR *, VICMD *)); + * PUBLIC: int v_increment(SCR *, VICMD *); */ int v_increment(sp, vp) diff --git a/usr.bin/vi/vi/v_init.c b/usr.bin/vi/vi/v_init.c index 02236bb3253..a212785bf91 100644 --- a/usr.bin/vi/vi/v_init.c +++ b/usr.bin/vi/vi/v_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_init.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_init.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)v_init.c 10.8 (Berkeley) 3/30/96"; * v_screen_copy -- * Copy vi screen. * - * PUBLIC: int v_screen_copy __P((SCR *, SCR *)); + * PUBLIC: int v_screen_copy(SCR *, SCR *); */ int v_screen_copy(orig, sp) @@ -77,7 +77,7 @@ v_screen_copy(orig, sp) * v_screen_end -- * End a vi screen. * - * PUBLIC: int v_screen_end __P((SCR *)); + * PUBLIC: int v_screen_end(SCR *); */ int v_screen_end(sp) @@ -107,7 +107,7 @@ v_screen_end(sp) * v_optchange -- * Handle change of options for vi. * - * PUBLIC: int v_optchange __P((SCR *, int, char *, u_long *)); + * PUBLIC: int v_optchange(SCR *, int, char *, u_long *); */ int v_optchange(sp, offset, str, valp) diff --git a/usr.bin/vi/vi/v_itxt.c b/usr.bin/vi/vi/v_itxt.c index adb89236b4f..40ac66673da 100644 --- a/usr.bin/vi/vi/v_itxt.c +++ b/usr.bin/vi/vi/v_itxt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_itxt.c,v 1.5 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_itxt.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -59,13 +59,13 @@ static const char sccsid[] = "@(#)v_itxt.c 10.16 (Berkeley) 10/23/96"; (void)log_cursor(sp); \ } -static u_int32_t set_txt_std __P((SCR *, VICMD *, u_int32_t)); +static u_int32_t set_txt_std(SCR *, VICMD *, u_int32_t); /* * v_iA -- [count]A * Append text to the end of the line. * - * PUBLIC: int v_iA __P((SCR *, VICMD *)); + * PUBLIC: int v_iA(SCR *, VICMD *); */ int v_iA(sp, vp) @@ -87,7 +87,7 @@ v_iA(sp, vp) * [count]A * Append text to the cursor position. * - * PUBLIC: int v_ia __P((SCR *, VICMD *)); + * PUBLIC: int v_ia(SCR *, VICMD *); */ int v_ia(sp, vp) @@ -126,7 +126,7 @@ v_ia(sp, vp) * v_iI -- [count]I * Insert text at the first nonblank. * - * PUBLIC: int v_iI __P((SCR *, VICMD *)); + * PUBLIC: int v_iI(SCR *, VICMD *); */ int v_iI(sp, vp) @@ -147,7 +147,7 @@ v_iI(sp, vp) * [count]I * Insert text at the cursor position. * - * PUBLIC: int v_ii __P((SCR *, VICMD *)); + * PUBLIC: int v_ii(SCR *, VICMD *); */ int v_ii(sp, vp) @@ -176,13 +176,13 @@ v_ii(sp, vp) } enum which { o_cmd, O_cmd }; -static int io __P((SCR *, VICMD *, enum which)); +static int io(SCR *, VICMD *, enum which); /* * v_iO -- [count]O * Insert text above this line. * - * PUBLIC: int v_iO __P((SCR *, VICMD *)); + * PUBLIC: int v_iO(SCR *, VICMD *); */ int v_iO(sp, vp) @@ -196,7 +196,7 @@ v_iO(sp, vp) * v_io -- [count]o * Insert text after this line. * - * PUBLIC: int v_io __P((SCR *, VICMD *)); + * PUBLIC: int v_io(SCR *, VICMD *); */ int v_io(sp, vp) @@ -257,7 +257,7 @@ insert: p = ""; * [buffer][count]S * Change command. * - * PUBLIC: int v_change __P((SCR *, VICMD *)); + * PUBLIC: int v_change(SCR *, VICMD *); */ int v_change(sp, vp) @@ -398,7 +398,7 @@ v_change(sp, vp) * v_Replace -- [count]R * Overwrite multiple characters. * - * PUBLIC: int v_Replace __P((SCR *, VICMD *)); + * PUBLIC: int v_Replace(SCR *, VICMD *); */ int v_Replace(sp, vp) @@ -434,7 +434,7 @@ v_Replace(sp, vp) * v_subst -- [buffer][count]s * Substitute characters. * - * PUBLIC: int v_subst __P((SCR *, VICMD *)); + * PUBLIC: int v_subst(SCR *, VICMD *); */ int v_subst(sp, vp) diff --git a/usr.bin/vi/vi/v_left.c b/usr.bin/vi/vi/v_left.c index 32258df38fc..70ccb8b2df9 100644 --- a/usr.bin/vi/vi/v_left.c +++ b/usr.bin/vi/vi/v_left.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_left.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_left.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_left.c 10.7 (Berkeley) 3/6/96"; * v_left -- [count]^H, [count]h * Move left by columns. * - * PUBLIC: int v_left __P((SCR *, VICMD *)); + * PUBLIC: int v_left(SCR *, VICMD *); */ int v_left(sp, vp) @@ -70,7 +70,7 @@ v_left(sp, vp) * v_cfirst -- [count]_ * Move to the first non-blank character in a line. * - * PUBLIC: int v_cfirst __P((SCR *, VICMD *)); + * PUBLIC: int v_cfirst(SCR *, VICMD *); */ int v_cfirst(sp, vp) @@ -139,7 +139,7 @@ v_cfirst(sp, vp) * v_first -- ^ * Move to the first non-blank character in this line. * - * PUBLIC: int v_first __P((SCR *, VICMD *)); + * PUBLIC: int v_first(SCR *, VICMD *); */ int v_first(sp, vp) @@ -203,7 +203,7 @@ v_first(sp, vp) * requested column is past EOL, move to EOL. The nasty part is * that we have to know character column widths to make this work. * - * PUBLIC: int v_ncol __P((SCR *, VICMD *)); + * PUBLIC: int v_ncol(SCR *, VICMD *); */ int v_ncol(sp, vp) @@ -265,7 +265,7 @@ v_ncol(sp, vp) * v_zero -- 0 * Move to the first column on this line. * - * PUBLIC: int v_zero __P((SCR *, VICMD *)); + * PUBLIC: int v_zero(SCR *, VICMD *); */ int v_zero(sp, vp) diff --git a/usr.bin/vi/vi/v_mark.c b/usr.bin/vi/vi/v_mark.c index 0e901cda57d..c57bb63e6bf 100644 --- a/usr.bin/vi/vi/v_mark.c +++ b/usr.bin/vi/vi/v_mark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_mark.c,v 1.4 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_mark.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_mark.c 10.8 (Berkeley) 9/20/96"; * v_mark -- m[a-z] * Set a mark. * - * PUBLIC: int v_mark __P((SCR *, VICMD *)); + * PUBLIC: int v_mark(SCR *, VICMD *); */ int v_mark(sp, vp) @@ -42,7 +42,7 @@ v_mark(sp, vp) } enum which {BQMARK, FQMARK}; -static int mark __P((SCR *, VICMD *, enum which)); +static int mark(SCR *, VICMD *, enum which); /* @@ -58,7 +58,7 @@ static int mark __P((SCR *, VICMD *, enum which)); * people don't know it and will be delighted that you are able to tell * them. * - * PUBLIC: int v_bmark __P((SCR *, VICMD *)); + * PUBLIC: int v_bmark(SCR *, VICMD *); */ int v_bmark(sp, vp) @@ -74,7 +74,7 @@ v_bmark(sp, vp) * * Move to the first nonblank character of the line containing the mark. * - * PUBLIC: int v_fmark __P((SCR *, VICMD *)); + * PUBLIC: int v_fmark(SCR *, VICMD *); */ int v_fmark(sp, vp) diff --git a/usr.bin/vi/vi/v_match.c b/usr.bin/vi/vi/v_match.c index 623220e3ff7..e7e7b9d9371 100644 --- a/usr.bin/vi/vi/v_match.c +++ b/usr.bin/vi/vi/v_match.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_match.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_match.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_match.c 10.8 (Berkeley) 3/6/96"; * v_match -- % * Search to matching character. * - * PUBLIC: int v_match __P((SCR *, VICMD *)); + * PUBLIC: int v_match(SCR *, VICMD *); */ int v_match(sp, vp) @@ -41,7 +41,7 @@ v_match(sp, vp) VCS cs; MARK *mp; size_t cno, len, off; - int cnt, isempty, matchc, startc, (*gc)__P((SCR *, VCS *)); + int cnt, isempty, matchc, startc, (*gc)(SCR *, VCS *); char *p; /* diff --git a/usr.bin/vi/vi/v_paragraph.c b/usr.bin/vi/vi/v_paragraph.c index 66c27a1f040..11125b6241a 100644 --- a/usr.bin/vi/vi/v_paragraph.c +++ b/usr.bin/vi/vi/v_paragraph.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_paragraph.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_paragraph.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -63,7 +63,7 @@ static const char sccsid[] = "@(#)v_paragraph.c 10.7 (Berkeley) 3/6/96"; * Paragraphs are empty lines after text, formfeed characters, or values * from the paragraph or section options. * - * PUBLIC: int v_paragraphf __P((SCR *, VICMD *)); + * PUBLIC: int v_paragraphf(SCR *, VICMD *); */ int v_paragraphf(sp, vp) @@ -202,7 +202,7 @@ eof: if (vp->m_start.lno == lno || vp->m_start.lno == lno - 1) { * v_paragraphb -- [count]{ * Move backward count paragraphs. * - * PUBLIC: int v_paragraphb __P((SCR *, VICMD *)); + * PUBLIC: int v_paragraphb(SCR *, VICMD *); */ int v_paragraphb(sp, vp) @@ -310,7 +310,7 @@ found: vp->m_stop.lno = lno; * v_buildps -- * Build the paragraph command search pattern. * - * PUBLIC: int v_buildps __P((SCR *, char *, char *)); + * PUBLIC: int v_buildps(SCR *, char *, char *); */ int v_buildps(sp, p_p, s_p) diff --git a/usr.bin/vi/vi/v_put.c b/usr.bin/vi/vi/v_put.c index 56139a175fe..8845852c371 100644 --- a/usr.bin/vi/vi/v_put.c +++ b/usr.bin/vi/vi/v_put.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_put.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_put.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -26,13 +26,13 @@ static const char sccsid[] = "@(#)v_put.c 10.5 (Berkeley) 3/6/96"; #include "../common/common.h" #include "vi.h" -static void inc_buf __P((SCR *, VICMD *)); +static void inc_buf(SCR *, VICMD *); /* * v_Put -- [buffer]P * Insert the contents of the buffer before the cursor. * - * PUBLIC: int v_Put __P((SCR *, VICMD *)); + * PUBLIC: int v_Put(SCR *, VICMD *); */ int v_Put(sp, vp) @@ -65,7 +65,7 @@ v_Put(sp, vp) * v_put -- [buffer]p * Insert the contents of the buffer after the cursor. * - * PUBLIC: int v_put __P((SCR *, VICMD *)); + * PUBLIC: int v_put(SCR *, VICMD *); */ int v_put(sp, vp) diff --git a/usr.bin/vi/vi/v_redraw.c b/usr.bin/vi/vi/v_redraw.c index 5553bfc5f7a..8c224722afd 100644 --- a/usr.bin/vi/vi/v_redraw.c +++ b/usr.bin/vi/vi/v_redraw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_redraw.c,v 1.3 2001/01/29 01:58:51 niklas Exp $ */ +/* $OpenBSD: v_redraw.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_redraw.c 10.6 (Berkeley) 3/6/96"; * v_redraw -- ^L, ^R * Redraw the screen. * - * PUBLIC: int v_redraw __P((SCR *, VICMD *)); + * PUBLIC: int v_redraw(SCR *, VICMD *); */ int v_redraw(sp, vp) diff --git a/usr.bin/vi/vi/v_replace.c b/usr.bin/vi/vi/v_replace.c index c6e32c14030..581f9a6e5df 100644 --- a/usr.bin/vi/vi/v_replace.c +++ b/usr.bin/vi/vi/v_replace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_replace.c,v 1.4 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_replace.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -42,7 +42,7 @@ static const char sccsid[] = "@(#)v_replace.c 10.17 (Berkeley) 6/30/96"; * <literal> character, it required three <literal> characters after the * command. This may not be right, but at least it's not insane. * - * PUBLIC: int v_replace __P((SCR *, VICMD *)); + * PUBLIC: int v_replace(SCR *, VICMD *); */ int v_replace(sp, vp) diff --git a/usr.bin/vi/vi/v_right.c b/usr.bin/vi/vi/v_right.c index 4b29eb18886..0fbf2362fc0 100644 --- a/usr.bin/vi/vi/v_right.c +++ b/usr.bin/vi/vi/v_right.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_right.c,v 1.3 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_right.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_right.c 10.7 (Berkeley) 3/6/96"; * v_right -- [count]' ', [count]l * Move right by columns. * - * PUBLIC: int v_right __P((SCR *, VICMD *)); + * PUBLIC: int v_right(SCR *, VICMD *); */ int v_right(sp, vp) @@ -82,7 +82,7 @@ eol: v_eol(sp, NULL); * v_dollar -- [count]$ * Move to the last column. * - * PUBLIC: int v_dollar __P((SCR *, VICMD *)); + * PUBLIC: int v_dollar(SCR *, VICMD *); */ int v_dollar(sp, vp) diff --git a/usr.bin/vi/vi/v_screen.c b/usr.bin/vi/vi/v_screen.c index 728697dfc7a..e6bf6d99bb8 100644 --- a/usr.bin/vi/vi/v_screen.c +++ b/usr.bin/vi/vi/v_screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_screen.c,v 1.3 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_screen.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_screen.c 10.10 (Berkeley) 4/27/96"; * v_screen -- ^W * Switch screens. * - * PUBLIC: int v_screen __P((SCR *, VICMD *)); + * PUBLIC: int v_screen(SCR *, VICMD *); */ int v_screen(sp, vp) diff --git a/usr.bin/vi/vi/v_scroll.c b/usr.bin/vi/vi/v_scroll.c index 6bce588af7b..b943a88f647 100644 --- a/usr.bin/vi/vi/v_scroll.c +++ b/usr.bin/vi/vi/v_scroll.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_scroll.c,v 1.4 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_scroll.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -27,7 +27,7 @@ static const char sccsid[] = "@(#)v_scroll.c 10.9 (Berkeley) 4/27/96"; #include "../common/common.h" #include "vi.h" -static void goto_adjust __P((VICMD *)); +static void goto_adjust(VICMD *); /* * The historic vi had a problem in that all movements were by physical @@ -66,7 +66,7 @@ static void goto_adjust __P((VICMD *)); * Go to first non-blank character of the line count, the last line * of the file by default. * - * PUBLIC: int v_lgoto __P((SCR *, VICMD *)); + * PUBLIC: int v_lgoto(SCR *, VICMD *); */ int v_lgoto(sp, vp) @@ -105,7 +105,7 @@ v_lgoto(sp, vp) * Move to the first non-blank character of the logical line * count - 1 from the top of the screen, 0 by default. * - * PUBLIC: int v_home __P((SCR *, VICMD *)); + * PUBLIC: int v_home(SCR *, VICMD *); */ int v_home(sp, vp) @@ -124,7 +124,7 @@ v_home(sp, vp) * Move to the first non-blank character of the logical line * in the middle of the screen. * - * PUBLIC: int v_middle __P((SCR *, VICMD *)); + * PUBLIC: int v_middle(SCR *, VICMD *); */ int v_middle(sp, vp) @@ -147,7 +147,7 @@ v_middle(sp, vp) * Move to the first non-blank character of the logical line * count - 1 from the bottom of the screen, 0 by default. * - * PUBLIC: int v_bottom __P((SCR *, VICMD *)); + * PUBLIC: int v_bottom(SCR *, VICMD *); */ int v_bottom(sp, vp) @@ -213,7 +213,7 @@ goto_adjust(vp) * v_up -- [count]^P, [count]k, [count]- * Move up by lines. * - * PUBLIC: int v_up __P((SCR *, VICMD *)); + * PUBLIC: int v_up(SCR *, VICMD *); */ int v_up(sp, vp) @@ -237,7 +237,7 @@ v_up(sp, vp) * In a script window, send the line to the shell. * In a regular window, move down by lines. * - * PUBLIC: int v_cr __P((SCR *, VICMD *)); + * PUBLIC: int v_cr(SCR *, VICMD *); */ int v_cr(sp, vp) @@ -260,7 +260,7 @@ v_cr(sp, vp) * v_down -- [count]^J, [count]^N, [count]j, [count]^M, [count]+ * Move down by lines. * - * PUBLIC: int v_down __P((SCR *, VICMD *)); + * PUBLIC: int v_down(SCR *, VICMD *); */ int v_down(sp, vp) @@ -283,7 +283,7 @@ v_down(sp, vp) * v_hpageup -- [count]^U * Page up half screens. * - * PUBLIC: int v_hpageup __P((SCR *, VICMD *)); + * PUBLIC: int v_hpageup(SCR *, VICMD *); */ int v_hpageup(sp, vp) @@ -309,7 +309,7 @@ v_hpageup(sp, vp) * v_hpagedown -- [count]^D * Page down half screens. * - * PUBLIC: int v_hpagedown __P((SCR *, VICMD *)); + * PUBLIC: int v_hpagedown(SCR *, VICMD *); */ int v_hpagedown(sp, vp) @@ -339,7 +339,7 @@ v_hpagedown(sp, vp) * if EOF was already displayed on the screen. This implementation does * move to EOF in that case, making ^F more like the the historic ^D. * - * PUBLIC: int v_pagedown __P((SCR *, VICMD *)); + * PUBLIC: int v_pagedown(SCR *, VICMD *); */ int v_pagedown(sp, vp) @@ -387,7 +387,7 @@ v_pagedown(sp, vp) * if SOF was already displayed on the screen. This implementation does * move to SOF in that case, making ^B more like the the historic ^U. * - * PUBLIC: int v_pageup __P((SCR *, VICMD *)); + * PUBLIC: int v_pageup(SCR *, VICMD *); */ int v_pageup(sp, vp) @@ -435,7 +435,7 @@ v_pageup(sp, vp) * v_lineup -- [count]^Y * Page up by lines. * - * PUBLIC: int v_lineup __P((SCR *, VICMD *)); + * PUBLIC: int v_lineup(SCR *, VICMD *); */ int v_lineup(sp, vp) @@ -457,7 +457,7 @@ v_lineup(sp, vp) * v_linedown -- [count]^E * Page down by lines. * - * PUBLIC: int v_linedown __P((SCR *, VICMD *)); + * PUBLIC: int v_linedown(SCR *, VICMD *); */ int v_linedown(sp, vp) diff --git a/usr.bin/vi/vi/v_search.c b/usr.bin/vi/vi/v_search.c index 63accba63f6..2b497d77527 100644 --- a/usr.bin/vi/vi/v_search.c +++ b/usr.bin/vi/vi/v_search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_search.c,v 1.6 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_search.c,v 1.7 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,14 +30,14 @@ static const char sccsid[] = "@(#)v_search.c 10.18 (Berkeley) 9/19/96"; #include "../common/common.h" #include "vi.h" -static int v_exaddr __P((SCR *, VICMD *, dir_t)); -static int v_search __P((SCR *, VICMD *, char *, size_t, u_int, dir_t)); +static int v_exaddr(SCR *, VICMD *, dir_t); +static int v_search(SCR *, VICMD *, char *, size_t, u_int, dir_t); /* * v_srch -- [count]?RE[? offset] * Ex address search backward. * - * PUBLIC: int v_searchb __P((SCR *, VICMD *)); + * PUBLIC: int v_searchb(SCR *, VICMD *); */ int v_searchb(sp, vp) @@ -51,7 +51,7 @@ v_searchb(sp, vp) * v_searchf -- [count]/RE[/ offset] * Ex address search forward. * - * PUBLIC: int v_searchf __P((SCR *, VICMD *)); + * PUBLIC: int v_searchf(SCR *, VICMD *); */ int v_searchf(sp, vp) @@ -285,7 +285,7 @@ err2: vp->m_final.lno = s_lno; * v_searchN -- N * Reverse last search. * - * PUBLIC: int v_searchN __P((SCR *, VICMD *)); + * PUBLIC: int v_searchN(SCR *, VICMD *); */ int v_searchN(sp, vp) @@ -312,7 +312,7 @@ v_searchN(sp, vp) * v_searchn -- n * Repeat last search. * - * PUBLIC: int v_searchn __P((SCR *, VICMD *)); + * PUBLIC: int v_searchn(SCR *, VICMD *); */ int v_searchn(sp, vp) @@ -326,7 +326,7 @@ v_searchn(sp, vp) * v_searchw -- [count]^A * Search for the word under the cursor. * - * PUBLIC: int v_searchw __P((SCR *, VICMD *)); + * PUBLIC: int v_searchw(SCR *, VICMD *); */ int v_searchw(sp, vp) @@ -420,7 +420,7 @@ v_search(sp, vp, ptrn, plen, flags, dir) * 'k' and put would no longer work correctly. In any case, we try to do * the right thing, but it's not going to exactly match historic practice. * - * PUBLIC: int v_correct __P((SCR *, VICMD *, int)); + * PUBLIC: int v_correct(SCR *, VICMD *, int); */ int v_correct(sp, vp, isdelta) diff --git a/usr.bin/vi/vi/v_section.c b/usr.bin/vi/vi/v_section.c index 5c68ac51c80..9e53f4fbf68 100644 --- a/usr.bin/vi/vi/v_section.c +++ b/usr.bin/vi/vi/v_section.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_section.c,v 1.3 2001/01/29 01:58:52 niklas Exp $ */ +/* $OpenBSD: v_section.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -61,7 +61,7 @@ static const char sccsid[] = "@(#)v_section.c 10.7 (Berkeley) 3/6/96"; * a section, it did NOT include the matched line. If it matched a }, it * did include the line. No clue why. * - * PUBLIC: int v_sectionf __P((SCR *, VICMD *)); + * PUBLIC: int v_sectionf(SCR *, VICMD *); */ int v_sectionf(sp, vp) @@ -169,7 +169,7 @@ ret2: if (ISMOTION(vp)) { * v_sectionb -- [count][[ * Move backward count sections/functions. * - * PUBLIC: int v_sectionb __P((SCR *, VICMD *)); + * PUBLIC: int v_sectionb(SCR *, VICMD *); */ int v_sectionb(sp, vp) diff --git a/usr.bin/vi/vi/v_sentence.c b/usr.bin/vi/vi/v_sentence.c index 665f5602d11..bc223e83530 100644 --- a/usr.bin/vi/vi/v_sentence.c +++ b/usr.bin/vi/vi/v_sentence.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_sentence.c,v 1.3 2001/01/29 01:58:53 niklas Exp $ */ +/* $OpenBSD: v_sentence.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -51,7 +51,7 @@ static const char sccsid[] = "@(#)v_sentence.c 10.7 (Berkeley) 3/6/96"; * v_sentencef -- [count]) * Move forward count sentences. * - * PUBLIC: int v_sentencef __P((SCR *, VICMD *)); + * PUBLIC: int v_sentencef(SCR *, VICMD *); */ int v_sentencef(sp, vp) @@ -192,7 +192,7 @@ okret: vp->m_stop.lno = cs.cs_lno; * v_sentenceb -- [count]( * Move backward count sentences. * - * PUBLIC: int v_sentenceb __P((SCR *, VICMD *)); + * PUBLIC: int v_sentenceb(SCR *, VICMD *); */ int v_sentenceb(sp, vp) diff --git a/usr.bin/vi/vi/v_status.c b/usr.bin/vi/vi/v_status.c index 30ef93531f1..d8e90393086 100644 --- a/usr.bin/vi/vi/v_status.c +++ b/usr.bin/vi/vi/v_status.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_status.c,v 1.3 2001/01/29 01:58:53 niklas Exp $ */ +/* $OpenBSD: v_status.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_status.c 10.9 (Berkeley) 5/15/96"; * v_status -- ^G * Show the file status. * - * PUBLIC: int v_status __P((SCR *, VICMD *)); + * PUBLIC: int v_status(SCR *, VICMD *); */ int v_status(sp, vp) diff --git a/usr.bin/vi/vi/v_txt.c b/usr.bin/vi/vi/v_txt.c index e5b497d4a22..e1b3a3f14d2 100644 --- a/usr.bin/vi/vi/v_txt.c +++ b/usr.bin/vi/vi/v_txt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_txt.c,v 1.11 2001/09/19 02:31:31 pvalchev Exp $ */ +/* $OpenBSD: v_txt.c,v 1.12 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -32,25 +32,25 @@ static const char sccsid[] = "@(#)v_txt.c 10.87 (Berkeley) 10/13/96"; #include "../common/common.h" #include "vi.h" -static int txt_abbrev __P((SCR *, TEXT *, CHAR_T *, int, int *, int *)); -static void txt_ai_resolve __P((SCR *, TEXT *, int *)); -static TEXT *txt_backup __P((SCR *, TEXTH *, TEXT *, u_int32_t *)); -static int txt_dent __P((SCR *, TEXT *, int)); -static int txt_emark __P((SCR *, TEXT *, size_t)); -static void txt_err __P((SCR *, TEXTH *)); -static int txt_fc __P((SCR *, TEXT *, int *)); -static int txt_fc_col __P((SCR *, int, ARGS **)); -static int txt_hex __P((SCR *, TEXT *)); -static int txt_insch __P((SCR *, TEXT *, CHAR_T *, u_int)); -static int txt_isrch __P((SCR *, VICMD *, TEXT *, u_int8_t *)); -static int txt_map_end __P((SCR *)); -static int txt_map_init __P((SCR *)); -static int txt_margin __P((SCR *, TEXT *, TEXT *, int *, u_int32_t)); -static void txt_nomorech __P((SCR *)); -static void txt_Rresolve __P((SCR *, TEXTH *, TEXT *, const size_t)); -static int txt_resolve __P((SCR *, TEXTH *, u_int32_t)); -static int txt_showmatch __P((SCR *, TEXT *)); -static void txt_unmap __P((SCR *, TEXT *, u_int32_t *)); +static int txt_abbrev(SCR *, TEXT *, CHAR_T *, int, int *, int *); +static void txt_ai_resolve(SCR *, TEXT *, int *); +static TEXT *txt_backup(SCR *, TEXTH *, TEXT *, u_int32_t *); +static int txt_dent(SCR *, TEXT *, int); +static int txt_emark(SCR *, TEXT *, size_t); +static void txt_err(SCR *, TEXTH *); +static int txt_fc(SCR *, TEXT *, int *); +static int txt_fc_col(SCR *, int, ARGS **); +static int txt_hex(SCR *, TEXT *); +static int txt_insch(SCR *, TEXT *, CHAR_T *, u_int); +static int txt_isrch(SCR *, VICMD *, TEXT *, u_int8_t *); +static int txt_map_end(SCR *); +static int txt_map_init(SCR *); +static int txt_margin(SCR *, TEXT *, TEXT *, int *, u_int32_t); +static void txt_nomorech(SCR *); +static void txt_Rresolve(SCR *, TEXTH *, TEXT *, const size_t); +static int txt_resolve(SCR *, TEXTH *, u_int32_t); +static int txt_showmatch(SCR *, TEXT *); +static void txt_unmap(SCR *, TEXT *, u_int32_t *); /* Cursor character (space is hard to track on the screen). */ #if defined(DEBUG) && 0 @@ -62,7 +62,7 @@ static void txt_unmap __P((SCR *, TEXT *, u_int32_t *)); * v_tcmd -- * Fill a buffer from the terminal for vi. * - * PUBLIC: int v_tcmd __P((SCR *, VICMD *, ARG_CHAR_T, u_int)); + * PUBLIC: int v_tcmd(SCR *, VICMD *, ARG_CHAR_T, u_int); */ int v_tcmd(sp, vp, prompt, flags) @@ -1767,7 +1767,7 @@ txt_ai_resolve(sp, tp, changedp) * Handle autoindent. If aitp isn't NULL, use it, otherwise, * retrieve the line. * - * PUBLIC: int v_txt_auto __P((SCR *, recno_t, TEXT *, size_t, TEXT *)); + * PUBLIC: int v_txt_auto(SCR *, recno_t, TEXT *, size_t, TEXT *); */ int v_txt_auto(sp, lno, aitp, len, tp) diff --git a/usr.bin/vi/vi/v_ulcase.c b/usr.bin/vi/vi/v_ulcase.c index d439ecc24b2..94735d87b43 100644 --- a/usr.bin/vi/vi/v_ulcase.c +++ b/usr.bin/vi/vi/v_ulcase.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_ulcase.c,v 1.5 2001/01/29 01:58:53 niklas Exp $ */ +/* $OpenBSD: v_ulcase.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_ulcase.c 10.7 (Berkeley) 3/6/96"; #include "../common/common.h" #include "vi.h" -static int ulcase __P((SCR *, recno_t, CHAR_T *, size_t, size_t, size_t)); +static int ulcase(SCR *, recno_t, CHAR_T *, size_t, size_t, size_t); /* * v_ulcase -- [count]~ @@ -46,7 +46,7 @@ static int ulcase __P((SCR *, recno_t, CHAR_T *, size_t, size_t, size_t)); * if there had been an associated motion, but it's too late to make * that the default now. * - * PUBLIC: int v_ulcase __P((SCR *, VICMD *)); + * PUBLIC: int v_ulcase(SCR *, VICMD *); */ int v_ulcase(sp, vp) @@ -106,7 +106,7 @@ v_ulcase(sp, vp) * v_mulcase -- [count]~[count]motion * Toggle upper & lower case letters over a range. * - * PUBLIC: int v_mulcase __P((SCR *, VICMD *)); + * PUBLIC: int v_mulcase(SCR *, VICMD *); */ int v_mulcase(sp, vp) diff --git a/usr.bin/vi/vi/v_undo.c b/usr.bin/vi/vi/v_undo.c index aa85672d43e..ba9600e9154 100644 --- a/usr.bin/vi/vi/v_undo.c +++ b/usr.bin/vi/vi/v_undo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_undo.c,v 1.3 2001/01/29 01:58:53 niklas Exp $ */ +/* $OpenBSD: v_undo.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -33,7 +33,7 @@ static const char sccsid[] = "@(#)v_undo.c 10.5 (Berkeley) 3/6/96"; * v_Undo -- U * Undo changes to this line. * - * PUBLIC: int v_Undo __P((SCR *, VICMD *)); + * PUBLIC: int v_Undo(SCR *, VICMD *); */ int v_Undo(sp, vp) @@ -69,7 +69,7 @@ v_Undo(sp, vp) * v_undo -- u * Undo the last change. * - * PUBLIC: int v_undo __P((SCR *, VICMD *)); + * PUBLIC: int v_undo(SCR *, VICMD *); */ int v_undo(sp, vp) diff --git a/usr.bin/vi/vi/v_util.c b/usr.bin/vi/vi/v_util.c index 8b4cd231e9d..39fd1217c2b 100644 --- a/usr.bin/vi/vi/v_util.c +++ b/usr.bin/vi/vi/v_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_util.c,v 1.4 2001/01/29 01:58:53 niklas Exp $ */ +/* $OpenBSD: v_util.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -34,7 +34,7 @@ static const char sccsid[] = "@(#)v_util.c 10.11 (Berkeley) 6/30/96"; * v_eof -- * Vi end-of-file error. * - * PUBLIC: void v_eof __P((SCR *, MARK *)); + * PUBLIC: void v_eof(SCR *, MARK *); */ void v_eof(sp, mp) @@ -59,7 +59,7 @@ v_eof(sp, mp) * v_eol -- * Vi end-of-line error. * - * PUBLIC: void v_eol __P((SCR *, MARK *)); + * PUBLIC: void v_eol(SCR *, MARK *); */ void v_eol(sp, mp) @@ -84,7 +84,7 @@ v_eol(sp, mp) * v_nomove -- * Vi no cursor movement error. * - * PUBLIC: void v_nomove __P((SCR *)); + * PUBLIC: void v_nomove(SCR *); */ void v_nomove(sp) @@ -97,7 +97,7 @@ v_nomove(sp) * v_sof -- * Vi start-of-file error. * - * PUBLIC: void v_sof __P((SCR *, MARK *)); + * PUBLIC: void v_sof(SCR *, MARK *); */ void v_sof(sp, mp) @@ -114,7 +114,7 @@ v_sof(sp, mp) * v_sol -- * Vi start-of-line error. * - * PUBLIC: void v_sol __P((SCR *)); + * PUBLIC: void v_sol(SCR *); */ void v_sol(sp) @@ -127,7 +127,7 @@ v_sol(sp) * v_isempty -- * Return if the line contains nothing but white-space characters. * - * PUBLIC: int v_isempty __P((char *, size_t)); + * PUBLIC: int v_isempty(char *, size_t); */ int v_isempty(p, len) @@ -144,7 +144,7 @@ v_isempty(p, len) * v_emsg -- * Display a few common vi messages. * - * PUBLIC: void v_emsg __P((SCR *, char *, vim_t)); + * PUBLIC: void v_emsg(SCR *, char *, vim_t); */ void v_emsg(sp, p, which) diff --git a/usr.bin/vi/vi/v_word.c b/usr.bin/vi/vi/v_word.c index 86d5872e378..44cc132dd7b 100644 --- a/usr.bin/vi/vi/v_word.c +++ b/usr.bin/vi/vi/v_word.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_word.c,v 1.3 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: v_word.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -68,15 +68,15 @@ static const char sccsid[] = "@(#)v_word.c 10.5 (Berkeley) 3/6/96"; enum which {BIGWORD, LITTLEWORD}; -static int bword __P((SCR *, VICMD *, enum which)); -static int eword __P((SCR *, VICMD *, enum which)); -static int fword __P((SCR *, VICMD *, enum which)); +static int bword(SCR *, VICMD *, enum which); +static int eword(SCR *, VICMD *, enum which); +static int fword(SCR *, VICMD *, enum which); /* * v_wordW -- [count]W * Move forward a bigword at a time. * - * PUBLIC: int v_wordW __P((SCR *, VICMD *)); + * PUBLIC: int v_wordW(SCR *, VICMD *); */ int v_wordW(sp, vp) @@ -90,7 +90,7 @@ v_wordW(sp, vp) * v_wordw -- [count]w * Move forward a word at a time. * - * PUBLIC: int v_wordw __P((SCR *, VICMD *)); + * PUBLIC: int v_wordw(SCR *, VICMD *); */ int v_wordw(sp, vp) @@ -243,7 +243,7 @@ ret: if (!ISMOTION(vp) && * v_wordE -- [count]E * Move forward to the end of the bigword. * - * PUBLIC: int v_wordE __P((SCR *, VICMD *)); + * PUBLIC: int v_wordE(SCR *, VICMD *); */ int v_wordE(sp, vp) @@ -257,7 +257,7 @@ v_wordE(sp, vp) * v_worde -- [count]e * Move forward to the end of the word. * - * PUBLIC: int v_worde __P((SCR *, VICMD *)); + * PUBLIC: int v_worde(SCR *, VICMD *); */ int v_worde(sp, vp) @@ -396,7 +396,7 @@ ret: if (!ISMOTION(vp) && * v_WordB -- [count]B * Move backward a bigword at a time. * - * PUBLIC: int v_wordB __P((SCR *, VICMD *)); + * PUBLIC: int v_wordB(SCR *, VICMD *); */ int v_wordB(sp, vp) @@ -410,7 +410,7 @@ v_wordB(sp, vp) * v_wordb -- [count]b * Move backward a word at a time. * - * PUBLIC: int v_wordb __P((SCR *, VICMD *)); + * PUBLIC: int v_wordb(SCR *, VICMD *); */ int v_wordb(sp, vp) diff --git a/usr.bin/vi/vi/v_xchar.c b/usr.bin/vi/vi/v_xchar.c index 2fbd2cb32c5..d3f43a384bc 100644 --- a/usr.bin/vi/vi/v_xchar.c +++ b/usr.bin/vi/vi/v_xchar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_xchar.c,v 1.4 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: v_xchar.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_xchar.c 10.9 (Berkeley) 10/23/96"; * v_xchar -- [buffer] [count]x * Deletes the character(s) on which the cursor sits. * - * PUBLIC: int v_xchar __P((SCR *, VICMD *)); + * PUBLIC: int v_xchar(SCR *, VICMD *); */ int v_xchar(sp, vp) @@ -79,7 +79,7 @@ nodel: msgq(sp, M_BERR, "206|No characters to delete"); * Deletes the character(s) immediately before the current cursor * position. * - * PUBLIC: int v_Xchar __P((SCR *, VICMD *)); + * PUBLIC: int v_Xchar(SCR *, VICMD *); */ int v_Xchar(sp, vp) diff --git a/usr.bin/vi/vi/v_yank.c b/usr.bin/vi/vi/v_yank.c index ef5d18f8c43..43ba898ffd4 100644 --- a/usr.bin/vi/vi/v_yank.c +++ b/usr.bin/vi/vi/v_yank.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_yank.c,v 1.4 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: v_yank.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -41,7 +41,7 @@ static const char sccsid[] = "@(#)v_yank.c 10.9 (Berkeley) 5/19/96"; * to the line and column marked by a. Hopefully, the motion component code * got it right... Unlike delete, we make no adjustments here. * - * PUBLIC: int v_yank __P((SCR *, VICMD *)); + * PUBLIC: int v_yank(SCR *, VICMD *); */ int v_yank(sp, vp) diff --git a/usr.bin/vi/vi/v_z.c b/usr.bin/vi/vi/v_z.c index 0aecbb90a25..58d85b2f8ae 100644 --- a/usr.bin/vi/vi/v_z.c +++ b/usr.bin/vi/vi/v_z.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_z.c,v 1.3 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: v_z.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -30,7 +30,7 @@ static const char sccsid[] = "@(#)v_z.c 10.10 (Berkeley) 5/16/96"; * v_z -- [count]z[count][-.+^<CR>] * Move the screen. * - * PUBLIC: int v_z __P((SCR *, VICMD *)); + * PUBLIC: int v_z(SCR *, VICMD *); */ int v_z(sp, vp) @@ -135,7 +135,7 @@ v_z(sp, vp) * vs_crel -- * Change the relative size of the current screen. * - * PUBLIC: int vs_crel __P((SCR *, long)); + * PUBLIC: int vs_crel(SCR *, long); */ int vs_crel(sp, count) diff --git a/usr.bin/vi/vi/v_zexit.c b/usr.bin/vi/vi/v_zexit.c index 703baf5cfc9..061017edf89 100644 --- a/usr.bin/vi/vi/v_zexit.c +++ b/usr.bin/vi/vi/v_zexit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: v_zexit.c,v 1.3 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: v_zexit.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)v_zexit.c 10.6 (Berkeley) 4/27/96"; * v_zexit -- ZZ * Save the file and exit. * - * PUBLIC: int v_zexit __P((SCR *, VICMD *)); + * PUBLIC: int v_zexit(SCR *, VICMD *); */ int v_zexit(sp, vp) diff --git a/usr.bin/vi/vi/vi.c b/usr.bin/vi/vi/vi.c index 9cca2998160..7fe4483d7c5 100644 --- a/usr.bin/vi/vi/vi.c +++ b/usr.bin/vi/vi/vi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vi.c,v 1.8 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: vi.c,v 1.9 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -36,17 +36,17 @@ typedef enum { } gcret_t; static VIKEYS const - *v_alias __P((SCR *, VICMD *, VIKEYS const *)); -static gcret_t v_cmd __P((SCR *, VICMD *, VICMD *, VICMD *, int *, int *)); -static int v_count __P((SCR *, ARG_CHAR_T, u_long *)); -static void v_dtoh __P((SCR *)); -static int v_init __P((SCR *)); -static gcret_t v_key __P((SCR *, int, EVENT *, u_int32_t)); -static int v_keyword __P((SCR *)); -static int v_motion __P((SCR *, VICMD *, VICMD *, int *)); + *v_alias(SCR *, VICMD *, VIKEYS const *); +static gcret_t v_cmd(SCR *, VICMD *, VICMD *, VICMD *, int *, int *); +static int v_count(SCR *, ARG_CHAR_T, u_long *); +static void v_dtoh(SCR *); +static int v_init(SCR *); +static gcret_t v_key(SCR *, int, EVENT *, u_int32_t); +static int v_keyword(SCR *); +static int v_motion(SCR *, VICMD *, VICMD *, int *); #if defined(DEBUG) && defined(COMLOG) -static void v_comlog __P((SCR *, VICMD *)); +static void v_comlog(SCR *, VICMD *); #endif /* @@ -61,7 +61,7 @@ static void v_comlog __P((SCR *, VICMD *)); * vi -- * Main vi command loop. * - * PUBLIC: int vi __P((SCR **)); + * PUBLIC: int vi(SCR **); */ int vi(spp) diff --git a/usr.bin/vi/vi/vi.h b/usr.bin/vi/vi/vi.h index 2ceba14bf0a..71233457bef 100644 --- a/usr.bin/vi/vi/vi.h +++ b/usr.bin/vi/vi/vi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vi.h,v 1.3 2001/01/29 01:58:54 niklas Exp $ */ +/* $OpenBSD: vi.h,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -128,7 +128,7 @@ typedef struct _vicmd { /* Vi command table structure. */ struct _vikeys { /* Underlying function. */ - int (*func) __P((SCR *, VICMD *)); + int (*func)(SCR *, VICMD *); #define V_ABS 0x00004000 /* Absolute movement, set '' mark. */ #define V_ABS_C 0x00008000 /* V_ABS: if the line/column changed. */ #define V_ABS_L 0x00010000 /* V_ABS: if the line changed. */ @@ -163,12 +163,12 @@ typedef struct _vcs { int cs_flags; /* Return flags. */ } VCS; -int cs_bblank __P((SCR *, VCS *)); -int cs_fblank __P((SCR *, VCS *)); -int cs_fspace __P((SCR *, VCS *)); -int cs_init __P((SCR *, VCS *)); -int cs_next __P((SCR *, VCS *)); -int cs_prev __P((SCR *, VCS *)); +int cs_bblank(SCR *, VCS *); +int cs_fblank(SCR *, VCS *); +int cs_fspace(SCR *, VCS *); +int cs_init(SCR *, VCS *); +int cs_next(SCR *, VCS *); +int cs_prev(SCR *, VCS *); /* * We use a single "window" for each set of vi screens. The model would be diff --git a/usr.bin/vi/vi/vs_line.c b/usr.bin/vi/vi/vs_line.c index 037bf859ebf..59e2eee9a78 100644 --- a/usr.bin/vi/vi/vs_line.c +++ b/usr.bin/vi/vi/vs_line.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_line.c,v 1.5 2001/05/28 22:44:32 pvalchev Exp $ */ +/* $OpenBSD: vs_line.c,v 1.6 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)vs_line.c 10.19 (Berkeley) 9/26/96"; * vs_line -- * Update one line on the screen. * - * PUBLIC: int vs_line __P((SCR *, SMAP *, size_t *, size_t *)); + * PUBLIC: int vs_line(SCR *, SMAP *, size_t *, size_t *); */ int vs_line(sp, smp, yp, xp) @@ -477,7 +477,7 @@ ret1: (void)gp->scr_move(sp, oldy, oldx); * vs_number -- * Repaint the numbers on all the lines. * - * PUBLIC: int vs_number __P((SCR *)); + * PUBLIC: int vs_number(SCR *); */ int vs_number(sp) diff --git a/usr.bin/vi/vi/vs_msg.c b/usr.bin/vi/vi/vs_msg.c index 891328bc653..8fe633f2c8c 100644 --- a/usr.bin/vi/vi/vs_msg.c +++ b/usr.bin/vi/vi/vs_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_msg.c,v 1.6 2001/01/29 01:58:55 niklas Exp $ */ +/* $OpenBSD: vs_msg.c,v 1.7 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -39,11 +39,11 @@ typedef enum { */ } sw_t; -static void vs_divider __P((SCR *)); -static void vs_msgsave __P((SCR *, mtype_t, char *, size_t)); -static void vs_output __P((SCR *, mtype_t, const char *, int)); -static void vs_scroll __P((SCR *, int *, sw_t)); -static void vs_wait __P((SCR *, int *, sw_t)); +static void vs_divider(SCR *); +static void vs_msgsave(SCR *, mtype_t, char *, size_t); +static void vs_output(SCR *, mtype_t, const char *, int); +static void vs_scroll(SCR *, int *, sw_t); +static void vs_wait(SCR *, int *, sw_t); /* * vs_busy -- @@ -55,7 +55,7 @@ static void vs_wait __P((SCR *, int *, sw_t)); * messages, e.g. X11 clock icons, should set their scr_busy function to the * correct function before calling the main editor routine. * - * PUBLIC: void vs_busy __P((SCR *, const char *, busy_t)); + * PUBLIC: void vs_busy(SCR *, const char *, busy_t); */ void vs_busy(sp, msg, btype) @@ -145,7 +145,7 @@ vs_busy(sp, msg, btype) * vs_home -- * Home the cursor to the bottom row, left-most column. * - * PUBLIC: void vs_home __P((SCR *)); + * PUBLIC: void vs_home(SCR *); */ void vs_home(sp) @@ -159,7 +159,7 @@ vs_home(sp) * vs_update -- * Update a command. * - * PUBLIC: void vs_update __P((SCR *, const char *, const char *)); + * PUBLIC: void vs_update(SCR *, const char *, const char *); */ void vs_update(sp, m1, m2) @@ -227,7 +227,7 @@ vs_update(sp, m1, m2) * alternate method of displaying messages, e.g. dialog boxes, should set their * scr_msg function to the correct function before calling the editor. * - * PUBLIC: void vs_msg __P((SCR *, mtype_t, char *, size_t)); + * PUBLIC: void vs_msg(SCR *, mtype_t, char *, size_t); */ void vs_msg(sp, mtype, line, len) @@ -522,7 +522,7 @@ vs_output(sp, mtype, line, llen) * This routine is called when exiting a colon command to resolve any ex * output that may have occurred. * - * PUBLIC: int vs_ex_resolve __P((SCR *, int *)); + * PUBLIC: int vs_ex_resolve(SCR *, int *); */ int vs_ex_resolve(sp, continuep) @@ -648,7 +648,7 @@ vs_ex_resolve(sp, continuep) * vs_resolve -- * Deal with message output. * - * PUBLIC: int vs_resolve __P((SCR *, SCR *, int)); + * PUBLIC: int vs_resolve(SCR *, SCR *, int); */ int vs_resolve(sp, csp, forcewait) diff --git a/usr.bin/vi/vi/vs_refresh.c b/usr.bin/vi/vi/vs_refresh.c index 61bc1b548d9..0a5c949014f 100644 --- a/usr.bin/vi/vi/vs_refresh.c +++ b/usr.bin/vi/vi/vs_refresh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_refresh.c,v 1.8 2001/01/29 01:58:55 niklas Exp $ */ +/* $OpenBSD: vs_refresh.c,v 1.9 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -32,14 +32,14 @@ static const char sccsid[] = "@(#)vs_refresh.c 10.44 (Berkeley) 10/13/96"; #define UPDATE_CURSOR 0x01 /* Update the cursor. */ #define UPDATE_SCREEN 0x02 /* Flush to screen. */ -static void vs_modeline __P((SCR *)); -static int vs_paint __P((SCR *, u_int)); +static void vs_modeline(SCR *); +static int vs_paint(SCR *, u_int); /* * v_repaint -- * Repaint selected lines from the screen. * - * PUBLIC: int vs_repaint __P((SCR *, EVENT *)); + * PUBLIC: int vs_repaint(SCR *, EVENT *); */ int vs_repaint(sp, evp) @@ -61,7 +61,7 @@ vs_repaint(sp, evp) * vs_refresh -- * Refresh all screens. * - * PUBLIC: int vs_refresh __P((SCR *, int)); + * PUBLIC: int vs_refresh(SCR *, int); */ int vs_refresh(sp, forcepaint) diff --git a/usr.bin/vi/vi/vs_relative.c b/usr.bin/vi/vi/vs_relative.c index f65bea6c4bf..34a68f39419 100644 --- a/usr.bin/vi/vi/vs_relative.c +++ b/usr.bin/vi/vi/vs_relative.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_relative.c,v 1.2 2001/01/29 01:58:55 niklas Exp $ */ +/* $OpenBSD: vs_relative.c,v 1.3 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -31,7 +31,7 @@ static const char sccsid[] = "@(#)vs_relative.c 10.11 (Berkeley) 5/13/96"; * vs_column -- * Return the logical column of the cursor in the line. * - * PUBLIC: int vs_column __P((SCR *, size_t *)); + * PUBLIC: int vs_column(SCR *, size_t *); */ int vs_column(sp, colp) @@ -54,7 +54,7 @@ vs_column(sp, colp) * the physical character column within the line, including space * required for the O_NUMBER and O_LIST options. * - * PUBLIC: size_t vs_screens __P((SCR *, recno_t, size_t *)); + * PUBLIC: size_t vs_screens(SCR *, recno_t, size_t *); */ size_t vs_screens(sp, lno, cnop) @@ -100,7 +100,7 @@ vs_screens(sp, lno, cnop) * Return the screen columns necessary to display the line, or, * if specified, the physical character column within the line. * - * PUBLIC: size_t vs_columns __P((SCR *, char *, recno_t, size_t *, size_t *)); + * PUBLIC: size_t vs_columns(SCR *, char *, recno_t, size_t *, size_t *); */ size_t vs_columns(sp, lp, lno, cnop, diffp) @@ -199,7 +199,7 @@ done: if (diffp != NULL) /* XXX */ * character closest to the currently most attractive character * position (which is stored as a screen column). * - * PUBLIC: size_t vs_rcm __P((SCR *, recno_t, int)); + * PUBLIC: size_t vs_rcm(SCR *, recno_t, int); */ size_t vs_rcm(sp, lno, islast) @@ -228,7 +228,7 @@ vs_rcm(sp, lno, islast) * Return the physical column from the line that will display a * character closest to the specified screen column. * - * PUBLIC: size_t vs_colpos __P((SCR *, recno_t, size_t)); + * PUBLIC: size_t vs_colpos(SCR *, recno_t, size_t); */ size_t vs_colpos(sp, lno, cno) diff --git a/usr.bin/vi/vi/vs_smap.c b/usr.bin/vi/vi/vs_smap.c index 140db651396..0366b5537e6 100644 --- a/usr.bin/vi/vi/vs_smap.c +++ b/usr.bin/vi/vi/vs_smap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_smap.c,v 1.3 2001/01/29 01:58:55 niklas Exp $ */ +/* $OpenBSD: vs_smap.c,v 1.4 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -28,20 +28,20 @@ static const char sccsid[] = "@(#)vs_smap.c 10.25 (Berkeley) 7/12/96"; #include "../common/common.h" #include "vi.h" -static int vs_deleteln __P((SCR *, int)); -static int vs_insertln __P((SCR *, int)); -static int vs_sm_delete __P((SCR *, recno_t)); -static int vs_sm_down __P((SCR *, MARK *, recno_t, scroll_t, SMAP *)); -static int vs_sm_erase __P((SCR *)); -static int vs_sm_insert __P((SCR *, recno_t)); -static int vs_sm_reset __P((SCR *, recno_t)); -static int vs_sm_up __P((SCR *, MARK *, recno_t, scroll_t, SMAP *)); +static int vs_deleteln(SCR *, int); +static int vs_insertln(SCR *, int); +static int vs_sm_delete(SCR *, recno_t); +static int vs_sm_down(SCR *, MARK *, recno_t, scroll_t, SMAP *); +static int vs_sm_erase(SCR *); +static int vs_sm_insert(SCR *, recno_t); +static int vs_sm_reset(SCR *, recno_t); +static int vs_sm_up(SCR *, MARK *, recno_t, scroll_t, SMAP *); /* * vs_change -- * Make a change to the screen. * - * PUBLIC: int vs_change __P((SCR *, recno_t, lnop_t)); + * PUBLIC: int vs_change(SCR *, recno_t, lnop_t); */ int vs_change(sp, lno, op) @@ -171,7 +171,7 @@ vs_change(sp, lno, op) * slot is already filled in, P_BOTTOM means that the TMAP slot is * already filled in, and we just finish up the job. * - * PUBLIC: int vs_sm_fill __P((SCR *, recno_t, pos_t)); + * PUBLIC: int vs_sm_fill(SCR *, recno_t, pos_t); */ int vs_sm_fill(sp, lno, pos) @@ -511,7 +511,7 @@ vs_sm_reset(sp, lno) * Scroll the SMAP up/down count logical lines. Different * semantics based on the vi command, *sigh*. * - * PUBLIC: int vs_sm_scroll __P((SCR *, MARK *, recno_t, scroll_t)); + * PUBLIC: int vs_sm_scroll(SCR *, MARK *, recno_t, scroll_t); */ int vs_sm_scroll(sp, rp, count, scmd) @@ -753,7 +753,7 @@ vs_sm_up(sp, rp, count, scmd, smp) * vs_sm_1up -- * Scroll the SMAP up one. * - * PUBLIC: int vs_sm_1up __P((SCR *)); + * PUBLIC: int vs_sm_1up(SCR *); */ int vs_sm_1up(sp) @@ -988,7 +988,7 @@ vs_sm_erase(sp) * vs_sm_1down -- * Scroll the SMAP down one. * - * PUBLIC: int vs_sm_1down __P((SCR *)); + * PUBLIC: int vs_sm_1down(SCR *); */ int vs_sm_1down(sp) @@ -1048,7 +1048,7 @@ vs_insertln(sp, cnt) * vs_sm_next -- * Fill in the next entry in the SMAP. * - * PUBLIC: int vs_sm_next __P((SCR *, SMAP *, SMAP *)); + * PUBLIC: int vs_sm_next(SCR *, SMAP *, SMAP *); */ int vs_sm_next(sp, p, t) @@ -1078,7 +1078,7 @@ vs_sm_next(sp, p, t) * vs_sm_prev -- * Fill in the previous entry in the SMAP. * - * PUBLIC: int vs_sm_prev __P((SCR *, SMAP *, SMAP *)); + * PUBLIC: int vs_sm_prev(SCR *, SMAP *, SMAP *); */ int vs_sm_prev(sp, p, t) @@ -1105,7 +1105,7 @@ vs_sm_prev(sp, p, t) * vs_sm_cursor -- * Return the SMAP entry referenced by the cursor. * - * PUBLIC: int vs_sm_cursor __P((SCR *, SMAP **)); + * PUBLIC: int vs_sm_cursor(SCR *, SMAP **); */ int vs_sm_cursor(sp, smpp) @@ -1146,7 +1146,7 @@ vs_sm_cursor(sp, smpp) * (The vi H, M and L commands.) Here because only the screen routines * know what's really out there. * - * PUBLIC: int vs_sm_position __P((SCR *, MARK *, u_long, pos_t)); + * PUBLIC: int vs_sm_position(SCR *, MARK *, u_long, pos_t); */ int vs_sm_position(sp, rp, cnt, pos) @@ -1230,7 +1230,7 @@ eof: msgq(sp, M_BERR, * Return the number of screen lines from an SMAP entry to the * start of some file line, less than a maximum value. * - * PUBLIC: recno_t vs_sm_nlines __P((SCR *, SMAP *, recno_t, size_t)); + * PUBLIC: recno_t vs_sm_nlines(SCR *, SMAP *, recno_t, size_t); */ recno_t vs_sm_nlines(sp, from_sp, to_lno, max) diff --git a/usr.bin/vi/vi/vs_split.c b/usr.bin/vi/vi/vs_split.c index 9c12cf69fa6..f281b1a702a 100644 --- a/usr.bin/vi/vi/vs_split.c +++ b/usr.bin/vi/vi/vs_split.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs_split.c,v 1.6 2001/01/29 01:58:55 niklas Exp $ */ +/* $OpenBSD: vs_split.c,v 1.7 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -29,13 +29,13 @@ static const char sccsid[] = "@(#)vs_split.c 10.31 (Berkeley) 10/13/96"; #include "../common/common.h" #include "vi.h" -static SCR *vs_getbg __P((SCR *, char *)); +static SCR *vs_getbg(SCR *, char *); /* * vs_split -- * Create a new screen. * - * PUBLIC: int vs_split __P((SCR *, SCR *, int)); + * PUBLIC: int vs_split(SCR *, SCR *, int); */ int vs_split(sp, new, ccl) @@ -196,7 +196,7 @@ vs_split(sp, new, ccl) * Discard the screen, folding the real-estate into a related screen, * if one exists, and return that screen. * - * PUBLIC: int vs_discard __P((SCR *, SCR **)); + * PUBLIC: int vs_discard(SCR *, SCR **); */ int vs_discard(sp, spp) @@ -283,7 +283,7 @@ vs_discard(sp, spp) * vs_fg -- * Background the current screen, and foreground a new one. * - * PUBLIC: int vs_fg __P((SCR *, SCR **, CHAR_T *, int)); + * PUBLIC: int vs_fg(SCR *, SCR **, CHAR_T *, int); */ int vs_fg(sp, nspp, name, newscreen) @@ -333,7 +333,7 @@ vs_fg(sp, nspp, name, newscreen) * vs_bg -- * Background the screen, and switch to the next one. * - * PUBLIC: int vs_bg __P((SCR *)); + * PUBLIC: int vs_bg(SCR *); */ int vs_bg(sp) @@ -372,7 +372,7 @@ vs_bg(sp) * vs_swap -- * Swap the current screen with a backgrounded one. * - * PUBLIC: int vs_swap __P((SCR *, SCR **, char *)); + * PUBLIC: int vs_swap(SCR *, SCR **, char *); */ int vs_swap(sp, nspp, name) @@ -464,7 +464,7 @@ vs_swap(sp, nspp, name) * vs_resize -- * Change the absolute size of the current screen. * - * PUBLIC: int vs_resize __P((SCR *, long, adj_t)); + * PUBLIC: int vs_resize(SCR *, long, adj_t); */ int vs_resize(sp, count, adj) diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c index 4c6d97c62eb..5a6d6f55ba5 100644 --- a/usr.bin/vis/vis.c +++ b/usr.bin/vis/vis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: vis.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */ /* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: vis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: vis.c,v 1.5 2002/02/16 21:27:58 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -56,8 +56,8 @@ static char rcsid[] = "$OpenBSD: vis.c,v 1.4 2001/11/19 19:02:17 mpech Exp $"; int eflags, fold, foldwidth=80, none, markeol, debug; -int foldit __P((char *, int, int)); -void process __P((FILE *, char *)); +int foldit(char *, int, int); +void process(FILE *, char *); int main(argc, argv) diff --git a/usr.bin/vmstat/dkstats.c b/usr.bin/vmstat/dkstats.c index 787a6781940..6d6d20d3ab7 100644 --- a/usr.bin/vmstat/dkstats.c +++ b/usr.bin/vmstat/dkstats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dkstats.c,v 1.14 2001/07/21 09:21:56 deraadt Exp $ */ +/* $OpenBSD: dkstats.c,v 1.15 2002/02/16 21:27:58 millert Exp $ */ /* $NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $ */ /* @@ -100,7 +100,7 @@ char **dr_name; #define timerset(tvp, uvp) ((uvp)->tv_sec = (tvp)->tv_sec); \ ((uvp)->tv_usec = (tvp)->tv_usec) -static void deref_kptr __P((void *, void *, size_t)); +static void deref_kptr(void *, void *, size_t); /* * Take the delta between the present values and the last recorded diff --git a/usr.bin/vmstat/dkstats.h b/usr.bin/vmstat/dkstats.h index fedb64ce047..231b7aa9240 100644 --- a/usr.bin/vmstat/dkstats.h +++ b/usr.bin/vmstat/dkstats.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dkstats.h,v 1.6 2001/05/14 07:09:59 angelos Exp $ */ +/* $OpenBSD: dkstats.h,v 1.7 2002/02/16 21:27:58 millert Exp $ */ /* $NetBSD: dkstats.h,v 1.1 1996/05/10 23:19:28 thorpej Exp $ */ /* @@ -49,6 +49,6 @@ struct _disk { long cp_time[CPUSTATES]; /* System timer ticks. */ }; -void dkswap __P((void)); -void dkreadstats __P((void)); -int dkinit __P((int)); +void dkswap(void); +void dkreadstats(void); +int dkinit(int); diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index 1cdd3b6bc19..acc3e0dcaa1 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1,5 +1,5 @@ /* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */ -/* $OpenBSD: vmstat.c,v 1.65 2002/02/01 14:31:19 art Exp $ */ +/* $OpenBSD: vmstat.c,v 1.66 2002/02/16 21:27:58 millert Exp $ */ /* * Copyright (c) 1980, 1986, 1991, 1993 @@ -137,20 +137,20 @@ kvm_t *kd; #define TIMESTAT 0x10 #define VMSTAT 0x20 -void cpustats __P((void)); -void dkstats __P((void)); -void dointr __P((void)); -void domem __P((void)); -void dopool __P((void)); -void dosum __P((void)); -void dovmstat __P((u_int, int)); -void kread __P((int, void *, size_t)); -void usage __P((void)); -void dotimes __P((void)); -void doforkst __P((void)); -void printhdr __P((void)); - -char **choosedrives __P((char **)); +void cpustats(void); +void dkstats(void); +void dointr(void); +void domem(void); +void dopool(void); +void dosum(void); +void dovmstat(u_int, int); +void kread(int, void *, size_t); +void usage(void); +void dotimes(void); +void doforkst(void); +void printhdr(void); + +char **choosedrives(char **); /* Namelist and memory file names. */ char *nlistf, *memf; diff --git a/usr.bin/w/extern.h b/usr.bin/w/extern.h index de201afd439..187117510f0 100644 --- a/usr.bin/w/extern.h +++ b/usr.bin/w/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/26 05:42:42 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1993 @@ -36,8 +36,8 @@ */ struct proc; -void fmt_puts __P((char *, int *)); -void fmt_putc __P((int, int *)); -void pr_attime __P((time_t *, time_t *)); -void pr_idle __P((time_t)); -int proc_compare __P((struct proc *, struct proc *)); +void fmt_puts(char *, int *); +void fmt_putc(int, int *); +void pr_attime(time_t *, time_t *); +void pr_idle(time_t); +int proc_compare(struct proc *, struct proc *); diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 1b8b7dbde29..7b99d2a9ccc 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -1,4 +1,4 @@ -/* $OpenBSD: w.c,v 1.34 2001/07/12 05:17:31 deraadt Exp $ */ +/* $OpenBSD: w.c,v 1.35 2002/02/16 21:27:58 millert Exp $ */ /*- * Copyright (c) 1980, 1991, 1993, 1994 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94"; #else -static char *rcsid = "$OpenBSD: w.c,v 1.34 2001/07/12 05:17:31 deraadt Exp $"; +static char *rcsid = "$OpenBSD: w.c,v 1.35 2002/02/16 21:27:58 millert Exp $"; #endif #endif /* not lint */ @@ -114,11 +114,11 @@ struct entry { struct kinfo_proc *kp; /* `most interesting' proc */ } *ep, *ehead = NULL, **nextp = &ehead; -static void pr_args __P((struct kinfo_proc *)); -static void pr_header __P((time_t *, int)); +static void pr_args(struct kinfo_proc *); +static void pr_header(time_t *, int); static struct stat - *ttystat __P((char *)); -static void usage __P((int)); + *ttystat(char *); +static void usage(int); int main(argc, argv) diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c index 796ed62a3fe..7316aded68f 100644 --- a/usr.bin/wc/wc.c +++ b/usr.bin/wc/wc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wc.c,v 1.6 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: wc.c,v 1.7 2002/02/16 21:27:58 millert Exp $ */ /* * Copyright (c) 1980, 1987, 1991, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95"; #else -static char rcsid[] = "$OpenBSD: wc.c,v 1.6 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: wc.c,v 1.7 2002/02/16 21:27:58 millert Exp $"; #endif #endif /* not lint */ @@ -63,8 +63,8 @@ int doline, doword, dochar; int rval; extern char *__progname; -void print_counts __P((int64_t, int64_t, int64_t, char *)); -void cnt __P((char *)); +void print_counts(int64_t, int64_t, int64_t, char *); +void cnt(char *); int main(argc, argv) diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index 3ff87c58fa1..0e8c22fcc35 100644 --- a/usr.bin/what/what.c +++ b/usr.bin/what/what.c @@ -1,4 +1,4 @@ -/* $OpenBSD: what.c,v 1.6 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: what.c,v 1.7 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: what.c,v 1.6 2001/11/19 19:02:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: what.c,v 1.7 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: what.c,v 1.6 2001/11/19 19:02:17 mpech Exp $"; #include <err.h> #include <string.h> -void search __P((char *)); +void search(char *); /* * what diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c index 8f74ead0425..79ff0e59385 100644 --- a/usr.bin/whatis/whatis.c +++ b/usr.bin/whatis/whatis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whatis.c,v 1.6 2001/11/19 19:02:17 mpech Exp $ */ +/* $OpenBSD: whatis.c,v 1.7 2002/02/16 21:27:59 millert Exp $ */ /* * Copyright (c) 1987, 1993 @@ -60,10 +60,10 @@ static char sccsid[] = "@(#)whatis.c 8.5 (Berkeley) 11/26/93"; static int *found, foundman; extern char *__progname; -void dashtrunc __P((char *, char *)); -int match __P((char *, char *)); -void usage __P((void)); -void whatis __P((char **, char *, int)); +void dashtrunc(char *, char *); +int match(char *, char *); +void usage(void); +void whatis(char **, char *, int); int main(argc, argv) diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index 6827e2ce0e0..fef3eb6b0b5 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -1,4 +1,4 @@ -/* $OpenBSD: which.c,v 1.5 1998/06/21 22:14:05 millert Exp $ */ +/* $OpenBSD: which.c,v 1.6 2002/02/16 21:27:59 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: which.c,v 1.5 1998/06/21 22:14:05 millert Exp $"; +static char rcsid[] = "$OpenBSD: which.c,v 1.6 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -48,8 +48,8 @@ static char rcsid[] = "$OpenBSD: which.c,v 1.5 1998/06/21 22:14:05 millert Exp $ extern char *__progname; -int findprog __P((char *, char *, int, int)); -void usage __P((void)); +int findprog(char *, char *, int, int); +void usage(void); /* * which(1) -- find an executable(s) in the user's path diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c index f39f954e1de..7dacf6da813 100644 --- a/usr.bin/who/who.c +++ b/usr.bin/who/who.c @@ -1,4 +1,4 @@ -/* $OpenBSD: who.c,v 1.11 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: who.c,v 1.12 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: who.c,v 1.11 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: who.c,v 1.12 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -63,11 +63,11 @@ static char rcsid[] = "$OpenBSD: who.c,v 1.11 2001/11/19 19:02:18 mpech Exp $"; #include <err.h> #include <locale.h> -void output __P((struct utmp *)); -void output_labels __P((void)); -void who_am_i __P((FILE *)); -void usage __P((void)); -FILE *file __P((char *)); +void output(struct utmp *); +void output_labels(void); +void who_am_i(FILE *); +void usage(void); +FILE *file(char *); int only_current_term; /* show info about the current terminal only */ int show_term; /* show term state */ diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index d92cdb88d40..652d1eab3f6 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whois.c,v 1.13 2002/01/21 00:55:55 stevesk Exp $ */ +/* $OpenBSD: whois.c,v 1.14 2002/02/16 21:27:59 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: whois.c,v 1.13 2002/01/21 00:55:55 stevesk Exp $"; +static char rcsid[] = "$OpenBSD: whois.c,v 1.14 2002/02/16 21:27:59 millert Exp $"; #endif #endif /* not lint */ @@ -75,8 +75,8 @@ static char rcsid[] = "$OpenBSD: whois.c,v 1.13 2002/01/21 00:55:55 stevesk Exp #define WHOIS_INIC_FALLBACK 0x02 #define WHOIS_QUICK 0x04 -static void usage __P((void)); -static void whois __P((char *, struct addrinfo *, int)); +static void usage(void); +static void whois(char *, struct addrinfo *, int); int main(argc, argv) diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c index 355c05b9095..7597973b31a 100644 --- a/usr.bin/write/write.c +++ b/usr.bin/write/write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: write.c,v 1.14 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: write.c,v 1.15 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95"; #endif -static char *rcsid = "$OpenBSD: write.c,v 1.14 2001/11/19 19:02:18 mpech Exp $"; +static char *rcsid = "$OpenBSD: write.c,v 1.15 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -66,12 +66,12 @@ static char *rcsid = "$OpenBSD: write.c,v 1.14 2001/11/19 19:02:18 mpech Exp $"; #include <err.h> #include <vis.h> -void done __P((int sig)); -void do_write __P((char *, char *, uid_t)); -void wr_fputs __P((char *)); -void search_utmp __P((char *, char *, char *, uid_t)); -int term_chk __P((char *, int *, time_t *, int)); -int utmp_chk __P((char *, char *)); +void done(int sig); +void do_write(char *, char *, uid_t); +void wr_fputs(char *); +void search_utmp(char *, char *, char *, uid_t); +int term_chk(char *, int *, time_t *, int); +int utmp_chk(char *, char *); int main(argc, argv) diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 63d8ca80951..1b54bf03ce1 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xargs.c,v 1.9 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: xargs.c,v 1.10 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93"; #endif -static char rcsid[] = "$OpenBSD: xargs.c,v 1.9 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: xargs.c,v 1.10 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -66,8 +66,8 @@ static char rcsid[] = "$OpenBSD: xargs.c,v 1.9 2001/11/19 19:02:18 mpech Exp $"; int tflag, rval; int zflag; -void run __P((char **)); -void usage __P((void)); +void run(char **); +void usage(void); int main(argc, argv) diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 30d02072d79..8115450cd4e 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.30 2002/01/24 23:01:19 millert Exp $ */ +/* $OpenBSD: xinstall.c,v 1.31 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static char rcsid[] = "$OpenBSD: xinstall.c,v 1.30 2002/01/24 23:01:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: xinstall.c,v 1.31 2002/02/16 21:27:59 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -82,15 +82,15 @@ char *suffix = BACKUP_SUFFIX; uid_t uid; gid_t gid; -void copy __P((int, char *, int, char *, off_t, int)); -int compare __P((int, const char *, size_t, int, const char *, size_t)); -void install __P((char *, char *, u_long, u_int)); -void install_dir __P((char *)); -void strip __P((char *)); -void usage __P((void)); -int create_newfile __P((char *, struct stat *)); -int create_tempfile __P((char *, char *, size_t)); -int file_write __P((int, char *, size_t, int *, int *, int)); +void copy(int, char *, int, char *, off_t, int); +int compare(int, const char *, size_t, int, const char *, size_t); +void install(char *, char *, u_long, u_int); +void install_dir(char *); +void strip(char *); +void usage(void); +int create_newfile(char *, struct stat *); +int create_tempfile(char *, char *, size_t); +int file_write(int, char *, size_t, int *, int *, int); int main(argc, argv) diff --git a/usr.bin/xlint/lint1/cgram.y b/usr.bin/xlint/lint1/cgram.y index 7fdc3d44e63..9a7d5237a7d 100644 --- a/usr.bin/xlint/lint1/cgram.y +++ b/usr.bin/xlint/lint1/cgram.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: cgram.y,v 1.3 1996/06/26 05:44:08 deraadt Exp $ */ +/* $OpenBSD: cgram.y,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: cgram.y,v 1.8 1995/10/02 17:31:35 jpo Exp $ */ /* @@ -34,7 +34,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: cgram.y,v 1.3 1996/06/26 05:44:08 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: cgram.y,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdlib.h> @@ -56,9 +56,9 @@ int blklev; */ int mblklev; -static int toicon __P((tnode_t *)); -static void idecl __P((sym_t *, int)); -static void ignuptorp __P((void)); +static int toicon(tnode_t *); +static void idecl(sym_t *, int); +static void ignuptorp(void); %} diff --git a/usr.bin/xlint/lint1/decl.c b/usr.bin/xlint/lint1/decl.c index 6ea28efb294..21f10176ae2 100644 --- a/usr.bin/xlint/lint1/decl.c +++ b/usr.bin/xlint/lint1/decl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: decl.c,v 1.6 2001/11/19 19:22:43 deraadt Exp $ */ +/* $OpenBSD: decl.c,v 1.7 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: decl.c,v 1.11 1995/10/02 17:34:16 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: decl.c,v 1.6 2001/11/19 19:22:43 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: decl.c,v 1.7 2002/02/16 21:27:59 millert Exp $"; #endif #include <sys/param.h> @@ -60,25 +60,25 @@ int enumval; */ dinfo_t *dcs; -static type_t *tdeferr __P((type_t *, tspec_t)); -static void settdsym __P((type_t *, sym_t *)); -static tspec_t mrgtspec __P((tspec_t, tspec_t)); -static void align __P((int, int)); -static sym_t *newtag __P((sym_t *, scl_t, int, int)); -static int eqargs __P((type_t *, type_t *, int *)); -static int mnoarg __P((type_t *, int *)); -static int chkosdef __P((sym_t *, sym_t *)); -static int chkptdecl __P((sym_t *, sym_t *)); -static sym_t *nsfunc __P((sym_t *, sym_t *)); -static void osfunc __P((sym_t *, sym_t *)); -static void ledecl __P((sym_t *)); -static int chkinit __P((sym_t *)); -static void chkausg __P((int, sym_t *)); -static void chkvusg __P((int, sym_t *)); -static void chklusg __P((sym_t *)); -static void chktusg __P((sym_t *)); -static void chkglvar __P((sym_t *)); -static void glchksz __P((sym_t *)); +static type_t *tdeferr(type_t *, tspec_t); +static void settdsym(type_t *, sym_t *); +static tspec_t mrgtspec(tspec_t, tspec_t); +static void align(int, int); +static sym_t *newtag(sym_t *, scl_t, int, int); +static int eqargs(type_t *, type_t *, int *); +static int mnoarg(type_t *, int *); +static int chkosdef(sym_t *, sym_t *); +static int chkptdecl(sym_t *, sym_t *); +static sym_t *nsfunc(sym_t *, sym_t *); +static void osfunc(sym_t *, sym_t *); +static void ledecl(sym_t *); +static int chkinit(sym_t *); +static void chkausg(int, sym_t *); +static void chkvusg(int, sym_t *); +static void chklusg(sym_t *); +static void chktusg(sym_t *); +static void chkglvar(sym_t *); +static void glchksz(sym_t *); /* * initializes all global vars used in declarations diff --git a/usr.bin/xlint/lint1/emit.c b/usr.bin/xlint/lint1/emit.c index 5d2156a50cf..18dfaf49a62 100644 --- a/usr.bin/xlint/lint1/emit.c +++ b/usr.bin/xlint/lint1/emit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emit.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $ */ +/* $OpenBSD: emit.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: emit.c,v 1.2 1995/07/03 21:24:00 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: emit.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: emit.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdio.h> @@ -50,7 +50,7 @@ static FILE *lout; /* output buffer data */ ob_t ob; -static void outxbuf __P((void)); +static void outxbuf(void); /* diff --git a/usr.bin/xlint/lint1/emit1.c b/usr.bin/xlint/lint1/emit1.c index 83ae2df2e58..d51333e40d5 100644 --- a/usr.bin/xlint/lint1/emit1.c +++ b/usr.bin/xlint/lint1/emit1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emit1.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $ */ +/* $OpenBSD: emit1.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: emit1.c,v 1.4 1995/10/02 17:21:28 jpo Exp $ */ /* @@ -33,15 +33,15 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: emit1.c,v 1.2 1996/06/26 05:44:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: emit1.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; #endif #include <ctype.h> #include "lint1.h" -static void outtt __P((sym_t *, sym_t *)); -static void outfstrg __P((strg_t *)); +static void outtt(sym_t *, sym_t *); +static void outfstrg(strg_t *); /* * Write type into the output buffer. diff --git a/usr.bin/xlint/lint1/err.c b/usr.bin/xlint/lint1/err.c index ebe82b21094..435e9627922 100644 --- a/usr.bin/xlint/lint1/err.c +++ b/usr.bin/xlint/lint1/err.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err.c,v 1.3 1998/07/27 16:53:40 deraadt Exp $ */ +/* $OpenBSD: err.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: err.c,v 1.8 1995/10/02 17:37:00 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: err.c,v 1.3 1998/07/27 16:53:40 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: err.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif /* number of errors found */ @@ -51,9 +51,9 @@ int sytxerr; #include "lint1.h" -static const char *basename __P((const char *)); -static void verror __P((int, va_list)); -static void vwarning __P((int, va_list)); +static const char *basename(const char *); +static void verror(int, va_list); +static void vwarning(int, va_list); const char *msgs[] = { diff --git a/usr.bin/xlint/lint1/externs.h b/usr.bin/xlint/lint1/externs.h index a4755975e45..afbdbb58fd9 100644 --- a/usr.bin/xlint/lint1/externs.h +++ b/usr.bin/xlint/lint1/externs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: externs.h,v 1.2 1996/06/26 05:44:12 deraadt Exp $ */ +/* $OpenBSD: externs.h,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: externs.h,v 1.2 1995/07/03 21:24:06 cgd Exp $ */ /* @@ -35,23 +35,23 @@ /* * mem.c */ -extern void *xmalloc __P((size_t)); -extern void *xcalloc __P((size_t, size_t)); -extern void *xrealloc __P((void *, size_t)); -extern char *xstrdup __P((const char *)); -extern void nomem __P((void)); +extern void *xmalloc(size_t); +extern void *xcalloc(size_t, size_t); +extern void *xrealloc(void *, size_t); +extern char *xstrdup(const char *); +extern void nomem(void); /* * emit.c */ extern ob_t ob; -extern void outopen __P((const char *)); -extern void outclose __P((void)); -extern void outclr __P((void)); -extern void outchar __P((int)); -extern void outqchar __P((int)); -extern void outstrg __P((const char *)); -extern void outint __P((int)); -extern void outname __P((const char *)); -extern void outsrc __P((const char *)); +extern void outopen(const char *); +extern void outclose(void); +extern void outclr(void); +extern void outchar(int); +extern void outqchar(int); +extern void outstrg(const char *); +extern void outint(int); +extern void outname(const char *); +extern void outsrc(const char *); diff --git a/usr.bin/xlint/lint1/externs1.h b/usr.bin/xlint/lint1/externs1.h index 052e432eca4..dcc078dead3 100644 --- a/usr.bin/xlint/lint1/externs1.h +++ b/usr.bin/xlint/lint1/externs1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: externs1.h,v 1.2 1996/06/26 05:44:12 deraadt Exp $ */ +/* $OpenBSD: externs1.h,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: externs1.h,v 1.7 1995/10/02 17:31:39 jpo Exp $ */ /* @@ -52,7 +52,7 @@ extern int vflag; extern int yflag; extern int zflag; -extern void norecover __P((void)); +extern void norecover(void); /* * cgram.y @@ -61,8 +61,8 @@ extern int blklev; extern int mblklev; extern int yydebug; -extern int yyerror __P((char *)); -extern int yyparse __P((void)); +extern int yyerror(char *); +extern int yyparse(void); /* * scan.l @@ -73,39 +73,39 @@ extern symt_t symtyp; extern FILE *yyin; extern u_quad_t qbmasks[], qlmasks[], qumasks[]; -extern void initscan __P((void)); -extern int sign __P((quad_t, tspec_t, int)); -extern int msb __P((quad_t, tspec_t, int)); -extern quad_t xsign __P((quad_t, tspec_t, int)); -extern void clrwflgs __P((void)); -extern sym_t *getsym __P((sbuf_t *)); -extern void cleanup __P((void)); -extern sym_t *pushdown __P((sym_t *)); -extern void rmsym __P((sym_t *)); -extern void rmsyms __P((sym_t *)); -extern void inssym __P((int, sym_t *)); -extern void freeyyv __P((void *, int)); -extern int yylex __P((void)); +extern void initscan(void); +extern int sign(quad_t, tspec_t, int); +extern int msb(quad_t, tspec_t, int); +extern quad_t xsign(quad_t, tspec_t, int); +extern void clrwflgs(void); +extern sym_t *getsym(sbuf_t *); +extern void cleanup(void); +extern sym_t *pushdown(sym_t *); +extern void rmsym(sym_t *); +extern void rmsyms(sym_t *); +extern void inssym(int, sym_t *); +extern void freeyyv(void *, int); +extern int yylex(void); /* * mem1.c */ -extern const char *fnalloc __P((const char *)); -extern const char *fnnalloc __P((const char *, size_t)); -extern int getfnid __P((const char *)); +extern const char *fnalloc(const char *); +extern const char *fnnalloc(const char *, size_t); +extern int getfnid(const char *); -extern void initmem __P((void)); +extern void initmem(void); -extern void *getblk __P((size_t)); -extern void *getlblk __P((int, size_t)); -extern void freeblk __P((void)); -extern void freelblk __P((int)); +extern void *getblk(size_t); +extern void *getlblk(int, size_t); +extern void freeblk(void); +extern void freelblk(int); -extern void *tgetblk __P((size_t)); -extern tnode_t *getnode __P((void)); -extern void tfreeblk __P((void)); -extern struct mbl *tsave __P((void)); -extern void trestor __P((struct mbl *)); +extern void *tgetblk(size_t); +extern tnode_t *getnode(void); +extern void tfreeblk(void); +extern struct mbl *tsave(void); +extern void trestor(struct mbl *); /* * err.c @@ -114,11 +114,11 @@ extern int nerr; extern int sytxerr; extern const char *msgs[]; -extern void error __P((int, ...)); -extern void warning __P((int, ...)); -extern void message __P((int, ...)); -extern int gnuism __P((int, ...)); -extern void lerror __P((const char *, ...)); +extern void error(int, ...); +extern void warning(int, ...); +extern void message(int, ...); +extern int gnuism(int, ...); +extern void lerror(const char *, ...); /* * decl.c @@ -127,82 +127,82 @@ extern dinfo_t *dcs; extern const char *unnamed; extern int enumval; -extern void initdecl __P((void)); -extern type_t *gettyp __P((tspec_t)); -extern type_t *duptyp __P((const type_t *)); -extern type_t *tduptyp __P((const type_t *)); -extern int incompl __P((type_t *)); -extern void setcompl __P((type_t *, int)); -extern void addscl __P((scl_t)); -extern void addtype __P((type_t *)); -extern void addqual __P((tqual_t)); -extern void pushdecl __P((scl_t)); -extern void popdecl __P((void)); -extern void setasm __P((void)); -extern void clrtyp __P((void)); -extern void deftyp __P((void)); -extern int length __P((type_t *, const char *)); -extern int getbound __P((type_t *)); -extern sym_t *lnklst __P((sym_t *, sym_t *)); -extern void chktyp __P((sym_t *)); -extern sym_t *decl1str __P((sym_t *)); -extern sym_t *bitfield __P((sym_t *, int)); -extern pqinf_t *mergepq __P((pqinf_t *, pqinf_t *)); -extern sym_t *addptr __P((sym_t *, pqinf_t *)); -extern sym_t *addarray __P((sym_t *, int, int)); -extern sym_t *addfunc __P((sym_t *, sym_t *)); -extern void chkfdef __P((sym_t *, int)); -extern sym_t *dname __P((sym_t *)); -extern sym_t *iname __P((sym_t *)); -extern type_t *mktag __P((sym_t *, tspec_t, int, int)); -extern const char *scltoa __P((scl_t)); -extern type_t *compltag __P((type_t *, sym_t *)); -extern sym_t *ename __P((sym_t *, int, int)); -extern void decl1ext __P((sym_t *, int)); -extern void cpuinfo __P((sym_t *, sym_t *)); -extern int isredec __P((sym_t *, int *)); -extern int eqtype __P((type_t *, type_t *, int, int, int *)); -extern void compltyp __P((sym_t *, sym_t *)); -extern sym_t *decl1arg __P((sym_t *, int)); -extern void cluparg __P((void)); -extern void decl1loc __P((sym_t *, int)); -extern sym_t *aname __P((void)); -extern void globclup __P((void)); -extern sym_t *decl1abs __P((sym_t *)); -extern void chksz __P((sym_t *)); -extern void setsflg __P((sym_t *)); -extern void setuflg __P((sym_t *, int, int)); -extern void chkusage __P((dinfo_t *)); -extern void chkusg1 __P((int, sym_t *)); -extern void chkglsyms __P((void)); -extern void prevdecl __P((int, sym_t *)); +extern void initdecl(void); +extern type_t *gettyp(tspec_t); +extern type_t *duptyp(const type_t *); +extern type_t *tduptyp(const type_t *); +extern int incompl(type_t *); +extern void setcompl(type_t *, int); +extern void addscl(scl_t); +extern void addtype(type_t *); +extern void addqual(tqual_t); +extern void pushdecl(scl_t); +extern void popdecl(void); +extern void setasm(void); +extern void clrtyp(void); +extern void deftyp(void); +extern int length(type_t *, const char *); +extern int getbound(type_t *); +extern sym_t *lnklst(sym_t *, sym_t *); +extern void chktyp(sym_t *); +extern sym_t *decl1str(sym_t *); +extern sym_t *bitfield(sym_t *, int); +extern pqinf_t *mergepq(pqinf_t *, pqinf_t *); +extern sym_t *addptr(sym_t *, pqinf_t *); +extern sym_t *addarray(sym_t *, int, int); +extern sym_t *addfunc(sym_t *, sym_t *); +extern void chkfdef(sym_t *, int); +extern sym_t *dname(sym_t *); +extern sym_t *iname(sym_t *); +extern type_t *mktag(sym_t *, tspec_t, int, int); +extern const char *scltoa(scl_t); +extern type_t *compltag(type_t *, sym_t *); +extern sym_t *ename(sym_t *, int, int); +extern void decl1ext(sym_t *, int); +extern void cpuinfo(sym_t *, sym_t *); +extern int isredec(sym_t *, int *); +extern int eqtype(type_t *, type_t *, int, int, int *); +extern void compltyp(sym_t *, sym_t *); +extern sym_t *decl1arg(sym_t *, int); +extern void cluparg(void); +extern void decl1loc(sym_t *, int); +extern sym_t *aname(void); +extern void globclup(void); +extern sym_t *decl1abs(sym_t *); +extern void chksz(sym_t *); +extern void setsflg(sym_t *); +extern void setuflg(sym_t *, int, int); +extern void chkusage(dinfo_t *); +extern void chkusg1(int, sym_t *); +extern void chkglsyms(void); +extern void prevdecl(int, sym_t *); /* * tree.c */ -extern void initmtab __P((void)); -extern type_t *incref __P((type_t *, tspec_t)); -extern type_t *tincref __P((type_t *, tspec_t)); -extern tnode_t *getcnode __P((type_t *, val_t *)); -extern tnode_t *getnnode __P((sym_t *, int)); -extern tnode_t *getsnode __P((strg_t *)); -extern sym_t *strmemb __P((tnode_t *, op_t, sym_t *)); -extern tnode_t *build __P((op_t, tnode_t *, tnode_t *)); -extern tnode_t *cconv __P((tnode_t *)); -extern int typeok __P((op_t, int, tnode_t *, tnode_t *)); -extern tnode_t *promote __P((op_t, int, tnode_t *)); -extern tnode_t *convert __P((op_t, int, type_t *, tnode_t *)); -extern void cvtcon __P((op_t, int, type_t *, val_t *, val_t *)); -extern const char *tyname __P((type_t *)); -extern tnode_t *bldszof __P((type_t *)); -extern tnode_t *cast __P((tnode_t *, type_t *)); -extern tnode_t *funcarg __P((tnode_t *, tnode_t *)); -extern tnode_t *funccall __P((tnode_t *, tnode_t *)); -extern val_t *constant __P((tnode_t *)); -extern void expr __P((tnode_t *, int, int)); -extern void chkmisc __P((tnode_t *, int, int, int, int, int, int)); -extern int conaddr __P((tnode_t *, sym_t **, ptrdiff_t *)); -extern strg_t *catstrg __P((strg_t *, strg_t *)); +extern void initmtab(void); +extern type_t *incref(type_t *, tspec_t); +extern type_t *tincref(type_t *, tspec_t); +extern tnode_t *getcnode(type_t *, val_t *); +extern tnode_t *getnnode(sym_t *, int); +extern tnode_t *getsnode(strg_t *); +extern sym_t *strmemb(tnode_t *, op_t, sym_t *); +extern tnode_t *build(op_t, tnode_t *, tnode_t *); +extern tnode_t *cconv(tnode_t *); +extern int typeok(op_t, int, tnode_t *, tnode_t *); +extern tnode_t *promote(op_t, int, tnode_t *); +extern tnode_t *convert(op_t, int, type_t *, tnode_t *); +extern void cvtcon(op_t, int, type_t *, val_t *, val_t *); +extern const char *tyname(type_t *); +extern tnode_t *bldszof(type_t *); +extern tnode_t *cast(tnode_t *, type_t *); +extern tnode_t *funcarg(tnode_t *, tnode_t *); +extern tnode_t *funccall(tnode_t *, tnode_t *); +extern val_t *constant(tnode_t *); +extern void expr(tnode_t *, int, int); +extern void chkmisc(tnode_t *, int, int, int, int, int, int); +extern int conaddr(tnode_t *, sym_t **, ptrdiff_t *); +extern strg_t *catstrg(strg_t *, strg_t *); /* * func.c @@ -225,39 +225,39 @@ extern int nowarn; extern int plibflg; extern int quadflg; -extern void pushctrl __P((int)); -extern void popctrl __P((int)); -extern void chkreach __P((void)); -extern void funcdef __P((sym_t *)); -extern void funcend __P((void)); -extern void label __P((int, sym_t *, tnode_t *)); -extern void if1 __P((tnode_t *)); -extern void if2 __P((void)); -extern void if3 __P((int)); -extern void switch1 __P((tnode_t *)); -extern void switch2 __P((void)); -extern void while1 __P((tnode_t *)); -extern void while2 __P((void)); -extern void do1 __P((void)); -extern void do2 __P((tnode_t *)); -extern void for1 __P((tnode_t *, tnode_t *, tnode_t *)); -extern void for2 __P((void)); -extern void dogoto __P((sym_t *)); -extern void docont __P((void)); -extern void dobreak __P((void)); -extern void doreturn __P((tnode_t *)); -extern void glclup __P((int)); -extern void argsused __P((int)); -extern void constcond __P((int)); -extern void fallthru __P((int)); -extern void notreach __P((int)); -extern void lintlib __P((int)); -extern void linted __P((int)); -extern void varargs __P((int)); -extern void printflike __P((int)); -extern void scanflike __P((int)); -extern void protolib __P((int)); -extern void longlong __P((int)); +extern void pushctrl(int); +extern void popctrl(int); +extern void chkreach(void); +extern void funcdef(sym_t *); +extern void funcend(void); +extern void label(int, sym_t *, tnode_t *); +extern void if1(tnode_t *); +extern void if2(void); +extern void if3(int); +extern void switch1(tnode_t *); +extern void switch2(void); +extern void while1(tnode_t *); +extern void while2(void); +extern void do1(void); +extern void do2(tnode_t *); +extern void for1(tnode_t *, tnode_t *, tnode_t *); +extern void for2(void); +extern void dogoto(sym_t *); +extern void docont(void); +extern void dobreak(void); +extern void doreturn(tnode_t *); +extern void glclup(int); +extern void argsused(int); +extern void constcond(int); +extern void fallthru(int); +extern void notreach(int); +extern void lintlib(int); +extern void linted(int); +extern void varargs(int); +extern void printflike(int); +extern void scanflike(int); +extern void protolib(int); +extern void longlong(int); /* * init.c @@ -266,17 +266,17 @@ extern int initerr; extern sym_t *initsym; extern int startinit; -extern void prepinit __P((void)); -extern void initrbr __P((void)); -extern void initlbr __P((void)); -extern void mkinit __P((tnode_t *)); +extern void prepinit(void); +extern void initrbr(void); +extern void initlbr(void); +extern void mkinit(tnode_t *); /* * emit.c */ -extern void outtype __P((type_t *)); -extern const char *ttos __P((type_t *)); -extern void outsym __P((sym_t *, scl_t, def_t)); -extern void outfdef __P((sym_t *, pos_t *, int, int, sym_t *)); -extern void outcall __P((tnode_t *, int, int)); -extern void outusg __P((sym_t *)); +extern void outtype(type_t *); +extern const char *ttos(type_t *); +extern void outsym(sym_t *, scl_t, def_t); +extern void outfdef(sym_t *, pos_t *, int, int, sym_t *); +extern void outcall(tnode_t *, int, int); +extern void outusg(sym_t *); diff --git a/usr.bin/xlint/lint1/init.c b/usr.bin/xlint/lint1/init.c index 3d56f25c07c..f0a0d86a889 100644 --- a/usr.bin/xlint/lint1/init.c +++ b/usr.bin/xlint/lint1/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: init.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: init.c,v 1.4 1995/10/02 17:21:37 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: init.c,v 1.3 2001/09/19 10:58:07 mpech Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdlib.h> @@ -54,12 +54,12 @@ sym_t *initsym; istk_t *initstk; -static void popi2 __P((void)); -static void popinit __P((int)); -static void pushinit __P((void)); -static void testinit __P((void)); -static void nextinit __P((int)); -static int strginit __P((tnode_t *)); +static void popi2(void); +static void popinit(int); +static void pushinit(void); +static void testinit(void); +static void nextinit(int); +static int strginit(tnode_t *); /* diff --git a/usr.bin/xlint/lint1/main1.c b/usr.bin/xlint/lint1/main1.c index 880286d0411..1e00c57e7b7 100644 --- a/usr.bin/xlint/lint1/main1.c +++ b/usr.bin/xlint/lint1/main1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main1.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $ */ +/* $OpenBSD: main1.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: main1.c,v 1.3 1995/10/02 17:29:56 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: main1.c,v 1.2 1996/06/26 05:44:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main1.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdio.h> @@ -105,7 +105,7 @@ int vflag = 1; /* Complain about structures which are never defined. */ int zflag = 1; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.bin/xlint/lint1/mem1.c b/usr.bin/xlint/lint1/mem1.c index 0e498a85c2a..e2f28521a63 100644 --- a/usr.bin/xlint/lint1/mem1.c +++ b/usr.bin/xlint/lint1/mem1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem1.c,v 1.3 2001/05/11 16:06:06 art Exp $ */ +/* $OpenBSD: mem1.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: mem1.c,v 1.2 1995/07/03 21:24:25 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mem1.c,v 1.3 2001/05/11 16:06:06 art Exp $"; +static char rcsid[] = "$OpenBSD: mem1.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <sys/types.h> @@ -58,7 +58,7 @@ typedef struct fn { static fn_t *fnames; -static fn_t *srchfn __P((const char *, size_t)); +static fn_t *srchfn(const char *, size_t); /* * Look for a Filename of length l. @@ -164,9 +164,9 @@ static mbl_t *frmblks; /* length of new allocated memory blocks */ static size_t mblklen; -static void *xgetblk __P((mbl_t **, size_t)); -static void xfreeblk __P((mbl_t **)); -static mbl_t *xnewblk __P((void)); +static void *xgetblk(mbl_t **, size_t); +static void xfreeblk(mbl_t **); +static mbl_t *xnewblk(void); static mbl_t * xnewblk() diff --git a/usr.bin/xlint/lint1/scan.l b/usr.bin/xlint/lint1/scan.l index 11ee1dad37d..49d2acbbea9 100644 --- a/usr.bin/xlint/lint1/scan.l +++ b/usr.bin/xlint/lint1/scan.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scan.l,v 1.3 1996/06/26 05:44:18 deraadt Exp $ */ +/* $OpenBSD: scan.l,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: scan.l,v 1.8 1995/10/23 13:38:51 jpo Exp $ */ /* @@ -34,7 +34,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: scan.l,v 1.3 1996/06/26 05:44:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: scan.l,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdlib.h> @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: scan.l,v 1.3 1996/06/26 05:44:18 deraadt Exp $" #define CHAR_MASK (~(~0 << CHAR_BIT)) /* XXX declaration of strtouq() is missing in stdlib.h ? */ -extern u_quad_t strtouq __P((const char *, char **, int)); +extern u_quad_t strtouq(const char *, char **, int); /* Current position (its also updated when an included file is parsed) */ pos_t curr_pos = { 1, "" }; @@ -63,25 +63,25 @@ pos_t curr_pos = { 1, "" }; */ pos_t csrc_pos = { 1, "" }; -static void incline __P((void)); -static void badchar __P((int)); -static sbuf_t *allocsb __P((void)); -static void freesb __P((sbuf_t *)); -static int inpc __P((void)); -static int hash __P((const char *)); -static sym_t *search __P((sbuf_t *)); -static int name __P((void)); -static int keyw __P((sym_t *)); -static int icon __P((int)); -static int fcon __P((void)); -static int operator __P((int, op_t)); -static int ccon __P((void)); -static int wccon __P((void)); -static int getescc __P((int)); -static void directive __P((void)); -static void comment __P((void)); -static int string __P((void)); -static int wcstrg __P((void)); +static void incline(void); +static void badchar(int); +static sbuf_t *allocsb(void); +static void freesb(sbuf_t *); +static int inpc(void); +static int hash(const char *); +static sym_t *search(sbuf_t *); +static int name(void); +static int keyw(sym_t *); +static int icon(int); +static int fcon(void); +static int operator(int, op_t); +static int ccon(void); +static int wccon(void); +static int getescc(int); +static void directive(void); +static void comment(void); +static int string(void); +static int wcstrg(void); %} @@ -1009,7 +1009,7 @@ comment() static struct { const char *keywd; int arg; - void (*func) __P((int)); + void (*func)(int); } keywtab[] = { { "ARGSUSED", 1, argsused }, { "CONSTCOND", 0, constcond }, diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c index 2ab3833ba4e..a9669d4ba19 100644 --- a/usr.bin/xlint/lint1/tree.c +++ b/usr.bin/xlint/lint1/tree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: tree.c,v 1.6 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: tree.c,v 1.12 1995/10/02 17:37:57 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $"; +static char rcsid[] = "$OpenBSD: tree.c,v 1.6 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdlib.h> @@ -48,40 +48,40 @@ static char rcsid[] = "$OpenBSD: tree.c,v 1.5 2001/09/19 10:58:07 mpech Exp $"; /* Various flags for each operator. */ static mod_t modtab[NOPS]; -static tnode_t *getinode __P((tspec_t, quad_t)); -static void ptrcmpok __P((op_t, tnode_t *, tnode_t *)); -static int asgntypok __P((op_t, int, tnode_t *, tnode_t *)); -static void chkbeop __P((op_t, tnode_t *, tnode_t *)); -static void chkeop2 __P((op_t, int, tnode_t *, tnode_t *)); -static void chkeop1 __P((op_t, int, tnode_t *, tnode_t *)); -static tnode_t *mktnode __P((op_t, type_t *, tnode_t *, tnode_t *)); -static void balance __P((op_t, tnode_t **, tnode_t **)); -static void incompat __P((op_t, tspec_t, tspec_t)); -static void illptrc __P((mod_t *, type_t *, type_t *)); -static void mrgqual __P((type_t **, type_t *, type_t *)); -static int conmemb __P((type_t *)); -static void ptconv __P((int, tspec_t, tspec_t, type_t *, tnode_t *)); -static void iiconv __P((op_t, int, tspec_t, tspec_t, type_t *, tnode_t *)); -static void piconv __P((op_t, tspec_t, type_t *, tnode_t *)); -static void ppconv __P((op_t, tnode_t *, type_t *)); -static tnode_t *bldstr __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldincdec __P((op_t, tnode_t *)); -static tnode_t *bldamper __P((tnode_t *, int)); -static tnode_t *bldplmi __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldshft __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *bldcol __P((tnode_t *, tnode_t *)); -static tnode_t *bldasgn __P((op_t, tnode_t *, tnode_t *)); -static tnode_t *plength __P((type_t *)); -static tnode_t *fold __P((tnode_t *)); -static tnode_t *foldtst __P((tnode_t *)); -static tnode_t *foldflt __P((tnode_t *)); -static tnode_t *chkfarg __P((type_t *, tnode_t *)); -static tnode_t *parg __P((int, type_t *, tnode_t *)); -static void nulleff __P((tnode_t *)); -static void displexpr __P((tnode_t *, int)); -static void chkaidx __P((tnode_t *, int)); -static void chkcomp __P((op_t, tnode_t *, tnode_t *)); -static void precconf __P((tnode_t *)); +static tnode_t *getinode(tspec_t, quad_t); +static void ptrcmpok(op_t, tnode_t *, tnode_t *); +static int asgntypok(op_t, int, tnode_t *, tnode_t *); +static void chkbeop(op_t, tnode_t *, tnode_t *); +static void chkeop2(op_t, int, tnode_t *, tnode_t *); +static void chkeop1(op_t, int, tnode_t *, tnode_t *); +static tnode_t *mktnode(op_t, type_t *, tnode_t *, tnode_t *); +static void balance(op_t, tnode_t **, tnode_t **); +static void incompat(op_t, tspec_t, tspec_t); +static void illptrc(mod_t *, type_t *, type_t *); +static void mrgqual(type_t **, type_t *, type_t *); +static int conmemb(type_t *); +static void ptconv(int, tspec_t, tspec_t, type_t *, tnode_t *); +static void iiconv(op_t, int, tspec_t, tspec_t, type_t *, tnode_t *); +static void piconv(op_t, tspec_t, type_t *, tnode_t *); +static void ppconv(op_t, tnode_t *, type_t *); +static tnode_t *bldstr(op_t, tnode_t *, tnode_t *); +static tnode_t *bldincdec(op_t, tnode_t *); +static tnode_t *bldamper(tnode_t *, int); +static tnode_t *bldplmi(op_t, tnode_t *, tnode_t *); +static tnode_t *bldshft(op_t, tnode_t *, tnode_t *); +static tnode_t *bldcol(tnode_t *, tnode_t *); +static tnode_t *bldasgn(op_t, tnode_t *, tnode_t *); +static tnode_t *plength(type_t *); +static tnode_t *fold(tnode_t *); +static tnode_t *foldtst(tnode_t *); +static tnode_t *foldflt(tnode_t *); +static tnode_t *chkfarg(type_t *, tnode_t *); +static tnode_t *parg(int, type_t *, tnode_t *); +static void nulleff(tnode_t *); +static void displexpr(tnode_t *, int); +static void chkaidx(tnode_t *, int); +static void chkcomp(op_t, tnode_t *, tnode_t *); +static void precconf(tnode_t *); /* * Initialize mods of operators. diff --git a/usr.bin/xlint/lint2/chk.c b/usr.bin/xlint/lint2/chk.c index 8313f6974ed..65431ca2be3 100644 --- a/usr.bin/xlint/lint2/chk.c +++ b/usr.bin/xlint/lint2/chk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chk.c,v 1.6 2001/11/19 19:22:43 deraadt Exp $ */ +/* $OpenBSD: chk.c,v 1.7 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: chk.c,v 1.2 1995/07/03 21:24:42 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: chk.c,v 1.6 2001/11/19 19:22:43 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: chk.c,v 1.7 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdlib.h> @@ -47,28 +47,28 @@ static char rcsid[] = "$OpenBSD: chk.c,v 1.6 2001/11/19 19:22:43 deraadt Exp $"; ttab_t ttab[NTSPEC]; -static void chkund __P((hte_t *)); -static void chkdnu __P((hte_t *)); -static void chkdnud __P((hte_t *)); -static void chkmd __P((hte_t *)); -static void chkvtui __P((hte_t *, sym_t *, sym_t *)); -static void chkvtdi __P((hte_t *, sym_t *, sym_t *)); -static void chkfaui __P((hte_t *, sym_t *, sym_t *)); +static void chkund(hte_t *); +static void chkdnu(hte_t *); +static void chkdnud(hte_t *); +static void chkmd(hte_t *); +static void chkvtui(hte_t *, sym_t *, sym_t *); +static void chkvtdi(hte_t *, sym_t *, sym_t *); +static void chkfaui(hte_t *, sym_t *, sym_t *); static void chkau __P((hte_t *, int, sym_t *, sym_t *, pos_t *, fcall_t *, fcall_t *, type_t *, type_t *)); -static void chkrvu __P((hte_t *, sym_t *)); -static void chkadecl __P((hte_t *, sym_t *, sym_t *)); +static void chkrvu(hte_t *, sym_t *); +static void chkadecl(hte_t *, sym_t *, sym_t *); static void printflike __P((hte_t *,fcall_t *, int, const char *, type_t **)); static void scanflike __P((hte_t *, fcall_t *, int, const char *, type_t **)); -static void badfmt __P((hte_t *, fcall_t *)); -static void inconarg __P((hte_t *, fcall_t *, int)); -static void tofewarg __P((hte_t *, fcall_t *)); -static void tomanyarg __P((hte_t *, fcall_t *)); -static int eqtype __P((type_t *, type_t *, int, int, int, int *)); -static int eqargs __P((type_t *, type_t *, int *)); -static int mnoarg __P((type_t *, int *)); +static void badfmt(hte_t *, fcall_t *); +static void inconarg(hte_t *, fcall_t *, int); +static void tofewarg(hte_t *, fcall_t *); +static void tomanyarg(hte_t *, fcall_t *); +static int eqtype(type_t *, type_t *, int, int, int, int *); +static int eqargs(type_t *, type_t *, int *); +static int mnoarg(type_t *, int *); void diff --git a/usr.bin/xlint/lint2/emit2.c b/usr.bin/xlint/lint2/emit2.c index 04a00ddec32..8806f7a5ffd 100644 --- a/usr.bin/xlint/lint2/emit2.c +++ b/usr.bin/xlint/lint2/emit2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emit2.c,v 1.2 1996/06/26 05:44:22 deraadt Exp $ */ +/* $OpenBSD: emit2.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: emit2.c,v 1.2 1995/07/03 21:24:44 cgd Exp $ */ /* @@ -33,16 +33,16 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: emit2.c,v 1.2 1996/06/26 05:44:22 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: emit2.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; #endif #include <err.h> #include "lint2.h" -static void outtype __P((type_t *)); -static void outdef __P((hte_t *, sym_t *)); -static void dumpname __P((hte_t *)); +static void outtype(type_t *); +static void outdef(hte_t *, sym_t *); +static void dumpname(hte_t *); /* * Write type into the output buffer. diff --git a/usr.bin/xlint/lint2/externs2.h b/usr.bin/xlint/lint2/externs2.h index f0edc7c227b..d9d23667309 100644 --- a/usr.bin/xlint/lint2/externs2.h +++ b/usr.bin/xlint/lint2/externs2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: externs2.h,v 1.2 1996/06/26 05:44:23 deraadt Exp $ */ +/* $OpenBSD: externs2.h,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: externs2.h,v 1.2 1995/07/03 21:24:46 cgd Exp $ */ /* @@ -50,8 +50,8 @@ extern int Fflag; /* * hash.c */ -extern void inithash __P((void)); -extern hte_t *hsearch __P((const char *, int)); +extern void inithash(void); +extern hte_t *hsearch(const char *, int); extern void forall __P((void (*)(hte_t *))); /* @@ -60,29 +60,29 @@ extern void forall __P((void (*)(hte_t *))); extern const char **fnames; extern type_t **tlst; -extern void readfile __P((const char *)); -extern void mkstatic __P((hte_t *)); +extern void readfile(const char *); +extern void mkstatic(hte_t *); /* * mem2.c */ -extern void initmem __P((void)); -extern void *xalloc __P((size_t)); +extern void initmem(void); +extern void *xalloc(size_t); /* * chk.c */ -extern void inittyp __P((void)); -extern void mainused __P((void)); -extern void chkname __P((hte_t *)); +extern void inittyp(void); +extern void mainused(void); +extern void chkname(hte_t *); /* * msg.c */ -extern void msg __P((int, ...)); -extern const char *mkpos __P((pos_t *)); +extern void msg(int, ...); +extern const char *mkpos(pos_t *); /* * emit2.c */ -extern void outlib __P((const char *)); +extern void outlib(const char *); diff --git a/usr.bin/xlint/lint2/hash.c b/usr.bin/xlint/lint2/hash.c index 98d36a66f1f..35c7c540398 100644 --- a/usr.bin/xlint/lint2/hash.c +++ b/usr.bin/xlint/lint2/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.3 1998/07/29 03:14:52 millert Exp $ */ +/* $OpenBSD: hash.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: hash.c,v 1.2 1995/07/03 21:24:47 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: hash.c,v 1.3 1998/07/29 03:14:52 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stddef.h> @@ -45,7 +45,7 @@ static char rcsid[] = "$OpenBSD: hash.c,v 1.3 1998/07/29 03:14:52 millert Exp $" /* pointer to hash table, initialized in inithash() */ static hte_t **htab; -static int hash __P((const char *)); +static int hash(const char *); /* * Initialize hash table. @@ -113,7 +113,7 @@ hsearch(s, mknew) */ void forall(f) - void (*f) __P((hte_t *)); + void (*f)(hte_t *); { int i; hte_t *hte; diff --git a/usr.bin/xlint/lint2/main2.c b/usr.bin/xlint/lint2/main2.c index e3ca9e24fa5..f5fbdd289f6 100644 --- a/usr.bin/xlint/lint2/main2.c +++ b/usr.bin/xlint/lint2/main2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main2.c,v 1.3 2001/11/19 19:22:50 deraadt Exp $ */ +/* $OpenBSD: main2.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: main2.c,v 1.2 1995/07/03 21:24:53 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: main2.c,v 1.3 2001/11/19 19:22:50 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main2.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdio.h> @@ -84,7 +84,7 @@ int Fflag; */ const char **libs; -static void usage __P((void)); +static void usage(void); int diff --git a/usr.bin/xlint/lint2/msg.c b/usr.bin/xlint/lint2/msg.c index cc5f7bb420d..b9758026a0e 100644 --- a/usr.bin/xlint/lint2/msg.c +++ b/usr.bin/xlint/lint2/msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msg.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $ */ +/* $OpenBSD: msg.c,v 1.3 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: msg.c,v 1.2 1995/07/03 21:24:56 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: msg.c,v 1.2 1996/06/26 05:44:25 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: msg.c,v 1.3 2002/02/16 21:27:59 millert Exp $"; #endif #include <string.h> @@ -69,7 +69,7 @@ static const char *msgs[] = { "%s function value must be declared before use \t%s :: %s",/* 17 */ }; -static const char *basename __P((const char *)); +static const char *basename(const char *); #ifdef __STDC__ void diff --git a/usr.bin/xlint/lint2/read.c b/usr.bin/xlint/lint2/read.c index 826760213eb..8c8e9e407e5 100644 --- a/usr.bin/xlint/lint2/read.c +++ b/usr.bin/xlint/lint2/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.3 1998/07/29 03:14:54 millert Exp $ */ +/* $OpenBSD: read.c,v 1.4 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: read.c,v 1.2 1995/07/03 21:24:59 cgd Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: read.c,v 1.3 1998/07/29 03:14:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: read.c,v 1.4 2002/02/16 21:27:59 millert Exp $"; #endif #include <stdio.h> @@ -83,20 +83,20 @@ static size_t tlstlen; /* length of tlst */ static int csrcfile; -static void inperr __P((void)); -static void setsrc __P((const char *)); -static void setfnid __P((int, const char *)); -static void funccall __P((pos_t *, const char *)); -static void decldef __P((pos_t *, const char *)); -static void usedsym __P((pos_t *, const char *)); -static u_short inptype __P((const char *, const char **)); -static int gettlen __P((const char *, const char **)); -static u_short findtype __P((const char *, size_t, int)); -static u_short storetyp __P((type_t *, const char *, size_t, int)); -static int thash __P((const char *, size_t)); -static char *inpqstrg __P((const char *, const char **)); -static const char *inpname __P((const char *, const char **)); -static int getfnidx __P((const char *)); +static void inperr(void); +static void setsrc(const char *); +static void setfnid(int, const char *); +static void funccall(pos_t *, const char *); +static void decldef(pos_t *, const char *); +static void usedsym(pos_t *, const char *); +static u_short inptype(const char *, const char **); +static int gettlen(const char *, const char **); +static u_short findtype(const char *, size_t, int); +static u_short storetyp(type_t *, const char *, size_t, int); +static int thash(const char *, size_t); +static char *inpqstrg(const char *, const char **); +static const char *inpname(const char *, const char **); +static int getfnidx(const char *); void readfile(name) diff --git a/usr.bin/xlint/xlint/xlint.c b/usr.bin/xlint/xlint/xlint.c index 50c8434e0c1..54201383c34 100644 --- a/usr.bin/xlint/xlint/xlint.c +++ b/usr.bin/xlint/xlint/xlint.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xlint.c,v 1.7 2001/11/05 09:42:28 deraadt Exp $ */ +/* $OpenBSD: xlint.c,v 1.8 2002/02/16 21:27:59 millert Exp $ */ /* $NetBSD: xlint.c,v 1.3 1995/10/23 14:29:30 jpo Exp $ */ /* @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: xlint.c,v 1.7 2001/11/05 09:42:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: xlint.c,v 1.8 2002/02/16 21:27:59 millert Exp $"; #endif #include <sys/param.h> @@ -111,22 +111,22 @@ static int first = 1; static const char *currfn; -static void appstrg __P((char ***, char *)); -static void appcstrg __P((char ***, const char *)); -static void applst __P((char ***, char *const *)); -static void freelst __P((char ***)); -static char *concat2 __P((const char *, const char *)); -static char *concat3 __P((const char *, const char *, const char *)); -static void terminate __P((int)); -static const char *basename __P((const char *, int)); -static void appdef __P((char ***, const char *)); -static void usage __P((void)); -static void fname __P((const char *, int)); -static void runchild __P((const char *, char *const *, const char *)); -static void findlibs __P((char *const *)); -static int rdok __P((const char *)); -static void lint2 __P((void)); -static void cat __P((char *const *, const char *)); +static void appstrg(char ***, char *); +static void appcstrg(char ***, const char *); +static void applst(char ***, char *const *); +static void freelst(char ***); +static char *concat2(const char *, const char *); +static char *concat3(const char *, const char *, const char *); +static void terminate(int); +static const char *basename(const char *, int); +static void appdef(char ***, const char *); +static void usage(void); +static void fname(const char *, int); +static void runchild(const char *, char *const *, const char *); +static void findlibs(char *const *); +static int rdok(const char *); +static void lint2(void); +static void cat(char *const *, const char *); /* * Some functions to deal with lists of strings. diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h index 475e090c719..2c2813bb92d 100644 --- a/usr.bin/yacc/defs.h +++ b/usr.bin/yacc/defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: defs.h,v 1.8 2001/12/10 00:22:00 deraadt Exp $ */ +/* $OpenBSD: defs.h,v 1.9 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: defs.h,v 1.6 1996/03/19 03:21:30 jtc Exp $ */ /* @@ -316,60 +316,60 @@ extern short final_state; extern char *allocate(); extern bucket *lookup(); extern bucket *make_bucket(); -extern void set_first_derives __P((void)); -extern void closure __P((short *, int)); -extern void finalize_closure __P((void)); +extern void set_first_derives(void); +extern void closure(short *, int); +extern void finalize_closure(void); -extern void fatal __P((char *)); +extern void fatal(char *); -extern void reflexive_transitive_closure __P((unsigned *, int)); -extern void done __P((int)); +extern void reflexive_transitive_closure(unsigned *, int); +extern void done(int); -extern void no_space __P((void)); +extern void no_space(void); extern void open_error(char *); -extern void unexpected_EOF __P((void)); -extern void print_pos __P((char *, char *)); -extern void syntax_error __P((int, char *, char *)); -extern void unterminated_comment __P((int, char *, char *)); -extern void unterminated_string __P((int, char *, char *)); -extern void unterminated_text __P((int, char *, char *)); -extern void unterminated_union __P((int, char *, char *)); -extern void over_unionized __P((char *)); -extern void illegal_tag __P((int, char *, char *)); -extern void illegal_character __P((char *)); -extern void used_reserved __P((char *)); -extern void tokenized_start __P((char *)); -extern void retyped_warning __P((char *)); -extern void reprec_warning __P((char *)); -extern void revalued_warning __P((char *)); -extern void terminal_start __P((char *)); -extern void restarted_warning __P((void)); -extern void no_grammar __P((void)); -extern void terminal_lhs __P((int)); -extern void prec_redeclared __P((void)); -extern void unterminated_action __P((int, char *, char *)); -extern void dollar_warning __P((int, int)); -extern void dollar_error __P((int, char *, char *)); -extern void untyped_lhs __P((void)); -extern void untyped_rhs __P((int, char *)); -extern void unknown_rhs __P((int)); -extern void default_action_warning __P((void)); -extern void undefined_goal __P((char *)); -extern void undefined_symbol_warning __P((char *)); - -extern void lalr __P((void)); - -extern void reader __P((void)); -extern void lr0 __P((void)); -extern void make_parser __P((void)); -extern void verbose __P((void)); -extern void output __P((void)); -extern void free_parser __P((void)); -extern void write_section __P((char *[])); - -extern void create_symbol_table __P((void)); -extern void free_symbol_table __P((void)); -extern void free_symbols __P((void)); +extern void unexpected_EOF(void); +extern void print_pos(char *, char *); +extern void syntax_error(int, char *, char *); +extern void unterminated_comment(int, char *, char *); +extern void unterminated_string(int, char *, char *); +extern void unterminated_text(int, char *, char *); +extern void unterminated_union(int, char *, char *); +extern void over_unionized(char *); +extern void illegal_tag(int, char *, char *); +extern void illegal_character(char *); +extern void used_reserved(char *); +extern void tokenized_start(char *); +extern void retyped_warning(char *); +extern void reprec_warning(char *); +extern void revalued_warning(char *); +extern void terminal_start(char *); +extern void restarted_warning(void); +extern void no_grammar(void); +extern void terminal_lhs(int); +extern void prec_redeclared(void); +extern void unterminated_action(int, char *, char *); +extern void dollar_warning(int, int); +extern void dollar_error(int, char *, char *); +extern void untyped_lhs(void); +extern void untyped_rhs(int, char *); +extern void unknown_rhs(int); +extern void default_action_warning(void); +extern void undefined_goal(char *); +extern void undefined_symbol_warning(char *); + +extern void lalr(void); + +extern void reader(void); +extern void lr0(void); +extern void make_parser(void); +extern void verbose(void); +extern void output(void); +extern void free_parser(void); +extern void write_section(char *[]); + +extern void create_symbol_table(void); +extern void free_symbol_table(void); +extern void free_symbols(void); /* system variables */ diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c index 20a9e4071cd..9d09b78a896 100644 --- a/usr.bin/yacc/lalr.c +++ b/usr.bin/yacc/lalr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: lalr.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90"; #else -static char rcsid[] = "$OpenBSD: lalr.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: lalr.c,v 1.6 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -68,21 +68,21 @@ short *from_state; short *to_state; short **transpose(); -void set_state_table __P((void)); -void set_accessing_symbol __P((void)); -void set_shift_table __P((void)); -void set_reduction_table __P((void)); -void set_maxrhs __P((void)); -void initialize_LA __P((void)); -void set_goto_map __P((void)); -void initialize_F __P((void)); -void build_relations __P((void)); -void compute_FOLLOWS __P((void)); -void compute_lookaheads __P((void)); -int map_goto __P((int, int)); -void digraph __P((short **)); -void add_lookback_edge __P((int, int, int)); -void traverse __P((int)); +void set_state_table(void); +void set_accessing_symbol(void); +void set_shift_table(void); +void set_reduction_table(void); +void set_maxrhs(void); +void initialize_LA(void); +void set_goto_map(void); +void initialize_F(void); +void build_relations(void); +void compute_FOLLOWS(void); +void compute_lookaheads(void); +int map_goto(int, int); +void digraph(short **); +void add_lookback_edge(int, int, int); +void traverse(int); static int infinity; static int maxrhs; diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c index 4fbdb6f46b9..b411d6630b7 100644 --- a/usr.bin/yacc/lr0.c +++ b/usr.bin/yacc/lr0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lr0.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: lr0.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91"; #else -static char rcsid[] = "$OpenBSD: lr0.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: lr0.c,v 1.6 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -56,27 +56,27 @@ core *first_state; shifts *first_shift; reductions *first_reduction; -int get_state __P((int)); -core *new_state __P((int)); - -void allocate_itemsets __P((void)); -void allocate_storage __P((void)); -void append_states __P((void)); -void free_storage __P((void)); -void generate_states __P((void)); -void initialize_states __P((void)); -void new_itemsets __P((void)); -void show_cores __P((void)); -void show_ritems __P((void)); -void show_rrhs __P((void)); -void show_shifts __P((void)); -void save_shifts __P((void)); -void save_reductions __P((void)); -void set_derives __P((void)); -void print_derives __P((void)); -void set_nullable __P((void)); -void free_derives __P((void)); -void free_nullable __P((void)); +int get_state(int); +core *new_state(int); + +void allocate_itemsets(void); +void allocate_storage(void); +void append_states(void); +void free_storage(void); +void generate_states(void); +void initialize_states(void); +void new_itemsets(void); +void show_cores(void); +void show_ritems(void); +void show_rrhs(void); +void show_shifts(void); +void save_shifts(void); +void save_reductions(void); +void set_derives(void); +void print_derives(void); +void set_nullable(void); +void free_derives(void); +void free_nullable(void); static core **state_set; static core *this_state; diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c index a5341fa95a7..d081d828691 100644 --- a/usr.bin/yacc/main.c +++ b/usr.bin/yacc/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.14 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.15 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.14 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.15 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -116,12 +116,12 @@ char *rassoc; short **derives; char *nullable; -void onintr __P((int)); -void set_signals __P((void)); -void usage __P((void)); -void getargs __P((int, char *[])); -void create_file_names __P((void)); -void open_files __P((void)); +void onintr(int); +void set_signals(void); +void usage(void); +void getargs(int, char *[]); +void create_file_names(void); +void open_files(void); volatile sig_atomic_t sigdie; diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c index 64422e5d797..688bc646110 100644 --- a/usr.bin/yacc/mkpar.c +++ b/usr.bin/yacc/mkpar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkpar.c,v 1.7 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: mkpar.c,v 1.8 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: mkpar.c,v 1.4 1996/03/19 03:21:39 jtc Exp $ */ @@ -67,14 +67,14 @@ extern action *get_shifts(); extern action *add_reductions(); extern action *add_reduce(); -int sole_reduction __P((int)); -void free_action_row __P((action *)); +int sole_reduction(int); +void free_action_row(action *); -void find_final_state __P((void)); -void unused_rules __P((void)); -void remove_conflicts __P((void)); -void total_conflicts __P((void)); -void defreds __P((void)); +void find_final_state(void); +void unused_rules(void); +void remove_conflicts(void); +void total_conflicts(void); +void defreds(void); void diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c index f23db33a112..1b47b0f5baf 100644 --- a/usr.bin/yacc/output.c +++ b/usr.bin/yacc/output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output.c,v 1.7 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: output.c,v 1.8 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93"; #else -static char rcsid[] = "$OpenBSD: output.c,v 1.7 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: output.c,v 1.8 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -63,31 +63,31 @@ static short *check; static int lowzero; static int high; -void output_prefix __P((void)); -void output_rule_data __P((void)); -void output_yydefred __P((void)); -void output_actions __P((void)); -void token_actions __P((void)); -void goto_actions __P((void)); -int default_goto __P((int)); -void save_column __P((int, int)); -void sort_actions __P((void)); -void pack_table __P((void)); -int matching_vector __P((int)); -int pack_vector __P((int)); -void output_base __P((void)); -void output_table __P((void)); -void output_check __P((void)); -int is_C_identifier __P((char *)); -void output_defines __P((void)); -void output_stored_text __P((void)); -void output_debug __P((void)); -void output_stype __P((void)); -void output_trailing_text __P((void)); -void output_semantic_actions __P((void)); -void free_itemsets __P((void)); -void free_shifts __P((void)); -void free_reductions __P((void)); +void output_prefix(void); +void output_rule_data(void); +void output_yydefred(void); +void output_actions(void); +void token_actions(void); +void goto_actions(void); +int default_goto(int); +void save_column(int, int); +void sort_actions(void); +void pack_table(void); +int matching_vector(int); +int pack_vector(int); +void output_base(void); +void output_table(void); +void output_check(void); +int is_C_identifier(char *); +void output_defines(void); +void output_stored_text(void); +void output_debug(void); +void output_stype(void); +void output_trailing_text(void); +void output_semantic_actions(void); +void free_itemsets(void); +void free_shifts(void); +void free_reductions(void); void output() diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c index 67caf3ca5c9..a6f951f70bb 100644 --- a/usr.bin/yacc/reader.c +++ b/usr.bin/yacc/reader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reader.c,v 1.9 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: reader.c,v 1.10 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $ */ @@ -79,43 +79,43 @@ bucket **plhs; int name_pool_size; char *name_pool; -void cachec __P((int)); -void get_line __P((void)); -char * dup_line __P((void)); -void skip_comment __P((void)); -int nextc __P((void)); -int keyword __P((void)); -void copy_ident __P((void)); -void copy_text __P((void)); -void copy_union __P((void)); -int hexval __P((int)); -bucket * get_literal __P((void)); -int is_reserved __P((char *)); -bucket * get_name __P((void)); -int get_number __P((void)); -char * get_tag __P((void)); -void declare_tokens __P((int)); -void declare_types __P((void)); -void declare_start __P((void)); -void handle_expect __P((void)); -void read_declarations __P((void)); -void initialize_grammar __P((void)); -void expand_items __P((void)); -void expand_rules __P((void)); -void advance_to_start __P((void)); -void start_rule __P((bucket *, int)); -void end_rule __P((void)); -void insert_empty_rule __P((void)); -void add_symbol __P((void)); -void copy_action __P((void)); -int mark_symbol __P((void)); -void read_grammar __P((void)); -void free_tags __P((void)); -void pack_names __P((void)); -void check_symbols __P((void)); -void pack_symbols __P((void)); -void pack_grammar __P((void)); -void print_grammar __P((void)); +void cachec(int); +void get_line(void); +char * dup_line(void); +void skip_comment(void); +int nextc(void); +int keyword(void); +void copy_ident(void); +void copy_text(void); +void copy_union(void); +int hexval(int); +bucket * get_literal(void); +int is_reserved(char *); +bucket * get_name(void); +int get_number(void); +char * get_tag(void); +void declare_tokens(int); +void declare_types(void); +void declare_start(void); +void handle_expect(void); +void read_declarations(void); +void initialize_grammar(void); +void expand_items(void); +void expand_rules(void); +void advance_to_start(void); +void start_rule(bucket *, int); +void end_rule(void); +void insert_empty_rule(void); +void add_symbol(void); +void copy_action(void); +int mark_symbol(void); +void read_grammar(void); +void free_tags(void); +void pack_names(void); +void check_symbols(void); +void pack_symbols(void); +void pack_grammar(void); +void print_grammar(void); char line_format[] = "#line %d \"%s\"\n"; diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c index 55af445774a..9e500b81fe9 100644 --- a/usr.bin/yacc/symtab.c +++ b/usr.bin/yacc/symtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: symtab.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: symtab.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90"; #else -static char rcsid[] = "$OpenBSD: symtab.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -57,7 +57,7 @@ bucket **symbol_table; bucket *first_symbol; bucket *last_symbol; -int hash __P((char *)); +int hash(char *); int diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c index b839f841634..dc265c5e096 100644 --- a/usr.bin/yacc/verbose.c +++ b/usr.bin/yacc/verbose.c @@ -1,4 +1,4 @@ -/* $OpenBSD: verbose.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: verbose.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91"; #else -static char rcsid[] = "$OpenBSD: verbose.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: verbose.c,v 1.6 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ @@ -49,16 +49,16 @@ static char rcsid[] = "$OpenBSD: verbose.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ static short *null_rules; -void log_unused __P((void)); -void log_conflicts __P((void)); -void print_state __P((int)); -void print_conflicts __P((int)); -void print_core __P((int)); -void print_nulls __P((int)); -void print_actions __P((int)); -void print_shifts __P((action *)); -void print_reductions __P((action *, int)); -void print_gotos __P((int)); +void log_unused(void); +void log_conflicts(void); +void print_state(int); +void print_conflicts(int); +void print_core(int); +void print_nulls(int); +void print_actions(int); +void print_shifts(action *); +void print_reductions(action *, int); +void print_gotos(int); void verbose() diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c index 9677de917c4..a90abb605e5 100644 --- a/usr.bin/yacc/warshall.c +++ b/usr.bin/yacc/warshall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: warshall.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */ +/* $OpenBSD: warshall.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $ */ /* @@ -41,13 +41,13 @@ #if 0 static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93"; #else -static char rcsid[] = "$OpenBSD: warshall.c,v 1.5 2001/11/19 19:02:18 mpech Exp $"; +static char rcsid[] = "$OpenBSD: warshall.c,v 1.6 2002/02/16 21:28:00 millert Exp $"; #endif #endif /* not lint */ #include "defs.h" -void transitive_closure __P((unsigned *, int)); +void transitive_closure(unsigned *, int); void transitive_closure(R, n) |