diff options
| author |   millert <millert@openbsd.org> | 2002-02-16 21:27:05 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2002-02-16 21:27:05 +0000 |
| commit | c72b5b24e14c03dd8b22104fbae0d3921fa2aa37 (patch) | |
| tree | 1ac67aab11df5f96856c0e3015d691db7dc9e811 | |
| parent | default to rsa keyfile path for non key generation operations where (diff) | |
| download | wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.tar.xz wireguard-openbsd-c72b5b24e14c03dd8b22104fbae0d3921fa2aa37.zip | |
Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.
1328 files changed, 14384 insertions, 14384 deletions
diff --git a/bin/cat/cat.c b/bin/cat/cat.c index b4d072e24ff..227d11b6c5b 100644 --- a/bin/cat/cat.c +++ b/bin/cat/cat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $ */ /* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: cat.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: cat.c,v 1.12 2002/02/16 21:27:05 millert Exp $"; #endif #endif /* not lint */ @@ -70,10 +70,10 @@ int bflag, eflag, nflag, sflag, tflag, vflag; int rval; char *filename; -void cook_args __P((char *argv[])); -void cook_buf __P((FILE *)); -void raw_args __P((char *argv[])); -void raw_cat __P((int)); +void cook_args(char *argv[]); +void cook_buf(FILE *); +void raw_args(char *argv[]); +void raw_cat(int); int main(argc, argv) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index a11ff0c2792..deee9b68a79 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chio.c,v 1.9 2001/03/21 22:23:58 art Exp $ */ +/* $OpenBSD: chio.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: chio.c,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */ /* @@ -50,21 +50,21 @@ extern char *__progname; /* from crt0.o */ -static void usage __P((void)); -static void cleanup __P((void)); -static int parse_element_type __P((char *)); -static int parse_element_unit __P((char *)); -static int parse_special __P((char *)); -static int is_special __P((char *)); -static char *bits_to_string __P((int, const char *)); - -static int do_move __P((char *, int, char **)); -static int do_exchange __P((char *, int, char **)); -static int do_position __P((char *, int, char **)); -static int do_params __P((char *, int, char **)); -static int do_getpicker __P((char *, int, char **)); -static int do_setpicker __P((char *, int, char **)); -static int do_status __P((char *, int, char **)); +static void usage(void); +static void cleanup(void); +static int parse_element_type(char *); +static int parse_element_unit(char *); +static int parse_special(char *); +static int is_special(char *); +static char *bits_to_string(int, const char *); + +static int do_move(char *, int, char **); +static int do_exchange(char *, int, char **); +static int do_position(char *, int, char **); +static int do_params(char *, int, char **); +static int do_getpicker(char *, int, char **); +static int do_setpicker(char *, int, char **); +static int do_status(char *, int, char **); /* Valid changer element types. */ const struct element_type elements[] = { diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 58ffd330c7a..486985723c1 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: defs.h,v 1.3 1997/11/08 23:22:41 todd Exp $ */ +/* $OpenBSD: defs.h,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: defs.h,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ struct element_type { struct changer_command { char *cc_name; /* command name */ /* command handler */ - int (*cc_handler) __P((char *, int, char **)); + int (*cc_handler)(char *, int, char **); }; struct special_word { diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c index 8cc04abcde0..b449a0d803c 100644 --- a/bin/chmod/chmod.c +++ b/bin/chmod/chmod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $ */ +/* $OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $"; +static char rcsid[] = "$OpenBSD: chmod.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -66,9 +66,9 @@ static char rcsid[] = "$OpenBSD: chmod.c,v 1.12 2000/07/31 19:02:38 ericj Exp $" int ischflags, ischown, ischgrp, ischmod; extern char *__progname; -gid_t a_gid __P((const char *)); -uid_t a_uid __P((const char *)); -void usage __P((void)); +gid_t a_gid(const char *); +uid_t a_uid(const char *); +void usage(void); int main(argc, argv) diff --git a/bin/cp/cp.c b/bin/cp/cp.c index b0e694cc129..43d4f15b8c0 100644 --- a/bin/cp/cp.c +++ b/bin/cp/cp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $ */ +/* $OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95"; #else -static char rcsid[] = "$OpenBSD: cp.c,v 1.17 2001/06/25 04:35:31 art Exp $"; +static char rcsid[] = "$OpenBSD: cp.c,v 1.18 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -97,9 +97,9 @@ int myumask; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; -int copy __P((char *[], enum op, int)); -int mastercmp __P((const FTSENT **, const FTSENT **)); -char *find_last_component __P((char *)); +int copy(char *[], enum op, int); +int mastercmp(const FTSENT **, const FTSENT **); +char *find_last_component(char *); int main(argc, argv) diff --git a/bin/cp/extern.h b/bin/cp/extern.h index 4c410aca776..ce9b22753f5 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.8 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.9 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */ /*- @@ -50,11 +50,11 @@ extern char *__progname; #include <sys/cdefs.h> __BEGIN_DECLS -int copy_fifo __P((struct stat *, int)); -int copy_file __P((FTSENT *, int)); -int copy_link __P((FTSENT *, int)); -int copy_special __P((struct stat *, int)); -int setfile __P((struct stat *, int)); -int setlink __P((struct stat *)); -void usage __P((void)); +int copy_fifo(struct stat *, int); +int copy_file(FTSENT *, int); +int copy_link(FTSENT *, int); +int copy_special(struct stat *, int); +int setfile(struct stat *, int); +int setlink(struct stat *); +void usage(void); __END_DECLS diff --git a/bin/csh/csh.c b/bin/csh/csh.c index 309ca119c84..eecb80ab37b 100644 --- a/bin/csh/csh.c +++ b/bin/csh/csh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $ */ +/* $OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93"; #else -static char rcsid[] = "$OpenBSD: csh.c,v 1.14 2001/06/22 21:07:35 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: csh.c,v 1.15 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -104,16 +104,16 @@ bool tellwhat = 0; extern char **environ; -static int readf __P((void *, char *, int)); -static fpos_t seekf __P((void *, fpos_t, int)); -static int writef __P((void *, const char *, int)); -static int closef __P((void *)); -static int srccat __P((Char *, Char *)); -static int srcfile __P((char *, bool, bool)); -static void phup __P((int)); -static void srcunit __P((int, bool, bool)); -static void mailchk __P((void)); -static Char **defaultpath __P((void)); +static int readf(void *, char *, int); +static fpos_t seekf(void *, fpos_t, int); +static int writef(void *, const char *, int); +static int closef(void *); +static int srccat(Char *, Char *); +static int srcfile(char *, bool, bool); +static void phup(int); +static void srcunit(int, bool, bool); +static void mailchk(void); +static Char **defaultpath(void); int main(argc, argv) diff --git a/bin/csh/csh.h b/bin/csh/csh.h index fcb4e8b92cd..a7029b2ef38 100644 --- a/bin/csh/csh.h +++ b/bin/csh/csh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: csh.h,v 1.7 2000/10/30 17:16:46 millert Exp $ */ +/* $OpenBSD: csh.h,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */ /*- @@ -360,7 +360,7 @@ struct command { extern struct biltins { char *bname; - void (*bfunct) __P((Char **, struct command *)); + void (*bfunct)(Char **, struct command *); short minargs, maxargs; } bfunc[]; extern int nbfunc; diff --git a/bin/csh/dir.c b/bin/csh/dir.c index 6143fbc552f..342f8cffcde 100644 --- a/bin/csh/dir.c +++ b/bin/csh/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -61,12 +61,12 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.4 1998/05/18 20:37:19 deraadt Exp $"; /* Directory management. */ static struct directory - *dfind __P((Char *)); -static Char *dfollow __P((Char *)); -static void printdirs __P((void)); -static Char *dgoto __P((Char *)); -static void dnewcwd __P((struct directory *)); -static void dset __P((Char *)); + *dfind(Char *); +static Char *dfollow(Char *); +static void printdirs(void); +static Char *dgoto(Char *); +static void dnewcwd(struct directory *); +static void dset(Char *); struct directory dhead; /* "head" of loop */ int printd; /* force name to be printed */ diff --git a/bin/csh/dol.c b/bin/csh/dol.c index fd6ce9b1f53..a3432c4b291 100644 --- a/bin/csh/dol.c +++ b/bin/csh/dol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $ */ +/* $OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dol.c,v 1.7 2002/02/01 02:15:01 itojun Exp $"; +static char rcsid[] = "$OpenBSD: dol.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -91,17 +91,17 @@ static int dolnmod; /* Number of modifiers */ static int dolmcnt; /* :gx -> 10000, else 1 */ static int dolwcnt; /* :wx -> 10000, else 1 */ -static void Dfix2 __P((Char **)); -static Char *Dpack __P((Char *, Char *)); -static int Dword __P((void)); -static void dolerror __P((Char *)); -static int DgetC __P((int)); -static void Dgetdol __P((void)); -static void fixDolMod __P((void)); -static void setDolp __P((Char *)); -static void unDredc __P((int)); -static int Dredc __P((void)); -static void Dtestq __P((int)); +static void Dfix2(Char **); +static Char *Dpack(Char *, Char *); +static int Dword(void); +static void dolerror(Char *); +static int DgetC(int); +static void Dgetdol(void); +static void fixDolMod(void); +static void setDolp(Char *); +static void unDredc(int); +static int Dredc(void); +static void Dtestq(int); /* diff --git a/bin/csh/exec.c b/bin/csh/exec.c index c42dac6e1d8..59d8c05021a 100644 --- a/bin/csh/exec.c +++ b/bin/csh/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $ */ +/* $OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95"; #else -static char rcsid[] = "$OpenBSD: exec.c,v 1.7 1998/05/18 20:38:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -104,12 +104,12 @@ static int hits, misses; /* Dummy search path for just absolute search when no path */ static Char *justabs[] = {STRNULL, 0}; -static void pexerr __P((void)); -static void texec __P((Char *, Char **)); -static int hashname __P((Char *)); -static int tellmewhat __P((struct wordent *, Char *)); -static int executable __P((Char *, Char *, bool)); -static int iscommand __P((Char *)); +static void pexerr(void); +static void texec(Char *, Char **); +static int hashname(Char *); +static int tellmewhat(struct wordent *, Char *); +static int executable(Char *, Char *, bool); +static int iscommand(Char *); void diff --git a/bin/csh/exp.c b/bin/csh/exp.c index f832d0111b8..862485423f0 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $ */ +/* $OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $"; +static char rcsid[] = "$OpenBSD: exp.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -75,23 +75,23 @@ static char rcsid[] = "$OpenBSD: exp.c,v 1.3 1997/07/25 18:58:05 mickey Exp $"; #define EQMATCH 7 #define NOTEQMATCH 8 -static int exp1 __P((Char ***, bool)); -static int exp2 __P((Char ***, bool)); -static int exp2a __P((Char ***, bool)); -static int exp2b __P((Char ***, bool)); -static int exp2c __P((Char ***, bool)); -static Char * exp3 __P((Char ***, bool)); -static Char * exp3a __P((Char ***, bool)); -static Char * exp4 __P((Char ***, bool)); -static Char * exp5 __P((Char ***, bool)); -static Char * exp6 __P((Char ***, bool)); -static void evalav __P((Char **)); -static int isa __P((Char *, int)); -static int egetn __P((Char *)); +static int exp1(Char ***, bool); +static int exp2(Char ***, bool); +static int exp2a(Char ***, bool); +static int exp2b(Char ***, bool); +static int exp2c(Char ***, bool); +static Char * exp3(Char ***, bool); +static Char * exp3a(Char ***, bool); +static Char * exp4(Char ***, bool); +static Char * exp5(Char ***, bool); +static Char * exp6(Char ***, bool); +static void evalav(Char **); +static int isa(Char *, int); +static int egetn(Char *); #ifdef EDEBUG -static void etracc __P((char *, Char *, Char ***)); -static void etraci __P((char *, int, Char ***)); +static void etracc(char *, Char *, Char ***); +static void etraci(char *, int, Char ***); #endif int diff --git a/bin/csh/extern.h b/bin/csh/extern.h index 26e697cfa70..393be67a3a8 100644 --- a/bin/csh/extern.h +++ b/bin/csh/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1996/11/02 01:00:32 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */ /*- @@ -41,300 +41,300 @@ /* * csh.c */ -int gethdir __P((Char *)); -void dosource __P((Char **, struct command *)); -void exitstat __P((void)); -void goodbye __P((void)); -void importpath __P((Char *)); -void initdesc __P((void)); -void pintr __P((int)); -void pintr1 __P((bool)); -void printprompt __P((void)); -void process __P((bool)); -void rechist __P((void)); -void untty __P((void)); -int vis_fputc __P((int, FILE *)); +int gethdir(Char *); +void dosource(Char **, struct command *); +void exitstat(void); +void goodbye(void); +void importpath(Char *); +void initdesc(void); +void pintr(int); +void pintr1(bool); +void printprompt(void); +void process(bool); +void rechist(void); +void untty(void); +int vis_fputc(int, FILE *); #ifdef PROF -void done __P((int)); +void done(int); #else -void xexit __P((int)); +void xexit(int); #endif /* * dir.c */ -void dinit __P((Char *)); -void dodirs __P((Char **, struct command *)); -Char *dcanon __P((Char *, Char *)); -void dtildepr __P((Char *, Char *)); -void dtilde __P((void)); -void dochngd __P((Char **, struct command *)); -Char *dnormalize __P((Char *)); -void dopushd __P((Char **, struct command *)); -void dopopd __P((Char **, struct command *)); +void dinit(Char *); +void dodirs(Char **, struct command *); +Char *dcanon(Char *, Char *); +void dtildepr(Char *, Char *); +void dtilde(void); +void dochngd(Char **, struct command *); +Char *dnormalize(Char *); +void dopushd(Char **, struct command *); +void dopopd(Char **, struct command *); struct directory; -void dfree __P((struct directory *)); +void dfree(struct directory *); /* * dol.c */ -void Dfix __P((struct command *)); -Char *Dfix1 __P((Char *)); -void heredoc __P((Char *)); +void Dfix(struct command *); +Char *Dfix1(Char *); +void heredoc(Char *); /* * err.c */ -void seterror __P((int, ...)); -void stderror __P((int, ...)); +void seterror(int, ...); +void stderror(int, ...); /* * exec.c */ -void doexec __P((Char **, struct command *)); -void dohash __P((Char **, struct command *)); -void dounhash __P((Char **, struct command *)); -void dowhich __P((Char **, struct command *)); -void execash __P((Char **, struct command *)); -void hashstat __P((Char **, struct command *)); -void xechoit __P((Char **)); +void doexec(Char **, struct command *); +void dohash(Char **, struct command *); +void dounhash(Char **, struct command *); +void dowhich(Char **, struct command *); +void execash(Char **, struct command *); +void hashstat(Char **, struct command *); +void xechoit(Char **); /* * exp.c */ -int expr __P((Char ***)); -int exp0 __P((Char ***, bool)); +int expr(Char ***); +int exp0(Char ***, bool); /* * file.c */ #ifdef FILEC -int tenex __P((Char *, int)); +int tenex(Char *, int); #endif /* * func.c */ -void Setenv __P((Char *, Char *)); -void doalias __P((Char **, struct command *)); -void dobreak __P((Char **, struct command *)); -void docontin __P((Char **, struct command *)); -void doecho __P((Char **, struct command *)); -void doelse __P((Char **, struct command *)); -void doend __P((Char **, struct command *)); -void doeval __P((Char **, struct command *)); -void doexit __P((Char **, struct command *)); -void doforeach __P((Char **, struct command *)); -void doglob __P((Char **, struct command *)); -void dogoto __P((Char **, struct command *)); -void doif __P((Char **, struct command *)); -void dolimit __P((Char **, struct command *)); -void dologin __P((Char **, struct command *)); -void dologout __P((Char **, struct command *)); -void donohup __P((Char **, struct command *)); -void doonintr __P((Char **, struct command *)); -void doprintf __P((Char **, struct command *)); -void dorepeat __P((Char **, struct command *)); -void dosetenv __P((Char **, struct command *)); -void dosuspend __P((Char **, struct command *)); -void doswbrk __P((Char **, struct command *)); -void doswitch __P((Char **, struct command *)); -void doumask __P((Char **, struct command *)); -void dounlimit __P((Char **, struct command *)); -void dounsetenv __P((Char **, struct command *)); -void dowhile __P((Char **, struct command *)); -void dozip __P((Char **, struct command *)); -void func __P((struct command *, struct biltins *)); +void Setenv(Char *, Char *); +void doalias(Char **, struct command *); +void dobreak(Char **, struct command *); +void docontin(Char **, struct command *); +void doecho(Char **, struct command *); +void doelse(Char **, struct command *); +void doend(Char **, struct command *); +void doeval(Char **, struct command *); +void doexit(Char **, struct command *); +void doforeach(Char **, struct command *); +void doglob(Char **, struct command *); +void dogoto(Char **, struct command *); +void doif(Char **, struct command *); +void dolimit(Char **, struct command *); +void dologin(Char **, struct command *); +void dologout(Char **, struct command *); +void donohup(Char **, struct command *); +void doonintr(Char **, struct command *); +void doprintf(Char **, struct command *); +void dorepeat(Char **, struct command *); +void dosetenv(Char **, struct command *); +void dosuspend(Char **, struct command *); +void doswbrk(Char **, struct command *); +void doswitch(Char **, struct command *); +void doumask(Char **, struct command *); +void dounlimit(Char **, struct command *); +void dounsetenv(Char **, struct command *); +void dowhile(Char **, struct command *); +void dozip(Char **, struct command *); +void func(struct command *, struct biltins *); struct biltins * - isbfunc __P((struct command *)); -void prvars __P((void)); -void gotolab __P((Char *)); -int srchx __P((Char *)); -void unalias __P((Char **, struct command *)); -void wfree __P((void)); + isbfunc(struct command *); +void prvars(void); +void gotolab(Char *); +int srchx(Char *); +void unalias(Char **, struct command *); +void wfree(void); /* * glob.c */ -Char **dobackp __P((Char *, bool)); -void Gcat __P((Char *, Char *)); -Char *globone __P((Char *, int)); -int Gmatch __P((Char *, Char *)); -void ginit __P((void)); -Char **globall __P((Char **)); +Char **dobackp(Char *, bool); +void Gcat(Char *, Char *); +Char *globone(Char *, int); +int Gmatch(Char *, Char *); +void ginit(void); +Char **globall(Char **); void rscan __P((Char **, void (*)())); -void tglob __P((Char **)); -void trim __P((Char **)); +void tglob(Char **); +void trim(Char **); #ifdef FILEC -int sortscmp __P((const ptr_t, const ptr_t)); +int sortscmp(const ptr_t, const ptr_t); #endif /* FILEC */ /* * hist.c */ -void dohist __P((Char **, struct command *)); +void dohist(Char **, struct command *); struct Hist * - enthist __P((int, struct wordent *, bool)); -void savehist __P((struct wordent *)); + enthist(int, struct wordent *, bool); +void savehist(struct wordent *); /* * lex.c */ -void addla __P((Char *)); -void bseek __P((struct Ain *)); -void btell __P((struct Ain *)); -void btoeof __P((void)); -void copylex __P((struct wordent *, struct wordent *)); -Char *domod __P((Char *, int)); -void freelex __P((struct wordent *)); -int lex __P((struct wordent *)); -void prlex __P((FILE *, struct wordent *)); -int readc __P((bool)); -void settell __P((void)); -void unreadc __P((int)); +void addla(Char *); +void bseek(struct Ain *); +void btell(struct Ain *); +void btoeof(void); +void copylex(struct wordent *, struct wordent *); +Char *domod(Char *, int); +void freelex(struct wordent *); +int lex(struct wordent *); +void prlex(FILE *, struct wordent *); +int readc(bool); +void settell(void); +void unreadc(int); /* * misc.c */ -int any __P((char *, int)); -Char **blkcat __P((Char **, Char **)); -Char **blkcpy __P((Char **, Char **)); -Char **blkend __P((Char **)); -void blkfree __P((Char **)); -int blklen __P((Char **)); -void blkpr __P((FILE *, Char **)); -Char **blkspl __P((Char **, Char **)); -void closem __P((void)); -Char **copyblk __P((Char **)); -int dcopy __P((int, int)); -int dmove __P((int, int)); -void donefds __P((void)); -Char lastchr __P((Char *)); -void lshift __P((Char **, int)); -int number __P((Char *)); -int prefix __P((Char *, Char *)); -Char **saveblk __P((Char **)); -void setzero __P((char *, int)); -Char *strip __P((Char *)); -Char *quote __P((Char *)); -char *strsave __P((char *)); -char *strspl __P((char *, char *)); -void udvar __P((Char *)); +int any(char *, int); +Char **blkcat(Char **, Char **); +Char **blkcpy(Char **, Char **); +Char **blkend(Char **); +void blkfree(Char **); +int blklen(Char **); +void blkpr(FILE *, Char **); +Char **blkspl(Char **, Char **); +void closem(void); +Char **copyblk(Char **); +int dcopy(int, int); +int dmove(int, int); +void donefds(void); +Char lastchr(Char *); +void lshift(Char **, int); +int number(Char *); +int prefix(Char *, Char *); +Char **saveblk(Char **); +void setzero(char *, int); +Char *strip(Char *); +Char *quote(Char *); +char *strsave(char *); +char *strspl(char *, char *); +void udvar(Char *); #ifndef SHORT_STRINGS # ifdef NOTUSED -char *strstr __P((const char *, const char *)); +char *strstr(const char *, const char *); # endif /* NOTUSED */ -char *strend __P((char *)); +char *strend(char *); #endif /* * parse.c */ -void alias __P((struct wordent *)); -void freesyn __P((struct command *)); +void alias(struct wordent *); +void freesyn(struct command *); struct command * - syntax __P((struct wordent *, struct wordent *, int)); + syntax(struct wordent *, struct wordent *, int); /* * proc.c */ -void dobg __P((Char **, struct command *)); -void dobg1 __P((Char **, struct command *)); -void dofg __P((Char **, struct command *)); -void dofg1 __P((Char **, struct command *)); -void dojobs __P((Char **, struct command *)); -void dokill __P((Char **, struct command *)); -void donotify __P((Char **, struct command *)); -void dostop __P((Char **, struct command *)); -void dowait __P((Char **, struct command *)); -void palloc __P((int, struct command *)); -void panystop __P((bool)); -void pchild __P((int)); -void pendjob __P((void)); +void dobg(Char **, struct command *); +void dobg1(Char **, struct command *); +void dofg(Char **, struct command *); +void dofg1(Char **, struct command *); +void dojobs(Char **, struct command *); +void dokill(Char **, struct command *); +void donotify(Char **, struct command *); +void dostop(Char **, struct command *); +void dowait(Char **, struct command *); +void palloc(int, struct command *); +void panystop(bool); +void pchild(int); +void pendjob(void); struct process * - pfind __P((Char *)); -int pfork __P((struct command *, int)); -void pgetty __P((int, int)); -void pjwait __P((struct process *)); -void pnote __P((void)); -void prestjob __P((void)); -void psavejob __P((void)); -void pstart __P((struct process *, int)); -void pwait __P((void)); + pfind(Char *); +int pfork(struct command *, int); +void pgetty(int, int); +void pjwait(struct process *); +void pnote(void); +void prestjob(void); +void psavejob(void); +void pstart(struct process *, int); +void pwait(void); /* * sem.c */ -void execute __P((struct command *, int, int *, int *)); -void mypipe __P((int *)); +void execute(struct command *, int, int *, int *); +void mypipe(int *); /* * set.c */ struct varent - *adrof1 __P((Char *, struct varent *)); -void doset __P((Char **, struct command *)); -void dolet __P((Char **, struct command *)); -Char *putn __P((int)); -int getn __P((Char *)); -Char *value1 __P((Char *, struct varent *)); -void set __P((Char *, Char *)); -void set1 __P((Char *, Char **, struct varent *)); -void setq __P((Char *, Char **, struct varent *)); -void unset __P((Char **, struct command *)); -void unset1 __P((Char *[], struct varent *)); -void unsetv __P((Char *)); -void setNS __P((Char *)); -void shift __P((Char **, struct command *)); -void plist __P((struct varent *)); + *adrof1(Char *, struct varent *); +void doset(Char **, struct command *); +void dolet(Char **, struct command *); +Char *putn(int); +int getn(Char *); +Char *value1(Char *, struct varent *); +void set(Char *, Char *); +void set1(Char *, Char **, struct varent *); +void setq(Char *, Char **, struct varent *); +void unset(Char **, struct command *); +void unset1(Char *[], struct varent *); +void unsetv(Char *); +void setNS(Char *); +void shift(Char **, struct command *); +void plist(struct varent *); /* * time.c */ -void donice __P((Char **, struct command *)); -void dotime __P((Char **, struct command *)); +void donice(Char **, struct command *); +void dotime(Char **, struct command *); void prusage __P((struct rusage *, struct rusage *, struct timeval *, struct timeval *)); -void ruadd __P((struct rusage *, struct rusage *)); -void settimes __P((void)); -void pcsecs __P((long)); -void psecs __P((long)); +void ruadd(struct rusage *, struct rusage *); +void settimes(void); +void pcsecs(long); +void psecs(long); /* * alloc.c */ -void Free __P((ptr_t)); -ptr_t Malloc __P((size_t)); -ptr_t Realloc __P((ptr_t, size_t)); -ptr_t Calloc __P((size_t, size_t)); -void showall __P((Char **, struct command *)); +void Free(ptr_t); +ptr_t Malloc(size_t); +ptr_t Realloc(ptr_t, size_t); +ptr_t Calloc(size_t, size_t); +void showall(Char **, struct command *); /* * str.c: */ #ifdef SHORT_STRINGS -Char *s_strchr __P((Char *, int)); -Char *s_strrchr __P((Char *, int)); -Char *s_strcat __P((Char *, Char *)); +Char *s_strchr(Char *, int); +Char *s_strrchr(Char *, int); +Char *s_strcat(Char *, Char *); #ifdef NOTUSED -Char *s_strncat __P((Char *, Char *, size_t)); +Char *s_strncat(Char *, Char *, size_t); #endif -Char *s_strcpy __P((Char *, Char *)); -Char *s_strncpy __P((Char *, Char *, size_t)); -Char *s_strspl __P((Char *, Char *)); -size_t s_strlen __P((Char *)); -int s_strcmp __P((Char *, Char *)); -int s_strncmp __P((Char *, Char *, size_t)); -Char *s_strsave __P((Char *)); -Char *s_strend __P((Char *)); -Char *s_strstr __P((Char *, Char *)); -Char *str2short __P((char *)); -Char **blk2short __P((char **)); -char *short2str __P((Char *)); -char **short2blk __P((Char **)); +Char *s_strcpy(Char *, Char *); +Char *s_strncpy(Char *, Char *, size_t); +Char *s_strspl(Char *, Char *); +size_t s_strlen(Char *); +int s_strcmp(Char *, Char *); +int s_strncmp(Char *, Char *, size_t); +Char *s_strsave(Char *); +Char *s_strend(Char *); +Char *s_strstr(Char *, Char *); +Char *str2short(char *); +Char **blk2short(char **); +char *short2str(Char *); +char **short2blk(Char **); #endif -char *short2qstr __P((Char *)); -char *vis_str __P((Char *)); +char *short2qstr(Char *); +char *vis_str(Char *); diff --git a/bin/csh/file.c b/bin/csh/file.c index a4319857ef0..5f4c46545cf 100644 --- a/bin/csh/file.c +++ b/bin/csh/file.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: file.c,v 1.7 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: file.c,v 1.8 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -86,25 +86,25 @@ typedef enum { LIST, RECOGNIZE } COMMAND; -static void setup_tty __P((int)); -static void back_to_col_1 __P((void)); -static void pushback __P((Char *)); -static void catn __P((Char *, Char *, int)); -static void copyn __P((Char *, Char *, int)); -static Char filetype __P((Char *, Char *)); -static void print_by_column __P((Char *, Char *[], int)); -static Char *tilde __P((Char *, Char *)); -static void retype __P((void)); -static void beep __P((void)); -static void print_recognized_stuff __P((Char *)); -static void extract_dir_and_name __P((Char *, Char *, Char *)); -static Char *getentry __P((DIR *, int)); -static void free_items __P((Char **)); -static int tsearch __P((Char *, COMMAND, int)); -static int recognize __P((Char *, Char *, int, int)); -static int is_prefix __P((Char *, Char *)); -static int is_suffix __P((Char *, Char *)); -static int ignored __P((Char *)); +static void setup_tty(int); +static void back_to_col_1(void); +static void pushback(Char *); +static void catn(Char *, Char *, int); +static void copyn(Char *, Char *, int); +static Char filetype(Char *, Char *); +static void print_by_column(Char *, Char *[], int); +static Char *tilde(Char *, Char *); +static void retype(void); +static void beep(void); +static void print_recognized_stuff(Char *); +static void extract_dir_and_name(Char *, Char *, Char *); +static Char *getentry(DIR *, int); +static void free_items(Char **); +static int tsearch(Char *, COMMAND, int); +static int recognize(Char *, Char *, int, int); +static int is_prefix(Char *, Char *); +static int is_suffix(Char *, Char *); +static int ignored(Char *); /* * Put this here so the binary can be patched with adb to enable file @@ -533,7 +533,7 @@ again: /* search for matches */ } else { /* LIST */ qsort((ptr_t) items, numitems, sizeof(items[0]), - (int (*) __P((const void *, const void *))) sortscmp); + (int (*)(const void *, const void *)) sortscmp); print_by_column(looking_for_lognames ? NULL : tilded_dir, items, numitems); if (items != NULL) diff --git a/bin/csh/func.c b/bin/csh/func.c index 38617cd6f95..c64f90da9bc 100644 --- a/bin/csh/func.c +++ b/bin/csh/func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: func.c,v 1.13 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -62,16 +62,16 @@ static char rcsid[] = "$OpenBSD: func.c,v 1.12 2001/12/01 19:10:39 deraadt Exp $ extern char **environ; static int zlast = -1; -static void islogin __P((void)); -static void reexecute __P((struct command *)); -static void preread __P((void)); -static void doagain __P((void)); -static void search __P((int, int, Char *)); -static int getword __P((Char *)); -static int keyword __P((Char *)); -static void toend __P((void)); -static void xecho __P((int, Char **)); -static void Unsetenv __P((Char *)); +static void islogin(void); +static void reexecute(struct command *); +static void preread(void); +static void doagain(void); +static void search(int, int, Char *); +static int getword(Char *); +static int keyword(Char *); +static void toend(void); +static void xecho(int, Char **); +static void Unsetenv(Char *); struct biltins * isbfunc(t) @@ -1163,11 +1163,11 @@ static struct limits { { -1, NULL, 0, NULL } }; -static struct limits *findlim __P((Char *)); -static RLIM_TYPE getval __P((struct limits *, Char **)); -static void limtail __P((Char *, char *)); -static void plim __P((struct limits *, Char)); -static int setlim __P((struct limits *, Char, RLIM_TYPE)); +static struct limits *findlim(Char *); +static RLIM_TYPE getval(struct limits *, Char **); +static void limtail(Char *, char *); +static void plim(struct limits *, Char); +static int setlim(struct limits *, Char, RLIM_TYPE); static struct limits * findlim(cp) @@ -1515,7 +1515,7 @@ doprintf(v, t) { Char **newv; char **c; - extern int progprintf __P((int, char **)); + extern int progprintf(int, char **); int ret; gflag = 0; diff --git a/bin/csh/glob.c b/bin/csh/glob.c index ce729463bc4..cd3e1175002 100644 --- a/bin/csh/glob.c +++ b/bin/csh/glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.c,v 1.5 1997/09/01 18:40:50 millert Exp $ */ +/* $OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.5 1997/09/01 18:40:50 millert Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -89,15 +89,15 @@ long pargc = 0; * handled in glob() which is part of the 4.4BSD libc. * */ -static Char *globtilde __P((Char **, Char *)); -static Char **libglob __P((Char **)); -static Char **globexpand __P((Char **)); -static int globbrace __P((Char *, Char *, Char ***)); -static void expbrace __P((Char ***, Char ***, int)); -static int pmatch __P((Char *, Char *)); -static void pword __P((void)); -static void psave __P((int)); -static void backeval __P((Char *, bool)); +static Char *globtilde(Char **, Char *); +static Char **libglob(Char **); +static Char **globexpand(Char **); +static int globbrace(Char *, Char *, Char ***); +static void expbrace(Char ***, Char ***, int); +static int pmatch(Char *, Char *); +static void pword(void); +static void psave(int); +static void backeval(Char *, bool); static Char * diff --git a/bin/csh/hist.c b/bin/csh/hist.c index 073e5277fad..a4dfa650281 100644 --- a/bin/csh/hist.c +++ b/bin/csh/hist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $ */ +/* $OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $"; +static char rcsid[] = "$OpenBSD: hist.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -53,9 +53,9 @@ static char rcsid[] = "$OpenBSD: hist.c,v 1.3 1997/07/25 18:58:09 mickey Exp $"; #include "csh.h" #include "extern.h" -static void hfree __P((struct Hist *)); -static void dohist1 __P((struct Hist *, int *, int, int)); -static void phist __P((struct Hist *, int)); +static void hfree(struct Hist *); +static void dohist1(struct Hist *, int *, int, int); +static void phist(struct Hist *, int); void savehist(sp) diff --git a/bin/csh/lex.c b/bin/csh/lex.c index 267dab2e126..0c43487682c 100644 --- a/bin/csh/lex.c +++ b/bin/csh/lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: lex.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -64,24 +64,24 @@ static char rcsid[] = "$OpenBSD: lex.c,v 1.4 2001/12/01 19:10:39 deraadt Exp $"; * of input buffering, and especially because of history substitution. */ -static Char *word __P((void)); -static int getC1 __P((int)); -static void getdol __P((void)); -static void getexcl __P((int)); +static Char *word(void); +static int getC1(int); +static void getdol(void); +static void getexcl(int); static struct Hist - *findev __P((Char *, bool)); -static void setexclp __P((Char *)); -static int bgetc __P((void)); -static void bfree __P((void)); + *findev(Char *, bool); +static void setexclp(Char *); +static int bgetc(void); +static void bfree(void); static struct wordent - *gethent __P((int)); -static int matchs __P((Char *, Char *)); -static int getsel __P((int *, int *, int)); + *gethent(int); +static int matchs(Char *, Char *); +static int getsel(int *, int *, int); static struct wordent - *getsub __P((struct wordent *)); -static Char *subword __P((Char *, int, bool *)); + *getsub(struct wordent *); +static Char *subword(Char *, int, bool *); static struct wordent - *dosub __P((int, struct wordent *, bool)); + *dosub(int, struct wordent *, bool); /* * Peekc is a peek character for getC, peekread for readc. diff --git a/bin/csh/misc.c b/bin/csh/misc.c index 815d3c63e59..946680f7494 100644 --- a/bin/csh/misc.c +++ b/bin/csh/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $"; +static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: misc.c,v 1.5 1997/07/25 18:58:13 mickey Exp $"; #include "csh.h" #include "extern.h" -static int renum __P((int, int)); +static int renum(int, int); int any(s, c) diff --git a/bin/csh/parse.c b/bin/csh/parse.c index 9b039456e73..ba347b595bf 100644 --- a/bin/csh/parse.c +++ b/bin/csh/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $ */ +/* $OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -54,23 +54,23 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/07/25 18:58:14 mickey Exp $" #include "csh.h" #include "extern.h" -static void asyntax __P((struct wordent *, struct wordent *)); -static void asyn0 __P((struct wordent *, struct wordent *)); -static void asyn3 __P((struct wordent *, struct wordent *)); +static void asyntax(struct wordent *, struct wordent *); +static void asyn0(struct wordent *, struct wordent *); +static void asyn3(struct wordent *, struct wordent *); static struct wordent - *freenod __P((struct wordent *, struct wordent *)); + *freenod(struct wordent *, struct wordent *); static struct command - *syn0 __P((struct wordent *, struct wordent *, int)); + *syn0(struct wordent *, struct wordent *, int); static struct command - *syn1 __P((struct wordent *, struct wordent *, int)); + *syn1(struct wordent *, struct wordent *, int); static struct command - *syn1a __P((struct wordent *, struct wordent *, int)); + *syn1a(struct wordent *, struct wordent *, int); static struct command - *syn1b __P((struct wordent *, struct wordent *, int)); + *syn1b(struct wordent *, struct wordent *, int); static struct command - *syn2 __P((struct wordent *, struct wordent *, int)); + *syn2(struct wordent *, struct wordent *, int); static struct command - *syn3 __P((struct wordent *, struct wordent *, int)); + *syn3(struct wordent *, struct wordent *, int); #define ALEFT 21 /* max of 20 alias expansions */ #define HLEFT 11 /* max of 10 history expansions */ diff --git a/bin/csh/printf.c b/bin/csh/printf.c index d680ff19287..039124e05ac 100644 --- a/bin/csh/printf.c +++ b/bin/csh/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp $ */ +/* $OpenBSD: printf.c,v 1.11 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $ */ /* @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93"; #else -static char rcsid[] = "$OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: printf.c,v 1.11 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -72,15 +72,15 @@ static char rcsid[] = "$OpenBSD: printf.c,v 1.10 2000/12/22 22:53:10 deraadt Exp (void)printf(f, func); \ } -static int asciicode __P((void)); -static void escape __P((char *)); -static int getchr __P((void)); -static double getdouble __P((void)); -static int getint __P((int *)); -static int getlong __P((long *)); -static char *getstr __P((void)); -static char *mklong __P((char *, int)); -static void usage __P((void)); +static int asciicode(void); +static void escape(char *); +static int getchr(void); +static double getdouble(void); +static int getint(int *); +static int getlong(long *); +static char *getstr(void); +static char *mklong(char *, int); +static void usage(void); static char **gargv; diff --git a/bin/csh/proc.c b/bin/csh/proc.c index e7b0bd57fc2..2d1a4b2dece 100644 --- a/bin/csh/proc.c +++ b/bin/csh/proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: proc.c,v 1.14 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -63,17 +63,17 @@ static char rcsid[] = "$OpenBSD: proc.c,v 1.13 2001/12/01 19:10:39 deraadt Exp $ static struct rusage zru; -static void pflushall __P((void)); -static void pflush __P((struct process *)); -static void pclrcurr __P((struct process *)); -static void padd __P((struct command *)); -static int pprint __P((struct process *, int)); -static void ptprint __P((struct process *)); -static void pads __P((Char *)); -static void pkill __P((Char **v, int)); +static void pflushall(void); +static void pflush(struct process *); +static void pclrcurr(struct process *); +static void padd(struct command *); +static int pprint(struct process *, int); +static void ptprint(struct process *); +static void pads(Char *); +static void pkill(Char **v, int); static struct process - *pgetcurr __P((struct process *)); -static void okpcntl __P((void)); + *pgetcurr(struct process *); +static void okpcntl(void); /* * pchild - called at interrupt level by the SIGCHLD signal diff --git a/bin/csh/sem.c b/bin/csh/sem.c index 10da22d5e15..9f1fad0c130 100644 --- a/bin/csh/sem.c +++ b/bin/csh/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sem.c,v 1.10 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -60,10 +60,10 @@ static char rcsid[] = "$OpenBSD: sem.c,v 1.9 2001/12/01 19:10:39 deraadt Exp $"; #include "proc.h" #include "extern.h" -static void vffree __P((int)); -static Char *splicepipe __P((struct command *t, Char *)); -static void doio __P((struct command *t, int *, int *)); -static void chkclob __P((char *)); +static void vffree(int); +static Char *splicepipe(struct command *t, Char *); +static void doio(struct command *t, int *, int *); +static void chkclob(char *); void execute(t, wanttty, pipein, pipeout) diff --git a/bin/csh/set.c b/bin/csh/set.c index 509aacdd19d..37c052afb11 100644 --- a/bin/csh/set.c +++ b/bin/csh/set.c @@ -1,4 +1,4 @@ -/* $OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $ */ +/* $OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: set.c,v 1.6 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -56,18 +56,18 @@ static char rcsid[] = "$OpenBSD: set.c,v 1.5 2001/12/01 19:10:39 deraadt Exp $"; #include "csh.h" #include "extern.h" -static Char *getinx __P((Char *, int *)); -static void asx __P((Char *, int, Char *)); +static Char *getinx(Char *, int *); +static void asx(Char *, int, Char *); static struct varent - *getvx __P((Char *, int)); -static Char *xset __P((Char *, Char ***)); -static Char *operate __P((int, Char *, Char *)); -static void putn1 __P((int)); + *getvx(Char *, int); +static Char *xset(Char *, Char ***); +static Char *operate(int, Char *, Char *); +static void putn1(int); static struct varent - *madrof __P((Char *, struct varent *)); -static void unsetv1 __P((struct varent *)); -static void exportpath __P((Char **)); -static void balance __P((struct varent *, int, int)); + *madrof(Char *, struct varent *); +static void unsetv1(struct varent *); +static void exportpath(Char **); +static void balance(struct varent *, int, int); /* diff --git a/bin/csh/time.c b/bin/csh/time.c index 2d80f3c8248..b37b87aacec 100644 --- a/bin/csh/time.c +++ b/bin/csh/time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $ */ +/* $OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $"; +static char rcsid[] = "$OpenBSD: time.c,v 1.7 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: time.c,v 1.6 2002/02/14 22:13:33 nordin Exp $"; /* * C Shell - routines handling process timing and niceing */ -static void pdeltat __P((struct timeval *, struct timeval *)); +static void pdeltat(struct timeval *, struct timeval *); void settimes() diff --git a/bin/date/date.c b/bin/date/date.c index 9b2c56a5800..ae5b6484e1a 100644 --- a/bin/date/date.c +++ b/bin/date/date.c @@ -1,4 +1,4 @@ -/* $OpenBSD: date.c,v 1.20 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: date.c,v 1.21 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: date.c,v 1.20 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: date.c,v 1.21 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -72,9 +72,9 @@ time_t tval; int retval, nflag; int slidetime; -static void setthetime __P((char *)); -static void badformat __P((void)); -static void usage __P((void)); +static void setthetime(char *); +static void badformat(void); +static void usage(void); int main(argc, argv) diff --git a/bin/date/extern.h b/bin/date/extern.h index 53a9ba68276..a2587249e22 100644 --- a/bin/date/extern.h +++ b/bin/date/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/23 14:19:43 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/21 09:03:52 cgd Exp $ */ /*- @@ -36,4 +36,4 @@ * @(#)extern.h 8.1 (Berkeley) 5/31/93 */ -int netsettime __P((time_t)); +int netsettime(time_t); diff --git a/bin/dd/args.c b/bin/dd/args.c index c04c07a1be6..015f8187550 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -1,4 +1,4 @@ -/* $OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $ */ +/* $OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -59,25 +59,25 @@ static char rcsid[] = "$OpenBSD: args.c,v 1.11 2001/10/06 22:31:54 millert Exp $ #include "dd.h" #include "extern.h" -static int c_arg __P((const void *, const void *)); -static int c_conv __P((const void *, const void *)); -static void f_bs __P((char *)); -static void f_cbs __P((char *)); -static void f_conv __P((char *)); -static void f_count __P((char *)); -static void f_files __P((char *)); -static void f_ibs __P((char *)); -static void f_if __P((char *)); -static void f_obs __P((char *)); -static void f_of __P((char *)); -static void f_seek __P((char *)); -static void f_skip __P((char *)); -static size_t get_bsz __P((char *)); -static off_t get_off __P((char *)); +static int c_arg(const void *, const void *); +static int c_conv(const void *, const void *); +static void f_bs(char *); +static void f_cbs(char *); +static void f_conv(char *); +static void f_count(char *); +static void f_files(char *); +static void f_ibs(char *); +static void f_if(char *); +static void f_obs(char *); +static void f_of(char *); +static void f_seek(char *); +static void f_skip(char *); +static size_t get_bsz(char *); +static off_t get_off(char *); static const struct arg { char *name; - void (*f) __P((char *)); + void (*f)(char *); u_int set, noset; } args[] = { { "bs", f_bs, C_BS, C_BS|C_IBS|C_OBS|C_OSYNC }, diff --git a/bin/dd/dd.c b/bin/dd/dd.c index a849ef2a626..54188437728 100644 --- a/bin/dd/dd.c +++ b/bin/dd/dd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $ */ +/* $OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -70,14 +70,14 @@ static char rcsid[] = "$OpenBSD: dd.c,v 1.11 2001/10/06 22:31:54 millert Exp $"; #include "dd.h" #include "extern.h" -static void dd_close __P((void)); -static void dd_in __P((void)); -static void getfdtype __P((IO *)); -static void setup __P((void)); +static void dd_close(void); +static void dd_in(void); +static void getfdtype(IO *); +static void setup(void); IO in, out; /* input/output state */ STAT st; /* statistics */ -void (*cfunc) __P((void)); /* conversion function */ +void (*cfunc)(void); /* conversion function */ size_t cpy_cnt; /* # of blocks to copy */ u_int ddflags; /* conversion options */ size_t cbsz; /* conversion block size */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index 2d0eca452f8..6beb89ce3b9 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1997/02/14 07:05:21 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: extern.h,v 1.7 1996/02/20 19:29:07 jtc Exp $ */ /*- @@ -42,19 +42,19 @@ #include <sys/cdefs.h> -void block __P((void)); -void block_close __P((void)); -void dd_out __P((int)); -void def __P((void)); -void def_close __P((void)); -void jcl __P((char **)); -void pos_in __P((void)); -void pos_out __P((void)); -void summary __P((void)); -void summaryx __P((int)); -void terminate __P((int)); -void unblock __P((void)); -void unblock_close __P((void)); +void block(void); +void block_close(void); +void dd_out(int); +void def(void); +void def_close(void); +void jcl(char **); +void pos_in(void); +void pos_out(void); +void summary(void); +void summaryx(int); +void terminate(int); +void unblock(void); +void unblock_close(void); extern IO in, out; extern STAT st; diff --git a/bin/df/df.c b/bin/df/df.c index 29c549c7b75..2c0c1073fe9 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: df.c,v 1.31 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: df.c,v 1.31 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -68,19 +68,19 @@ static char rcsid[] = "$OpenBSD: df.c,v 1.30 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -int bread __P((int, off_t, void *, int)); -char *getmntpt __P((char *)); -void bsdprint __P((struct statfs *, long, int)); -void posixprint __P((struct statfs *, long, int)); -int selected __P((const char *)); -void maketypelist __P((char *)); -long regetmntinfo __P((struct statfs **, long)); -void usage __P((void)); - -int raw_df __P((char *, struct statfs *)); -extern int ffs_df __P((int, char *, struct statfs *)); -extern int lfs_df __P((int, char *, struct statfs *)); -extern int e2fs_df __P((int, char *, struct statfs *)); +int bread(int, off_t, void *, int); +char *getmntpt(char *); +void bsdprint(struct statfs *, long, int); +void posixprint(struct statfs *, long, int); +int selected(const char *); +void maketypelist(char *); +long regetmntinfo(struct statfs **, long); +void usage(void); + +int raw_df(char *, struct statfs *); +extern int ffs_df(int, char *, struct statfs *); +extern int lfs_df(int, char *, struct statfs *); +extern int e2fs_df(int, char *, struct statfs *); int hflag, iflag, kflag, lflag, nflag, Pflag; char **typelist = NULL; diff --git a/bin/df/ext2fs_df.c b/bin/df/ext2fs_df.c index de3612862c6..cde48ad1c1f 100644 --- a/bin/df/ext2fs_df.c +++ b/bin/df/ext2fs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_df.c,v 1.7 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: ext2fs_df.c,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* * This file is substantially derived from src/sys/ufs/ext2fs/ext2fs_vfsops.c:e2fs_statfs(). @@ -52,10 +52,10 @@ #include <fcntl.h> #include <fstab.h> -int e2fs_df __P((int, char *, struct statfs *)); +int e2fs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct ext2fs ie_fs; diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c index b4081f7f019..b2e36afabc5 100644 --- a/bin/df/ffs_df.c +++ b/bin/df/ffs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_df.c,v 1.6 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: ffs_df.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* * Copyright (c) 1980, 1990, 1993, 1994 @@ -54,10 +54,10 @@ static char copyright[] = #include <string.h> #include <fcntl.h> -int ffs_df __P((int, char *, struct statfs *)); +int ffs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct fs iu_fs; diff --git a/bin/df/lfs_df.c b/bin/df/lfs_df.c index f5824fd8bf0..eab3476719a 100644 --- a/bin/df/lfs_df.c +++ b/bin/df/lfs_df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_df.c,v 1.6 2001/05/11 18:40:46 mickey Exp $ */ +/* $OpenBSD: lfs_df.c,v 1.7 2002/02/16 21:27:06 millert Exp $ */ /* * This file is substantially duplicated from src/sys/ufs/lfs/lfs_vfsops.c:lfs_statfs(). @@ -52,10 +52,10 @@ #include <fcntl.h> #include <fstab.h> -int lfs_df __P((int, char *, struct statfs *)); +int lfs_df(int, char *, struct statfs *); -extern int bread __P((int, off_t, void *, int)); -extern char *getmntpt __P((char *)); +extern int bread(int, off_t, void *, int); +extern char *getmntpt(char *); union { struct lfs il_fs; diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 8ff5bb51421..01056e1d638 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: domainname.c,v 1.5 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: domainname.c,v 1.7 1995/03/21 09:04:22 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: domainname.c,v 1.5 2002/02/16 21:27:06 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: domainname.c,v 1.4 2001/09/06 13:29:08 mpech Ex extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 45a78003364..72e2d7b8615 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ed.h,v 1.7 2001/07/05 22:30:15 espie Exp $ */ +/* $OpenBSD: ed.h,v 1.8 2002/02/16 21:27:06 millert Exp $ */ /* $NetBSD: ed.h,v 1.23 1995/03/21 09:04:40 cgd Exp $ */ /* ed.h: type and constant definitions for the ed editor. */ @@ -199,80 +199,80 @@ if ((i) > (n)) { \ #endif /* Local Function Declarations */ -void add_line_node __P((line_t *)); -int append_lines __P((long)); -int apply_subst_template __P((char *, regmatch_t *, int, int)); -int build_active_list __P((int)); -int cbc_decode __P((char *, FILE *)); -int cbc_encode __P((char *, int, FILE *)); -int check_addr_range __P((long, long)); -void clear_active_list __P((void)); -void clear_undo_stack __P((void)); -int close_sbuf __P((void)); -int copy_lines __P((long)); -int delete_lines __P((long, long)); -void des_error __P((char *)); -int display_lines __P((long, long, int)); -line_t *dup_line_node __P((line_t *)); -int exec_command __P((void)); -long exec_global __P((int, int)); -void expand_des_key __P((char *, char *)); -int extract_addr_range __P((void)); -char *extract_pattern __P((int)); -int extract_subst_tail __P((int *, long *)); -char *extract_subst_template __P((void)); -int filter_lines __P((long, long, char *)); -int flush_des_file __P((FILE *)); -line_t *get_addressed_line_node __P((long)); -pattern_t *get_compiled_pattern __P((void)); -int get_des_char __P((FILE *)); -char *get_extended_line __P((int *, int)); -char *get_filename __P((void)); -int get_keyword __P((void)); -long get_line_node_addr __P((line_t *)); -long get_matching_node_addr __P((pattern_t *, int)); -long get_marked_node_addr __P((int)); -char *get_sbuf_line __P((line_t *)); -int get_shell_command __P((void)); -int get_stream_line __P((FILE *)); -int get_tty_line __P((void)); -void handle_hup __P((int)); -void handle_int __P((int)); -void handle_winch __P((int)); -int has_trailing_escape __P((char *, char *)); -int hex_to_binary __P((int, int)); -void init_buffers __P((void)); -void init_des_cipher __P((void)); -int is_legal_filename __P((char *)); -int join_lines __P((long, long)); -int mark_line_node __P((line_t *, int)); -int move_lines __P((long)); -line_t *next_active_node __P((void)); -long next_addr __P((void)); -int open_sbuf __P((void)); -char *parse_char_class __P((char *)); -int pop_undo_stack __P((void)); -undo_t *push_undo_stack __P((int, long, long)); -int put_des_char __P((int, FILE *)); -char *put_sbuf_line __P((char *)); -int put_stream_line __P((FILE *, char *, int)); -int put_tty_line __P((char *, int, long, int)); -void quit __P((int)); -long read_file __P((char *, long)); -long read_stream __P((FILE *, long)); -int search_and_replace __P((pattern_t *, int, int)); -int set_active_node __P((line_t *)); -void set_des_key __P((char *)); -void seterrmsg __P((char *)); -void signal_hup __P((int)); -void signal_int __P((int)); -char *strip_escapes __P((char *)); -int substitute_matching_text __P((pattern_t *, line_t *, int, int)); -char *translit_text __P((char *, int, int, int)); -void unmark_line_node __P((line_t *)); -void unset_active_nodes __P((line_t *, line_t *)); -long write_file __P((char *, char *, long, long)); -long write_stream __P((FILE *, long, long)); +void add_line_node(line_t *); +int append_lines(long); +int apply_subst_template(char *, regmatch_t *, int, int); +int build_active_list(int); +int cbc_decode(char *, FILE *); +int cbc_encode(char *, int, FILE *); +int check_addr_range(long, long); +void clear_active_list(void); +void clear_undo_stack(void); +int close_sbuf(void); +int copy_lines(long); +int delete_lines(long, long); +void des_error(char *); +int display_lines(long, long, int); +line_t *dup_line_node(line_t *); +int exec_command(void); +long exec_global(int, int); +void expand_des_key(char *, char *); +int extract_addr_range(void); +char *extract_pattern(int); +int extract_subst_tail(int *, long *); +char *extract_subst_template(void); +int filter_lines(long, long, char *); +int flush_des_file(FILE *); +line_t *get_addressed_line_node(long); +pattern_t *get_compiled_pattern(void); +int get_des_char(FILE *); +char *get_extended_line(int *, int); +char *get_filename(void); +int get_keyword(void); +long get_line_node_addr(line_t *); +long get_matching_node_addr(pattern_t *, int); +long get_marked_node_addr(int); +char *get_sbuf_line(line_t *); +int get_shell_command(void); +int get_stream_line(FILE *); +int get_tty_line(void); +void handle_hup(int); +void handle_int(int); +void handle_winch(int); +int has_trailing_escape(char *, char *); +int hex_to_binary(int, int); +void init_buffers(void); +void init_des_cipher(void); +int is_legal_filename(char *); +int join_lines(long, long); +int mark_line_node(line_t *, int); +int move_lines(long); +line_t *next_active_node(void); +long next_addr(void); +int open_sbuf(void); +char *parse_char_class(char *); +int pop_undo_stack(void); +undo_t *push_undo_stack(int, long, long); +int put_des_char(int, FILE *); +char *put_sbuf_line(char *); +int put_stream_line(FILE *, char *, int); +int put_tty_line(char *, int, long, int); +void quit(int); +long read_file(char *, long); +long read_stream(FILE *, long); +int search_and_replace(pattern_t *, int, int); +int set_active_node(line_t *); +void set_des_key(char *); +void seterrmsg(char *); +void signal_hup(int); +void signal_int(int); +char *strip_escapes(char *); +int substitute_matching_text(pattern_t *, line_t *, int, int); +char *translit_text(char *, int, int, int); +void unmark_line_node(line_t *); +void unset_active_nodes(line_t *, line_t *); +long write_file(char *, char *, long, long); +long write_stream(FILE *, long, long); /* global buffers */ extern char stdinbuf[]; diff --git a/bin/expr/expr.c b/bin/expr/expr.c index 6e6500e0f16..27c9de0f038 100644 --- a/bin/expr/expr.c +++ b/bin/expr/expr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expr.c,v 1.9 1997/11/13 07:57:17 deraadt Exp $ */ +/* $OpenBSD: expr.c,v 1.10 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: expr.c,v 1.3.6.1 1996/06/04 20:41:47 cgd Exp $ */ /* @@ -225,7 +225,7 @@ error() struct val * eval6() { - struct val *eval0 __P((void)); + struct val *eval0(void); struct val *v; if (token == OPERAND) { diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c index 5c7d394db03..ca7775077cb 100644 --- a/bin/hostname/hostname.c +++ b/bin/hostname/hostname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: hostname.c,v 1.5 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: hostname.c,v 1.10 1995/09/07 06:28:40 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: hostname.c,v 1.5 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: hostname.c,v 1.4 2001/09/06 13:29:08 mpech Exp extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/kill/kill.c b/bin/kill/kill.c index d1d802569e4..83256b3d8cb 100644 --- a/bin/kill/kill.c +++ b/bin/kill/kill.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: kill.c,v 1.5 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: kill.c,v 1.5 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,10 +58,10 @@ static char rcsid[] = "$OpenBSD: kill.c,v 1.4 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -void nosig __P((char *)); -void printsignals __P((FILE *)); -int signame_to_signum __P((char *)); -void usage __P((void)); +void nosig(char *); +void printsignals(FILE *); +int signame_to_signum(char *); +void usage(void); int main(argc, argv) diff --git a/bin/ln/ln.c b/bin/ln/ln.c index 43aa0a5b40c..284d99257d7 100644 --- a/bin/ln/ln.c +++ b/bin/ln/ln.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ln.c,v 1.6 2001/08/09 03:33:17 millert Exp $ */ +/* $OpenBSD: ln.c,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ln.c,v 1.10 1995/03/21 09:06:10 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #else -static const char rcsid[] = "$OpenBSD: ln.c,v 1.6 2001/08/09 03:33:17 millert Exp $"; +static const char rcsid[] = "$OpenBSD: ln.c,v 1.7 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -63,10 +63,10 @@ int fflag; /* Unlink existing files. */ int hflag; /* Check new name for symlink first. */ int sflag; /* Symbolic, not hard, link. */ /* System link call. */ -int (*linkf) __P((const char *, const char *)); +int (*linkf)(const char *, const char *); -int linkit __P((char *, char *, int)); -void usage __P((void)); +int linkit(char *, char *, int); +void usage(void); int main(argc, argv) @@ -127,7 +127,7 @@ linkit(target, source, isdir) { struct stat sb; char *p, path[MAXPATHLEN]; - int (*statf) __P((const char *, struct stat *)); + int (*statf)(const char *, struct stat *); if (!sflag) { /* If target doesn't exist, quit now. */ diff --git a/bin/ls/extern.h b/bin/ls/extern.h index e11314382f3..cbde87f1ba2 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.7 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.8 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $ */ /*- @@ -38,21 +38,21 @@ extern char *__progname; -int acccmp __P((const FTSENT *, const FTSENT *)); -int revacccmp __P((const FTSENT *, const FTSENT *)); -int modcmp __P((const FTSENT *, const FTSENT *)); -int revmodcmp __P((const FTSENT *, const FTSENT *)); -int namecmp __P((const FTSENT *, const FTSENT *)); -int revnamecmp __P((const FTSENT *, const FTSENT *)); -int statcmp __P((const FTSENT *, const FTSENT *)); -int revstatcmp __P((const FTSENT *, const FTSENT *)); -int sizecmp __P((const FTSENT *, const FTSENT *)); -int revsizecmp __P((const FTSENT *, const FTSENT *)); +int acccmp(const FTSENT *, const FTSENT *); +int revacccmp(const FTSENT *, const FTSENT *); +int modcmp(const FTSENT *, const FTSENT *); +int revmodcmp(const FTSENT *, const FTSENT *); +int namecmp(const FTSENT *, const FTSENT *); +int revnamecmp(const FTSENT *, const FTSENT *); +int statcmp(const FTSENT *, const FTSENT *); +int revstatcmp(const FTSENT *, const FTSENT *); +int sizecmp(const FTSENT *, const FTSENT *); +int revsizecmp(const FTSENT *, const FTSENT *); -int putname __P((char *)); -void printcol __P((DISPLAY *)); -void printacol __P((DISPLAY *)); -void printlong __P((DISPLAY *)); -void printscol __P((DISPLAY *)); -void printstream __P((DISPLAY *)); -void usage __P((void)); +int putname(char *); +void printcol(DISPLAY *); +void printacol(DISPLAY *); +void printlong(DISPLAY *); +void printscol(DISPLAY *); +void printstream(DISPLAY *); +void usage(void); diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 1c75f2a31db..d281cc64c4e 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $ */ +/* $OpenBSD: ls.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94"; #else -static char rcsid[] = "$OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ls.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -67,15 +67,15 @@ static char rcsid[] = "$OpenBSD: ls.c,v 1.15 2001/07/09 00:37:53 deraadt Exp $"; #include "ls.h" #include "extern.h" -char *group_from_gid __P((u_int, int)); -char *user_from_uid __P((u_int, int)); +char *group_from_gid(u_int, int); +char *user_from_uid(u_int, int); -static void display __P((FTSENT *, FTSENT *)); -static int mastercmp __P((const FTSENT **, const FTSENT **)); -static void traverse __P((int, char **, int)); +static void display(FTSENT *, FTSENT *); +static int mastercmp(const FTSENT **, const FTSENT **); +static void traverse(int, char **, int); -static void (*printfcn) __P((DISPLAY *)); -static int (*sortfcn) __P((const FTSENT *, const FTSENT *)); +static void (*printfcn)(DISPLAY *); +static int (*sortfcn)(const FTSENT *, const FTSENT *); #define BY_NAME 0 #define BY_SIZE 1 diff --git a/bin/ls/main.c b/bin/ls/main.c index 21a35e85730..544659b5978 100644 --- a/bin/ls/main.c +++ b/bin/ls/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.1 1999/02/23 23:54:17 art Exp $ */ +/* $OpenBSD: main.c,v 1.2 2002/02/16 21:27:07 millert Exp $ */ /* * Public domain - no warranty. @@ -6,7 +6,7 @@ #include <sys/cdefs.h> -int ls_main __P((int argc, char **argv)); +int ls_main(int argc, char **argv); int main(argc, argv) diff --git a/bin/ls/print.c b/bin/ls/print.c index c02aa56c843..77995c38176 100644 --- a/bin/ls/print.c +++ b/bin/ls/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $ */ +/* $OpenBSD: print.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -64,11 +64,11 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.15 2000/01/06 21:32:40 espie Exp $" #include "ls.h" #include "extern.h" -static int printaname __P((FTSENT *, u_long, u_long)); -static void printlink __P((FTSENT *)); -static void printtime __P((time_t)); -static int printtype __P((u_int)); -static int compute_columns __P((DISPLAY *, int *)); +static int printaname(FTSENT *, u_long, u_long); +static void printlink(FTSENT *); +static void printtime(time_t); +static int printtype(u_int); +static int compute_columns(DISPLAY *, int *); #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 2da6a1a8a24..4ddfe88b239 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: mkdir.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; #else -static char rcsid[] = "$OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: mkdir.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -61,8 +61,8 @@ static char rcsid[] = "$OpenBSD: mkdir.c,v 1.11 2002/01/16 18:44:21 mpech Exp $" extern char *__progname; -int mkpath __P((char *, mode_t, mode_t)); -void usage __P((void)); +int mkpath(char *, mode_t, mode_t); +void usage(void); int main(argc, argv) diff --git a/bin/mt/mt.c b/bin/mt/mt.c index db50ed616df..cf713b172d8 100644 --- a/bin/mt/mt.c +++ b/bin/mt/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.19 2002/01/16 18:44:21 mpech Exp $ */ +/* $OpenBSD: mt.c,v 1.20 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: mt.c,v 1.19 2002/01/16 18:44:21 mpech Exp $"; +static char rcsid[] = "$OpenBSD: mt.c,v 1.20 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -96,9 +96,9 @@ struct commands { }; #define COM_EJECT 9 /* element in the above array */ -void printreg __P((char *, u_int, char *)); -void status __P((struct mtget *)); -void usage __P((void)); +void printreg(char *, u_int, char *); +void status(struct mtget *); +void usage(void); char *host = NULL; /* remote host (if any) */ diff --git a/bin/mt/mt.h b/bin/mt/mt.h index bf61843cb9e..2c6f0771bee 100644 --- a/bin/mt/mt.h +++ b/bin/mt/mt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.h,v 1.1 1996/03/08 23:34:21 niklas Exp $ */ +/* $OpenBSD: mt.h,v 1.2 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mt.h,v 1.1 1996/03/05 20:39:36 scottr Exp $ */ /*- @@ -35,13 +35,13 @@ */ /* rmt routines */ -void rmtclose __P((void)); -int rmthost __P((char *host)); -int rmtopen __P((char *tape, int mode)); -int rmtioctl __P((int command, int count)); -struct mtget *rmtstatus __P((void)); +void rmtclose(void); +int rmthost(char *host); +int rmtopen(char *tape, int mode); +int rmtioctl(int command, int count); +struct mtget *rmtstatus(void); -void interrupt __P((int signo)); /* in case operator bangs on console */ +void interrupt(int signo); /* in case operator bangs on console */ /* * Exit status codes diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c index 072877fc4eb..5654ad5ed54 100644 --- a/bin/mt/mtrmt.c +++ b/bin/mt/mtrmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtrmt.c,v 1.8 2001/11/14 20:52:39 deraadt Exp $ */ +/* $OpenBSD: mtrmt.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */ /*- @@ -81,14 +81,14 @@ static int rmtstate = TS_CLOSED; static int rmtape; static char *rmtpeer; -static int okname __P((char *)); -static int rmtcall __P((char *, char *)); -static void rmtconnaborted __P((void)); -static void sigrmtconnaborted __P((int)); -static int rmtgetb __P((void)); -static void rmtgetconn __P((void)); -static void rmtgets __P((char *, int)); -static int rmtreply __P((char *)); +static int okname(char *); +static int rmtcall(char *, char *); +static void rmtconnaborted(void); +static void sigrmtconnaborted(int); +static int rmtgetb(void); +static void rmtgetconn(void); +static void rmtgets(char *, int); +static int rmtreply(char *); int rmthost(host) diff --git a/bin/mv/mv.c b/bin/mv/mv.c index 4a1189e5f0d..5c4c678b225 100644 --- a/bin/mv/mv.c +++ b/bin/mv/mv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mv.c,v 1.22 2002/01/25 07:10:04 millert Exp $ */ +/* $OpenBSD: mv.c,v 1.23 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: mv.c,v 1.22 2002/01/25 07:10:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: mv.c,v 1.23 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -74,10 +74,10 @@ extern char *__progname; int fflg, iflg; int stdin_ok; -int copy __P((char *, char *)); -int do_move __P((char *, char *)); -int fastcopy __P((char *, char *, struct stat *)); -void usage __P((void)); +int copy(char *, char *); +int do_move(char *, char *); +int fastcopy(char *, char *, struct stat *); +void usage(void); int main(argc, argv) diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c index 23c34b4b16f..37e1561cd37 100644 --- a/bin/pax/ar_io.c +++ b/bin/pax/ar_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_io.c,v 1.24 2001/09/19 10:58:07 mpech Exp $"; +static char rcsid[] = "$OpenBSD: ar_io.c,v 1.25 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -90,9 +90,9 @@ char *arcname; /* printable name of archive */ const char *gzip_program; /* name of gzip program */ static pid_t zpid = -1; /* pid of child process */ -static int get_phys __P((void)); +static int get_phys(void); extern sigset_t s_mask; -static void ar_start_gzip __P((int, const char *, int)); +static void ar_start_gzip(int, const char *, int); /* * ar_open() diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c index 591af8ba333..c5ceee60c88 100644 --- a/bin/pax/ar_subs.c +++ b/bin/pax/ar_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Exp $ */ +/* $OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Exp $"; +static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -60,9 +60,9 @@ static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.16 2001/07/17 18:19:48 millert Ex #include "pax.h" #include "extern.h" -static void wr_archive __P((register ARCHD *, int is_app)); -static int get_arc __P((void)); -static int next_head __P((register ARCHD *)); +static void wr_archive(register ARCHD *, int is_app); +static int get_arc(void); +static int next_head(register ARCHD *); extern sigset_t s_mask; /* diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c index e70955d5df2..5d75a0567f9 100644 --- a/bin/pax/cpio.c +++ b/bin/pax/cpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: cpio.c,v 1.8 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,9 +58,9 @@ static char rcsid[] = "$OpenBSD: cpio.c,v 1.7 2001/05/26 00:32:21 millert Exp $" #include "cpio.h" #include "extern.h" -static int rd_nm __P((register ARCHD *, int)); -static int rd_ln_nm __P((register ARCHD *)); -static int com_rd __P((register ARCHD *)); +static int rd_nm(register ARCHD *, int); +static int rd_ln_nm(register ARCHD *); +static int com_rd(register ARCHD *); /* * Routines which support the different cpio versions diff --git a/bin/pax/extern.h b/bin/pax/extern.h index d534dfe8147..405db195460 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.20 2001/07/17 18:19:49 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.21 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $ */ /*- @@ -51,27 +51,27 @@ */ extern char *arcname; extern const char *gzip_program; -int ar_open __P((char *)); -void ar_close __P((void)); -void ar_drain __P((void)); -int ar_set_wr __P((void)); -int ar_app_ok __P((void)); -int ar_read __P((register char *, register int)); -int ar_write __P((register char *, register int)); -int ar_rdsync __P((void)); -int ar_fow __P((off_t, off_t *)); -int ar_rev __P((off_t )); -int ar_next __P((void)); +int ar_open(char *); +void ar_close(void); +void ar_drain(void); +int ar_set_wr(void); +int ar_app_ok(void); +int ar_read(register char *, register int); +int ar_write(register char *, register int); +int ar_rdsync(void); +int ar_fow(off_t, off_t *); +int ar_rev(off_t ); +int ar_next(void); /* * ar_subs.c */ extern u_long flcnt; -void list __P((void)); -void extract __P((void)); -void append __P((void)); -void archive __P((void)); -void copy __P((void)); +void list(void); +void extract(void); +void append(void); +void archive(void); +void copy(void); /* * buf_subs.c @@ -83,126 +83,126 @@ extern int rdblksz; extern off_t wrlimit; extern off_t rdcnt; extern off_t wrcnt; -int wr_start __P((void)); -int rd_start __P((void)); -void cp_start __P((void)); -int appnd_start __P((off_t)); -int rd_sync __P((void)); -void pback __P((char *, int)); -int rd_skip __P((off_t)); -void wr_fin __P((void)); -int wr_rdbuf __P((register char *, register int)); -int rd_wrbuf __P((register char *, register int)); -int wr_skip __P((off_t)); -int wr_rdfile __P((ARCHD *, int, off_t *)); -int rd_wrfile __P((ARCHD *, int, off_t *)); -void cp_file __P((ARCHD *, int, int)); -int buf_fill __P((void)); -int buf_flush __P((register int)); +int wr_start(void); +int rd_start(void); +void cp_start(void); +int appnd_start(off_t); +int rd_sync(void); +void pback(char *, int); +int rd_skip(off_t); +void wr_fin(void); +int wr_rdbuf(register char *, register int); +int rd_wrbuf(register char *, register int); +int wr_skip(off_t); +int wr_rdfile(ARCHD *, int, off_t *); +int rd_wrfile(ARCHD *, int, off_t *); +void cp_file(ARCHD *, int, int); +int buf_fill(void); +int buf_flush(register int); /* * cache.c */ -int uidtb_start __P((void)); -int gidtb_start __P((void)); -int usrtb_start __P((void)); -int grptb_start __P((void)); -char * name_uid __P((uid_t, int)); -char * name_gid __P((gid_t, int)); -int uid_name __P((char *, uid_t *)); -int gid_name __P((char *, gid_t *)); +int uidtb_start(void); +int gidtb_start(void); +int usrtb_start(void); +int grptb_start(void); +char * name_uid(uid_t, int); +char * name_gid(gid_t, int); +int uid_name(char *, uid_t *); +int gid_name(char *, gid_t *); /* * cpio.c */ -int cpio_strd __P((void)); -int cpio_trail __P((register ARCHD *)); -int cpio_endwr __P((void)); -int cpio_id __P((char *, int)); -int cpio_rd __P((register ARCHD *, register char *)); -off_t cpio_endrd __P((void)); -int cpio_stwr __P((void)); -int cpio_wr __P((register ARCHD *)); -int vcpio_id __P((char *, int)); -int crc_id __P((char *, int)); -int crc_strd __P((void)); -int vcpio_rd __P((register ARCHD *, register char *)); -off_t vcpio_endrd __P((void)); -int crc_stwr __P((void)); -int vcpio_wr __P((register ARCHD *)); -int bcpio_id __P((char *, int)); -int bcpio_rd __P((register ARCHD *, register char *)); -off_t bcpio_endrd __P((void)); -int bcpio_wr __P((register ARCHD *)); +int cpio_strd(void); +int cpio_trail(register ARCHD *); +int cpio_endwr(void); +int cpio_id(char *, int); +int cpio_rd(register ARCHD *, register char *); +off_t cpio_endrd(void); +int cpio_stwr(void); +int cpio_wr(register ARCHD *); +int vcpio_id(char *, int); +int crc_id(char *, int); +int crc_strd(void); +int vcpio_rd(register ARCHD *, register char *); +off_t vcpio_endrd(void); +int crc_stwr(void); +int vcpio_wr(register ARCHD *); +int bcpio_id(char *, int); +int bcpio_rd(register ARCHD *, register char *); +off_t bcpio_endrd(void); +int bcpio_wr(register ARCHD *); /* * file_subs.c */ -int file_creat __P((register ARCHD *)); -void file_close __P((register ARCHD *, int)); -int lnk_creat __P((register ARCHD *)); -int cross_lnk __P((register ARCHD *)); -int chk_same __P((register ARCHD *)); -int node_creat __P((register ARCHD *)); -int unlnk_exist __P((register char *, register int)); -int chk_path __P((register char *, uid_t, gid_t)); -void set_ftime __P((char *fnm, time_t mtime, time_t atime, int frc)); -int set_ids __P((char *, uid_t, gid_t)); -int set_lids __P((char *, uid_t, gid_t)); -void set_pmode __P((char *, mode_t)); -int file_write __P((int, char *, register int, int *, int *, int, char *)); -void file_flush __P((int, char *, int)); -void rdfile_close __P((register ARCHD *, register int *)); -int set_crc __P((register ARCHD *, register int)); +int file_creat(register ARCHD *); +void file_close(register ARCHD *, int); +int lnk_creat(register ARCHD *); +int cross_lnk(register ARCHD *); +int chk_same(register ARCHD *); +int node_creat(register ARCHD *); +int unlnk_exist(register char *, register int); +int chk_path(register char *, uid_t, gid_t); +void set_ftime(char *fnm, time_t mtime, time_t atime, int frc); +int set_ids(char *, uid_t, gid_t); +int set_lids(char *, uid_t, gid_t); +void set_pmode(char *, mode_t); +int file_write(int, char *, register int, int *, int *, int, char *); +void file_flush(int, char *, int); +void rdfile_close(register ARCHD *, register int *); +int set_crc(register ARCHD *, register int); /* * ftree.c */ -int ftree_start __P((void)); -int ftree_add __P((register char *, int)); -void ftree_sel __P((register ARCHD *)); -void ftree_chk __P((void)); -int next_file __P((register ARCHD *)); +int ftree_start(void); +int ftree_add(register char *, int); +void ftree_sel(register ARCHD *); +void ftree_chk(void); +int next_file(register ARCHD *); /* * gen_subs.c */ -void ls_list __P((register ARCHD *, time_t, FILE *)); -void ls_tty __P((register ARCHD *)); -void safe_print __P((char *, FILE *)); -u_long asc_ul __P((register char *, int, register int)); -int ul_asc __P((u_long, register char *, register int, register int)); +void ls_list(register ARCHD *, time_t, FILE *); +void ls_tty(register ARCHD *); +void safe_print(char *, FILE *); +u_long asc_ul(register char *, int, register int); +int ul_asc(u_long, register char *, register int, register int); #ifndef LONG_OFF_T -u_quad_t asc_uqd __P((register char *, int, register int)); -int uqd_asc __P((u_quad_t, register char *, register int, register int)); +u_quad_t asc_uqd(register char *, int, register int); +int uqd_asc(u_quad_t, register char *, register int, register int); #endif /* * getoldopt.c */ -int getoldopt __P((int, char **, char *)); +int getoldopt(int, char **, char *); /* * options.c */ extern FSUB fsub[]; extern int ford[]; -void options __P((register int, register char **)); -OPLIST * opt_next __P((void)); -int opt_add __P((register char *)); -int bad_opt __P((void)); +void options(register int, register char **); +OPLIST * opt_next(void); +int opt_add(register char *); +int bad_opt(void); char *chdname; /* * pat_rep.c */ -int rep_add __P((register char *)); -int pat_add __P((char *, char *)); -void pat_chk __P((void)); -int pat_sel __P((register ARCHD *)); -int pat_match __P((register ARCHD *)); -int mod_name __P((register ARCHD *)); -int set_dest __P((register ARCHD *, char *, int)); +int rep_add(register char *); +int pat_add(char *, char *); +void pat_chk(void); +int pat_sel(register ARCHD *); +int pat_match(register ARCHD *); +int mod_name(register ARCHD *); +int set_dest(register ARCHD *, char *, int); /* * pax.c @@ -241,62 +241,62 @@ extern FILE *listf; extern char *tempfile; extern char *tempbase; -int main __P((int, char **)); -void sig_cleanup __P((int)); +int main(int, char **); +void sig_cleanup(int); /* * sel_subs.c */ -int sel_chk __P((register ARCHD *)); -int grp_add __P((register char *)); -int usr_add __P((register char *)); -int trng_add __P((register char *)); +int sel_chk(register ARCHD *); +int grp_add(register char *); +int usr_add(register char *); +int trng_add(register char *); /* * tables.c */ -int lnk_start __P((void)); -int chk_lnk __P((register ARCHD *)); -void purg_lnk __P((register ARCHD *)); -void lnk_end __P((void)); -int ftime_start __P((void)); -int chk_ftime __P((register ARCHD *)); -int name_start __P((void)); -int add_name __P((register char *, int, char *)); -void sub_name __P((register char *, int *, size_t)); -int dev_start __P((void)); -int add_dev __P((register ARCHD *)); -int map_dev __P((register ARCHD *, u_long, u_long)); -int atdir_start __P((void)); -void atdir_end __P((void)); -void add_atdir __P((char *, dev_t, ino_t, time_t, time_t)); -int get_atdir __P((dev_t, ino_t, time_t *, time_t *)); -int dir_start __P((void)); -void add_dir __P((char *, int, struct stat *, int)); -void proc_dir __P((void)); -u_int st_hash __P((char *, int, int)); +int lnk_start(void); +int chk_lnk(register ARCHD *); +void purg_lnk(register ARCHD *); +void lnk_end(void); +int ftime_start(void); +int chk_ftime(register ARCHD *); +int name_start(void); +int add_name(register char *, int, char *); +void sub_name(register char *, int *, size_t); +int dev_start(void); +int add_dev(register ARCHD *); +int map_dev(register ARCHD *, u_long, u_long); +int atdir_start(void); +void atdir_end(void); +void add_atdir(char *, dev_t, ino_t, time_t, time_t); +int get_atdir(dev_t, ino_t, time_t *, time_t *); +int dir_start(void); +void add_dir(char *, int, struct stat *, int); +void proc_dir(void); +u_int st_hash(char *, int, int); /* * tar.c */ -int tar_endwr __P((void)); -off_t tar_endrd __P((void)); -int tar_trail __P((register char *, register int, register int *)); -int tar_id __P((register char *, int)); -int tar_opt __P((void)); -int tar_rd __P((register ARCHD *, register char *)); -int tar_wr __P((register ARCHD *)); -int ustar_strd __P((void)); -int ustar_stwr __P((void)); -int ustar_id __P((char *, int)); -int ustar_rd __P((register ARCHD *, register char *)); -int ustar_wr __P((register ARCHD *)); +int tar_endwr(void); +off_t tar_endrd(void); +int tar_trail(register char *, register int, register int *); +int tar_id(register char *, int); +int tar_opt(void); +int tar_rd(register ARCHD *, register char *); +int tar_wr(register ARCHD *); +int ustar_strd(void); +int ustar_stwr(void); +int ustar_id(char *, int); +int ustar_rd(register ARCHD *, register char *); +int ustar_wr(register ARCHD *); /* * tty_subs.c */ -int tty_init __P((void)); -void tty_prnt __P((char *, ...)); -int tty_read __P((char *, int)); -void paxwarn __P((int, char *, ...)); -void syswarn __P((int, int, char *, ...)); +int tty_init(void); +void tty_prnt(char *, ...); +int tty_read(char *, int); +void paxwarn(int, char *, ...); +void syswarn(int, int, char *, ...); diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 5288e390c2a..8138094c8d2 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas Exp $ */ +/* $OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas Exp $"; +static char rcsid[] = "$OpenBSD: file_subs.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: file_subs.c,v 1.15 2001/10/25 16:59:03 niklas E #include "extern.h" static int -mk_link __P((register char *,register struct stat *,register char *, int)); +mk_link(register char *,register struct stat *,register char *, int); /* * routines that deal with file operations such as: creating, removing; diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c index 9754c62e2a3..c5e400409a5 100644 --- a/bin/pax/ftree.c +++ b/bin/pax/ftree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftree.c,v 1.16 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: ftree.c,v 1.16 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: ftree.c,v 1.17 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -83,7 +83,7 @@ static FTREE *ftcur = NULL; /* current file arg being processed */ static FTSENT *ftent = NULL; /* current file tree entry */ static int ftree_skip; /* when set skip to next file arg */ -static int ftree_arg __P((void)); +static int ftree_arg(void); /* * ftree_start() diff --git a/bin/pax/options.c b/bin/pax/options.c index 46d5f6846fa..95192097057 100644 --- a/bin/pax/options.c +++ b/bin/pax/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.48 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.48 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.49 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -72,17 +72,17 @@ static char flgch[] = FLGCH; /* list of all possible flags */ static OPLIST *ophead = NULL; /* head for format specific options -x */ static OPLIST *optail = NULL; /* option tail */ -static int no_op __P((void)); -static void printflg __P((unsigned int)); -static int c_frmt __P((const void *, const void *)); -static off_t str_offt __P((char *)); -static char *getline __P((FILE *fp)); -static void pax_options __P((register int, register char **)); -static void pax_usage __P((void)); -static void tar_options __P((register int, register char **)); -static void tar_usage __P((void)); -static void cpio_options __P((register int, register char **)); -static void cpio_usage __P((void)); +static int no_op(void); +static void printflg(unsigned int); +static int c_frmt(const void *, const void *); +static off_t str_offt(char *); +static char *getline(FILE *fp); +static void pax_options(register int, register char **); +static void pax_usage(void); +static void tar_options(register int, register char **); +static void tar_usage(void); +static void cpio_options(register int, register char **); +static void cpio_usage(void); /* errors from getline */ #define GETLINE_FILE_CORRUPT 1 diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c index 37be97f45f7..9e9474f755e 100644 --- a/bin/pax/pat_rep.c +++ b/bin/pax/pat_rep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pat_rep.c,v 1.15 2001/07/04 22:34:17 millert Exp $ */ +/* $OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.15 2001/07/04 22:34:17 millert Exp $"; +static char rcsid[] = "$OpenBSD: pat_rep.c,v 1.16 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -73,12 +73,12 @@ static PATTERN *pattail = NULL; /* file pattern match list tail */ static REPLACE *rephead = NULL; /* replacement string list head */ static REPLACE *reptail = NULL; /* replacement string list tail */ -static int rep_name __P((char *, int *, int)); -static int tty_rename __P((register ARCHD *)); -static int fix_path __P((char *, int *, char *, int)); -static int fn_match __P((register char *, register char *, char **)); -static char * range_match __P((register char *, register int)); -static int resub __P((regex_t *, regmatch_t *, char *, char *, char *, char *)); +static int rep_name(char *, int *, int); +static int tty_rename(register ARCHD *); +static int fix_path(char *, int *, char *, int); +static int fn_match(register char *, register char *, char **); +static char * range_match(register char *, register int); +static int resub(regex_t *, regmatch_t *, char *, char *, char *, char *); /* * rep_add() diff --git a/bin/pax/pax.c b/bin/pax/pax.c index 07484ea6b26..91f3fc8e2db 100644 --- a/bin/pax/pax.c +++ b/bin/pax/pax.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $ */ +/* $OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pax.c,v 1.19 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -68,7 +68,7 @@ static char rcsid[] = "$OpenBSD: pax.c,v 1.18 2001/11/05 09:38:52 deraadt Exp $" #include <paths.h> #include "pax.h" #include "extern.h" -static int gen_init __P((void)); +static int gen_init(void); /* * PAX main routines, general globals and some simple start up routines diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c index 83cfdd4d2a4..34f4512e017 100644 --- a/bin/pax/sel_subs.c +++ b/bin/pax/sel_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Exp $ */ +/* $OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.9 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -60,10 +60,10 @@ static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.8 2001/05/26 00:32:21 millert Ex #include "sel_subs.h" #include "extern.h" -static int str_sec __P((register char *, time_t *)); -static int usr_match __P((register ARCHD *)); -static int grp_match __P((register ARCHD *)); -static int trng_match __P((register ARCHD *)); +static int str_sec(register char *, time_t *); +static int usr_match(register ARCHD *); +static int grp_match(register ARCHD *); +static int trng_match(register ARCHD *); static TIME_RNG *trhead = NULL; /* time range list head */ static TIME_RNG *trtail = NULL; /* time range list tail */ diff --git a/bin/pax/tables.c b/bin/pax/tables.c index aee18b3af0e..ebdfdf0de29 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tables.c,v 1.13 2001/05/16 03:04:58 mickey Exp $ */ +/* $OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: tables.c,v 1.13 2001/05/16 03:04:58 mickey Exp $"; +static char rcsid[] = "$OpenBSD: tables.c,v 1.14 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -84,7 +84,7 @@ static int dirfd = -1; /* storage for setting created dir time/mode */ static u_long dircnt; /* entries in dir time/mode storage */ static int ffd = -1; /* tmp file for file time table name storage */ -static DEVT *chk_dev __P((dev_t, int)); +static DEVT *chk_dev(dev_t, int); /* * hard link table routines diff --git a/bin/pax/tar.c b/bin/pax/tar.c index 602a968ac5a..adf8967b298 100644 --- a/bin/pax/tar.c +++ b/bin/pax/tar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $ */ +/* $OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $"; +static char rcsid[] = "$OpenBSD: tar.c,v 1.24 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -62,11 +62,11 @@ static char rcsid[] = "$OpenBSD: tar.c,v 1.23 2001/12/19 22:51:32 millert Exp $" * Routines for reading, writing and header identify of various versions of tar */ -static u_long tar_chksm __P((register char *, register int)); -static char *name_split __P((register char *, register int)); -static int ul_oct __P((u_long, register char *, register int, int)); +static u_long tar_chksm(register char *, register int); +static char *name_split(register char *, register int); +static int ul_oct(u_long, register char *, register int, int); #ifndef LONG_OFF_T -static int uqd_oct __P((u_quad_t, register char *, register int, int)); +static int uqd_oct(u_quad_t, register char *, register int, int); #endif /* diff --git a/bin/ps/extern.h b/bin/ps/extern.h index 428381e3030..d1c60e97cca 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.6 2001/12/05 02:23:59 art Exp $ */ +/* $OpenBSD: extern.h,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */ /*- @@ -48,42 +48,42 @@ extern VAR var[]; extern VARENT *vhead; __BEGIN_DECLS -void command __P((KINFO *, VARENT *)); -void cputime __P((KINFO *, VARENT *)); -int donlist __P((void)); -void evar __P((KINFO *, VARENT *)); -void emulname __P((KINFO *, VARENT *)); -void fmt_puts __P((char *, int *)); -void fmt_putc __P((int, int *)); -double getpcpu __P((KINFO *)); -double getpmem __P((KINFO *)); -void gname __P((KINFO *, VARENT *)); -void logname __P((KINFO *, VARENT *)); -void longtname __P((KINFO *, VARENT *)); -void lstarted __P((KINFO *, VARENT *)); -void maxrss __P((KINFO *, VARENT *)); -void nlisterr __P((struct nlist *)); -void p_rssize __P((KINFO *, VARENT *)); -void pagein __P((KINFO *, VARENT *)); -void parsefmt __P((char *)); -void pcpu __P((KINFO *, VARENT *)); -void pmem __P((KINFO *, VARENT *)); -void pri __P((KINFO *, VARENT *)); -void printheader __P((void)); -void pvar __P((KINFO *, VARENT *)); -void rgname __P((KINFO *, VARENT *)); -void rssize __P((KINFO *, VARENT *)); -void runame __P((KINFO *, VARENT *)); -void rvar __P((KINFO *, VARENT *)); -void showkey __P((void)); -void started __P((KINFO *, VARENT *)); -void state __P((KINFO *, VARENT *)); -void tdev __P((KINFO *, VARENT *)); -void tname __P((KINFO *, VARENT *)); -void tsize __P((KINFO *, VARENT *)); -void ucomm __P((KINFO *, VARENT *)); -void uname __P((KINFO *, VARENT *)); -void uvar __P((KINFO *, VARENT *)); -void vsize __P((KINFO *, VARENT *)); -void wchan __P((KINFO *, VARENT *)); +void command(KINFO *, VARENT *); +void cputime(KINFO *, VARENT *); +int donlist(void); +void evar(KINFO *, VARENT *); +void emulname(KINFO *, VARENT *); +void fmt_puts(char *, int *); +void fmt_putc(int, int *); +double getpcpu(KINFO *); +double getpmem(KINFO *); +void gname(KINFO *, VARENT *); +void logname(KINFO *, VARENT *); +void longtname(KINFO *, VARENT *); +void lstarted(KINFO *, VARENT *); +void maxrss(KINFO *, VARENT *); +void nlisterr(struct nlist *); +void p_rssize(KINFO *, VARENT *); +void pagein(KINFO *, VARENT *); +void parsefmt(char *); +void pcpu(KINFO *, VARENT *); +void pmem(KINFO *, VARENT *); +void pri(KINFO *, VARENT *); +void printheader(void); +void pvar(KINFO *, VARENT *); +void rgname(KINFO *, VARENT *); +void rssize(KINFO *, VARENT *); +void runame(KINFO *, VARENT *); +void rvar(KINFO *, VARENT *); +void showkey(void); +void started(KINFO *, VARENT *); +void state(KINFO *, VARENT *); +void tdev(KINFO *, VARENT *); +void tname(KINFO *, VARENT *); +void tsize(KINFO *, VARENT *); +void ucomm(KINFO *, VARENT *); +void uname(KINFO *, VARENT *); +void uvar(KINFO *, VARENT *); +void vsize(KINFO *, VARENT *); +void wchan(KINFO *, VARENT *); __END_DECLS diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c index a1543a515fd..3bebf9813c6 100644 --- a/bin/ps/keyword.c +++ b/bin/ps/keyword.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $ */ +/* $OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp $"; +static char rcsid[] = "$OpenBSD: keyword.c,v 1.14 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: keyword.c,v 1.13 1998/11/25 22:33:38 aaron Exp #include <sys/ucred.h> #include <sys/sysctl.h> -static VAR *findvar __P((char *)); -static int vcmp __P((const void *, const void *)); +static VAR *findvar(char *); +static int vcmp(const void *, const void *); #ifdef NOTINUSE int utime(), stime(), ixrss(), idrss(), isrss(); diff --git a/bin/ps/print.c b/bin/ps/print.c index 32e31296841..435ad6d7e90 100644 --- a/bin/ps/print.c +++ b/bin/ps/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $ */ +/* $OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.25 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.24 2002/02/10 21:07:00 naddy Exp $" extern kvm_t *kd; extern int needenv, needcomm, commandonly; -static char *cmdpart __P((char *)); +static char *cmdpart(char *); #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 16cea0d3162..0de41a6d90f 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $ */ +/* $OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: ps.c,v 1.25 2002/01/30 17:52:40 mickey Exp $"; +static char rcsid[] = "$OpenBSD: ps.c,v 1.26 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -89,11 +89,11 @@ int needcomm, needenv, commandonly; enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT; -static char *kludge_oldps_options __P((char *)); -static int pscomp __P((const void *, const void *)); -static void saveuser __P((KINFO *)); -static void scanvars __P((void)); -static void usage __P((void)); +static char *kludge_oldps_options(char *); +static int pscomp(const void *, const void *); +static void saveuser(KINFO *); +static void scanvars(void); +static void usage(void); char dfmt[] = "pid tt state time command"; char jfmt[] = "user pid ppid pgid sess jobc state tt time command"; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index 0e72896a5f9..6cb0ab8814b 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ps.h,v 1.3 1997/08/08 19:30:10 millert Exp $ */ +/* $OpenBSD: ps.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: ps.h,v 1.11 1995/09/29 21:57:03 cgd Exp $ */ /*- @@ -74,7 +74,7 @@ typedef struct var { #define INF127 0x08 /* 127 = infinity: if > 127, print 127. */ u_int flag; /* output routine */ - void (*oproc) __P((struct kinfo *, struct varent *)); + void (*oproc)(struct kinfo *, struct varent *); short width; /* printing width */ char parsed; /* have we been parsed yet? (avoid dupes) */ /* diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index 444fb02d62d..46b2bb9da11 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: pwd.c,v 1.7 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #else -static char rcsid[] = "$OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: pwd.c,v 1.7 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: pwd.c,v 1.6 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h index b909d9524de..4ab443f10a4 100644 --- a/bin/rcp/extern.h +++ b/bin/rcp/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/03/21 08:19:01 cgd Exp $ */ /*- @@ -44,11 +44,11 @@ typedef struct { extern int iamremote; extern char *__progname; -BUF *allocbuf __P((BUF *, int, int)); -char *colon __P((char *)); -void lostconn __P((int)); -void nospace __P((void)); -int okname __P((char *)); -void run_err __P((const char *, ...)); -int susystem __P((char *, int)); -void verifydir __P((char *)); +BUF *allocbuf(BUF *, int, int); +char *colon(char *); +void lostconn(int); +void nospace(void); +int okname(char *); +void run_err(const char *, ...); +int susystem(char *, int); +void verifydir(char *); diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c index 5e9126277ba..3368beab00d 100644 --- a/bin/rcp/rcp.c +++ b/bin/rcp/rcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcp.c,v 1.25 2001/11/21 15:35:28 markus Exp $ */ +/* $OpenBSD: rcp.c,v 1.26 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */ /* @@ -99,20 +99,20 @@ int pflag, iamremote, iamrecursive, targetshouldbedirectory; char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ #ifdef KERBEROS -int kerberos __P((char **, char *, char *, char *)); -void oldw __P((const char *, ...)); +int kerberos(char **, char *, char *, char *); +void oldw(const char *, ...); /* XXX from ../../usr.bin/rlogin/krcmd.c */ -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 -int response __P((void)); -void rsource __P((char *, struct stat *)); -void sink __P((int, char *[])); -void source __P((int, char *[])); -void tolocal __P((int, char *[])); -void toremote __P((char *, int, char *[])); -void usage __P((void)); +int response(void); +void rsource(char *, struct stat *); +void sink(int, char *[]); +void source(int, char *[]); +void tolocal(int, char *[]); +void toremote(char *, int, char *[]); +void usage(void); int main(argc, argv) diff --git a/bin/rm/rm.c b/bin/rm/rm.c index b5f763c201f..587e0893a14 100644 --- a/bin/rm/rm.c +++ b/bin/rm/rm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rm.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rm.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95"; #else -static char rcsid[] = "$OpenBSD: rm.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rm.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -69,12 +69,12 @@ extern char *__progname; int dflag, eval, fflag, iflag, Pflag, Wflag, stdin_ok; -int check __P((char *, char *, struct stat *)); -void checkdot __P((char **)); -void rm_file __P((char **)); -void rm_overwrite __P((char *, struct stat *)); -void rm_tree __P((char **)); -void usage __P((void)); +int check(char *, char *, struct stat *); +void checkdot(char **); +void rm_file(char **); +void rm_overwrite(char *, struct stat *); +void rm_tree(char **); +void usage(void); /* * rm -- diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c index 31badbfee8b..e2da117a88e 100644 --- a/bin/rmail/rmail.c +++ b/bin/rmail/rmail.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rmail.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95"; #else -static char rcsid[] = "$OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rmail.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -89,8 +89,8 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.11 2001/09/06 13:29:08 mpech Exp $" extern char *__progname; -void err __P((int, const char *, ...)); -void usage __P((void)); +void err(int, const char *, ...); +void usage(void); #define TAYLOR_ENV /* use UU_MACHINE if present */ diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c index 12e35c5d3b1..2419d03789e 100644 --- a/bin/rmdir/rmdir.c +++ b/bin/rmdir/rmdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: rmdir.c,v 1.6 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: rmdir.c,v 1.13 1995/03/21 09:08:31 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: rmdir.c,v 1.6 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -58,8 +58,8 @@ static char rcsid[] = "$OpenBSD: rmdir.c,v 1.5 2001/09/06 13:29:08 mpech Exp $"; extern char *__progname; -int rm_path __P((char *)); -void usage __P((void)); +int rm_path(char *); +void usage(void); int main(argc, argv) diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c index c61cb9aadc1..fe79ce24735 100644 --- a/bin/sleep/sleep.c +++ b/bin/sleep/sleep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: sleep.c,v 1.12 2002/02/16 21:27:07 millert Exp $ */ /* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $"; +static char rcsid[] = "$OpenBSD: sleep.c,v 1.12 2002/02/16 21:27:07 millert Exp $"; #endif #endif /* not lint */ @@ -59,8 +59,8 @@ static char rcsid[] = "$OpenBSD: sleep.c,v 1.11 2001/09/06 13:29:08 mpech Exp $" extern char *__progname; -void usage __P((void)); -void alarmh __P((int)); +void usage(void); +void alarmh(int); int main(argc, argv) diff --git a/bin/stty/extern.h b/bin/stty/extern.h index 8e0611a85a6..205353c9c43 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 2001/09/06 13:29:08 mpech Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: extern.h,v 1.8 1996/05/07 18:20:06 jtc Exp $ */ /*- @@ -38,16 +38,16 @@ extern char *__progname; -int c_cchars __P((const void *, const void *)); -int c_modes __P((const void *, const void *)); -int csearch __P((char ***, struct info *)); -void checkredirect __P((void)); -void gprint __P((struct termios *, struct winsize *, int)); -void gread __P((struct termios *, char *)); -int ksearch __P((char ***, struct info *)); -int msearch __P((char ***, struct info *)); -void optlist __P((void)); -void print __P((struct termios *, struct winsize *, int, enum FMT)); -void usage __P((void)); +int c_cchars(const void *, const void *); +int c_modes(const void *, const void *); +int csearch(char ***, struct info *); +void checkredirect(void); +void gprint(struct termios *, struct winsize *, int); +void gread(struct termios *, char *); +int ksearch(char ***, struct info *); +int msearch(char ***, struct info *); +void optlist(void); +void print(struct termios *, struct winsize *, int, enum FMT); +void usage(void); extern const struct cchar cchars1[], cchars2[]; diff --git a/bin/stty/key.c b/bin/stty/key.c index a31e3c280a8..23f9dc4e489 100644 --- a/bin/stty/key.c +++ b/bin/stty/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $ */ +/* $OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)key.c 8.4 (Berkeley) 2/20/95"; #else -static char rcsid[] = "$OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -54,30 +54,30 @@ static char rcsid[] = "$OpenBSD: key.c,v 1.9 2001/06/25 03:40:25 millert Exp $"; #include "extern.h" __BEGIN_DECLS -void f_all __P((struct info *)); -void f_cbreak __P((struct info *)); -void f_columns __P((struct info *)); -void f_dec __P((struct info *)); -void f_ek __P((struct info *)); -void f_everything __P((struct info *)); -void f_extproc __P((struct info *)); -void f_ispeed __P((struct info *)); -void f_lcase __P((struct info *)); -void f_nl __P((struct info *)); -void f_ospeed __P((struct info *)); -void f_raw __P((struct info *)); -void f_rows __P((struct info *)); -void f_sane __P((struct info *)); -void f_size __P((struct info *)); -void f_speed __P((struct info *)); -void f_ostart __P((struct info *)); -void f_ostop __P((struct info *)); -void f_tty __P((struct info *)); +void f_all(struct info *); +void f_cbreak(struct info *); +void f_columns(struct info *); +void f_dec(struct info *); +void f_ek(struct info *); +void f_everything(struct info *); +void f_extproc(struct info *); +void f_ispeed(struct info *); +void f_lcase(struct info *); +void f_nl(struct info *); +void f_ospeed(struct info *); +void f_raw(struct info *); +void f_rows(struct info *); +void f_sane(struct info *); +void f_size(struct info *); +void f_speed(struct info *); +void f_ostart(struct info *); +void f_ostop(struct info *); +void f_tty(struct info *); __END_DECLS static struct key { char *name; /* name */ - void (*f) __P((struct info *)); /* function */ + void (*f)(struct info *); /* function */ #define F_NEEDARG 0x01 /* needs an argument */ #define F_OFFOK 0x02 /* can turn off */ int flags; diff --git a/bin/stty/print.c b/bin/stty/print.c index 15adb22478d..f22b12b291d 100644 --- a/bin/stty/print.c +++ b/bin/stty/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $ */ +/* $OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -51,9 +51,9 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.8 1999/10/26 22:53:52 deraadt Exp $ #include "stty.h" #include "extern.h" -static void binit __P((char *)); -static void bput __P((char *)); -static char *ccval __P((const struct cchar *, int)); +static void binit(char *); +static void bput(char *); +static char *ccval(const struct cchar *, int); void print(tp, wp, ldisc, fmt) diff --git a/distrib/alpha/ecoffrdsetroot.c b/distrib/alpha/ecoffrdsetroot.c index a8a4d04e6cb..fb4e7d5c96a 100644 --- a/distrib/alpha/ecoffrdsetroot.c +++ b/distrib/alpha/ecoffrdsetroot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecoffrdsetroot.c,v 1.3 2001/05/11 14:04:30 art Exp $ */ +/* $OpenBSD: ecoffrdsetroot.c,v 1.4 2002/02/16 21:27:08 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Milller @@ -45,7 +45,7 @@ #include <sys/exec_ecoff.h> #include <nlist.h> -void find_rd_root_image __P((char *)); +void find_rd_root_image(char *); struct ecoff_exechdr head; char *file; diff --git a/games/adventure/extern.h b/games/adventure/extern.h index 4dc071a4e2b..ebd822e874b 100644 --- a/games/adventure/extern.h +++ b/games/adventure/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2001/02/04 06:07:20 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1997/10/11 01:55:27 lukem Exp $ */ /* @@ -34,91 +34,91 @@ #include <string.h> /* crc.c */ -void crc_start __P((void)); -unsigned long crc __P((const char *, int)); +void crc_start(void); +unsigned long crc(const char *, int); /* done.c */ -int score __P((void)); -void done __P((int)); -void die __P((int)); +int score(void); +void done(int); +void die(int); /* init.c */ -void init __P((void)); -char *decr __P((int, int, int, int, int)); -void linkdata __P((void)); -void trapdel __P((int)); -void startup __P((void)); +void init(void); +char *decr(int, int, int, int, int); +void linkdata(void); +void trapdel(int); +void startup(void); /* io.c */ -void getin __P((char **, char **)); -int yes __P((int, int, int)); -int yesm __P((int, int, int)); -int next __P((void)); -void rdata __P((void)); -int rnum __P((void)); -void rdesc __P((int)); -void rtrav __P((void)); +void getin(char **, char **); +int yes(int, int, int); +int yesm(int, int, int); +int next(void); +void rdata(void); +int rnum(void); +void rdesc(int); +void rtrav(void); #ifdef DEBUG -void twrite __P((int)); +void twrite(int); #endif -void rvoc __P((void)); -void rlocs __P((void)); -void rdflt __P((void)); -void rliq __P((void)); -void rhints __P((void)); -void rspeak __P((int)); -void mspeak __P((int)); +void rvoc(void); +void rlocs(void); +void rdflt(void); +void rliq(void); +void rhints(void); +void rspeak(int); +void mspeak(int); struct text; -void speak __P((const struct text *)); -void pspeak __P((int, int)); +void speak(const struct text *); +void pspeak(int, int); /* main.c */ -int main __P((int, char **)); +int main(int, char **); /* save.c */ -int save __P((const char *)); -int restore __P((const char *)); +int save(const char *); +int restore(const char *); /* subr.c */ -int toting __P((int)); -int here __P((int)); -int at __P((int)); -int liq2 __P((int)); -int liq __P((void)); -int liqloc __P((int)); -int bitset __P((int, int)); -int forced __P((int)); -int dark __P((void)); -int pct __P((int)); -int fdwarf __P((void)); -int march __P((void)); -int mback __P((void)); -int specials __P((void)); -int trbridge __P((void)); -void badmove __P((void)); -void bug __P((int)); -void checkhints __P((void)); -int trsay __P((void)); -int trtake __P((void)); -int dropper __P((void)); -int trdrop __P((void)); -int tropen __P((void)); -int trkill __P((void)); -int trtoss __P((void)); -int trfeed __P((void)); -int trfill __P((void)); -void closing __P((void)); -void caveclose __P((void)); +int toting(int); +int here(int); +int at(int); +int liq2(int); +int liq(void); +int liqloc(int); +int bitset(int, int); +int forced(int); +int dark(void); +int pct(int); +int fdwarf(void); +int march(void); +int mback(void); +int specials(void); +int trbridge(void); +void badmove(void); +void bug(int); +void checkhints(void); +int trsay(void); +int trtake(void); +int dropper(void); +int trdrop(void); +int tropen(void); +int trkill(void); +int trtoss(void); +int trfeed(void); +int trfill(void); +void closing(void); +void caveclose(void); /* vocab.c */ -void dstroy __P((int)); -void juggle __P((int)); -void move __P((int, int)); -int put __P((int, int, int)); -void carry __P((int, int)); -void drop __P((int, int)); -int vocab __P((const char *, int, int)); -void prht __P((void)); +void dstroy(int); +void juggle(int); +void move(int, int); +int put(int, int, int); +void carry(int, int); +void drop(int, int); +int vocab(const char *, int, int); +void prht(void); /* These three used to be functions in vocab.c */ #define copystr(src, dest) strcpy((dest), (src)) @@ -126,9 +126,9 @@ void prht __P((void)); #define length(str) (strlen((str)) + 1) /* wizard.c */ -void datime __P((time_t *, time_t *)); -void poof __P((void)); -int Start __P((void)); -int wizard __P((void)); -void ciao __P((void)); -int ran __P((int)); +void datime(time_t *, time_t *); +void poof(void); +int Start(void); +int wizard(void); +void ciao(void); +int ran(int); diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c index 7966cc22c8c..61c3c92fc9e 100644 --- a/games/arithmetic/arithmetic.c +++ b/games/arithmetic/arithmetic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arithmetic.c,v 1.8 1998/09/15 05:22:45 pjanzen Exp $ */ +/* $OpenBSD: arithmetic.c,v 1.9 2002/02/16 21:27:08 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: arithmetic.c,v 1.8 1998/09/15 05:22:45 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: arithmetic.c,v 1.9 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -88,13 +88,13 @@ static char rcsid[] = "$OpenBSD: arithmetic.c,v 1.8 1998/09/15 05:22:45 pjanzen #include <time.h> #include <unistd.h> -int getrandom __P((int, int, int)); -void intr __P((int)); -int opnum __P((int)); -void penalise __P((int, int, int)); -int problem __P((void)); -void showstats __P((void)); -void usage __P((void)); +int getrandom(int, int, int); +void intr(int); +int opnum(int); +void penalise(int, int, int); +int problem(void); +void showstats(void); +void usage(void); const char keylist[] = "+-x/"; const char defaultkeys[] = "+-"; diff --git a/games/atc/extern.h b/games/atc/extern.h index 923de71e342..f7fe05a86bd 100644 --- a/games/atc/extern.h +++ b/games/atc/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 2001/02/04 02:15:28 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: extern.h,v 1.4 1995/04/27 21:22:22 mycroft Exp $ */ /*- @@ -63,77 +63,77 @@ extern struct termios tty_start, tty_new; extern DISPLACEMENT displacement[MAXDIR]; -int addplane __P((void)); -void append __P((LIST *, PLANE *)); -void check_adir __P((int, int, int)); -void check_edge __P((int, int)); -void check_edir __P((int, int, int)); -void check_line __P((int, int, int, int)); -void check_linepoint __P((int, int)); -void check_point __P((int, int)); -int checkdefs __P((void)); -int compar __P((const void *, const void *)); -void delete __P((LIST *, PLANE *)); -int dir_deg __P((int)); -int dir_no __P((char)); -void done_screen __P((void)); -void draw_all __P((void)); -void draw_line __P((WINDOW *, int, int, int, int, const char *)); -void erase_all __P((void)); -int getAChar __P((void)); -int getcommand __P((void)); -int gettoken __P((void)); -void ioaddstr __P((int, const char *)); -void ioclrtobot __P((void)); -void ioclrtoeol __P((int)); -void ioerror __P((int, int, const char *)); -void iomove __P((int)); -int list_games __P((void)); -int log_score __P((int)); -void log_score_quit __P((int)); -void loser __P((const PLANE *, const char *)); -char name __P((const PLANE *)); -int next_plane __P((void)); -void noise __P((void)); -int number __P((char)); -int open_score_file __P((void)); -void planewin __P((void)); -int pop __P((void)); -void push __P((int, int)); -void quit __P((int)); -int read_file __P((const char *)); -void redraw __P((void)); -void rezero __P((void)); -void setup_screen __P((const C_SCREEN *)); -int too_close __P((const PLANE *p1, const PLANE *p2, int)); -void update __P((int)); -int yyerror __P((const char *)); -int yylex __P((void)); -int yyparse __P((void)); -const char *Left __P((char)); -const char *Right __P((char)); -const char *airport __P((char)); -const char *beacon __P((char)); -const char *benum __P((char)); -const char *circle __P((char)); -const char *climb __P((char)); -const char *command __P((PLANE *)); -const char *default_game __P((void)); -const char *delayb __P((char)); -const char *descend __P((char)); -const char *ex_it __P((char)); -PLANE *findplane __P((int)); -const char *ignore __P((char)); -const char *left __P((char)); -const char *mark __P((char)); -PLANE *newplane __P((void)); -const char *okay_game __P((const char *)); -const char *rel_dir __P((char)); -const char *right __P((char)); -const char *setalt __P((char)); -const char *setplane __P((char)); -const char *setrelalt __P((char)); -const char *timestr __P((int)); -const char *to_dir __P((char)); -const char *turn __P((char)); -const char *unmark __P((char)); +int addplane(void); +void append(LIST *, PLANE *); +void check_adir(int, int, int); +void check_edge(int, int); +void check_edir(int, int, int); +void check_line(int, int, int, int); +void check_linepoint(int, int); +void check_point(int, int); +int checkdefs(void); +int compar(const void *, const void *); +void delete(LIST *, PLANE *); +int dir_deg(int); +int dir_no(char); +void done_screen(void); +void draw_all(void); +void draw_line(WINDOW *, int, int, int, int, const char *); +void erase_all(void); +int getAChar(void); +int getcommand(void); +int gettoken(void); +void ioaddstr(int, const char *); +void ioclrtobot(void); +void ioclrtoeol(int); +void ioerror(int, int, const char *); +void iomove(int); +int list_games(void); +int log_score(int); +void log_score_quit(int); +void loser(const PLANE *, const char *); +char name(const PLANE *); +int next_plane(void); +void noise(void); +int number(char); +int open_score_file(void); +void planewin(void); +int pop(void); +void push(int, int); +void quit(int); +int read_file(const char *); +void redraw(void); +void rezero(void); +void setup_screen(const C_SCREEN *); +int too_close(const PLANE *p1, const PLANE *p2, int); +void update(int); +int yyerror(const char *); +int yylex(void); +int yyparse(void); +const char *Left(char); +const char *Right(char); +const char *airport(char); +const char *beacon(char); +const char *benum(char); +const char *circle(char); +const char *climb(char); +const char *command(PLANE *); +const char *default_game(void); +const char *delayb(char); +const char *descend(char); +const char *ex_it(char); +PLANE *findplane(int); +const char *ignore(char); +const char *left(char); +const char *mark(char); +PLANE *newplane(void); +const char *okay_game(const char *); +const char *rel_dir(char); +const char *right(char); +const char *setalt(char); +const char *setplane(char); +const char *setrelalt(char); +const char *timestr(int); +const char *to_dir(char); +const char *turn(char); +const char *unmark(char); diff --git a/games/atc/input.c b/games/atc/input.c index 709f2fb4ceb..ee04bfa659e 100644 --- a/games/atc/input.c +++ b/games/atc/input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: input.c,v 1.6 2001/08/06 22:59:13 pjanzen Exp $ */ +/* $OpenBSD: input.c,v 1.7 2002/02/16 21:27:08 millert Exp $ */ /* $NetBSD: input.c,v 1.4 1995/04/27 21:22:24 mycroft Exp $ */ /*- @@ -50,7 +50,7 @@ #if 0 static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: input.c,v 1.6 2001/08/06 22:59:13 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: input.c,v 1.7 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ typedef struct { int token; int to_state; const char *str; - const char *(*func) __P((char)); + const char *(*func)(char); } RULE; typedef struct { @@ -231,7 +231,7 @@ int getcommand() { int c, i, done; - const char *s, *(*func) __P((char)); + const char *s, *(*func)(char); PLANE *pp; rezero(); diff --git a/games/backgammon/backgammon/backlocal.h b/games/backgammon/backgammon/backlocal.h index 4d800a01337..5d7f8eb8ae6 100644 --- a/games/backgammon/backgammon/backlocal.h +++ b/games/backgammon/backgammon/backlocal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: backlocal.h,v 1.2 2001/06/23 23:49:53 pjanzen Exp $ */ +/* $OpenBSD: backlocal.h,v 1.3 2002/02/16 21:27:08 millert Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -36,13 +36,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -void dble __P((void)); -int dblgood __P((void)); -int eval __P((void)); -int freemen __P((int)); -void movcmp __P((void)); -void domove __P((int)); -int movegood __P((void)); -void pickmove __P((void)); -int trapped __P((int, int)); -void trymove __P((int, int)); +void dble(void); +int dblgood(void); +int eval(void); +int freemen(int); +void movcmp(void); +void domove(int); +int movegood(void); +void pickmove(void); +int trapped(int, int); +void trymove(int, int); diff --git a/games/backgammon/backgammon/move.c b/games/backgammon/backgammon/move.c index 3f458a4cfa7..4f0af367325 100644 --- a/games/backgammon/backgammon/move.c +++ b/games/backgammon/backgammon/move.c @@ -1,4 +1,4 @@ -/* $OpenBSD: move.c,v 1.4 2001/06/23 23:49:54 pjanzen Exp $ */ +/* $OpenBSD: move.c,v 1.5 2002/02/16 21:27:08 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: move.c,v 1.4 2001/06/23 23:49:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: move.c,v 1.5 2002/02/16 21:27:08 millert Exp $"; #endif #endif /* not lint */ @@ -85,13 +85,13 @@ static int cg[5]; /* candidate finish position */ static int race; /* game reduced to a race */ -static int bcomp __P((struct BOARD *, struct BOARD *)); -static struct BOARD *bsave __P((void)); -static void binsert __P((struct BOARD *)); -static void boardcopy __P((struct BOARD *)); -static void makefree __P((struct BOARD *)); -static void mvcheck __P((struct BOARD *, struct BOARD *)); -static struct BOARD *nextfree __P((void)); +static int bcomp(struct BOARD *, struct BOARD *); +static struct BOARD *bsave(void); +static void binsert(struct BOARD *); +static void boardcopy(struct BOARD *); +static void makefree(struct BOARD *); +static void mvcheck(struct BOARD *, struct BOARD *); +static struct BOARD *nextfree(void); void diff --git a/games/backgammon/common_source/back.h b/games/backgammon/common_source/back.h index ce2151b17c6..9588693c272 100644 --- a/games/backgammon/common_source/back.h +++ b/games/backgammon/common_source/back.h @@ -1,4 +1,4 @@ -/* $OpenBSD: back.h,v 1.6 2001/06/23 23:50:02 pjanzen Exp $ */ +/* $OpenBSD: back.h,v 1.7 2002/02/16 21:27:08 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -131,44 +131,44 @@ extern int colen; /* length of color of current player */ extern int begscr; /* 'beginning' of screen (not including board) */ -int addbuf __P((int)); -void backone __P((int)); -void bsect __P((int, int, int, int)); -int canhit __P((int, int)); -int checkd __P((int)); -int checkmove __P((int)); -int count __P((void)); -int dotable __P((char, int)); -void errexit __P((const char *)); -void fboard __P((void)); -void fixcol __P((int, int, int, int, int)); -void fixpos __P((int, int, int, int, int)); -void getarg __P((int, char **)); -void getmove __P((void)); -void getout __P((int)); /* function to exit backgammon cleanly */ -void gwrite __P((void)); -void init __P((void)); -void initcurses __P((void)); -int last __P((void)); -int makmove __P((int)); -int movallow __P((void)); -void movback __P((int)); -void moveplayers __P((void)); -void moverr __P((int)); -int movokay __P((int)); -void nexturn __P((void)); -void norec __P((const char *)); -void odds __P((int, int, int)); -void proll __P((void)); -int quit __P((void)); -int readc __P((void)); -void recover __P((const char *)); -void roll __P((void)); -int rsetbrd __P((void)); -void save __P((int)); -int text __P((const char *const *)); -void wrboard __P((void)); -void wrbsub __P((void)); -void wrhit __P((int)); -void wrscore __P((void)); -int yorn __P((char)); +int addbuf(int); +void backone(int); +void bsect(int, int, int, int); +int canhit(int, int); +int checkd(int); +int checkmove(int); +int count(void); +int dotable(char, int); +void errexit(const char *); +void fboard(void); +void fixcol(int, int, int, int, int); +void fixpos(int, int, int, int, int); +void getarg(int, char **); +void getmove(void); +void getout(int); /* function to exit backgammon cleanly */ +void gwrite(void); +void init(void); +void initcurses(void); +int last(void); +int makmove(int); +int movallow(void); +void movback(int); +void moveplayers(void); +void moverr(int); +int movokay(int); +void nexturn(void); +void norec(const char *); +void odds(int, int, int); +void proll(void); +int quit(void); +int readc(void); +void recover(const char *); +void roll(void); +int rsetbrd(void); +void save(int); +int text(const char *const *); +void wrboard(void); +void wrbsub(void); +void wrhit(int); +void wrscore(void); +int yorn(char); diff --git a/games/backgammon/teachgammon/tutor.h b/games/backgammon/teachgammon/tutor.h index b031e25f93a..21d8cc23d6d 100644 --- a/games/backgammon/teachgammon/tutor.h +++ b/games/backgammon/teachgammon/tutor.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tutor.h,v 1.3 1999/07/31 21:57:41 pjanzen Exp $ */ +/* $OpenBSD: tutor.h,v 1.4 2002/02/16 21:27:09 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -65,7 +65,7 @@ extern const char *const stragy[]; extern const struct situatn test[]; -int brdeq __P((const int *, const int *)); -void clrest __P((void)); -void leave __P((void)); -void tutor __P((void)); +int brdeq(const int *, const int *); +void clrest(void); +void leave(void); +void tutor(void); diff --git a/games/battlestar/battlestar.c b/games/battlestar/battlestar.c index b65b54a8b8d..eaf7b12f88f 100644 --- a/games/battlestar/battlestar.c +++ b/games/battlestar/battlestar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen Exp $ */ +/* $OpenBSD: battlestar.c,v 1.12 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: battlestar.c,v 1.3 1995/03/21 15:06:47 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)battlestar.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: battlestar.c,v 1.12 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: battlestar.c,v 1.11 2000/09/26 04:42:54 pjanzen #include "extern.h" #include "pathnames.h" -int main __P((int, char *[])); +int main(int, char *[]); int main(argc, argv) diff --git a/games/battlestar/extern.h b/games/battlestar/extern.h index 5dd528d9f18..c5822f9427f 100644 --- a/games/battlestar/extern.h +++ b/games/battlestar/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.11 2000/09/26 04:42:56 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.12 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: extern.h,v 1.5 1995/04/24 12:22:18 cgd Exp $ */ /* @@ -331,62 +331,62 @@ struct objs { extern const struct objs dayobjs[]; extern const struct objs nightobjs[]; -void bury __P((void)); -int card __P((const char *, int)); -void chime __P((void)); -void convert __P((int)); -void crash __P((void)); -int cypher __P((void)); -void die __P((int)); -void dig __P((void)); -void dooropen __P((void)); -int draw __P((void)); -void drink __P((void)); -int drive __P((void)); -int drop __P((const char *)); -int eat __P((void)); -int fight __P((int, int)); -int follow __P((void)); -char *getcom __P((char *, int, const char *, const char *)); -char *getword __P((char *, char *, int)); -int give __P((void)); -int inc_wordnumber __P((const char *, const char *)); -void initialize __P((const char *)); -int jump __P((void)); -void kiss __P((void)); -int land __P((void)); -int launch __P((void)); -void light __P((void)); -void live __P((void)); -void love __P((void)); -int moveplayer __P((int, int)); -void murder __P((void)); -void newlocation __P((void)); -void news __P((void)); -void newway __P((int)); -void open_score_file __P((void)); -void parse __P((void)); -void post __P((char)); -void printobjs __P((void)); -int put __P((void)); -int puton __P((void)); -const char *rate __P((void)); -void ravage __P((void)); -void restore __P((const char *)); -int ride __P((void)); -void save __P((const char *)); -char *save_file_name __P((const char *, size_t)); -int shoot __P((void)); -int take __P((unsigned int[])); -int takeoff __P((void)); -int throw __P((const char *)); -const char *truedirec __P((int, char)); -int ucard __P((const unsigned int *)); -void undress __P((void)); -int use __P((void)); -int visual __P((void)); -int wearit __P((void)); -void whichway __P((struct room)); -void wordinit __P((void)); -void writedes __P((void)); -int zzz __P((void)); +void bury(void); +int card(const char *, int); +void chime(void); +void convert(int); +void crash(void); +int cypher(void); +void die(int); +void dig(void); +void dooropen(void); +int draw(void); +void drink(void); +int drive(void); +int drop(const char *); +int eat(void); +int fight(int, int); +int follow(void); +char *getcom(char *, int, const char *, const char *); +char *getword(char *, char *, int); +int give(void); +int inc_wordnumber(const char *, const char *); +void initialize(const char *); +int jump(void); +void kiss(void); +int land(void); +int launch(void); +void light(void); +void live(void); +void love(void); +int moveplayer(int, int); +void murder(void); +void newlocation(void); +void news(void); +void newway(int); +void open_score_file(void); +void parse(void); +void post(char); +void printobjs(void); +int put(void); +int puton(void); +const char *rate(void); +void ravage(void); +void restore(const char *); +int ride(void); +void save(const char *); +char *save_file_name(const char *, size_t); +int shoot(void); +int take(unsigned int[]); +int takeoff(void); +int throw(const char *); +const char *truedirec(int, char); +int ucard(const unsigned int *); +void undress(void); +int use(void); +int visual(void); +int wearit(void); +void whichway(struct room); +void wordinit(void); +void writedes(void); +int zzz(void); diff --git a/games/battlestar/fly.c b/games/battlestar/fly.c index e5053748717..feac9388cba 100644 --- a/games/battlestar/fly.c +++ b/games/battlestar/fly.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fly.c,v 1.8 2000/09/24 21:55:25 pjanzen Exp $ */ +/* $OpenBSD: fly.c,v 1.9 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: fly.c,v 1.3 1995/03/21 15:07:28 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)fly.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: fly.c,v 1.8 2000/09/24 21:55:25 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: fly.c,v 1.9 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -57,13 +57,13 @@ static char destroyed; static char cross = 0; static sig_t oldsig; -static void blast __P((void)); -static void endfly __P((void)); -static void moveenemy __P((int)); -static void notarget __P((void)); -static void screen __P((void)); -static void succumb __P((int)); -static void target __P((void)); +static void blast(void); +static void endfly(void); +static void moveenemy(int); +static void notarget(void); +static void screen(void); +static void succumb(int); +static void target(void); static void succumb(sigraised) diff --git a/games/battlestar/init.c b/games/battlestar/init.c index e100fcbcae1..c61a05451ba 100644 --- a/games/battlestar/init.c +++ b/games/battlestar/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.7 2000/09/24 21:55:25 pjanzen Exp $ */ +/* $OpenBSD: init.c,v 1.8 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: init.c,v 1.4 1995/03/21 15:07:35 cgd Exp $ */ /* @@ -38,15 +38,15 @@ #if 0 static char sccsid[] = "@(#)init.c 8.4 (Berkeley) 4/30/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.7 2000/09/24 21:55:25 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.8 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ #include "extern.h" -static int checkout __P((const char *)); -static const char *getutmp __P((void)); -static int wizard __P((const char *)); +static int checkout(const char *); +static const char *getutmp(void); +static int wizard(const char *); void initialize(filename) diff --git a/games/battlestar/parse.c b/games/battlestar/parse.c index ada345890ed..eaa2c850fff 100644 --- a/games/battlestar/parse.c +++ b/games/battlestar/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp $ */ +/* $OpenBSD: parse.c,v 1.11 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: parse.c,v 1.3 1995/03/21 15:07:48 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.11 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -48,9 +48,9 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.10 2000/09/26 04:42:56 pjanzen Exp #define HASHMUL 81 #define HASHMASK (HASHSIZE - 1) -static int hash __P((const char *)); -static void install __P((struct wlist *)); -static struct wlist *lookup __P((const char *)); +static int hash(const char *); +static void install(struct wlist *); +static struct wlist *lookup(const char *); struct wlist *hashtab[HASHSIZE]; diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c index 44bb47462fc..5c58a84f478 100644 --- a/games/bcd/bcd.c +++ b/games/bcd/bcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcd.c,v 1.6 1999/09/25 15:52:09 pjanzen Exp $ */ +/* $OpenBSD: bcd.c,v 1.7 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: bcd.c,v 1.6 1995/04/24 12:22:23 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; #else -static char rcsid[] = "$OpenBSD: bcd.c,v 1.6 1999/09/25 15:52:09 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: bcd.c,v 1.7 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -127,7 +127,7 @@ u_short holes[256] = { */ #define bit(w,i) ((w)&(1<<(i))) -void printcard __P((char *)); +void printcard(char *); int main(argc, argv) diff --git a/games/boggle/boggle/bog.c b/games/boggle/boggle/bog.c index 0d1500376ca..bfe137545d5 100644 --- a/games/boggle/boggle/bog.c +++ b/games/boggle/boggle/bog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bog.c,v 1.7 2001/06/03 23:10:50 pjanzen Exp $ */ +/* $OpenBSD: bog.c,v 1.8 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: bog.c,v 1.5 1995/04/24 12:22:32 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)bog.c 8.1 (Berkeley) 6/11/93"; #else -static char rcsid[] = "$OpenBSD: bog.c,v 1.7 2001/06/03 23:10:50 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: bog.c,v 1.8 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: bog.c,v 1.7 2001/06/03 23:10:50 pjanzen Exp $"; #include "bog.h" #include "extern.h" -static int compar __P((const void *, const void *)); +static int compar(const void *, const void *); struct dictindex dictindex[26]; diff --git a/games/boggle/boggle/extern.h b/games/boggle/boggle/extern.h index 0149a49f10c..c1a0dc1ef66 100644 --- a/games/boggle/boggle/extern.h +++ b/games/boggle/boggle/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1998/09/24 06:45:05 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/04/24 12:22:37 cgd Exp $ */ /*- @@ -36,39 +36,39 @@ * @(#)extern.h 8.1 (Berkeley) 6/11/93 */ -void addword __P((char *)); -void badword __P((void)); -char *batchword __P((FILE *)); -void checkdict __P((void)); -int checkword __P((char *, int, int *)); -void cleanup __P((void)); -void delay __P((int)); -long dictseek __P((FILE *, long, int)); -void findword __P((void)); -void flushin __P((FILE *)); -char *getline __P((char *)); -void getword __P((char *)); -int help __P((void)); -int inputch __P((void)); -int loaddict __P((FILE *)); -int loadindex __P((char *)); -void newgame __P((char *)); -char *nextword __P((FILE *)); -FILE *opendict __P((char *)); -void playgame __P((void)); -void prompt __P((char *)); +void addword(char *); +void badword(void); +char *batchword(FILE *); +void checkdict(void); +int checkword(char *, int, int *); +void cleanup(void); +void delay(int); +long dictseek(FILE *, long, int); +void findword(void); +void flushin(FILE *); +char *getline(char *); +void getword(char *); +int help(void); +int inputch(void); +int loaddict(FILE *); +int loadindex(char *); +void newgame(char *); +char *nextword(FILE *); +FILE *opendict(char *); +void playgame(void); +void prompt(char *); void prtable __P((char *[], int, int, int, void (*)(char *[], int), int (*)(char *[], int))); -void putstr __P((char *)); -void redraw __P((void)); -void results __P((void)); -int setup __P((int, time_t)); -void showboard __P((char *)); -void showstr __P((char *, int)); -void showword __P((int)); -void starttime __P((void)); -void startwords __P((void)); -void stoptime __P((void)); -int timerch __P((void)); -void usage __P((void)); -int validword __P((char *)); +void putstr(char *); +void redraw(void); +void results(void); +int setup(int, time_t); +void showboard(char *); +void showstr(char *, int); +void showword(int); +void starttime(void); +void startwords(void); +void stoptime(void); +int timerch(void); +void usage(void); +int validword(char *); diff --git a/games/boggle/boggle/mach.c b/games/boggle/boggle/mach.c index 9e2a86349ba..af8f0d1a0c7 100644 --- a/games/boggle/boggle/mach.c +++ b/games/boggle/boggle/mach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mach.c,v 1.3 1998/09/24 06:45:06 pjanzen Exp $ */ +/* $OpenBSD: mach.c,v 1.4 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: mach.c,v 1.5 1995/04/28 22:28:48 mycroft Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)mach.c 8.1 (Berkeley) 6/11/93"; #else -static char rcsid[] = "$OpenBSD: mach.c,v 1.3 1998/09/24 06:45:06 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: mach.c,v 1.4 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -73,14 +73,14 @@ int ncols, nlines; extern char *pword[], *mword[]; extern int ngames, nmwords, npwords, tnmwords, tnpwords; -static void cont_catcher __P((int)); -static int prwidth __P((char *[], int)); -static void prword __P((char *[], int)); -static void stop_catcher __P((int)); -static void tty_cleanup __P((void)); -static int tty_setup __P((void)); -static void tty_showboard __P((char *)); -static void winch_catcher __P((int)); +static void cont_catcher(int); +static int prwidth(char *[], int); +static void prword(char *[], int); +static void stop_catcher(int); +static void tty_cleanup(void); +static int tty_setup(void); +static void tty_showboard(char *); +static void winch_catcher(int); /* * Do system dependent initialization diff --git a/games/boggle/boggle/prtable.c b/games/boggle/boggle/prtable.c index 5d83448c968..4d04a57c132 100644 --- a/games/boggle/boggle/prtable.c +++ b/games/boggle/boggle/prtable.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prtable.c,v 1.4 1998/09/24 06:45:06 pjanzen Exp $ */ +/* $OpenBSD: prtable.c,v 1.5 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: prtable.c,v 1.2 1995/03/21 12:14:42 cgd Exp $ */ /*- @@ -66,8 +66,8 @@ void prtable(base, num, d_cols, width, prentry, length) char *base[]; int num, d_cols, width; - void (*prentry) __P((char *[], int)); - int (*length) __P((char *[], int)); + void (*prentry)(char *[], int); + int (*length)(char *[], int); { register int c, j; register int a, b, cols, loc, maxlen, nrows, z; @@ -117,7 +117,7 @@ static int get_maxlen(base, num, length) char *base[]; int num; - int (*length) __P((char **, int)); + int (*length)(char **, int); { register int i, len, max; diff --git a/games/boggle/boggle/timer.c b/games/boggle/boggle/timer.c index c29b7d4e84b..7a74a18c8b9 100644 --- a/games/boggle/boggle/timer.c +++ b/games/boggle/boggle/timer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: timer.c,v 1.4 2001/09/05 20:03:07 deraadt Exp $ */ +/* $OpenBSD: timer.c,v 1.5 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: timer.c,v 1.3 1995/04/24 12:22:45 cgd Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)timer.c 8.2 (Berkeley) 2/22/94"; #else -static char rcsid[] = "$OpenBSD: timer.c,v 1.4 2001/09/05 20:03:07 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: timer.c,v 1.5 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: timer.c,v 1.4 2001/09/05 20:03:07 deraadt Exp $ #include "bog.h" #include "extern.h" -static int waitch __P((long)); +static int waitch(long); /* * Update the display of the remaining time while waiting for a character diff --git a/games/boggle/mkindex/mkindex.c b/games/boggle/mkindex/mkindex.c index 4efaf57c7f3..79a976382a6 100644 --- a/games/boggle/mkindex/mkindex.c +++ b/games/boggle/mkindex/mkindex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkindex.c,v 1.2 1998/09/24 06:45:07 pjanzen Exp $ */ +/* $OpenBSD: mkindex.c,v 1.3 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: mkindex.c,v 1.2 1995/03/21 12:14:52 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkindex.c 8.1 (Berkeley) 6/11/93"; #else -static char rcsid[] = "$OpenBSD: mkindex.c,v 1.2 1998/09/24 06:45:07 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: mkindex.c,v 1.3 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: mkindex.c,v 1.2 1998/09/24 06:45:07 pjanzen Exp #include "bog.h" -char *nextword __P((FILE *, char *, int *, int *)); +char *nextword(FILE *, char *, int *, int *); int main(argc, argv) diff --git a/games/caesar/caesar.c b/games/caesar/caesar.c index a02b8e099c4..abba1c2e495 100644 --- a/games/caesar/caesar.c +++ b/games/caesar/caesar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: caesar.c,v 1.8 2001/02/17 20:15:00 pjanzen Exp $ */ +/* $OpenBSD: caesar.c,v 1.9 2002/02/16 21:27:09 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -51,7 +51,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: caesar.c,v 1.8 2001/02/17 20:15:00 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: caesar.c,v 1.9 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -79,8 +79,8 @@ double stdf[26] = { 2.62, 0.81, 1.88, 0.23, 2.07, 0.06, }; -void printit __P((int)); -void usage __P((void)); +void printit(int); +void usage(void); int diff --git a/games/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c index b47d7a47070..ba0e2a1c2a8 100644 --- a/games/canfield/canfield/canfield.c +++ b/games/canfield/canfield/canfield.c @@ -1,4 +1,4 @@ -/* $OpenBSD: canfield.c,v 1.5 2000/07/23 21:49:04 pjanzen Exp $ */ +/* $OpenBSD: canfield.c,v 1.6 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: canfield.c,v 1.7 1995/05/13 07:28:35 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)canfield.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: canfield.c,v 1.5 2000/07/23 21:49:04 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: canfield.c,v 1.6 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -203,52 +203,52 @@ bool startedgame = FALSE, infullgame = FALSE; time_t acctstart; int dbfd = -1; -void askquit __P((int)); -void cleanup __P((int)) __attribute__((__noreturn__)); -void cleanupboard __P((void)); -void clearabovemovebox __P((void)); -void clearbelowmovebox __P((void)); -void clearmsg __P((void)); -void clearstat __P((void)); -void destinerror __P((void)); -bool diffcolor __P((const struct cardtype *, const struct cardtype *)); -void dumberror __P((void)); -bool finish __P((void)); -void fndbase __P((struct cardtype **, int, int)); -void getcmd __P((int, int, const char *)); -void initall __P((void)); -void initdeck __P((struct cardtype *[])); -void initgame __P((void)); -void instruct __P((void)); -void makeboard __P((void)); -void movebox __P((void)); -void movecard __P((void)); -void movetofound __P((struct cardtype **, int)); -void movetotalon __P((void)); -bool notempty __P((const struct cardtype *)); -void printbottombettingbox __P((void)); -void printbottominstructions __P((void)); -void printcard __P((int, int, const struct cardtype *)); -void printrank __P((int, int, const struct cardtype *, bool)); -void printtopbettingbox __P((void)); -void printtopinstructions __P((void)); -bool rankhigher __P((const struct cardtype *, int)); -bool ranklower __P((const struct cardtype *, const struct cardtype *)); -void removecard __P((int, int)); -int samesuit __P((const struct cardtype *, int)); -void showcards __P((void)); -void showstat __P((void)); -void shuffle __P((struct cardtype *[])); -void simpletableau __P((struct cardtype **, int)); -void startgame __P((void)); -void suspend __P((void)); -bool tabok __P((const struct cardtype *, int)); -void tabprint __P((int, int)); -void tabtotab __P((int, int)); -void transit __P((struct cardtype **, struct cardtype **)); -void updatebettinginfo __P((void)); -void usedstock __P((void)); -void usedtalon __P((void)); +void askquit(int); +void cleanup(int) __attribute__((__noreturn__)); +void cleanupboard(void); +void clearabovemovebox(void); +void clearbelowmovebox(void); +void clearmsg(void); +void clearstat(void); +void destinerror(void); +bool diffcolor(const struct cardtype *, const struct cardtype *); +void dumberror(void); +bool finish(void); +void fndbase(struct cardtype **, int, int); +void getcmd(int, int, const char *); +void initall(void); +void initdeck(struct cardtype *[]); +void initgame(void); +void instruct(void); +void makeboard(void); +void movebox(void); +void movecard(void); +void movetofound(struct cardtype **, int); +void movetotalon(void); +bool notempty(const struct cardtype *); +void printbottombettingbox(void); +void printbottominstructions(void); +void printcard(int, int, const struct cardtype *); +void printrank(int, int, const struct cardtype *, bool); +void printtopbettingbox(void); +void printtopinstructions(void); +bool rankhigher(const struct cardtype *, int); +bool ranklower(const struct cardtype *, const struct cardtype *); +void removecard(int, int); +int samesuit(const struct cardtype *, int); +void showcards(void); +void showstat(void); +void shuffle(struct cardtype *[]); +void simpletableau(struct cardtype **, int); +void startgame(void); +void suspend(void); +bool tabok(const struct cardtype *, int); +void tabprint(int, int); +void tabtotab(int, int); +void transit(struct cardtype **, struct cardtype **); +void updatebettinginfo(void); +void usedstock(void); +void usedtalon(void); /* * The following procedures print the board onto the screen using the diff --git a/games/canfield/cfscores/cfscores.c b/games/canfield/cfscores/cfscores.c index b87920cfee8..3a274264540 100644 --- a/games/canfield/cfscores/cfscores.c +++ b/games/canfield/cfscores/cfscores.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfscores.c,v 1.7 2001/02/18 18:13:38 pjanzen Exp $ */ +/* $OpenBSD: cfscores.c,v 1.8 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: cfscores.c,v 1.3 1995/03/21 15:08:37 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)cfscores.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cfscores.c,v 1.7 2001/02/18 18:13:38 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: cfscores.c,v 1.8 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ struct betinfo { int dbfd; -void printuser __P((const struct passwd *, int)); +void printuser(const struct passwd *, int); int main(argc, argv) diff --git a/games/cribbage/cribbage.h b/games/cribbage/cribbage.h index b8310db4fa4..918a8f318ce 100644 --- a/games/cribbage/cribbage.h +++ b/games/cribbage/cribbage.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cribbage.h,v 1.3 2001/08/10 23:50:22 pjanzen Exp $ */ +/* $OpenBSD: cribbage.h,v 1.4 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: cribbage.h,v 1.3 1995/03/21 15:08:46 cgd Exp $ */ /* @@ -63,54 +63,54 @@ extern bool playing; /* currently playing game */ extern char expl[]; /* string for explanation */ -void addmsg __P((const char *, ...)); -int adjust __P((CARD [], CARD)); -int anymove __P((CARD [], int, int)); -int anysumto __P((CARD [], int, int, int)); -void bye __P((void)); -int cchose __P((CARD [], int, int)); -void cdiscard __P((bool)); -int chkscr __P((int *, int)); -int comphand __P((CARD [], char *)); -void cremove __P((CARD, CARD [], int)); -int cut __P((bool, int)); -int deal __P((int)); -void discard __P((bool)); -void do_wait __P((void)); -void endmsg __P((void)); -int eq __P((CARD, CARD)); -int fifteens __P((CARD [], int)); -void game __P((void)); -void gamescore __P((void)); -char *getline __P((void)); -int getuchar __P((void)); -int incard __P((CARD *)); -int infrom __P((CARD [], int, char *)); -void instructions __P((void)); -int isone __P((CARD, CARD [], int)); -void makeboard __P((void)); -void makedeck __P((CARD [])); -void makeknown __P((CARD [], int)); -void msg __P((const char *, ...)); -int msgcard __P((CARD, bool)); -int msgcrd __P((CARD, bool, char *, bool)); -int number __P((int, int, char *)); -int numofval __P((CARD [], int, int)); -int pairuns __P((CARD [], int)); -int peg __P((bool)); -int pegscore __P((CARD, CARD [], int, int)); -int playhand __P((bool)); -int plyrhand __P((CARD [], char *)); -void prcard __P((WINDOW *, int, int, CARD, bool)); -void prcrib __P((bool, bool)); -void prhand __P((CARD [], int, WINDOW *, bool)); -void printcard __P((WINDOW *, int, CARD, bool)); -void prpeg __P((int, int, bool)); -void prtable __P((int)); -int readchar __P((void)); -void rint __P((int)); -int score __P((bool)); -int scorehand __P((CARD [], CARD, int, bool, bool)); -void shuffle __P((CARD [])); -void sorthand __P((CARD [], int)); -void wait_for __P((int)); +void addmsg(const char *, ...); +int adjust(CARD [], CARD); +int anymove(CARD [], int, int); +int anysumto(CARD [], int, int, int); +void bye(void); +int cchose(CARD [], int, int); +void cdiscard(bool); +int chkscr(int *, int); +int comphand(CARD [], char *); +void cremove(CARD, CARD [], int); +int cut(bool, int); +int deal(int); +void discard(bool); +void do_wait(void); +void endmsg(void); +int eq(CARD, CARD); +int fifteens(CARD [], int); +void game(void); +void gamescore(void); +char *getline(void); +int getuchar(void); +int incard(CARD *); +int infrom(CARD [], int, char *); +void instructions(void); +int isone(CARD, CARD [], int); +void makeboard(void); +void makedeck(CARD []); +void makeknown(CARD [], int); +void msg(const char *, ...); +int msgcard(CARD, bool); +int msgcrd(CARD, bool, char *, bool); +int number(int, int, char *); +int numofval(CARD [], int, int); +int pairuns(CARD [], int); +int peg(bool); +int pegscore(CARD, CARD [], int, int); +int playhand(bool); +int plyrhand(CARD [], char *); +void prcard(WINDOW *, int, int, CARD, bool); +void prcrib(bool, bool); +void prhand(CARD [], int, WINDOW *, bool); +void printcard(WINDOW *, int, CARD, bool); +void prpeg(int, int, bool); +void prtable(int); +int readchar(void); +void rint(int); +int score(bool); +int scorehand(CARD [], CARD, int, bool, bool); +void shuffle(CARD []); +void sorthand(CARD [], int); +void wait_for(int); diff --git a/games/dm/dm.c b/games/dm/dm.c index ef500d7cba2..3a32389615b 100644 --- a/games/dm/dm.c +++ b/games/dm/dm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dm.c,v 1.13 1999/09/25 15:52:19 pjanzen Exp $ */ +/* $OpenBSD: dm.c,v 1.14 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: dm.c,v 1.5 1996/02/06 22:47:20 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dm.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dm.c,v 1.13 1999/09/25 15:52:19 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: dm.c,v 1.14 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -71,18 +71,18 @@ static int priority = 0; /* priority game runs at */ static char *game, /* requested game */ *gametty; /* from tty? */ -void c_day __P((const char *, const char *, const char *)); -void c_game __P((const char *, const char *, const char *, const char *)); -void c_tty __P((const char *)); -const char *hour __P((int)); -double load __P((void)); -int main __P((int, char *[])); -void nogamefile __P((void)); -void play __P((char **)); -void read_config __P((void)); -int users __P((void)); +void c_day(const char *, const char *, const char *); +void c_game(const char *, const char *, const char *, const char *); +void c_tty(const char *); +const char *hour(int); +double load(void); +int main(int, char *[]); +void nogamefile(void); +void play(char **); +void read_config(void); +int users(void); #ifdef LOG -void logfile __P((void)); +void logfile(void); #endif int diff --git a/games/factor/factor.c b/games/factor/factor.c index 0e12513327f..c899b387994 100644 --- a/games/factor/factor.c +++ b/games/factor/factor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: factor.c,v 1.11 2001/10/24 14:32:56 deraadt Exp $ */ +/* $OpenBSD: factor.c,v 1.12 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: factor.c,v 1.5 1995/03/23 08:28:07 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: factor.c,v 1.11 2001/10/24 14:32:56 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: factor.c,v 1.12 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -94,9 +94,9 @@ extern const ubig *pr_limit; /* largest prime in the prime array */ extern const char pattern[]; extern const int pattern_size; -void pr_fact __P((u_int64_t)); /* print factors of a value */ -void pr_bigfact __P((u_int64_t)); -void usage __P((void)); +void pr_fact(u_int64_t); /* print factors of a value */ +void pr_bigfact(u_int64_t); +void usage(void); int main(argc, argv) diff --git a/games/fish/fish.c b/games/fish/fish.c index 408b9fc4dbc..eeb77efd914 100644 --- a/games/fish/fish.c +++ b/games/fish/fish.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fish.c,v 1.9 2001/07/09 07:04:29 deraadt Exp $ */ +/* $OpenBSD: fish.c,v 1.10 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: fish.c,v 1.3 1995/03/23 08:28:18 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)fish.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: fish.c,v 1.9 2001/07/09 07:04:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: fish.c,v 1.10 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -83,22 +83,22 @@ int curcard; int asked[RANKS], comphand[RANKS], deck[TOTCARDS]; int userasked[RANKS], userhand[RANKS]; -void chkwinner __P((int, const int *)); -int compmove __P((void)); -int countbooks __P((const int *)); -int countcards __P((const int *)); -int drawcard __P((int, int *)); -int getans __P((const char *)); -int gofish __P((int, int, int *)); -void goodmove __P((int, int, int *, int *)); -void init __P((void)); -void instructions __P((void)); -int nrandom __P((int)); -void printhand __P((const int *)); -void printplayer __P((int)); -int promove __P((void)); -void usage __P((void)); -int usermove __P((void)); +void chkwinner(int, const int *); +int compmove(void); +int countbooks(const int *); +int countcards(const int *); +int drawcard(int, int *); +int getans(const char *); +int gofish(int, int, int *); +void goodmove(int, int, int *, int *); +void init(void); +void instructions(void); +int nrandom(int); +void printhand(const int *); +void printplayer(int); +int promove(void); +void usage(void); +int usermove(void); int main(argc, argv) diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c index c4ba4340abd..090b646f273 100644 --- a/games/fortune/fortune/fortune.c +++ b/games/fortune/fortune/fortune.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fortune.c,v 1.11 2001/06/26 01:36:33 pjanzen Exp $ */ +/* $OpenBSD: fortune.c,v 1.12 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: fortune.c,v 1.8 1995/03/23 08:28:40 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: fortune.c,v 1.11 2001/06/26 01:36:33 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: fortune.c,v 1.12 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -127,44 +127,44 @@ FILEDESC *Fortfile; /* Fortune file to use */ STRFILE Noprob_tbl; /* sum of data for all no prob files */ -int add_dir __P((FILEDESC *)); +int add_dir(FILEDESC *); int add_file __P((int, char *, char *, FILEDESC **, FILEDESC **, FILEDESC *)); -void all_forts __P((FILEDESC *, char *)); -char *copy __P((char *, u_int)); -void display __P((FILEDESC *)); -void do_free __P((void *)); -void *do_malloc __P((u_int)); -int form_file_list __P((char **, int)); -int fortlen __P((void)); -void get_fort __P((void)); -void get_pos __P((FILEDESC *)); -void get_tbl __P((FILEDESC *)); -void getargs __P((int, char *[])); -void init_prob __P((void)); -int is_dir __P((char *)); -int is_fortfile __P((char *, char **, char **, int)); -int is_off_name __P((char *)); -int max __P((int, int)); +void all_forts(FILEDESC *, char *); +char *copy(char *, u_int); +void display(FILEDESC *); +void do_free(void *); +void *do_malloc(u_int); +int form_file_list(char **, int); +int fortlen(void); +void get_fort(void); +void get_pos(FILEDESC *); +void get_tbl(FILEDESC *); +void getargs(int, char *[]); +void init_prob(void); +int is_dir(char *); +int is_fortfile(char *, char **, char **, int); +int is_off_name(char *); +int max(int, int); FILEDESC * - new_fp __P((void)); -char *off_name __P((char *)); -void open_dat __P((FILEDESC *)); -void open_fp __P((FILEDESC *)); + new_fp(void); +char *off_name(char *); +void open_dat(FILEDESC *); +void open_fp(FILEDESC *); FILEDESC * - pick_child __P((FILEDESC *)); -void print_file_list __P((void)); -void print_list __P((FILEDESC *, int)); -void sum_noprobs __P((FILEDESC *)); -void sum_tbl __P((STRFILE *, STRFILE *)); -void usage __P((void)); -void zero_tbl __P((STRFILE *)); + pick_child(FILEDESC *); +void print_file_list(void); +void print_list(FILEDESC *, int); +void sum_noprobs(FILEDESC *); +void sum_tbl(STRFILE *, STRFILE *); +void usage(void); +void zero_tbl(STRFILE *); #ifndef NO_REGEX -char *conv_pat __P((char *)); -int find_matches __P((void)); -void matches_in_list __P((FILEDESC *)); -int maxlen_in_list __P((FILEDESC *)); +char *conv_pat(char *); +int find_matches(void); +void matches_in_list(FILEDESC *); +int maxlen_in_list(FILEDESC *); #endif #ifndef NO_REGEX diff --git a/games/fortune/strfile/strfile.c b/games/fortune/strfile/strfile.c index ac8a86969c3..3af7d784d22 100644 --- a/games/fortune/strfile/strfile.c +++ b/games/fortune/strfile/strfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strfile.c,v 1.9 2001/03/30 04:47:28 pjanzen Exp $ */ +/* $OpenBSD: strfile.c,v 1.10 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: strfile.c,v 1.4 1995/04/24 12:23:09 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: strfile.c,v 1.9 2001/03/30 04:47:28 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: strfile.c,v 1.10 2002/02/16 21:27:09 millert Exp $"; #endif #endif /* not lint */ @@ -124,13 +124,13 @@ STRFILE Tbl; /* statistics table */ STR *Firstch; /* first chars of each string */ -void add_offset __P((FILE *, int32_t)); -int cmp_str __P((const void *, const void *)); -void do_order __P((void)); -void getargs __P((int, char **)); -void randomize __P((void)); -char *unctrl __P((char)); -void usage __P((void)); +void add_offset(FILE *, int32_t); +int cmp_str(const void *, const void *); +void do_order(void); +void getargs(int, char **); +void randomize(void); +char *unctrl(char); +void usage(void); /* * main: diff --git a/games/fortune/unstr/unstr.c b/games/fortune/unstr/unstr.c index b7a2966a878..d696af0e472 100644 --- a/games/fortune/unstr/unstr.c +++ b/games/fortune/unstr/unstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unstr.c,v 1.6 2001/03/30 04:47:33 pjanzen Exp $ */ +/* $OpenBSD: unstr.c,v 1.7 2002/02/16 21:27:09 millert Exp $ */ /* $NetBSD: unstr.c,v 1.3 1995/03/23 08:29:00 cgd Exp $ */ /*- @@ -73,8 +73,8 @@ char *Infile, /* name of input file */ FILE *Inf, *Dataf; -void getargs __P((char *[])); -void order_unstr __P((STRFILE *)); +void getargs(char *[]); +void order_unstr(STRFILE *); /* ARGSUSED */ int diff --git a/games/gomoku/gomoku.h b/games/gomoku/gomoku.h index 64310479117..9b83fb0d4d5 100644 --- a/games/gomoku/gomoku.h +++ b/games/gomoku/gomoku.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gomoku.h,v 1.4 1998/03/26 21:16:47 pjanzen Exp $ */ +/* $OpenBSD: gomoku.h,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. @@ -267,55 +267,55 @@ extern int movelog[BSZ * BSZ]; /* history of moves */ extern int movenum; extern int debug; -void addframes __P((int)); -void appendcombo __P((struct combostr *)); -void ask __P((char *)); -void bdinit __P((struct spotstr *)); -void bdisp __P((void)); -void bdisp_init __P((void)); +void addframes(int); +void appendcombo(struct combostr *); +void ask(char *); +void bdinit(struct spotstr *); +void bdisp(void); +void bdisp_init(void); #ifdef DEBUG -void bdump __P((FILE *)); +void bdump(FILE *); #endif -void bdwho __P((int)); -int better __P((struct spotstr *, struct spotstr *, int)); +void bdwho(int); +int better(struct spotstr *, struct spotstr *, int); int checkframes __P((struct combostr *, struct combostr *, struct spotstr *, int, struct ovlp_info *)); #ifdef DEBUG -void clearcombo __P((struct combostr *, int)); +void clearcombo(struct combostr *, int); #endif -int ctos __P((char *)); -void cursfini __P((void)); -void cursinit __P((void)); -void dislog __P((char *)); -void dlog __P((char *)); -int getcoord __P((void)); -int getline __P((char *, int)); -void init_overlap __P((void)); +int ctos(char *); +void cursfini(void); +void cursinit(void); +void dislog(char *); +void dlog(char *); +int getcoord(void); +int getline(char *, int); +void init_overlap(void); #ifdef DEBUG -int list_eq __P((struct combostr **, struct combostr **, int)); +int list_eq(struct combostr **, struct combostr **, int); #endif -void log __P((char *)); -int lton __P((int)); -void makecombo __P((struct combostr *, struct spotstr *, int, int)); -void makecombo2 __P((struct combostr *, struct spotstr *, int, int)); -void makeempty __P((struct combostr *)); -int makemove __P((int, int)); +void log(char *); +int lton(int); +void makecombo(struct combostr *, struct spotstr *, int, int); +void makecombo2(struct combostr *, struct spotstr *, int, int); +void makeempty(struct combostr *); +int makemove(int, int); #ifdef DEBUG -void markcombo __P((struct combostr *)); +void markcombo(struct combostr *); #endif -void panic __P((char *)); -int pickmove __P((int)); -void printcombo __P((struct combostr *, char *)); -void qlog __P((char *)); -void quit __P((int)); -int readinput __P((FILE *)); -void scanframes __P((int)); -int sortcombo __P((struct combostr **, struct combostr **, struct combostr *)); -char *stoc __P((int)); -void updatecombo __P((struct combostr *, int)); -void update_overlap __P((struct spotstr *)); +void panic(char *); +int pickmove(int); +void printcombo(struct combostr *, char *); +void qlog(char *); +void quit(int); +int readinput(FILE *); +void scanframes(int); +int sortcombo(struct combostr **, struct combostr **, struct combostr *); +char *stoc(int); +void updatecombo(struct combostr *, int); +void update_overlap(struct spotstr *); #ifdef DEBUG -void whatsup __P((int)); +void whatsup(int); #endif #define ASSERT(x) diff --git a/games/grdc/grdc.c b/games/grdc/grdc.c index a56eb436fb5..fed0dd8aa3d 100644 --- a/games/grdc/grdc.c +++ b/games/grdc/grdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grdc.c,v 1.9 2000/07/05 08:26:36 pjanzen Exp $ */ +/* $OpenBSD: grdc.c,v 1.10 2002/02/16 21:27:10 millert Exp $ */ /* * Grand digital clock for curses compatible terminals * Usage: grdc [-s] [n] -- run for n seconds (default infinity) @@ -36,10 +36,10 @@ int sigtermed=0; int hascolor = 0; -void set __P((int, int)); -void standt __P((int)); -void movto __P((int, int)); -void usage __P((void)); +void set(int, int); +void standt(int); +void movto(int, int); +void usage(void); void sighndl(signo) diff --git a/games/hangman/hangman.h b/games/hangman/hangman.h index 7d3f7713683..127b457d721 100644 --- a/games/hangman/hangman.h +++ b/games/hangman/hangman.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hangman.h,v 1.4 1999/09/25 20:51:53 pjanzen Exp $ */ +/* $OpenBSD: hangman.h,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: hangman.h,v 1.5 1995/04/24 12:23:44 cgd Exp $ */ /* @@ -89,13 +89,13 @@ extern FILE *Dict; extern off_t Dict_size; -void die __P((int)); -void endgame __P((void)); -void getguess __P((void)); -void getword __P((void)); -void playgame __P((void)); -void prdata __P((void)); -void prman __P((void)); -void prword __P((void)); -int readch __P((void)); -void setup __P((void)); +void die(int); +void endgame(void); +void getguess(void); +void getword(void); +void playgame(void); +void prdata(void); +void prman(void); +void prword(void); +int readch(void); +void setup(void); diff --git a/games/hunt/hunt/client.h b/games/hunt/hunt/client.h index 42f48e48e8a..26fb6d9589d 100644 --- a/games/hunt/hunt/client.h +++ b/games/hunt/hunt/client.h @@ -1,4 +1,4 @@ -/* $OpenBSD: client.h,v 1.2 1999/02/01 06:53:55 d Exp $ */ +/* $OpenBSD: client.h,v 1.3 2002/02/16 21:27:10 millert Exp $ */ /* hunt.c */ extern FLAG Am_monitor; /* -m flag */ @@ -7,19 +7,19 @@ extern char * Send_message; /* -w message */ extern int Socket; /* connection to server */ extern char map_key[256]; /* HUNT envvar */ -void bad_con __P((void)); -void bad_ver __P((void)); -void intr __P((int)); +void bad_con(void); +void bad_ver(void); +void intr(int); /* connect.c */ -void do_connect __P((char *, u_int8_t, u_int32_t)); +void do_connect(char *, u_int8_t, u_int32_t); /* playit.c */ -void playit __P((void)); -void do_message __P((void)); -int quit __P((int)); +void playit(void); +void do_message(void); +int quit(int); /* otto.c */ extern int Otto_mode; -int otto __P((int, int, char, char *, size_t)); -int otto_quit __P((int)); +int otto(int, int, char, char *, size_t); +int otto_quit(int); diff --git a/games/hunt/hunt/display.h b/games/hunt/hunt/display.h index 553bd55e5e6..10c837f68d1 100644 --- a/games/hunt/hunt/display.h +++ b/games/hunt/hunt/display.h @@ -1,18 +1,18 @@ -/* $OpenBSD: display.h,v 1.1 1999/01/29 07:30:33 d Exp $ */ +/* $OpenBSD: display.h,v 1.2 2002/02/16 21:27:10 millert Exp $ */ -void display_open __P((void)); -void display_beep __P((void)); -void display_refresh __P((void)); -void display_clear_eol __P((void)); -void display_put_ch __P((char)); -void display_put_str __P((char *)); -void display_clear_the_screen __P((void)); -void display_move __P((int, int)); -void display_getyx __P((int *, int *)); -void display_end __P((void)); -char display_atyx __P((int, int)); -void display_redraw_screen __P((void)); -int display_iskillchar __P((char)); -int display_iserasechar __P((char)); +void display_open(void); +void display_beep(void); +void display_refresh(void); +void display_clear_eol(void); +void display_put_ch(char); +void display_put_str(char *); +void display_clear_the_screen(void); +void display_move(int, int); +void display_getyx(int *, int *); +void display_end(void); +char display_atyx(int, int); +void display_redraw_screen(void); +int display_iskillchar(char); +int display_iserasechar(char); extern int cur_row, cur_col; diff --git a/games/hunt/hunt/hunt.c b/games/hunt/hunt/hunt.c index e4737d62ac5..13013bc0514 100644 --- a/games/hunt/hunt/hunt.c +++ b/games/hunt/hunt/hunt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hunt.c,v 1.8 2001/06/25 05:55:46 pvalchev Exp $ */ +/* $OpenBSD: hunt.c,v 1.9 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: hunt.c,v 1.8 1998/09/13 15:27:28 hubertf Exp $ */ /* * Hunt @@ -55,12 +55,12 @@ static char team = '-'; static int in_visual; -static void dump_scores __P((void)); -static long env_init __P((long)); -static void fill_in_blanks __P((void)); -static void leave __P((int, char *)) __attribute__((__noreturn__)); -static void sigterm __P((int)); -static int find_driver __P((void)); +static void dump_scores(void); +static long env_init(long); +static void fill_in_blanks(void); +static void leave(int, char *) __attribute__((__noreturn__)); +static void sigterm(int); +static int find_driver(void); /* * main: diff --git a/games/hunt/hunt/list.h b/games/hunt/hunt/list.h index acde43ca54f..b6a61cda05e 100644 --- a/games/hunt/hunt/list.h +++ b/games/hunt/hunt/list.h @@ -1,4 +1,4 @@ -/* $OpenBSD: list.h,v 1.1 1999/12/12 14:53:02 d Exp $ */ +/* $OpenBSD: list.h,v 1.2 2002/02/16 21:27:10 millert Exp $ */ struct driver { struct sockaddr addr; @@ -10,9 +10,9 @@ extern struct driver *drivers; extern int numdrivers; extern u_int16_t Server_port; -struct driver *next_driver __P((void)); -struct driver *next_driver_fd __P((int)); -const char * driver_name __P((struct driver *)); -void probe_drivers __P((u_int16_t, char *)); -void probe_cleanup __P((void)); +struct driver *next_driver(void); +struct driver *next_driver_fd(int); +const char * driver_name(struct driver *); +void probe_drivers(u_int16_t, char *); +void probe_cleanup(void); diff --git a/games/hunt/hunt/otto.c b/games/hunt/hunt/otto.c index b7dfe2a791a..b63cd75db7e 100644 --- a/games/hunt/hunt/otto.c +++ b/games/hunt/hunt/otto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: otto.c,v 1.5 2001/02/13 11:55:00 pjanzen Exp $ */ +/* $OpenBSD: otto.c,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: otto.c,v 1.2 1997/10/10 16:32:39 lukem Exp $ */ /* * otto - a hunt otto-matic player @@ -94,15 +94,15 @@ static int row, col; static int num_turns; /* for wandering */ static char been_there[HEIGHT][WIDTH2]; -static void attack __P((int, struct item *)); -static void duck __P((int)); -static void face_and_move_direction __P((int, int)); -static int go_for_ammo __P((char)); -static void ottolook __P((int, struct item *)); -static void look_around __P((void)); -static int stop_look __P((struct item *, char, int, int)); -static void wander __P((void)); -static void _panic __P((const char *, int, const char *)); +static void attack(int, struct item *); +static void duck(int); +static void face_and_move_direction(int, int); +static int go_for_ammo(char); +static void ottolook(int, struct item *); +static void look_around(void); +static int stop_look(struct item *, char, int, int); +static void wander(void); +static void _panic(const char *, int, const char *); int otto(y, x, face, buf, buflen) diff --git a/games/hunt/hunt/playit.c b/games/hunt/hunt/playit.c index 158641472d3..dc8629a58cf 100644 --- a/games/hunt/hunt/playit.c +++ b/games/hunt/hunt/playit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: playit.c,v 1.6 2001/02/13 11:55:01 pjanzen Exp $ */ +/* $OpenBSD: playit.c,v 1.7 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: playit.c,v 1.4 1997/10/20 00:37:15 lukem Exp $ */ /* * Hunt @@ -35,8 +35,8 @@ static unsigned char ibuf[256], *iptr = ibuf; #define GETCHR() (--icnt < 0 ? getchr() : *iptr++) -static unsigned char getchr __P((void)); -static void send_stuff __P((void)); +static unsigned char getchr(void); +static void send_stuff(void); /* * playit: diff --git a/games/hunt/huntd/answer.c b/games/hunt/huntd/answer.c index 1fa1468fd5c..02fe286206e 100644 --- a/games/hunt/huntd/answer.c +++ b/games/hunt/huntd/answer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: answer.c,v 1.7 1999/12/12 15:07:03 d Exp $ */ +/* $OpenBSD: answer.c,v 1.8 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: answer.c,v 1.3 1997/10/10 16:32:50 lukem Exp $ */ /* * Hunt @@ -31,9 +31,9 @@ int deny_severity = LOG_WARNING; /* List of spawning connections: */ struct spawn *Spawn = NULL; -static void stplayer __P((PLAYER *, int)); -static void stmonitor __P((PLAYER *)); -static IDENT * get_ident __P((struct sockaddr *, int, u_long, char *, char)); +static void stplayer(PLAYER *, int); +static void stmonitor(PLAYER *); +static IDENT * get_ident(struct sockaddr *, int, u_long, char *, char); void answer_first() diff --git a/games/hunt/huntd/conf.h b/games/hunt/huntd/conf.h index 63bd83301c4..f5fac25783e 100644 --- a/games/hunt/huntd/conf.h +++ b/games/hunt/huntd/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.3 1999/12/12 15:08:14 d Exp $ */ +/* $OpenBSD: conf.h,v 1.4 2002/02/16 21:27:10 millert Exp $ */ /* Configuration option variables for the server: */ @@ -50,6 +50,6 @@ extern int conf_scanlen; extern int conf_mindshot; extern int conf_simstep; -void config __P((void)); -void config_arg __P((char *)); +void config(void); +void config_arg(char *); diff --git a/games/hunt/huntd/draw.c b/games/hunt/huntd/draw.c index 745a5a0e205..c5236ccf4ce 100644 --- a/games/hunt/huntd/draw.c +++ b/games/hunt/huntd/draw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: draw.c,v 1.5 2001/09/19 15:19:45 pjanzen Exp $ */ +/* $OpenBSD: draw.c,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: draw.c,v 1.2 1997/10/10 16:33:04 lukem Exp $ */ /* * Hunt @@ -12,10 +12,10 @@ #include "server.h" #include "conf.h" -static char translate __P((char)); -static int player_sym __P((PLAYER *, int, int)); -static void drawstatus __P((PLAYER *)); -static void see __P((PLAYER *, int)); +static char translate(char); +static int player_sym(PLAYER *, int, int); +static void drawstatus(PLAYER *); +static void see(PLAYER *, int); /* * drawmaze: diff --git a/games/hunt/huntd/driver.c b/games/hunt/huntd/driver.c index f56e9bfd73d..d893ce294e6 100644 --- a/games/hunt/huntd/driver.c +++ b/games/hunt/huntd/driver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: driver.c,v 1.10 2001/02/13 11:55:10 pjanzen Exp $ */ +/* $OpenBSD: driver.c,v 1.11 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: driver.c,v 1.5 1997/10/20 00:37:16 lukem Exp $ */ /* * Hunt @@ -36,17 +36,17 @@ u_short sock_port; /* port # of tcp listen socket */ u_short stat_port; /* port # of statistics tcp socket */ in_addr_t Server_addr = INADDR_ANY; /* address to bind to */ -static void clear_scores __P((void)); -static int havechar __P((PLAYER *)); -static void init __P((void)); - int main __P((int, char *[])); -static void makeboots __P((void)); -static void send_stats __P((void)); -static void zap __P((PLAYER *, FLAG)); -static void announce_game __P((void)); -static void siginfo __P((int)); -static void print_stats __P((FILE *)); -static void handle_wkport __P((int)); +static void clear_scores(void); +static int havechar(PLAYER *); +static void init(void); + int main(int, char *[]); +static void makeboots(void); +static void send_stats(void); +static void zap(PLAYER *, FLAG); +static void announce_game(void); +static void siginfo(int); +static void print_stats(FILE *); +static void handle_wkport(int); /* * main: diff --git a/games/hunt/huntd/execute.c b/games/hunt/huntd/execute.c index e45297c6704..d21298ea293 100644 --- a/games/hunt/huntd/execute.c +++ b/games/hunt/huntd/execute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: execute.c,v 1.5 1999/08/30 23:29:46 d Exp $ */ +/* $OpenBSD: execute.c,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: execute.c,v 1.2 1997/10/10 16:33:13 lukem Exp $ */ /* * Hunt @@ -13,13 +13,13 @@ #include "conf.h" #include "server.h" -static void cloak __P((PLAYER *)); -static void face __P((PLAYER *, int)); -static void fire __P((PLAYER *, int)); -static void fire_slime __P((PLAYER *, int)); -static void move_player __P((PLAYER *, int)); -static void pickup __P((PLAYER *, int, int, int, int)); -static void scan __P((PLAYER *)); +static void cloak(PLAYER *); +static void face(PLAYER *, int); +static void fire(PLAYER *, int); +static void fire_slime(PLAYER *, int); +static void move_player(PLAYER *, int); +static void pickup(PLAYER *, int, int, int, int); +static void scan(PLAYER *); /* diff --git a/games/hunt/huntd/expl.c b/games/hunt/huntd/expl.c index f40ce908617..933867c5c14 100644 --- a/games/hunt/huntd/expl.c +++ b/games/hunt/huntd/expl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: expl.c,v 1.5 1999/08/30 23:30:08 d Exp $ */ +/* $OpenBSD: expl.c,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: expl.c,v 1.2 1997/10/10 16:33:18 lukem Exp $ */ /* * Hunt @@ -13,8 +13,8 @@ #include "server.h" #include "conf.h" -static void remove_wall __P((int, int)); -static void init_removed __P((void)); +static void remove_wall(int, int); +static void init_removed(void); /* diff --git a/games/hunt/huntd/makemaze.c b/games/hunt/huntd/makemaze.c index 3a6ca3e2464..bfbac4c9f67 100644 --- a/games/hunt/huntd/makemaze.c +++ b/games/hunt/huntd/makemaze.c @@ -1,4 +1,4 @@ -/* $OpenBSD: makemaze.c,v 1.4 2001/02/13 11:55:11 pjanzen Exp $ */ +/* $OpenBSD: makemaze.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: makemaze.c,v 1.2 1997/10/10 16:33:43 lukem Exp $ */ /* * Hunt @@ -15,10 +15,10 @@ # define ISCLEAR(y,x) (Maze[y][x] == SPACE) # define ODD(n) ((n) & 01) -static int candig __P((int, int)); -static void dig __P((int, int)); -static void dig_maze __P((int, int)); -static void remap __P((void)); +static int candig(int, int); +static void dig(int, int); +static void dig_maze(int, int); +static void remap(void); void makemaze() diff --git a/games/hunt/huntd/server.h b/games/hunt/huntd/server.h index 1772a5a2dcd..cac2c72d2f5 100644 --- a/games/hunt/huntd/server.h +++ b/games/hunt/huntd/server.h @@ -1,4 +1,4 @@ -/* $OpenBSD: server.h,v 1.5 1999/12/12 15:16:20 d Exp $ */ +/* $OpenBSD: server.h,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf Exp $ */ /* @@ -189,63 +189,63 @@ extern struct spawn * Spawn; extern int Socket; /* answer.c */ -void answer_first __P((void)); -int answer_next __P((struct spawn *)); -int rand_dir __P((void)); -void answer_info __P((FILE *)); +void answer_first(void); +int answer_next(struct spawn *); +int rand_dir(void); +void answer_info(FILE *); /* draw.c */ -void drawmaze __P((PLAYER *)); -void look __P((PLAYER *)); -void check __P((PLAYER *, int, int)); -void showstat __P((PLAYER *)); -void drawplayer __P((PLAYER *, FLAG)); -void message __P((PLAYER *, char *)); +void drawmaze(PLAYER *); +void look(PLAYER *); +void check(PLAYER *, int, int); +void showstat(PLAYER *); +void drawplayer(PLAYER *, FLAG); +void message(PLAYER *, char *); /* driver.c */ -int rand_num __P((int)); -void checkdam __P((PLAYER *, PLAYER *, IDENT *, int, char)); -void cleanup __P((int)); +int rand_num(int); +void checkdam(PLAYER *, PLAYER *, IDENT *, int, char); +void cleanup(int); /* execute.c */ -void mon_execute __P((PLAYER *)); -void execute __P((PLAYER *)); -void add_shot __P((int, int, int, char, int, PLAYER *, int, char)); +void mon_execute(PLAYER *); +void execute(PLAYER *); +void add_shot(int, int, int, char, int, PLAYER *, int, char); BULLET *create_shot __P((int, int, int, char, int, int, PLAYER *, IDENT *, int, char)); -void ammo_update __P((PLAYER *)); +void ammo_update(PLAYER *); /* expl.c */ -void showexpl __P((int, int, char)); -void rollexpl __P((void)); -void makemaze __P((void)); -void clearwalls __P((void)); -int can_rollexpl __P((void)); +void showexpl(int, int, char); +void rollexpl(void); +void makemaze(void); +void clearwalls(void); +int can_rollexpl(void); /* makemaze.c */ -void makemaze __P((void)); +void makemaze(void); /* shots.c */ -int can_moveshots __P((void)); -void moveshots __P((void)); -PLAYER *play_at __P((int, int)); -int opposite __P((int, char)); -BULLET *is_bullet __P((int, int)); -void fixshots __P((int, int, char)); +int can_moveshots(void); +void moveshots(void); +PLAYER *play_at(int, int); +int opposite(int, char); +BULLET *is_bullet(int, int); +void fixshots(int, int, char); /* terminal.c */ -void cgoto __P((PLAYER *, int, int)); -void outch __P((PLAYER *, char)); -void outstr __P((PLAYER *, char *, int)); -void outyx __P((PLAYER *, int, int, const char *, ...)) +void cgoto(PLAYER *, int, int); +void outch(PLAYER *, char); +void outstr(PLAYER *, char *, int); +void outyx(PLAYER *, int, int, const char *, ...) __attribute__((format (printf, 4, 5))); -void clrscr __P((PLAYER *)); -void ce __P((PLAYER *)); -void sendcom __P((PLAYER *, int, ...)); -void flush __P((PLAYER *)); -void log __P((int, const char *, ...)) +void clrscr(PLAYER *); +void ce(PLAYER *); +void sendcom(PLAYER *, int, ...); +void flush(PLAYER *); +void log(int, const char *, ...) __attribute__((format (printf, 2, 3))); -void logx __P((int, const char *, ...)) +void logx(int, const char *, ...) __attribute__((format (printf, 2, 3))); /* extern.c */ diff --git a/games/hunt/huntd/shots.c b/games/hunt/huntd/shots.c index 9ae2b1086e3..a035784fdd4 100644 --- a/games/hunt/huntd/shots.c +++ b/games/hunt/huntd/shots.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shots.c,v 1.5 2001/09/19 15:19:45 pjanzen Exp $ */ +/* $OpenBSD: shots.c,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: shots.c,v 1.3 1997/10/11 08:13:50 lukem Exp $ */ /* * Hunt @@ -17,19 +17,19 @@ #define PLUS_DELTA(x, max) if (x < max) x++; else x-- #define MINUS_DELTA(x, min) if (x > min) x--; else x++ -static void chkshot __P((BULLET *, BULLET *)); -static void chkslime __P((BULLET *, BULLET *)); -static void explshot __P((BULLET *, int, int)); -static void find_under __P((BULLET *, BULLET *)); -static int iswall __P((int, int)); -static void mark_boot __P((BULLET *)); -static void mark_player __P((BULLET *)); -static int move_drone __P((BULLET *)); -static void move_flyer __P((PLAYER *)); -static int move_normal_shot __P((BULLET *)); -static void move_slime __P((BULLET *, int, BULLET *)); -static void save_bullet __P((BULLET *)); -static void zapshot __P((BULLET *, BULLET *)); +static void chkshot(BULLET *, BULLET *); +static void chkslime(BULLET *, BULLET *); +static void explshot(BULLET *, int, int); +static void find_under(BULLET *, BULLET *); +static int iswall(int, int); +static void mark_boot(BULLET *); +static void mark_player(BULLET *); +static int move_drone(BULLET *); +static void move_flyer(PLAYER *); +static int move_normal_shot(BULLET *); +static void move_slime(BULLET *, int, BULLET *); +static void save_bullet(BULLET *); +static void zapshot(BULLET *, BULLET *); /* Return true if there is pending activity */ int diff --git a/games/larn/create.c b/games/larn/create.c index 2ec0c2e94dc..374a69efe4a 100644 --- a/games/larn/create.c +++ b/games/larn/create.c @@ -1,16 +1,16 @@ -/* $OpenBSD: create.c,v 1.4 1998/09/15 05:12:31 pjanzen Exp $ */ +/* $OpenBSD: create.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: create.c,v 1.6 1997/10/18 20:03:09 christos Exp $ */ /* create.c Larn is copyrighted 1986 by Noah Morgan. */ #ifndef lint -static char rcsid[] = "$OpenBSD: create.c,v 1.4 1998/09/15 05:12:31 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: create.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif /* not lint */ #include "header.h" #include "extern.h" #include <unistd.h> -static void fillroom __P((int, int)); +static void fillroom(int, int); /* * makeplayer() diff --git a/games/larn/display.c b/games/larn/display.c index cd2da384683..471888dbdf1 100644 --- a/games/larn/display.c +++ b/games/larn/display.c @@ -1,16 +1,16 @@ -/* $OpenBSD: display.c,v 1.2 1998/09/15 05:12:31 pjanzen Exp $ */ +/* $OpenBSD: display.c,v 1.3 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: display.c,v 1.4 1997/10/18 20:03:15 christos Exp $ */ /* display.c Larn is copyrighted 1986 by Noah Morgan. */ #ifndef lint -static char rcsid[] = "$OpenBSD: display.c,v 1.2 1998/09/15 05:12:31 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: display.c,v 1.3 2002/02/16 21:27:10 millert Exp $"; #endif /* not lint */ #include "header.h" #include "extern.h" #define makecode(_a,_b,_c) (((_a)<<16) + ((_b)<<8) + (_c)) -static void botsub __P((int, char *)); +static void botsub(int, char *); static int minx, maxx, miny, maxy, k, m; static char bot1f = 0, bot2f = 0, bot3f = 0; diff --git a/games/larn/extern.h b/games/larn/extern.h index f34aba76774..6c2edea50fa 100644 --- a/games/larn/extern.h +++ b/games/larn/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.1 1998/09/15 05:12:31 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.2 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: extern.h,v 1.1 1997/10/18 20:03:17 christos Exp $ */ /* @@ -31,283 +31,283 @@ */ /* bill.c */ -void mailbill __P((void)); +void mailbill(void); /* config.c */ /* create.c */ -void makeplayer __P((void)); -void newcavelevel __P((int)); -void makemaze __P((int)); -void eat __P((int, int)); -int cannedlevel __P((int)); -void treasureroom __P((int)); -void troom __P((int, int, int, int, int, int)); -void makeobject __P((int)); -void fillmroom __P((int, int, int)); -void froom __P((int, int, int)); -int fillmonst __P((int)); -void sethp __P((int)); -void checkgen __P((void)); +void makeplayer(void); +void newcavelevel(int); +void makemaze(int); +void eat(int, int); +int cannedlevel(int); +void treasureroom(int); +void troom(int, int, int, int, int, int); +void makeobject(int); +void fillmroom(int, int, int); +void froom(int, int, int); +int fillmonst(int); +void sethp(int); +void checkgen(void); /* data.c */ /* diag.c */ -void diag __P((void)); -int dcount __P((int)); -void diagdrawscreen __P((void)); -int savegame __P((char *)); -void restoregame __P((char *)); -void greedy __P((void)); -void fsorry __P((void)); -void fcheat __P((void)); +void diag(void); +int dcount(int); +void diagdrawscreen(void); +int savegame(char *); +void restoregame(char *); +void greedy(void); +void fsorry(void); +void fcheat(void); /* display.c */ -void bottomline __P((void)); -void bottomhp __P((void)); -void bottomspell __P((void)); -void bottomdo __P((void)); -void bot_linex __P((void)); -void bottomgold __P((void)); -void bot_hpx __P((void)); -void bot_spellx __P((void)); -void botside __P((void)); -void draws __P((int, int, int, int)); -void drawscreen __P((void)); -void showcell __P((int, int)); -void show1cell __P((int, int)); -void showplayer __P((void)); -int moveplayer __P((int)); -void seemagic __P((int)); -void seepage __P((void)); +void bottomline(void); +void bottomhp(void); +void bottomspell(void); +void bottomdo(void); +void bot_linex(void); +void bottomgold(void); +void bot_hpx(void); +void bot_spellx(void); +void botside(void); +void draws(int, int, int, int); +void drawscreen(void); +void showcell(int, int); +void show1cell(int, int); +void showplayer(void); +int moveplayer(int); +void seemagic(int); +void seepage(void); /* fortune.c */ -char *fortune __P((void)); +char *fortune(void); /* global.c */ -void raiselevel __P((void)); -void loselevel __P((void)); -void raiseexperience __P((long)); -void loseexperience __P((long)); -void losehp __P((int)); -void losemhp __P((int)); -void raisehp __P((int)); -void raisemhp __P((int)); -void raisespells __P((int)); -void raisemspells __P((int)); -void losespells __P((int)); -void losemspells __P((int)); -int makemonst __P((int)); -void positionplayer __P((void)); -void recalc __P((void)); -void quit __P((void)); -void more __P((void)); -int take __P((int, int)); -int drop_object __P((int)); -void enchantarmor __P((void)); -void enchweapon __P((void)); -int pocketfull __P((void)); -int nearbymonst __P((void)); -int stealsomething __P((void)); -int emptyhanded __P((void)); -void creategem __P((void)); -void adjustcvalues __P((int, int)); -void gettokstr __P((char *)); -int getpassword __P((void)); -int getyn __P((void)); -int packweight __P((void)); -int rnd __P((int)); -int rund __P((int)); +void raiselevel(void); +void loselevel(void); +void raiseexperience(long); +void loseexperience(long); +void losehp(int); +void losemhp(int); +void raisehp(int); +void raisemhp(int); +void raisespells(int); +void raisemspells(int); +void losespells(int); +void losemspells(int); +int makemonst(int); +void positionplayer(void); +void recalc(void); +void quit(void); +void more(void); +int take(int, int); +int drop_object(int); +void enchantarmor(void); +void enchweapon(void); +int pocketfull(void); +int nearbymonst(void); +int stealsomething(void); +int emptyhanded(void); +void creategem(void); +void adjustcvalues(int, int); +void gettokstr(char *); +int getpassword(void); +int getyn(void); +int packweight(void); +int rnd(int); +int rund(int); /* help.c */ -void help __P((void)); -void welcome __P((void)); -void retcont __P((void)); -int openhelp __P((void)); +void help(void); +void welcome(void); +void retcont(void); +int openhelp(void); /* io.c */ -void setupvt100 __P((void)); -void clearvt100 __P((void)); -int lgetchar __P((void)); -void scbr __P((void)); -void sncbr __P((void)); -void newgame __P((void)); -void lprintf __P((const char *, ...)); -void lprint __P((long)); -void lwrite __P((char *, int)); -long lgetc __P((void)); -long lrint __P((void)); -void lrfill __P((char *, int)); -char *lgetw __P((void)); -char *lgetl __P((void)); -int lcreat __P((char *)); -int lopen __P((char *)); -int lappend __P((char *)); -void lrclose __P((void)); -void lwclose __P((void)); -void lprcat __P((char *)); -void cursor __P((int, int)); -void cursors __P((void)); -void init_term __P((void)); -void cl_line __P((int, int)); -void cl_up __P((int, int)); -void cl_dn __P((int, int)); -void lstandout __P((char *)); -void set_score_output __P((void)); -void lflush __P((void)); -int xputchar __P((int)); -void flush_buf __P((void)); -char *tmcapcnv __P((char *, char *)); -void lbeep __P((void)); +void setupvt100(void); +void clearvt100(void); +int lgetchar(void); +void scbr(void); +void sncbr(void); +void newgame(void); +void lprintf(const char *, ...); +void lprint(long); +void lwrite(char *, int); +long lgetc(void); +long lrint(void); +void lrfill(char *, int); +char *lgetw(void); +char *lgetl(void); +int lcreat(char *); +int lopen(char *); +int lappend(char *); +void lrclose(void); +void lwclose(void); +void lprcat(char *); +void cursor(int, int); +void cursors(void); +void init_term(void); +void cl_line(int, int); +void cl_up(int, int); +void cl_dn(int, int); +void lstandout(char *); +void set_score_output(void); +void lflush(void); +int xputchar(int); +void flush_buf(void); +char *tmcapcnv(char *, char *); +void lbeep(void); /* main.c */ -int main __P((int, char **)); -void showstr __P((void)); -void qshowstr __P((void)); -void t_setup __P((int)); -void t_endup __P((int)); -void showwear __P((void)); -void showwield __P((void)); -void showread __P((void)); -void showeat __P((void)); -void showquaff __P((void)); -void show1 __P((int, char *[])); -void show3 __P((int)); -void randmonst __P((void)); -void parse __P((void)); -void parse2 __P((void)); -void run __P((int)); -void wield __P((void)); -void ydhi __P((int)); -void ycwi __P((int)); -void wear __P((void)); -void dropobj __P((void)); -void readscr __P((void)); -void eatcookie __P((void)); -void quaff __P((void)); -int whatitem __P((char *)); -unsigned long readnum __P((long)); -void szero __P((char *)); +int main(int, char **); +void showstr(void); +void qshowstr(void); +void t_setup(int); +void t_endup(int); +void showwear(void); +void showwield(void); +void showread(void); +void showeat(void); +void showquaff(void); +void show1(int, char *[]); +void show3(int); +void randmonst(void); +void parse(void); +void parse2(void); +void run(int); +void wield(void); +void ydhi(int); +void ycwi(int); +void wear(void); +void dropobj(void); +void readscr(void); +void eatcookie(void); +void quaff(void); +int whatitem(char *); +unsigned long readnum(long); +void szero(char *); /* monster.c */ -void createmonster __P((int)); -int cgood __P((int, int, int, int)); -void createitem __P((int, int)); -void cast __P((void)); -void speldamage __P((int)); -void loseint __P((void)); -int isconfuse __P((void)); -int nospell __P((int, int)); -int fullhit __P((int)); -void direct __P((int, int, char *, int)); -void godirect __P((int, int, char *, int, int)); -void ifblind __P((int, int)); -void tdirect __P((int)); -void omnidirect __P((int, int, char *)); -int vxy __P((int *, int *)); -void dirpoly __P((int)); -void hitmonster __P((int, int)); -int hitm __P((int, int, int)); -void hitplayer __P((int, int)); -void dropsomething __P((int)); -void dropgold __P((int)); -void something __P((int)); -int newobject __P((int, int *)); -int spattack __P((int, int, int)); -void checkloss __P((int)); -int annihilate __P((void)); -int newsphere __P((int, int, int, int)); -int rmsphere __P((int, int)); -void sphboom __P((int, int)); -void genmonst __P((void)); +void createmonster(int); +int cgood(int, int, int, int); +void createitem(int, int); +void cast(void); +void speldamage(int); +void loseint(void); +int isconfuse(void); +int nospell(int, int); +int fullhit(int); +void direct(int, int, char *, int); +void godirect(int, int, char *, int, int); +void ifblind(int, int); +void tdirect(int); +void omnidirect(int, int, char *); +int vxy(int *, int *); +void dirpoly(int); +void hitmonster(int, int); +int hitm(int, int, int); +void hitplayer(int, int); +void dropsomething(int); +void dropgold(int); +void something(int); +int newobject(int, int *); +int spattack(int, int, int); +void checkloss(int); +int annihilate(void); +int newsphere(int, int, int, int); +int rmsphere(int, int); +void sphboom(int, int); +void genmonst(void); /* moreobj.c */ -void oaltar __P((void)); -void othrone __P((int)); -void odeadthrone __P((void)); -void ochest __P((void)); -void ofountain __P((void)); -void fntchange __P((int)); +void oaltar(void); +void othrone(int); +void odeadthrone(void); +void ochest(void); +void ofountain(void); +void fntchange(int); /* movem.c */ -void movemonst __P((void)); -void movemt __P((int, int)); -void mmove __P((int, int, int, int)); -void movsphere __P((void)); +void movemonst(void); +void movemt(int, int); +void mmove(int, int, int, int); +void movsphere(void); /* nap.c */ -void nap __P((int)); +void nap(int); /* object.c */ -void lookforobject __P((void)); -void finditem __P((int)); -void ostairs __P((int)); -void oteleport __P((int)); -void opotion __P((int)); -void quaffpotion __P((int)); -void oscroll __P((int)); -void adjusttime __P((long)); -void read_scroll __P((int)); -void oorb __P((void)); -void opit __P((void)); -void obottomless __P((void)); -void oelevator __P((int)); -void ostatue __P((void)); -void omirror __P((void)); -void obook __P((void)); -void readbook __P((int)); -void ocookie __P((void)); -void ogold __P((int)); -void ohome __P((void)); -void iopts __P((void)); -void ignore __P((void)); +void lookforobject(void); +void finditem(int); +void ostairs(int); +void oteleport(int); +void opotion(int); +void quaffpotion(int); +void oscroll(int); +void adjusttime(long); +void read_scroll(int); +void oorb(void); +void opit(void); +void obottomless(void); +void oelevator(int); +void ostatue(void); +void omirror(void); +void obook(void); +void readbook(int); +void ocookie(void); +void ogold(int); +void ohome(void); +void iopts(void); +void ignore(void); /* regen.c */ -void regen __P((void)); +void regen(void); /* savelev.c */ -void savelevel __P((void)); -void getlevel __P((void)); +void savelevel(void); +void getlevel(void); /* scores.c */ -int readboard __P((void)); -int writeboard __P((void)); -int makeboard __P((void)); -int hashewon __P((void)); -long paytaxes __P((long)); -int winshou __P((void)); -int shou __P((int)); -void showscores __P((void)); -void showallscores __P((void)); -int sortboard __P((void)); -void newscore __P((long, char *, int, int)); -void new1sub __P((long, int, char *, long)); -void new2sub __P((long, int, char *, int)); -void died __P((int)); -void diedsub __P((int)); -void diedlog __P((void)); -int getplid __P((char *)); +int readboard(void); +int writeboard(void); +int makeboard(void); +int hashewon(void); +long paytaxes(long); +int winshou(void); +int shou(int); +void showscores(void); +void showallscores(void); +int sortboard(void); +void newscore(long, char *, int, int); +void new1sub(long, int, char *, long); +void new2sub(long, int, char *, int); +void died(int); +void diedsub(int); +void diedlog(void); +int getplid(char *); /* signal.c */ -void sigsetup __P((void)); +void sigsetup(void); /* store.c */ -void dnd_2hed __P((void)); -void dnd_hed __P((void)); -void dndstore __P((void)); -void sch_hed __P((void)); -void oschool __P((void)); -void obank __P((void)); -void obank2 __P((void)); -void ointerest __P((void)); -void obanksub __P((void)); -void appraise __P((int)); -void otradepost __P((void)); -void cnsitm __P((void)); -void olrs __P((void)); +void dnd_2hed(void); +void dnd_hed(void); +void dndstore(void); +void sch_hed(void); +void oschool(void); +void obank(void); +void obank2(void); +void ointerest(void); +void obanksub(void); +void appraise(int); +void otradepost(void); +void cnsitm(void); +void olrs(void); /* tok.c */ -int yylex __P((void)); -void flushall __P((void)); -void sethard __P((int)); -void readopts __P((void)); +int yylex(void); +void flushall(void); +void sethard(int); +void readopts(void); diff --git a/games/larn/monster.c b/games/larn/monster.c index 65dc04589a5..da2af0dc06a 100644 --- a/games/larn/monster.c +++ b/games/larn/monster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monster.c,v 1.4 1999/05/30 02:23:16 pjanzen Exp $ */ +/* $OpenBSD: monster.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: monster.c,v 1.5 1997/10/18 20:03:29 christos Exp $ */ /* @@ -100,7 +100,7 @@ * */ #ifndef lint -static char rcsid[] = "$OpenBSD: monster.c,v 1.4 1999/05/30 02:23:16 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: monster.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif /* not lint */ #include <ctype.h> @@ -115,7 +115,7 @@ struct isave { /* used for altar reality */ short arg; /* the type of item or hitpoints of monster */ }; -static int dirsub __P((int *, int *)); +static int dirsub(int *, int *); /* * createmonster(monstno) Function to create a monster next to the player * int monstno; diff --git a/games/larn/moreobj.c b/games/larn/moreobj.c index edc283d11a6..d399e7d4fbb 100644 --- a/games/larn/moreobj.c +++ b/games/larn/moreobj.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moreobj.c,v 1.3 1998/09/15 05:12:32 pjanzen Exp $ */ +/* $OpenBSD: moreobj.c,v 1.4 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: moreobj.c,v 1.4 1997/10/18 20:03:32 christos Exp $ */ /* @@ -9,7 +9,7 @@ * oaltar() othrone() ochest() ofountain() */ #ifndef lint -static char rcsid[] = "$OpenBSD: moreobj.c,v 1.3 1998/09/15 05:12:32 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: moreobj.c,v 1.4 2002/02/16 21:27:10 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -18,8 +18,8 @@ static char rcsid[] = "$OpenBSD: moreobj.c,v 1.3 1998/09/15 05:12:32 pjanzen Exp #include "header.h" #include "extern.h" -static void ohear __P((int)); -static void fch __P((int, long *)); +static void ohear(int); +static void fch(int, long *); /* * ****** diff --git a/games/larn/signal.c b/games/larn/signal.c index cf1cc7ddc59..ba05e2cbb62 100644 --- a/games/larn/signal.c +++ b/games/larn/signal.c @@ -1,10 +1,10 @@ -/* $OpenBSD: signal.c,v 1.4 2001/09/04 23:35:57 millert Exp $ */ +/* $OpenBSD: signal.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: signal.c,v 1.6 1997/10/18 20:03:50 christos Exp $ */ /* "Larn is copyrighted 1986 by Noah Morgan.\n" */ #ifndef lint -static char rcsid[] = "$OpenBSD: signal.c,v 1.4 2001/09/04 23:35:57 millert Exp $"; +static char rcsid[] = "$OpenBSD: signal.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -14,11 +14,11 @@ static char rcsid[] = "$OpenBSD: signal.c,v 1.4 2001/09/04 23:35:57 millert Exp #include "header.h" #include "extern.h" -static void s2choose __P((void)); -static void cntlc __P((int)); -static void sgam __P((int)); -static void tstop __P((int)); -static void sigpanic __P((int)); +static void s2choose(void); +static void cntlc(int); +static void sgam(int); +static void tstop(int); +static void sigpanic(int); static void s2choose() diff --git a/games/larn/store.c b/games/larn/store.c index 57b36797a6d..a9fb06d23ea 100644 --- a/games/larn/store.c +++ b/games/larn/store.c @@ -1,4 +1,4 @@ -/* $OpenBSD: store.c,v 1.4 1998/09/15 05:12:33 pjanzen Exp $ */ +/* $OpenBSD: store.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: store.c,v 1.6 1997/10/18 20:03:52 christos Exp $ */ /*- @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)store.c 5.4 (Berkeley) 5/13/91"; #else -static char rcsid[] = "$OpenBSD: store.c,v 1.4 1998/09/15 05:12:33 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: store.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -47,12 +47,12 @@ static char rcsid[] = "$OpenBSD: store.c,v 1.4 1998/09/15 05:12:33 pjanzen Exp $ #include "header.h" #include "extern.h" -static void handsfull __P((void)); -static void outofstock __P((void)); -static void nogold __P((void)); -static void dnditem __P((int)); -static void banktitle __P((char *)); -static void otradhead __P((void)); +static void handsfull(void); +static void outofstock(void); +static void nogold(void); +static void dnditem(int); +static void banktitle(char *); +static void otradhead(void); static int dndcount = 0, dnditm = 0; diff --git a/games/mille/mille.h b/games/mille/mille.h index deb8af59d0c..bd924d721c6 100644 --- a/games/mille/mille.h +++ b/games/mille/mille.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mille.h,v 1.5 2001/09/03 21:36:12 pjanzen Exp $ */ +/* $OpenBSD: mille.h,v 1.6 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $ */ /* @@ -228,42 +228,42 @@ extern WINDOW *Board, *Miles, *Score; * functions */ -void account __P((CARD)); -void calcmove __P((void)); -int canplay __P((const PLAY *, const PLAY *, CARD)); -int check_ext __P((bool)); -void check_go __P((void)); -void check_more __P((void)); -void die __P((int)); -void domove __P((void)); -bool error __P((char *, ...)); -void finalscore __P((PLAY *)); -CARD getcard __P((void)); -void getmove __P((void)); -int getyn __P((int)); -int haspicked __P((const PLAY *)); -void init __P((void)); -int is_repair __P((CARD)); -int main __P((int, char **)); -void newboard __P((void)); -void newscore __P((void)); -int onecard __P((const PLAY *)); -int playcard __P((PLAY *)); -void prboard __P((void)); -void prompt __P((int)); -void prscore __P((bool)); -int readch __P((void)); -bool rest_f __P((const char *)); -int roll __P((int, int)); -void rub __P((int)); -int safety __P((CARD)); -bool save __P((void)); -void show_card __P((int, int, CARD, CARD *)); -void show_score __P((int, int, int, int *)); -void shuffle __P((void)); -void sort __P((CARD *)); -bool varpush __P((int, ssize_t __P((int, const struct iovec *, int)))); +void account(CARD); +void calcmove(void); +int canplay(const PLAY *, const PLAY *, CARD); +int check_ext(bool); +void check_go(void); +void check_more(void); +void die(int); +void domove(void); +bool error(char *, ...); +void finalscore(PLAY *); +CARD getcard(void); +void getmove(void); +int getyn(int); +int haspicked(const PLAY *); +void init(void); +int is_repair(CARD); +int main(int, char **); +void newboard(void); +void newscore(void); +int onecard(const PLAY *); +int playcard(PLAY *); +void prboard(void); +void prompt(int); +void prscore(bool); +int readch(void); +bool rest_f(const char *); +int roll(int, int); +void rub(int); +int safety(CARD); +bool save(void); +void show_card(int, int, CARD, CARD *); +void show_score(int, int, int, int *); +void shuffle(void); +void sort(CARD *); +bool varpush __P((int, ssize_t(int, const struct iovec *, int))); #ifdef EXTRAP -void extrapolate __P((PLAY *)); -void undoex __P((void)); +void extrapolate(PLAY *); +void undoex(void); #endif diff --git a/games/mille/varpush.c b/games/mille/varpush.c index f479d107876..d2b43217e7b 100644 --- a/games/mille/varpush.c +++ b/games/mille/varpush.c @@ -1,4 +1,4 @@ -/* $OpenBSD: varpush.c,v 1.4 2001/09/03 21:36:12 pjanzen Exp $ */ +/* $OpenBSD: varpush.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: varpush.c,v 1.4 1995/03/24 05:02:35 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)varpush.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: varpush.c,v 1.4 2001/09/03 21:36:12 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: varpush.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -56,7 +56,7 @@ static char rcsid[] = "$OpenBSD: varpush.c,v 1.4 2001/09/03 21:36:12 pjanzen Exp bool varpush(file, func) int file; - ssize_t (*func) __P((int, const struct iovec *, int)); + ssize_t (*func)(int, const struct iovec *, int); { int temp; const struct iovec vec[] = { diff --git a/games/monop/cards.c b/games/monop/cards.c index 5e3702371aa..9d36bad9e0b 100644 --- a/games/monop/cards.c +++ b/games/monop/cards.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cards.c,v 1.4 2000/06/30 16:00:04 millert Exp $ */ +/* $OpenBSD: cards.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: cards.c,v 1.3 1995/03/23 08:34:35 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)cards.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: cards.c,v 1.4 2000/06/30 16:00:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: cards.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -60,8 +60,8 @@ static char *cardfile = "cards.pck"; static FILE *deckf; -static void set_up __P((DECK *)); -static void printmes __P((void)); +static void set_up(DECK *); +static void printmes(void); /* * This routine initializes the decks from the data file, diff --git a/games/monop/execute.c b/games/monop/execute.c index 9e9b5e332f2..2e5746a3f09 100644 --- a/games/monop/execute.c +++ b/games/monop/execute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: execute.c,v 1.4 2000/06/30 16:00:04 millert Exp $ */ +/* $OpenBSD: execute.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: execute.c,v 1.3 1995/03/23 08:34:38 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)execute.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: execute.c,v 1.4 2000/06/30 16:00:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: execute.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -60,7 +60,7 @@ static char buf[257]; static bool new_play; /* set if move on to new player */ -static void show_move __P((void)); +static void show_move(void); /* * This routine takes user input and puts it in buf diff --git a/games/monop/getinp.c b/games/monop/getinp.c index 75393b0a319..a8bf164f547 100644 --- a/games/monop/getinp.c +++ b/games/monop/getinp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp $ */ +/* $OpenBSD: getinp.c,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: getinp.c,v 1.4 1995/04/24 12:24:20 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)getinp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: getinp.c,v 1.5 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: getinp.c,v 1.4 2000/07/24 00:56:04 pjanzen Exp static char buf[257]; -static int comp __P((char *)); +static int comp(char *); int getinp(prompt, list) diff --git a/games/monop/houses.c b/games/monop/houses.c index eed8ae029ed..3b089ff3773 100644 --- a/games/monop/houses.c +++ b/games/monop/houses.c @@ -1,4 +1,4 @@ -/* $OpenBSD: houses.c,v 1.2 1998/09/20 23:36:51 pjanzen Exp $ */ +/* $OpenBSD: houses.c,v 1.3 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: houses.c,v 1.3 1995/03/23 08:34:40 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)houses.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: houses.c,v 1.2 1998/09/20 23:36:51 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: houses.c,v 1.3 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -49,9 +49,9 @@ static char *names[N_MON+2], static MON *monops[N_MON]; -static void buy_h __P((MON *)); -static void sell_h __P((MON *)); -static void list_cur __P((MON *)); +static void buy_h(MON *); +static void sell_h(MON *); +static void list_cur(MON *); /* * These routines deal with buying and selling houses diff --git a/games/monop/initdeck.c b/games/monop/initdeck.c index b33f13276ca..d86e1ad9d52 100644 --- a/games/monop/initdeck.c +++ b/games/monop/initdeck.c @@ -1,4 +1,4 @@ -/* $OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $ */ +/* $OpenBSD: initdeck.c,v 1.9 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: initdeck.c,v 1.3 1995/03/23 08:34:43 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)initdeck.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: initdeck.c,v 1.8 2000/11/10 15:33:03 provos Exp $"; +static char rcsid[] = "$OpenBSD: initdeck.c,v 1.9 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -77,9 +77,9 @@ DECK deck[2]; FILE *inf, *outf; -static void getargs __P((int, char *[])); -static void count __P((void)); -static void putem __P((void)); +static void getargs(int, char *[]); +static void count(void); +static void putem(void); int main(ac, av) diff --git a/games/monop/monop.c b/games/monop/monop.c index 5558b84ec65..2266be4137a 100644 --- a/games/monop/monop.c +++ b/games/monop/monop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $ */ +/* $OpenBSD: monop.c,v 1.4 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: monop.c,v 1.3 1995/03/23 08:34:52 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)monop.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $"; +static char rcsid[] = "$OpenBSD: monop.c,v 1.4 2002/02/16 21:27:10 millert Exp $"; #endif #endif /* not lint */ @@ -54,10 +54,10 @@ static char rcsid[] = "$OpenBSD: monop.c,v 1.3 2001/01/04 20:41:31 todd Exp $"; #include <unistd.h> #include "monop.def" -static void getplayers __P((void)); -static void init_players __P((void)); -static void init_monops __P((void)); -static void do_quit __P((int)); +static void getplayers(void); +static void init_players(void); +static void init_monops(void); +static void do_quit(int); /* * This program implements a monopoly game diff --git a/games/monop/monop.def b/games/monop/monop.def index 3a187b2a27b..0fb4614cfd7 100644 --- a/games/monop/monop.def +++ b/games/monop/monop.def @@ -1,4 +1,4 @@ -/* $OpenBSD: monop.def,v 1.2 1998/09/20 23:36:52 pjanzen Exp $ */ +/* $OpenBSD: monop.def,v 1.3 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: monop.def,v 1.3 1995/03/23 08:34:54 cgd Exp $ */ /*- @@ -81,7 +81,7 @@ int player, /* current player number */ num_luck = sizeof lucky_mes / sizeof (char *); /* list of command functions */ -void (*func[]) __P((void)) = { /* array of function calls for commands */ +void (*func[])(void) = { /* array of function calls for commands */ quit, /* quit game |* 0 *| */ printboard, /* print board |* 1 *| */ where, /* where players are |* 2 *| */ diff --git a/games/monop/monop.h b/games/monop/monop.h index 75c8bdd5e06..7a2bb5b7db7 100644 --- a/games/monop/monop.h +++ b/games/monop/monop.h @@ -1,4 +1,4 @@ -/* $OpenBSD: monop.h,v 1.4 1998/09/20 23:36:54 pjanzen Exp $ */ +/* $OpenBSD: monop.h,v 1.5 2002/02/16 21:27:10 millert Exp $ */ /* $NetBSD: monop.h,v 1.4 1995/04/24 12:24:23 cgd Exp $ */ /* @@ -137,74 +137,74 @@ typedef struct prp_st RR_S; typedef struct prp_st UTIL_S; /* cards.c */ -void init_decks __P((void)); -void get_card __P((DECK *)); +void init_decks(void); +void get_card(DECK *); /* execute.c */ -void execute __P((int)); -void do_move __P((void)); -void move __P((int)); -void save __P((void)); -void restore __P((void)); -int rest_f __P((char *)); +void execute(int); +void do_move(void); +void move(int); +void save(void); +void restore(void); +int rest_f(char *); /* getinp.c */ -int getinp __P((char *, char *[])); +int getinp(char *, char *[]); /* houses.c */ -void buy_houses __P((void)); -void sell_houses __P((void)); +void buy_houses(void); +void sell_houses(void); /* jail.c */ -void card __P((void)); -void ret_card __P((PLAY *)); -void pay __P((void)); -int move_jail __P((int, int )); -void printturn __P((void)); +void card(void); +void ret_card(PLAY *); +void pay(void); +int move_jail(int, int ); +void printturn(void); /* misc.c */ -int getyn __P((char *)); -void notify __P((void)); -void next_play __P((void)); -int get_int __P((char *)); -void set_ownlist __P((int)); -void is_monop __P((MON *, int)); -void isnot_monop __P((MON *)); -void list __P((void)); -void list_all __P((void)); -void quit __P((void)); +int getyn(char *); +void notify(void); +void next_play(void); +int get_int(char *); +void set_ownlist(int); +void is_monop(MON *, int); +void isnot_monop(MON *); +void list(void); +void list_all(void); +void quit(void); /* morg.c */ -void mortgage __P((void)); -void unmortgage __P((void)); -void force_morg __P((void)); +void mortgage(void); +void unmortgage(void); +void force_morg(void); /* print.c */ -void printboard __P((void)); -void where __P((void)); -void printsq __P((int, bool)); -void printhold __P((int)); +void printboard(void); +void where(void); +void printsq(int, bool); +void printhold(int); /* prop.c */ -void buy __P((int, SQUARE *)); -void add_list __P((int, OWN **, int)); -void del_list __P((int, OWN **, shrt)); -void bid __P((void)); -int prop_worth __P((PLAY *)); +void buy(int, SQUARE *); +void add_list(int, OWN **, int); +void del_list(int, OWN **, shrt); +void bid(void); +int prop_worth(PLAY *); /* rent.c */ -void rent __P((SQUARE *)); +void rent(SQUARE *); /* roll.c */ -int roll __P((int, int)); +int roll(int, int); /* spec.c */ -void inc_tax __P((void)); -void goto_jail __P((void)); -void lux_tax __P((void)); -void cc __P((void)); -void chance __P((void)); +void inc_tax(void); +void goto_jail(void); +void lux_tax(void); +void cc(void); +void chance(void); /* trade.c */ -void trade __P((void)); -void resign __P((void)); +void trade(void); +void resign(void); diff --git a/games/monop/morg.c b/games/monop/morg.c index 46c027242ec..d9e1b30af96 100644 --- a/games/monop/morg.c +++ b/games/monop/morg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: morg.c,v 1.2 1998/09/20 23:36:54 pjanzen Exp $ */ +/* $OpenBSD: morg.c,v 1.3 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: morg.c,v 1.4 1995/03/23 08:35:02 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)morg.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: morg.c,v 1.2 1998/09/20 23:36:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: morg.c,v 1.3 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -72,10 +72,10 @@ static shrt square[MAX_PRP+2]; static int num_good,got_houses; -static int set_mlist __P((void)); -static void m __P((int)); -static int set_umlist __P((void)); -static void unm __P((int)); +static int set_mlist(void); +static void m(int); +static int set_umlist(void); +static void unm(int); /* * This routine is the command level response the mortgage command. diff --git a/games/monop/print.c b/games/monop/print.c index 69ab9e3e838..b66e9e48d41 100644 --- a/games/monop/print.c +++ b/games/monop/print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $ */ +/* $OpenBSD: print.c,v 1.3 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: print.c,v 1.3 1995/03/23 08:35:05 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: print.c,v 1.3 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: print.c,v 1.2 1998/09/20 23:36:55 pjanzen Exp $ static char *header = "Name Own Price Mg # Rent"; -static void printmorg __P((SQUARE *)); +static void printmorg(SQUARE *); /* * This routine prints out the current board diff --git a/games/monop/prop.c b/games/monop/prop.c index 6568c25ffe0..441ac90aab1 100644 --- a/games/monop/prop.c +++ b/games/monop/prop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prop.c,v 1.3 2001/01/17 00:27:21 pjanzen Exp $ */ +/* $OpenBSD: prop.c,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: prop.c,v 1.3 1995/03/23 08:35:06 cgd Exp $ */ /* @@ -38,14 +38,14 @@ #if 0 static char sccsid[] = "@(#)prop.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: prop.c,v 1.3 2001/01/17 00:27:21 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: prop.c,v 1.4 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ #include <err.h> #include "monop.ext" -static int value __P((SQUARE *)); +static int value(SQUARE *); /* * This routine deals with buying property, setting all the diff --git a/games/monop/trade.c b/games/monop/trade.c index c0ea9f38d24..75c206da790 100644 --- a/games/monop/trade.c +++ b/games/monop/trade.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trade.c,v 1.2 1998/09/20 23:36:56 pjanzen Exp $ */ +/* $OpenBSD: trade.c,v 1.3 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: trade.c,v 1.3 1995/03/23 08:35:19 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)trade.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: trade.c,v 1.2 1998/09/20 23:36:56 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: trade.c,v 1.3 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -59,11 +59,11 @@ static int used[MAX_PRP]; static TRADE trades[2]; -static void get_list __P((int, int )); -static int set_list __P((OWN *)); -static void summate __P((void)); -static void do_trade __P((void)); -static void move_em __P((TRADE *, TRADE *)); +static void get_list(int, int ); +static int set_list(OWN *); +static void summate(void); +static void do_trade(void); +static void move_em(TRADE *, TRADE *); void trade() diff --git a/games/morse/morse.c b/games/morse/morse.c index f2b56b9a54f..9849eda017b 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: morse.c,v 1.7 1998/12/13 07:53:03 pjanzen Exp $ */ +/* $OpenBSD: morse.c,v 1.8 2002/02/16 21:27:11 millert Exp $ */ /* * Copyright (c) 1988, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: morse.c,v 1.7 1998/12/13 07:53:03 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: morse.c,v 1.8 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -115,9 +115,9 @@ struct punc { { '\0', NULL } }; -void morse __P((int)); -void decode __P((char *)); -void show __P((char *)); +void morse(int); +void decode(char *); +void show(char *); static int sflag = 0; static int dflag = 0; diff --git a/games/number/number.c b/games/number/number.c index a1264570812..237b15784ad 100644 --- a/games/number/number.c +++ b/games/number/number.c @@ -1,4 +1,4 @@ -/* $OpenBSD: number.c,v 1.7 1999/09/25 15:52:20 pjanzen Exp $ */ +/* $OpenBSD: number.c,v 1.8 2002/02/16 21:27:11 millert Exp $ */ /* * Copyright (c) 1988, 1993, 1994 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)number.c 8.3 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: number.c,v 1.7 1999/09/25 15:52:20 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: number.c,v 1.8 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -81,13 +81,13 @@ static const char *const name1[] = { "novemdecillion", "vigintillion", }; -void convert __P((char *)); -void convertexp __P((char *)); -int number __P((const char *, int)); -void pfract __P((int)); -void toobig __P((void)); -int unit __P((int, const char *)); -void usage __P((void)); +void convert(char *); +void convertexp(char *); +int number(const char *, int); +void pfract(int); +void toobig(void); +int unit(int, const char *); +void usage(void); int lflag; diff --git a/games/phantasia/phantglobs.h b/games/phantasia/phantglobs.h index 980eb7d8a8f..81d187d9c1f 100644 --- a/games/phantasia/phantglobs.h +++ b/games/phantasia/phantglobs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: phantglobs.h,v 1.3 1998/11/29 19:57:01 pjanzen Exp $ */ +/* $OpenBSD: phantglobs.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: phantglobs.h,v 1.3 1995/04/24 12:24:39 cgd Exp $ */ /* @@ -64,72 +64,72 @@ extern char Nobetter[]; /* functions which we need to know about */ -char *descrlocation __P((struct player *, bool)); -char *descrstatus __P((struct player *)); -char *descrtype __P((struct player *, bool)); -void activelist __P((void)); -void adjuststats __P((void)); -long allocrecord __P((void)); -long allocvoid __P((void)); -void allstatslist __P((void)); -void altercoordinates __P((double, double, int)); -void awardtreasure __P((void)); -void battleplayer __P((long)); -void callmonster __P((int)); -void cancelmonster __P((void)); -void catchalarm __P((int)); -void changestats __P((bool)); -void checkbattle __P((void)); -void checktampered __P((void)); -void cleanup __P((int)); -void collecttaxes __P((double, double)); -void cursedtreasure __P((void)); -void death __P((char *)); -void displaystats __P((void)); -double distance __P((double, double, double, double)); -void dotampered __P((void)); -double drandom __P((void)); -void encounter __P((int)); -void enterscore __P((void)); -void error __P((char *)); -double explevel __P((double)); -long findname __P((char *, struct player *)); -void freerecord __P((struct player *, long)); -void genchar __P((int)); -int getanswer __P((char *, bool)); -void getstring __P((char *, int)); -void hitmonster __P((double)); -void ill_sig __P((int)); -double infloat __P((void)); -void initialstate __P((void)); -void initplayer __P((struct player *)); -int inputoption __P((void)); -void interrupt __P((void)); -void leavegame __P((void)); -void monsthits __P((void)); -void monstlist __P((void)); -void more __P((int)); -void movelevel __P((void)); -void myturn __P((void)); -void neatstuff __P((void)); -int pickmonster __P((void)); -void playerhits __P((void)); -void playinit __P((void)); -void procmain __P((void)); -void purgeoldplayers __P((void)); -void readmessage __P((void)); -void readrecord __P((struct player *, long)); -long recallplayer __P((void)); -long recallplayer __P((void)); -long rollnewplayer __P((void)); -void scorelist __P((void)); -void scramblestats __P((void)); -void tampered __P((int, double, double)); -void throneroom __P((void)); -void throwspell __P((void)); -void titlelist __P((void)); -void tradingpost __P((void)); -void truncstring __P((char *)); -void userlist __P((bool)); -void writerecord __P((struct player *, long)); -void writevoid __P((struct energyvoid *, long)); +char *descrlocation(struct player *, bool); +char *descrstatus(struct player *); +char *descrtype(struct player *, bool); +void activelist(void); +void adjuststats(void); +long allocrecord(void); +long allocvoid(void); +void allstatslist(void); +void altercoordinates(double, double, int); +void awardtreasure(void); +void battleplayer(long); +void callmonster(int); +void cancelmonster(void); +void catchalarm(int); +void changestats(bool); +void checkbattle(void); +void checktampered(void); +void cleanup(int); +void collecttaxes(double, double); +void cursedtreasure(void); +void death(char *); +void displaystats(void); +double distance(double, double, double, double); +void dotampered(void); +double drandom(void); +void encounter(int); +void enterscore(void); +void error(char *); +double explevel(double); +long findname(char *, struct player *); +void freerecord(struct player *, long); +void genchar(int); +int getanswer(char *, bool); +void getstring(char *, int); +void hitmonster(double); +void ill_sig(int); +double infloat(void); +void initialstate(void); +void initplayer(struct player *); +int inputoption(void); +void interrupt(void); +void leavegame(void); +void monsthits(void); +void monstlist(void); +void more(int); +void movelevel(void); +void myturn(void); +void neatstuff(void); +int pickmonster(void); +void playerhits(void); +void playinit(void); +void procmain(void); +void purgeoldplayers(void); +void readmessage(void); +void readrecord(struct player *, long); +long recallplayer(void); +long recallplayer(void); +long rollnewplayer(void); +void scorelist(void); +void scramblestats(void); +void tampered(int, double, double); +void throneroom(void); +void throwspell(void); +void titlelist(void); +void tradingpost(void); +void truncstring(char *); +void userlist(bool); +void writerecord(struct player *, long); +void writevoid(struct energyvoid *, long); diff --git a/games/phantasia/setup.c b/games/phantasia/setup.c index e97596c6645..05f8d067788 100644 --- a/games/phantasia/setup.c +++ b/games/phantasia/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.4 1998/11/29 19:57:02 pjanzen Exp $ */ +/* $OpenBSD: setup.c,v 1.5 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: setup.c,v 1.4 1995/04/24 12:24:41 cgd Exp $ */ /* @@ -10,7 +10,7 @@ #include "include.h" #include <fcntl.h> -void Error __P((char *, char *)); +void Error(char *, char *); /* */ /************************************************************************ diff --git a/games/pig/pig.c b/games/pig/pig.c index e7584b90a97..3f636d697f5 100644 --- a/games/pig/pig.c +++ b/games/pig/pig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pig.c,v 1.6 1998/08/19 07:40:49 pjanzen Exp $ */ +/* $OpenBSD: pig.c,v 1.7 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: pig.c,v 1.2 1995/03/23 08:41:40 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pig.c 8.2 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: pig.c,v 1.6 1998/08/19 07:40:49 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: pig.c,v 1.7 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: pig.c,v 1.6 1998/08/19 07:40:49 pjanzen Exp $"; #include <string.h> #include <unistd.h> -void pigout __P((char *, int)); -void usage __P((void)); +void pigout(char *, int); +void usage(void); int main(argc, argv) diff --git a/games/pom/pom.c b/games/pom/pom.c index d05529306c8..d00659bbafd 100644 --- a/games/pom/pom.c +++ b/games/pom/pom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pom.c,v 1.6 1998/09/06 12:29:25 pjanzen Exp $ */ +/* $OpenBSD: pom.c,v 1.7 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: pom.c,v 1.6 1996/02/06 22:47:29 jtc Exp $ */ /* @@ -46,7 +46,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)pom.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: pom.c,v 1.6 1998/09/06 12:29:25 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: pom.c,v 1.7 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -84,11 +84,11 @@ static char rcsid[] = "$OpenBSD: pom.c,v 1.6 1998/09/06 12:29:25 pjanzen Exp $"; #define Pzero 36.340410 /* lunar mean long of perigee at EPOCH */ #define Nzero 318.510107 /* lunar mean long of node at EPOCH */ -void adj360 __P((double *)); -double dtor __P((double)); -double potm __P((double)); -time_t parsetime __P((char *)); -void badformat __P((void)); +void adj360(double *); +double dtor(double); +double potm(double); +time_t parsetime(char *); +void badformat(void); int main(argc, argv) diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c index c4b121cd081..3cfe0bc87db 100644 --- a/games/ppt/ppt.c +++ b/games/ppt/ppt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppt.c,v 1.5 1998/08/19 08:18:15 pjanzen Exp $ */ +/* $OpenBSD: ppt.c,v 1.6 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: ppt.c,v 1.4 1995/03/23 08:35:40 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ppt.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: ppt.c,v 1.5 1998/08/19 08:18:15 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: ppt.c,v 1.6 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: ppt.c,v 1.5 1998/08/19 08:18:15 pjanzen Exp $"; #include <stdio.h> #include <unistd.h> -static void putppt __P((int)); +static void putppt(int); int main(argc, argv) diff --git a/games/primes/primes.c b/games/primes/primes.c index d5a9149480f..3941088261b 100644 --- a/games/primes/primes.c +++ b/games/primes/primes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: primes.c,v 1.9 2001/08/19 22:50:57 pjanzen Exp $ */ +/* $OpenBSD: primes.c,v 1.10 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: primes.c,v 1.5 1995/04/24 12:24:47 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)primes.c 8.5 (Berkeley) 5/10/95"; #else -static char rcsid[] = "$OpenBSD: primes.c,v 1.9 2001/08/19 22:50:57 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: primes.c,v 1.10 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -109,9 +109,9 @@ extern const ubig *pr_limit; /* largest prime in the prime array */ extern const char pattern[]; extern const int pattern_size; /* length of pattern array */ -void primes __P((ubig, ubig)); -ubig read_num_buf __P((void)); -void usage __P((void)); +void primes(ubig, ubig); +ubig read_num_buf(void); +void usage(void); int main(argc, argv) diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c index dccb74c9719..ce73b3bfceb 100644 --- a/games/quiz/quiz.c +++ b/games/quiz/quiz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quiz.c,v 1.9 1999/10/02 06:36:45 pjanzen Exp $ */ +/* $OpenBSD: quiz.c,v 1.10 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: quiz.c,v 1.9 1995/04/22 10:16:58 cgd Exp $ */ /*- @@ -48,7 +48,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: quiz.c,v 1.9 1999/10/02 06:36:45 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: quiz.c,v 1.10 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -68,15 +68,15 @@ static QE qlist; static int catone, cattwo, tflag; static u_int qsize; -char *appdstr __P((char *, const char *, size_t)); -void downcase __P((char *)); -void get_cats __P((char *, char *)); -void get_file __P((const char *)); -const char *next_cat __P((const char *)); -void quiz __P((void)); -void score __P((u_int, u_int, u_int)); -void show_index __P((void)); -void usage __P((void)); +char *appdstr(char *, const char *, size_t); +void downcase(char *); +void get_cats(char *, char *); +void get_file(const char *); +const char *next_cat(const char *); +void quiz(void); +void score(u_int, u_int, u_int); +void show_index(void); +void usage(void); int main(argc, argv) diff --git a/games/quiz/quiz.h b/games/quiz/quiz.h index 63441eb2bee..1c9f38a2b23 100644 --- a/games/quiz/quiz.h +++ b/games/quiz/quiz.h @@ -1,4 +1,4 @@ -/* $OpenBSD: quiz.h,v 1.3 1999/03/27 04:45:26 pjanzen Exp $ */ +/* $OpenBSD: quiz.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: quiz.h,v 1.4 1995/04/22 10:16:59 cgd Exp $ */ /*- @@ -59,6 +59,6 @@ typedef struct qentry { extern char rxperr[]; -int rxp_compile __P((const char *)); -char *rxp_expand __P((void)); -int rxp_match __P((const char *)); +int rxp_compile(const char *); +char *rxp_expand(void); +int rxp_match(const char *); diff --git a/games/quiz/rxp.c b/games/quiz/rxp.c index 43da86fe705..8662e8285be 100644 --- a/games/quiz/rxp.c +++ b/games/quiz/rxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rxp.c,v 1.4 1999/10/02 06:36:45 pjanzen Exp $ */ +/* $OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: rxp.c,v 1.5 1995/04/22 10:17:00 cgd Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: rxp.c,v 1.4 1999/10/02 06:36:45 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: rxp.c,v 1.5 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -85,9 +85,9 @@ typedef short Rxp_t; /* type for regexp tokens */ static Rxp_t rxpbuf[RXP_LINE_SZ]; /* compiled regular expression buffer */ char rxperr[128]; /* parser error message */ -static int rxp__compile __P((const char *, int)); -static char *rxp__expand __P((int)); -static int rxp__match __P((const char *, int, Rxp_t *, Rxp_t *, const char *)); +static int rxp__compile(const char *, int); +static char *rxp__expand(int); +static int rxp__match(const char *, int, Rxp_t *, Rxp_t *, const char *); int rxp_compile(s) diff --git a/games/rain/rain.c b/games/rain/rain.c index f07c3338021..78a1543545a 100644 --- a/games/rain/rain.c +++ b/games/rain/rain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rain.c,v 1.9 2000/01/25 06:37:09 pjanzen Exp $ */ +/* $OpenBSD: rain.c,v 1.10 2002/02/16 21:27:11 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: rain.c,v 1.9 2000/01/25 06:37:09 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: rain.c,v 1.10 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: rain.c,v 1.9 2000/01/25 06:37:09 pjanzen Exp $" volatile sig_atomic_t sig_caught = 0; -static void onsig __P((int)); +static void onsig(int); int diff --git a/games/random/random.c b/games/random/random.c index b65e2c721e3..ed52a55adf5 100644 --- a/games/random/random.c +++ b/games/random/random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: random.c,v 1.6 1998/08/22 08:55:22 pjanzen Exp $ */ +/* $OpenBSD: random.c,v 1.7 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: random.c,v 1.3 1995/04/22 07:44:05 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)random.c 8.5 (Berkeley) 4/5/94"; #else -static char rcsid[] = "$OpenBSD: random.c,v 1.6 1998/08/22 08:55:22 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: random.c,v 1.7 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: random.c,v 1.6 1998/08/22 08:55:22 pjanzen Exp #include <unistd.h> #include <limits.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/games/robots/robots.h b/games/robots/robots.h index a17bbfbf5b9..bd64cefeb3c 100644 --- a/games/robots/robots.h +++ b/games/robots/robots.h @@ -1,4 +1,4 @@ -/* $OpenBSD: robots.h,v 1.4 1999/12/18 11:18:13 pjanzen Exp $ */ +/* $OpenBSD: robots.h,v 1.5 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: robots.h,v 1.5 1995/04/24 12:24:54 cgd Exp $ */ /* @@ -120,25 +120,25 @@ extern COORD Max, Min, My_pos, Robots[]; * functions types */ -void add_score __P((int)); -bool another __P((void)); -int cmp_sc __P((const void *, const void *)); -bool do_move __P((int, int)); -bool eaten __P((COORD *)); -void get_move __P((void)); -void init_field __P((void)); -bool jumping __P((void)); -void make_level __P((void)); -void move_robots __P((void)); -bool must_telep __P((void)); -void play_level __P((void)); -int query __P((char *)); -void quit __P((int)); -void reset_count __P((void)); -int rnd __P((int)); -COORD *rnd_pos __P((void)); -void score __P((int)); -void set_name __P((SCORE *)); -void show_score __P((void)); -int sign __P((int)); -void usage __P((void)); +void add_score(int); +bool another(void); +int cmp_sc(const void *, const void *); +bool do_move(int, int); +bool eaten(COORD *); +void get_move(void); +void init_field(void); +bool jumping(void); +void make_level(void); +void move_robots(void); +bool must_telep(void); +void play_level(void); +int query(char *); +void quit(int); +void reset_count(void); +int rnd(int); +COORD *rnd_pos(void); +void score(int); +void set_name(SCORE *); +void show_score(void); +int sign(int); +void usage(void); diff --git a/games/rogue/rogue.h b/games/rogue/rogue.h index 84e43eeac4d..6b37d2a767e 100644 --- a/games/rogue/rogue.h +++ b/games/rogue/rogue.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rogue.h,v 1.6 2001/08/12 19:52:56 pjanzen Exp $ */ +/* $OpenBSD: rogue.h,v 1.7 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: rogue.h,v 1.4 1995/04/24 12:25:04 cgd Exp $ */ /* @@ -447,302 +447,302 @@ struct rogue_time { #include <string.h> #include <unistd.h> -object *alloc_object __P((void)); -object *check_duplicate __P((object *, object *)); -char *get_ench_color __P((void)); -object *get_letter_object __P((int)); -object *get_thrown_at_monster __P((object *, short, short *, short *)); -object *get_zapped_monster __P((short, short *, short *)); -object *gr_monster __P((object *, int)); -object *gr_object __P((void)); -char *md_getenv __P((char *)); -char *md_gln __P((void)); -char *md_malloc __P((int)); -char *mon_name __P((object *)); -char *name_of __P((object *)); -object *object_at __P((object *, short, short)); -object *pick_up __P((short, short, short *)); -void add_exp __P((int, boolean)); -void add_mazes __P((void)); -void add_traps __P((void)); -void aggravate __P((void)); -void aim_monster __P((object *)); -void bounce __P((short, short, short, short, short)); -void byebye __P((int)); -void c_object_for_wizard __P((void)); -void call_it __P((void)); -boolean can_move __P((short, short, short, short)); -boolean can_turn __P((short, short)); -void center __P((short, char *)); -void check_gold_seeker __P((object *)); -boolean check_hunger __P((boolean)); -boolean check_imitator __P((object *)); -void check_message __P((void)); -int check_up __P((void)); -void clean_up __P((char *)); -void clear_level __P((void)); -void cnfs __P((void)); -int coin_toss __P((void)); -int connect_rooms __P((short, short)); -void cough_up __P((object *)); -void create_monster __P((void)); -int damage_for_strength __P((void)); -void darken_room __P((short)); -void disappear __P((object *)); -void do_args __P((int, char **)); -void do_opts __P((void)); -void do_put_on __P((object *, boolean)); -void do_shell __P((void)); -void do_wear __P((object *)); -void do_wield __P((object *)); -void dr_course __P((object *, boolean, short, short)); -void drain_life __P((void)); -void draw_magic_map __P((void)); -void draw_simple_passage __P((short, short, short, short, short)); -void drop __P((void)); -int drop_check __P((void)); -void drop_level __P((void)); -void eat __P((void)); -void edit_opts __P((void)); -void env_get_value __P((char **, char *, boolean)); -void error_save __P((int)); -void fight __P((int)); -void fill_it __P((int, boolean)); -void fill_out_level __P((void)); -boolean flame_broil __P((object *)); -int flit __P((object *)); -void flop_weapon __P((object *, short, short)); -void free_object __P((object *)); -void free_stuff __P((object *)); -void freeze __P((object *)); -int get_armor_class __P((object *)); -int get_com_id __P((int *, short)); -int get_damage __P((char *, boolean)); -void get_desc __P((object *, char *)); -int get_dir __P((short, short, short, short)); -void get_dir_rc __P((short, short *, short *, short)); -char get_dungeon_char __P((short, short)); -int get_exp_level __P((long)); -void get_food __P((object *, boolean)); -int get_hit_chance __P((object *)); -int get_input_line __P((char *, char *, char *, int, char *, boolean, boolean)); -char get_mask_char __P((unsigned short)); -int get_number __P((char *)); -boolean get_oth_room __P((short, short *, short *)); -int get_rand __P((int, int)); -short get_room_number __P((short, short)); -int get_value __P((object *)); -int get_w_damage __P((object *)); -void get_wand_and_ring_materials __P((void)); -int get_weapon_damage __P((object *)); -char gmc __P((object *)); -char gmc_row_col __P((short, short)); -void go_blind __P((void)); -boolean gold_at __P((short, short)); -void gr_armor __P((object *)); -char gr_dir __P((void)); -char gr_obj_char __P((void)); -void gr_potion __P((object *)); -void gr_ring __P((object *, boolean)); -short gr_room __P((void)); -void gr_row_col __P((short *, short *, unsigned short)); -void gr_scroll __P((object *)); -void gr_wand __P((object *)); -void gr_weapon __P((object *, int)); -void hallucinate __P((void)); -boolean has_amulet __P((void)); -boolean has_been_touched __P((struct rogue_time *, struct rogue_time *)); -void heal __P((void)); -void hide_boxed_passage __P((short, short, short, short, short)); -void hold_monster __P((void)); -int hp_raise __P((void)); -void id_all __P((void)); -void id_com __P((void)); -void id_trap __P((void)); -void id_type __P((void)); -void idntfy __P((void)); -boolean imitating __P((short, short)); -int init __P((int, char **)); -void init_str __P((char **, char *)); -void insert_score __P((char [][], char [][], char *, short, short, object *, int)); -void inv_armor_weapon __P((boolean)); -void inv_rings __P((void)); -void inventory __P((object *, unsigned short)); -boolean is_all_connected __P((void)); -boolean is_digit __P((int)); -boolean is_direction __P((short, short *)); -boolean is_pack_letter __P((short *, unsigned short *)); -boolean is_passable __P((short, short)); -boolean is_vowel __P((short)); -void kick_into_pack __P((void)); -void killed_by __P((object *, short)); -long lget_number __P((char *)); -void light_passage __P((short, short)); -void light_up_room __P((int)); -boolean m_confuse __P((object *)); -void make_level __P((void)); -void make_maze __P((short, short, short, short, short, short)); -void make_party __P((void)); -void make_room __P((short, short, short, short)); -void make_scroll_titles __P((void)); -boolean mask_pack __P((object *, unsigned short)); -boolean mask_room __P((short, short *, short *, unsigned short)); -boolean md_df __P((char *)); -void md_exit __P((int)); -void md_gct __P((struct rogue_time *)); -int md_get_file_id __P((char *)); -void md_gfmt __P((char *, struct rogue_time *)); -int md_gseed __P((void)); -void md_heed_signals __P((void)); -void md_ignore_signals __P((void)); -int md_link_count __P((char *)); -void md_lock __P((boolean)); -void md_shell __P((char *)); -void md_sleep __P((int)); -void md_slurp __P((void)); -void message __P((char *, boolean)); -void mix_colors __P((void)); -void mix_colors __P((void)); -void mix_random_rooms __P((void)); -int mon_can_go __P((object *, short, short)); -int mon_damage __P((object *, short)); -void mon_hit __P((object *)); -boolean mon_sees __P((object *, short, short)); -int move_confused __P((object *)); -void move_mon_to __P((object *, short, short)); -void move_onto __P((void)); -int mtry __P((object *, short, short)); -void multiple_move_rogue __P((short)); -void mv_1_monster __P((object *, short, short)); -void mv_aquatars __P((void)); -void mv_mons __P((void)); -int name_cmp __P((char *, char *)); -short next_avail_ichar __P((void)); -boolean next_to_something __P((short, short)); -void nickize __P((char *, char *, char *)); -int no_room_for_monster __P((int)); -int one_move_rogue __P((short, short)); -void onintr __P((int)); -void opt_erase __P((int)); -void opt_go __P((int)); -void opt_show __P((int)); -short pack_count __P((object *)); -short pack_letter __P((char *, unsigned short)); -void pad __P((char *, short)); -void party_monsters __P((int, int)); -short party_objects __P((int)); -void place_at __P((object *, short, short)); -void plant_gold __P((short, short, boolean)); -void play_level __P((void)); -void player_init __P((void)); -void player_init __P((void)); -void potion_heal __P((int)); -int pr_com_id __P((int)); -int pr_motion_char __P((int)); -void print_stats __P((int)); -void put_amulet __P((void)); -void put_door __P((room *, short, short *, short *)); -void put_gold __P((void)); -void put_m_at __P((short, short, object *)); -void put_mons __P((void)); -void put_objects __P((void)); -void put_on_ring __P((void)); -void put_player __P((short)); -void put_scores __P((object *, short)); -void put_stairs __P((void)); -void quaff __P((void)); -void quit __P((boolean)); -int r_index __P((char *, int, boolean)); -void r_read __P((FILE *, char *, int)); -void r_write __P((FILE *, char *, int)); -void rand_around __P((short, short *, short *)); -int rand_percent __P((int)); -void rand_place __P((object *)); -void read_pack __P((object *, FILE *, boolean)); -void read_scroll __P((void)); -void read_string __P((char *, FILE *)); -void recursive_deadend __P((short, short *, short, short)); -boolean reg_move __P((void)); -void relight __P((void)); -void remessage __P((short)); -void remove_ring __P((void)); -void rest __P((int)); -void restore __P((char *)); -int rgetchar __P((void)); -void ring_stats __P((boolean)); -int rogue_can_see __P((short, short)); -void rogue_damage __P((short, object *, short)); -void rogue_hit __P((object *, boolean)); -int rogue_is_around __P((short, short)); -long rrandom __P((void)); -void rust __P((object *)); -void rw_dungeon __P((FILE *, boolean)); -void rw_id __P((struct id *, FILE *, int, boolean)); -void rw_rooms __P((FILE *, boolean)); -void s_con_mon __P((object *)); -int same_col __P((int, int)); -int same_row __P((int, int)); -void save_game __P((void)); -void save_into_file __P((char *)); -void save_screen __P((void)); -void search __P((short, boolean)); -boolean seek_gold __P((object *)); -void sell_pack __P((void)); -void sf_error __P((void)); -void show_average_hp __P((void)); -void show_monsters __P((void)); -void show_objects __P((void)); -void show_traps __P((void)); -void single_inv __P((short)); -void sound_bell __P((void)); -void special_hit __P((object *)); -void srrandom __P((int)); -void start_window __P((void)); -void start_window __P((void)); -void steal_gold __P((object *)); -void steal_item __P((object *)); -void sting __P((object *)); -void stop_window __P((void)); -void stop_window __P((void)); -void take_a_nap __P((void)); -void take_from_pack __P((object *, object *)); -void take_off __P((void)); -void tele __P((void)); -void tele_away __P((object *)); -void throw __P((void)); -boolean throw_at_monster __P((object *, object *)); -int to_hit __P((object *)); -short trap_at __P((short, short)); -void trap_player __P((short, short)); -boolean try_to_cough __P((short, short, object *)); -void turn_passage __P((short, boolean)); -void un_put_on __P((object *)); -void unblind __P((void)); -void unconfuse __P((void)); -void uncurse_all __P((void)); -void unhallucinate __P((void)); -void unwear __P((object *)); -void unwield __P((object *)); -void vanish __P((object *, short, object *)); -void visit_rooms __P((int)); -void wait_for_ack __P((void)); -void wake_room __P((short, boolean, short, short)); -void wake_up __P((object *)); -void wanderer __P((void)); -void wdrain_life __P((object *)); -void wear __P((void)); -void wield __P((void)); -void win __P((void)); -void wizardize __P((void)); -void write_pack __P((object *, FILE *)); -void write_string __P((char *, FILE *)); -long xxx __P((boolean)); -void xxxx __P((char *, short)); -void zap_monster __P((object *, unsigned short)); -void zapp __P((void)); -object *add_to_pack __P((object *, object *, int)); -struct id *get_id_table __P((object *)); -unsigned short gr_what_is __P((void)); +object *alloc_object(void); +object *check_duplicate(object *, object *); +char *get_ench_color(void); +object *get_letter_object(int); +object *get_thrown_at_monster(object *, short, short *, short *); +object *get_zapped_monster(short, short *, short *); +object *gr_monster(object *, int); +object *gr_object(void); +char *md_getenv(char *); +char *md_gln(void); +char *md_malloc(int); +char *mon_name(object *); +char *name_of(object *); +object *object_at(object *, short, short); +object *pick_up(short, short, short *); +void add_exp(int, boolean); +void add_mazes(void); +void add_traps(void); +void aggravate(void); +void aim_monster(object *); +void bounce(short, short, short, short, short); +void byebye(int); +void c_object_for_wizard(void); +void call_it(void); +boolean can_move(short, short, short, short); +boolean can_turn(short, short); +void center(short, char *); +void check_gold_seeker(object *); +boolean check_hunger(boolean); +boolean check_imitator(object *); +void check_message(void); +int check_up(void); +void clean_up(char *); +void clear_level(void); +void cnfs(void); +int coin_toss(void); +int connect_rooms(short, short); +void cough_up(object *); +void create_monster(void); +int damage_for_strength(void); +void darken_room(short); +void disappear(object *); +void do_args(int, char **); +void do_opts(void); +void do_put_on(object *, boolean); +void do_shell(void); +void do_wear(object *); +void do_wield(object *); +void dr_course(object *, boolean, short, short); +void drain_life(void); +void draw_magic_map(void); +void draw_simple_passage(short, short, short, short, short); +void drop(void); +int drop_check(void); +void drop_level(void); +void eat(void); +void edit_opts(void); +void env_get_value(char **, char *, boolean); +void error_save(int); +void fight(int); +void fill_it(int, boolean); +void fill_out_level(void); +boolean flame_broil(object *); +int flit(object *); +void flop_weapon(object *, short, short); +void free_object(object *); +void free_stuff(object *); +void freeze(object *); +int get_armor_class(object *); +int get_com_id(int *, short); +int get_damage(char *, boolean); +void get_desc(object *, char *); +int get_dir(short, short, short, short); +void get_dir_rc(short, short *, short *, short); +char get_dungeon_char(short, short); +int get_exp_level(long); +void get_food(object *, boolean); +int get_hit_chance(object *); +int get_input_line(char *, char *, char *, int, char *, boolean, boolean); +char get_mask_char(unsigned short); +int get_number(char *); +boolean get_oth_room(short, short *, short *); +int get_rand(int, int); +short get_room_number(short, short); +int get_value(object *); +int get_w_damage(object *); +void get_wand_and_ring_materials(void); +int get_weapon_damage(object *); +char gmc(object *); +char gmc_row_col(short, short); +void go_blind(void); +boolean gold_at(short, short); +void gr_armor(object *); +char gr_dir(void); +char gr_obj_char(void); +void gr_potion(object *); +void gr_ring(object *, boolean); +short gr_room(void); +void gr_row_col(short *, short *, unsigned short); +void gr_scroll(object *); +void gr_wand(object *); +void gr_weapon(object *, int); +void hallucinate(void); +boolean has_amulet(void); +boolean has_been_touched(struct rogue_time *, struct rogue_time *); +void heal(void); +void hide_boxed_passage(short, short, short, short, short); +void hold_monster(void); +int hp_raise(void); +void id_all(void); +void id_com(void); +void id_trap(void); +void id_type(void); +void idntfy(void); +boolean imitating(short, short); +int init(int, char **); +void init_str(char **, char *); +void insert_score(char [][], char [][], char *, short, short, object *, int); +void inv_armor_weapon(boolean); +void inv_rings(void); +void inventory(object *, unsigned short); +boolean is_all_connected(void); +boolean is_digit(int); +boolean is_direction(short, short *); +boolean is_pack_letter(short *, unsigned short *); +boolean is_passable(short, short); +boolean is_vowel(short); +void kick_into_pack(void); +void killed_by(object *, short); +long lget_number(char *); +void light_passage(short, short); +void light_up_room(int); +boolean m_confuse(object *); +void make_level(void); +void make_maze(short, short, short, short, short, short); +void make_party(void); +void make_room(short, short, short, short); +void make_scroll_titles(void); +boolean mask_pack(object *, unsigned short); +boolean mask_room(short, short *, short *, unsigned short); +boolean md_df(char *); +void md_exit(int); +void md_gct(struct rogue_time *); +int md_get_file_id(char *); +void md_gfmt(char *, struct rogue_time *); +int md_gseed(void); +void md_heed_signals(void); +void md_ignore_signals(void); +int md_link_count(char *); +void md_lock(boolean); +void md_shell(char *); +void md_sleep(int); +void md_slurp(void); +void message(char *, boolean); +void mix_colors(void); +void mix_colors(void); +void mix_random_rooms(void); +int mon_can_go(object *, short, short); +int mon_damage(object *, short); +void mon_hit(object *); +boolean mon_sees(object *, short, short); +int move_confused(object *); +void move_mon_to(object *, short, short); +void move_onto(void); +int mtry(object *, short, short); +void multiple_move_rogue(short); +void mv_1_monster(object *, short, short); +void mv_aquatars(void); +void mv_mons(void); +int name_cmp(char *, char *); +short next_avail_ichar(void); +boolean next_to_something(short, short); +void nickize(char *, char *, char *); +int no_room_for_monster(int); +int one_move_rogue(short, short); +void onintr(int); +void opt_erase(int); +void opt_go(int); +void opt_show(int); +short pack_count(object *); +short pack_letter(char *, unsigned short); +void pad(char *, short); +void party_monsters(int, int); +short party_objects(int); +void place_at(object *, short, short); +void plant_gold(short, short, boolean); +void play_level(void); +void player_init(void); +void player_init(void); +void potion_heal(int); +int pr_com_id(int); +int pr_motion_char(int); +void print_stats(int); +void put_amulet(void); +void put_door(room *, short, short *, short *); +void put_gold(void); +void put_m_at(short, short, object *); +void put_mons(void); +void put_objects(void); +void put_on_ring(void); +void put_player(short); +void put_scores(object *, short); +void put_stairs(void); +void quaff(void); +void quit(boolean); +int r_index(char *, int, boolean); +void r_read(FILE *, char *, int); +void r_write(FILE *, char *, int); +void rand_around(short, short *, short *); +int rand_percent(int); +void rand_place(object *); +void read_pack(object *, FILE *, boolean); +void read_scroll(void); +void read_string(char *, FILE *); +void recursive_deadend(short, short *, short, short); +boolean reg_move(void); +void relight(void); +void remessage(short); +void remove_ring(void); +void rest(int); +void restore(char *); +int rgetchar(void); +void ring_stats(boolean); +int rogue_can_see(short, short); +void rogue_damage(short, object *, short); +void rogue_hit(object *, boolean); +int rogue_is_around(short, short); +long rrandom(void); +void rust(object *); +void rw_dungeon(FILE *, boolean); +void rw_id(struct id *, FILE *, int, boolean); +void rw_rooms(FILE *, boolean); +void s_con_mon(object *); +int same_col(int, int); +int same_row(int, int); +void save_game(void); +void save_into_file(char *); +void save_screen(void); +void search(short, boolean); +boolean seek_gold(object *); +void sell_pack(void); +void sf_error(void); +void show_average_hp(void); +void show_monsters(void); +void show_objects(void); +void show_traps(void); +void single_inv(short); +void sound_bell(void); +void special_hit(object *); +void srrandom(int); +void start_window(void); +void start_window(void); +void steal_gold(object *); +void steal_item(object *); +void sting(object *); +void stop_window(void); +void stop_window(void); +void take_a_nap(void); +void take_from_pack(object *, object *); +void take_off(void); +void tele(void); +void tele_away(object *); +void throw(void); +boolean throw_at_monster(object *, object *); +int to_hit(object *); +short trap_at(short, short); +void trap_player(short, short); +boolean try_to_cough(short, short, object *); +void turn_passage(short, boolean); +void un_put_on(object *); +void unblind(void); +void unconfuse(void); +void uncurse_all(void); +void unhallucinate(void); +void unwear(object *); +void unwield(object *); +void vanish(object *, short, object *); +void visit_rooms(int); +void wait_for_ack(void); +void wake_room(short, boolean, short, short); +void wake_up(object *); +void wanderer(void); +void wdrain_life(object *); +void wear(void); +void wield(void); +void win(void); +void wizardize(void); +void write_pack(object *, FILE *); +void write_string(char *, FILE *); +long xxx(boolean); +void xxxx(char *, short); +void zap_monster(object *, unsigned short); +void zapp(void); +object *add_to_pack(object *, object *, int); +struct id *get_id_table(object *); +unsigned short gr_what_is(void); extern boolean ask_quit; extern boolean being_held; diff --git a/games/sail/assorted.c b/games/sail/assorted.c index 7facf0f109c..e924eb081ab 100644 --- a/games/sail/assorted.c +++ b/games/sail/assorted.c @@ -1,4 +1,4 @@ -/* $OpenBSD: assorted.c,v 1.2 1999/01/18 06:20:51 pjanzen Exp $ */ +/* $OpenBSD: assorted.c,v 1.3 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)assorted.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: assorted.c,v 1.2 1999/01/18 06:20:51 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: assorted.c,v 1.3 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: assorted.c,v 1.2 1999/01/18 06:20:51 pjanzen Ex #include <unistd.h> #include <err.h> -static void strike __P((struct ship *, struct ship *)); +static void strike(struct ship *, struct ship *); void table(rig, shot, hittable, on, from, roll) diff --git a/games/sail/extern.h b/games/sail/extern.h index e239cb3cccc..dc7dc15249f 100644 --- a/games/sail/extern.h +++ b/games/sail/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2000/01/03 23:22:41 pjanzen Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: extern.h,v 1.8 1998/09/13 15:27:30 hubertf Exp $ */ /* @@ -306,143 +306,143 @@ extern int people; extern char hasdriver; /* assorted.c */ -void table __P((int, int, int, struct ship *, struct ship *, int)); -void Cleansnag __P((struct ship *, struct ship *, int, int)); +void table(int, int, int, struct ship *, struct ship *, int); +void Cleansnag(struct ship *, struct ship *, int, int); /* dr_1.c */ -void unfoul __P((void)); -void boardcomp __P((void)); -int fightitout __P((struct ship *, struct ship *, int)); -void resolve __P((void)); -void compcombat __P((void)); -int next __P((void)); +void unfoul(void); +void boardcomp(void); +int fightitout(struct ship *, struct ship *, int); +void resolve(void); +void compcombat(void); +int next(void); /* dr_2.c */ -void thinkofgrapples __P((void)); -void checkup __P((void)); -void prizecheck __P((void)); -int str_end __P((const char *)); -void closeon __P((struct ship *, struct ship *, char[], int, int, int)); -int score __P((char[], struct ship *, struct ship *, int)); -void move_ship __P((const char *, struct ship *, unsigned char *, short *, short *, char *)); +void thinkofgrapples(void); +void checkup(void); +void prizecheck(void); +int str_end(const char *); +void closeon(struct ship *, struct ship *, char[], int, int, int); +int score(char[], struct ship *, struct ship *, int); +void move_ship(const char *, struct ship *, unsigned char *, short *, short *, char *); void try __P((char[], char [], int, int, int, int, int, struct ship *, struct ship *, int *, int)); -void rmend __P((char *)); +void rmend(char *); /* dr_3.c */ -void moveall __P((void)); -int stillmoving __P((int)); -int is_isolated __P((struct ship *)); -int push __P((struct ship *, struct ship *)); -void step __P((int, struct ship *, char *)); -void sendbp __P((struct ship *, struct ship *, int, int)); -int is_toughmelee __P((struct ship *, struct ship *, int, int)); -void reload __P((void)); -void checksails __P((void)); +void moveall(void); +int stillmoving(int); +int is_isolated(struct ship *); +int push(struct ship *, struct ship *); +void step(int, struct ship *, char *); +void sendbp(struct ship *, struct ship *, int, int); +int is_toughmelee(struct ship *, struct ship *, int, int); +void reload(void); +void checksails(void); /* dr_4.c */ -void ungrap __P((struct ship *, struct ship *)); -void grap __P((struct ship *, struct ship *)); +void ungrap(struct ship *, struct ship *); +void grap(struct ship *, struct ship *); /* dr_5.c */ -void subtract __P((struct ship *, int, int [3], struct ship *, int)); +void subtract(struct ship *, int, int [3], struct ship *, int); int mensent __P((struct ship *, struct ship *, int[3], struct ship **, int *, int)); /* dr_main.c */ -int dr_main __P((void)); +int dr_main(void); /* game.c */ -int maxturns __P((struct ship *, char *)); -int maxmove __P((struct ship *, int, int)); +int maxturns(struct ship *, char *); +int maxmove(struct ship *, int, int); /* lo_main.c */ -int lo_main __P((void)); +int lo_main(void); /* misc.c */ -int range __P((struct ship *, struct ship *)); -struct ship *closestenemy __P((struct ship *, int, int)); -int angle __P((int, int)); -int gunsbear __P((struct ship *, struct ship *)); -int portside __P((struct ship *, struct ship *, int)); -int colours __P((struct ship *)); -void logger __P((struct ship *)); +int range(struct ship *, struct ship *); +struct ship *closestenemy(struct ship *, int, int); +int angle(int, int); +int gunsbear(struct ship *, struct ship *); +int portside(struct ship *, struct ship *, int); +int colours(struct ship *); +void logger(struct ship *); /* parties.c */ -int meleeing __P((struct ship *, struct ship *)); -int boarding __P((struct ship *, int)); -void unboard __P((struct ship *, struct ship *, int)); +int meleeing(struct ship *, struct ship *); +int boarding(struct ship *, int); +void unboard(struct ship *, struct ship *, int); /* pl_1.c */ -void leave __P((int)) __attribute__((__noreturn__)); -void choke __P((int)) __attribute__((__noreturn__)); -void child __P((int)); +void leave(int) __attribute__((__noreturn__)); +void choke(int) __attribute__((__noreturn__)); +void child(int); /* pl_2.c */ -void play __P((void)); +void play(void); /* pl_3.c */ -void acceptcombat __P((void)); -void grapungrap __P((void)); -void unfoulplayer __P((void)); +void acceptcombat(void); +void grapungrap(void); +void unfoulplayer(void); /* pl_4.c */ -void changesail __P((void)); -void acceptsignal __P((void)); -void lookout __P((void)); -const char *saywhat __P((struct ship *, int)); -void eyeball __P((struct ship *)); +void changesail(void); +void acceptsignal(void); +void lookout(void); +const char *saywhat(struct ship *, int); +void eyeball(struct ship *); /* pl_5.c */ -void acceptmove __P((void)); -void acceptboard __P((void)); -void parties __P((int[3], struct ship *, int, int)); +void acceptmove(void); +void acceptboard(void); +void parties(int[3], struct ship *, int, int); /* pl_6.c */ -void repair __P((void)); -int turned __P((void)); -void loadplayer __P((void)); +void repair(void); +int turned(void); +void loadplayer(void); /* pl_7.c */ -void initscreen __P((void)); -void cleanupscreen __P((void)); -void newturn __P((int)); -void Signal __P((char *, struct ship *, ...)) +void initscreen(void); +void cleanupscreen(void); +void newturn(int); +void Signal(char *, struct ship *, ...) __attribute__((__format__(__printf__,1,3))); -void Msg __P((char *, ...)) +void Msg(char *, ...) __attribute__((__format__(__printf__,1,2))); -void Scroll __P((void)); -void prompt __P((const char *, struct ship *)); -void endprompt __P((int)); -int sgetch __P((const char *, struct ship *, int)); -void sgetstr __P((const char *, char *, int)); -void draw_screen __P((void)); -void draw_view __P((void)); -void draw_turn __P((void)); -void draw_stat __P((void)); -void draw_slot __P((void)); -void draw_board __P((void)); -void centerview __P((void)); -void upview __P((void)); -void downview __P((void)); -void leftview __P((void)); -void rightview __P((void)); -void adjustview __P((void)); +void Scroll(void); +void prompt(const char *, struct ship *); +void endprompt(int); +int sgetch(const char *, struct ship *, int); +void sgetstr(const char *, char *, int); +void draw_screen(void); +void draw_view(void); +void draw_turn(void); +void draw_stat(void); +void draw_slot(void); +void draw_board(void); +void centerview(void); +void upview(void); +void downview(void); +void leftview(void); +void rightview(void); +void adjustview(void); /* pl_main.c */ -int pl_main __P((void)); -void initialize __P((void)); +int pl_main(void); +void initialize(void); /* sync.c */ -void fmtship __P((char *, size_t, const char *, struct ship *)); -void makesignal __P((struct ship *, const char *, struct ship *, ...)) +void fmtship(char *, size_t, const char *, struct ship *); +void makesignal(struct ship *, const char *, struct ship *, ...) __attribute__((__format__(__printf__,2,4))); -void makemsg __P((struct ship *, const char *, ...)) +void makemsg(struct ship *, const char *, ...) __attribute__((__format__(__printf__,2,3))); -int sync_exists __P((int)); -int sync_open __P((void)); -void sync_close __P((int)); -void Write __P((int, struct ship *, long, long, long, long)); -void Writestr __P((int, struct ship *, const char *)); -int Sync __P((void)); -int sync_update __P((int, struct ship *, const char *, long, long, long, long)); +int sync_exists(int); +int sync_open(void); +void sync_close(int); +void Write(int, struct ship *, long, long, long, long); +void Writestr(int, struct ship *, const char *); +int Sync(void); +int sync_update(int, struct ship *, const char *, long, long, long, long); diff --git a/games/snake/snake.c b/games/snake/snake.c index e05bfd8f3d0..c4b9cd7da08 100644 --- a/games/snake/snake.c +++ b/games/snake/snake.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snake.c,v 1.4 2001/11/18 23:53:29 deraadt Exp $ */ +/* $OpenBSD: snake.c,v 1.5 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: snake.c,v 1.8 1995/04/29 00:06:41 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)snake.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: snake.c,v 1.4 2001/11/18 23:53:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: snake.c,v 1.5 2002/02/16 21:27:11 millert Exp $"; #endif #endif /* not lint */ @@ -122,28 +122,28 @@ FILE *logfile; int lcnt, ccnt; /* user's idea of screen size */ int chunk; /* amount of money given at a time */ -void snscore __P((int, int)); - -void chase __P((struct point *, struct point *)); -int chk __P((struct point *)); -void drawbox __P((void)); -void length __P((int)); -void mainloop __P((void)); -int post __P((int, int)); -int pushsnake __P((void)); -void setup __P((void)); -void snrand __P((struct point *)); -void snap __P((void)); -void spacewarp __P((int)); -void stop __P((int)); -int stretch __P((struct point *)); -void surround __P((struct point *)); -void suspend __P((void)); -void win __P((struct point *)); -void winnings __P((int)); +void snscore(int, int); + +void chase(struct point *, struct point *); +int chk(struct point *); +void drawbox(void); +void length(int); +void mainloop(void); +int post(int, int); +int pushsnake(void); +void setup(void); +void snrand(struct point *); +void snap(void); +void spacewarp(int); +void stop(int); +int stretch(struct point *); +void surround(struct point *); +void suspend(void); +void win(struct point *); +void winnings(int); #ifdef LOGGING -void logit __P((char *)); +void logit(char *); #endif int wantstop; diff --git a/games/tetris/input.h b/games/tetris/input.h index fddfe1e9b9d..789797ca99f 100644 --- a/games/tetris/input.h +++ b/games/tetris/input.h @@ -1,4 +1,4 @@ -/* $OpenBSD: input.h,v 1.3 1999/03/22 07:38:26 pjanzen Exp $ */ +/* $OpenBSD: input.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: input.h,v 1.2 1995/04/22 07:42:36 cgd Exp $ */ /*- @@ -39,6 +39,6 @@ * @(#)input.h 8.1 (Berkeley) 5/31/93 */ -int rwait __P((struct timeval *)); -int tgetchar __P((void)); -void tsleep __P((void)); +int rwait(struct timeval *); +int tgetchar(void); +void tsleep(void); diff --git a/games/tetris/scores.c b/games/tetris/scores.c index b46aa7b0ce2..3961f706be3 100644 --- a/games/tetris/scores.c +++ b/games/tetris/scores.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scores.c,v 1.5 2001/02/04 14:23:27 pjanzen Exp $ */ +/* $OpenBSD: scores.c,v 1.6 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: scores.c,v 1.2 1995/04/22 07:42:38 cgd Exp $ */ /*- @@ -81,11 +81,11 @@ static int nscores; static int gotscores; static struct highscore scores[NUMSPOTS]; -static int checkscores __P((struct highscore *, int)); -static int cmpscores __P((const void *, const void *)); -static void getscores __P((FILE **)); -static void printem __P((int, int, struct highscore *, int, const char *)); -static char *thisuser __P((void)); +static int checkscores(struct highscore *, int); +static int cmpscores(const void *, const void *); +static void getscores(FILE **); +static void printem(int, int, struct highscore *, int, const char *); +static char *thisuser(void); /* * Read the score file. Can be called from savescore (before showscores) diff --git a/games/tetris/scores.h b/games/tetris/scores.h index 500e8731b77..dbd28fc9d84 100644 --- a/games/tetris/scores.h +++ b/games/tetris/scores.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scores.h,v 1.3 2001/02/04 14:23:28 pjanzen Exp $ */ +/* $OpenBSD: scores.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: scores.h,v 1.2 1995/04/22 07:42:40 cgd Exp $ */ /*- @@ -53,5 +53,5 @@ struct highscore { #define MAXSCORES 9 /* maximum high score entries per person */ #define EXPIRATION (5L * 365 * 24 * 60 * 60) -void savescore __P((int)); -void showscores __P((int)); +void savescore(int); +void showscores(int); diff --git a/games/tetris/screen.c b/games/tetris/screen.c index 17fd2506e0b..280b269d083 100644 --- a/games/tetris/screen.c +++ b/games/tetris/screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.c,v 1.6 2001/09/04 23:35:58 millert Exp $ */ +/* $OpenBSD: screen.c,v 1.7 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: screen.c,v 1.4 1995/04/29 01:11:36 mycroft Exp $ */ /*- @@ -62,10 +62,10 @@ static cell curscreen[B_SIZE]; /* 1 => standout (or otherwise marked) */ static int curscore; static int isset; /* true => terminal is in game mode */ static struct termios oldtt; -static void (*tstp) __P((int)); +static void (*tstp)(int); -static void scr_stop __P((int)); -static void stopset __P((int)); +static void scr_stop(int); +static void stopset(int); /* * Capabilities from TERMCAP. @@ -247,7 +247,7 @@ scr_set() struct winsize ws; struct termios newtt; sigset_t sigset, osigset; - void (*ttou) __P((int)); + void (*ttou)(int); sigemptyset(&sigset); sigaddset(&sigset, SIGTSTP); diff --git a/games/tetris/screen.h b/games/tetris/screen.h index a21257b87f4..fb62aeec122 100644 --- a/games/tetris/screen.h +++ b/games/tetris/screen.h @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.h,v 1.3 2000/01/03 23:22:45 pjanzen Exp $ */ +/* $OpenBSD: screen.h,v 1.4 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: screen.h,v 1.2 1995/04/22 07:42:42 cgd Exp $ */ /*- @@ -50,10 +50,10 @@ extern char *SOstr; /* begin standout mode */ */ #define putpad(s) tputs(s, 1, put) -int put __P((int)); /* just calls putchar; for tputs */ -void scr_clear __P((void)); -void scr_end __P((void)); -void scr_init __P((void)); -void scr_msg __P((char *, int)); -void scr_set __P((void)); -void scr_update __P((void)); +int put(int); /* just calls putchar; for tputs */ +void scr_clear(void); +void scr_end(void); +void scr_init(void); +void scr_msg(char *, int); +void scr_set(void); +void scr_update(void); diff --git a/games/tetris/tetris.c b/games/tetris/tetris.c index 1be87f03bdb..d2eee78b237 100644 --- a/games/tetris/tetris.c +++ b/games/tetris/tetris.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tetris.c,v 1.10 2001/11/19 21:29:06 deraadt Exp $ */ +/* $OpenBSD: tetris.c,v 1.11 2002/02/16 21:27:11 millert Exp $ */ /* $NetBSD: tetris.c,v 1.2 1995/04/22 07:42:47 cgd Exp $ */ /*- @@ -75,11 +75,11 @@ gid_t gid, egid; char key_msg[100]; int showpreview; -static void elide __P((void)); -static void setup_board __P((void)); -struct shape *randshape __P((void)); -void onintr __P((int)); -void usage __P((void)); +static void elide(void); +static void setup_board(void); +struct shape *randshape(void); +void onintr(int); +void usage(void); /* * Set up the initial board. The bottom display row is completely set, diff --git a/games/tetris/tetris.h b/games/tetris/tetris.h index c0a6305ad4a..e27f38602df 100644 --- a/games/tetris/tetris.h +++ b/games/tetris/tetris.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tetris.h,v 1.5 2000/01/03 23:22:45 pjanzen Exp $ */ +/* $OpenBSD: tetris.h,v 1.6 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: tetris.h,v 1.2 1995/04/22 07:42:48 cgd Exp $ */ /*- @@ -175,6 +175,6 @@ extern gid_t gid, egid; extern char key_msg[100]; extern int showpreview; -int fits_in __P((struct shape *, int)); -void place __P((struct shape *, int, int)); -void stop __P((char *)); +int fits_in(struct shape *, int); +void place(struct shape *, int, int); +void stop(char *); diff --git a/games/trek/compkl.c b/games/trek/compkl.c index eac12ad0b6c..7f2ca02922a 100644 --- a/games/trek/compkl.c +++ b/games/trek/compkl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compkl.c,v 1.2 1998/08/19 07:41:18 pjanzen Exp $ */ +/* $OpenBSD: compkl.c,v 1.3 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: compkl.c,v 1.3 1995/04/22 10:58:38 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)compkl.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: compkl.c,v 1.2 1998/08/19 07:41:18 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: compkl.c,v 1.3 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -56,7 +56,7 @@ static char rcsid[] = "$OpenBSD: compkl.c,v 1.2 1998/08/19 07:41:18 pjanzen Exp ** move. */ -static void sortkl __P((void)); +static void sortkl(void); void compkldist(f) diff --git a/games/trek/computer.c b/games/trek/computer.c index 204b8c7f551..3cdc2275cf2 100644 --- a/games/trek/computer.c +++ b/games/trek/computer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: computer.c,v 1.4 1999/07/31 18:48:58 pjanzen Exp $ */ +/* $OpenBSD: computer.c,v 1.5 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: computer.c,v 1.4 1995/04/24 12:25:51 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: computer.c,v 1.4 1999/07/31 18:48:58 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: computer.c,v 1.5 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -107,8 +107,8 @@ struct cvntab Cputab[] = { NULL, NULL, NULL, 0 } }; -static int kalc __P((int, int, int, int, double *)); -static void prkalc __P((int, double)); +static int kalc(int, int, int, int, double *); +static void prkalc(int, double); void computer(v) diff --git a/games/trek/dumpgame.c b/games/trek/dumpgame.c index 319af6c155b..d1bbfcc3f4c 100644 --- a/games/trek/dumpgame.c +++ b/games/trek/dumpgame.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumpgame.c,v 1.4 1999/03/12 03:02:41 pjanzen Exp $ */ +/* $OpenBSD: dumpgame.c,v 1.5 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: dumpgame.c,v 1.4 1995/04/24 12:25:54 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: dumpgame.c,v 1.4 1999/03/12 03:02:41 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: dumpgame.c,v 1.5 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -72,7 +72,7 @@ struct dump Dump_template[] = { NULL, 0 } }; -static int readdump __P((int)); +static int readdump(int); /* ** DUMP GAME diff --git a/games/trek/getpar.c b/games/trek/getpar.c index 0ce6b908b23..f340c1bc784 100644 --- a/games/trek/getpar.c +++ b/games/trek/getpar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getpar.c,v 1.4 1999/07/31 18:48:58 pjanzen Exp $ */ +/* $OpenBSD: getpar.c,v 1.5 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: getpar.c,v 1.4 1995/04/24 12:25:57 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)getpar.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: getpar.c,v 1.4 1999/07/31 18:48:58 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: getpar.c,v 1.5 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -47,7 +47,7 @@ static char rcsid[] = "$OpenBSD: getpar.c,v 1.4 1999/07/31 18:48:58 pjanzen Exp #include "getpar.h" #include "trek.h" -static int testterm __P((void)); +static int testterm(void); /** ** get integer parameter diff --git a/games/trek/getpar.h b/games/trek/getpar.h index 5cd8f479447..dfb08f665ee 100644 --- a/games/trek/getpar.h +++ b/games/trek/getpar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: getpar.h,v 1.3 1999/07/31 18:48:58 pjanzen Exp $ */ +/* $OpenBSD: getpar.h,v 1.4 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: getpar.h,v 1.3 1995/04/22 10:58:59 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -typedef void (*cmdfun) __P((int)); +typedef void (*cmdfun)(int); struct cvntab /* used for getcodpar() paramater list */ { @@ -48,11 +48,11 @@ struct cvntab /* used for getcodpar() paramater list */ int value2; }; -int getintpar __P((const char *)); -double getfltpar __P((const char *)); -int getynpar __P((const char *)); -const struct cvntab *getcodpar __P((const char *, const struct cvntab[])); -void getstrpar __P((const char *, char *, int, const char *)); -int testnl __P((void)); -void skiptonl __P((int)); -int readdelim __P((int)); +int getintpar(const char *); +double getfltpar(const char *); +int getynpar(const char *); +const struct cvntab *getcodpar(const char *, const struct cvntab[]); +void getstrpar(const char *, char *, int, const char *); +int testnl(void); +void skiptonl(int); +int readdelim(int); diff --git a/games/trek/torped.c b/games/trek/torped.c index 88a2972b758..cb0ef725a30 100644 --- a/games/trek/torped.c +++ b/games/trek/torped.c @@ -1,4 +1,4 @@ -/* $OpenBSD: torped.c,v 1.3 1999/03/12 03:02:44 pjanzen Exp $ */ +/* $OpenBSD: torped.c,v 1.4 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: torped.c,v 1.3 1995/04/22 10:59:34 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)torped.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: torped.c,v 1.3 1999/03/12 03:02:44 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: torped.c,v 1.4 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -47,7 +47,7 @@ static char rcsid[] = "$OpenBSD: torped.c,v 1.3 1999/03/12 03:02:44 pjanzen Exp #include "trek.h" #include "getpar.h" -static int randcourse __P((int)); +static int randcourse(int); /* ** PHOTON TORPEDO CONTROL diff --git a/games/trek/trek.h b/games/trek/trek.h index a54981491a2..5a05afeddec 100644 --- a/games/trek/trek.h +++ b/games/trek/trek.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trek.h,v 1.5 1999/07/31 18:49:00 pjanzen Exp $ */ +/* $OpenBSD: trek.h,v 1.6 2002/02/16 21:27:12 millert Exp $ */ /* $NetBSD: trek.h,v 1.3 1995/04/22 10:59:36 cgd Exp $ */ /* @@ -379,152 +379,152 @@ int Trace; #endif /* abandon.c */ -void abandon __P((int)); +void abandon(int); /* attack.c */ -void attack __P((int)); +void attack(int); /* autover.c */ -void autover __P((void)); +void autover(void); /* capture.c */ -void capture __P((int)); -struct kling *selectklingon __P((void)); +void capture(int); +struct kling *selectklingon(void); /* check_out.c */ -int check_out __P((int)); +int check_out(int); /* checkcond.c */ -void checkcond __P((void)); +void checkcond(void); /* compkl.c */ -void compkldist __P((int)); +void compkldist(int); /* computer.c */ -void computer __P((int)); +void computer(int); /* damage.c */ -void damage __P((int, double)); +void damage(int, double); /* damaged.c */ -int damaged __P((int)); +int damaged(int); /* dcrept.c */ -void dcrept __P((int)); +void dcrept(int); /* destruct.c */ -void destruct __P((int)); +void destruct(int); /* dock.c */ -void dock __P((int)); -void undock __P((int)); +void dock(int); +void undock(int); /* dumpgame.c */ -void dumpgame __P((int)); -int restartgame __P((void)); +void dumpgame(int); +int restartgame(void); /* dumpme.c */ -void dumpme __P((int)); +void dumpme(int); /* dumpssradio.c */ -int dumpssradio __P((void)); +int dumpssradio(void); /* events.c */ -int events __P((int)); +int events(int); /* externs.c */ /* getcodi.c */ -int getcodi __P((int *, double *)); +int getcodi(int *, double *); /* help.c */ -void help __P((int)); +void help(int); /* impulse.c */ -void impulse __P((int)); +void impulse(int); /* initquad.c */ -void initquad __P((int)); -void sector __P((int *, int *)); +void initquad(int); +void sector(int *, int *); /* kill.c */ -void killk __P((int, int )); -void killb __P((int, int )); -void kills __P((int, int , int)); -void killd __P((int, int , int)); +void killk(int, int ); +void killb(int, int ); +void kills(int, int , int); +void killd(int, int , int); /* klmove.c */ -void klmove __P((int)); +void klmove(int); /* lose.c */ -void lose __P((int)); +void lose(int); /* lrscan.c */ -void lrscan __P((int)); +void lrscan(int); /* move.c */ -double move __P((int, int, double, double)); +double move(int, int, double, double); /* nova.c */ -void nova __P((int, int )); +void nova(int, int ); /* out.c */ -void out __P((int)); +void out(int); /* phaser.c */ -void phaser __P((int)); +void phaser(int); /* play.c */ -void myreset __P((int)); -void play __P((void)); +void myreset(int); +void play(void); /* ram.c */ -void ram __P((int, int )); +void ram(int, int ); /* ranf.c */ -int ranf __P((int)); -double franf __P((void)); +int ranf(int); +double franf(void); /* rest.c */ -void rest __P((int)); +void rest(int); /* schedule.c */ -struct event *schedule __P((int, double, int, int , int)); -void reschedule __P((struct event *, double)); -void unschedule __P((struct event *)); -struct event *xsched __P((int, int, int, int , int )); -void xresched __P((struct event *, int, int)); +struct event *schedule(int, double, int, int , int); +void reschedule(struct event *, double); +void unschedule(struct event *); +struct event *xsched(int, int, int, int , int ); +void xresched(struct event *, int, int); /* score.c */ -long score __P((void)); +long score(void); /* setup.c */ -void setup __P((void)); +void setup(void); /* setwarp.c */ -void setwarp __P((int)); +void setwarp(int); /* shield.c */ -void shield __P((int)); +void shield(int); /* snova.c */ -void snova __P((int, int )); +void snova(int, int ); /* srscan.c */ -void srscan __P((int)); +void srscan(int); /* systemname.c */ -const char *systemname __P((const struct quad *)); +const char *systemname(const struct quad *); /* torped.c */ -void torped __P((int)); +void torped(int); /* visual.c */ -void visual __P((int)); +void visual(int); /* warp.c */ -void dowarp __P((int)); -void warp __P((int, int, double)); +void dowarp(int); +void warp(int, int, double); /* win.c */ -void win __P((void)); +void win(void); diff --git a/games/worm/worm.c b/games/worm/worm.c index 06fd29cad6b..87ddc05d550 100644 --- a/games/worm/worm.c +++ b/games/worm/worm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: worm.c,v 1.14 2001/11/17 08:21:44 deraadt Exp $ */ +/* $OpenBSD: worm.c,v 1.15 2002/02/16 21:27:12 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: worm.c,v 1.14 2001/11/17 08:21:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: worm.c,v 1.15 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -88,17 +88,17 @@ char outbuf[BUFSIZ]; int wantleave; int wantsuspend; -void crash __P((void)); -void display __P((struct body *, char)); -void leave __P((int)); -void life __P((void)); -void newpos __P((struct body *)); -struct body *newlink __P((void)); -void process __P((int)); -void prize __P((void)); -int rnd __P((int)); -void setup __P((void)); -void suspend __P((int)); +void crash(void); +void display(struct body *, char); +void leave(int); +void life(void); +void newpos(struct body *); +struct body *newlink(void); +void process(int); +void prize(void); +int rnd(int); +void setup(void); +void suspend(int); int main(argc, argv) diff --git a/games/worms/worms.c b/games/worms/worms.c index 006efe6fc06..08b32b0c3e2 100644 --- a/games/worms/worms.c +++ b/games/worms/worms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: worms.c,v 1.10 2000/01/25 06:37:17 pjanzen Exp $ */ +/* $OpenBSD: worms.c,v 1.11 2002/02/16 21:27:12 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)worms.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: worms.c,v 1.10 2000/01/25 06:37:17 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: worms.c,v 1.11 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -182,8 +182,8 @@ static struct worm { volatile sig_atomic_t sig_caught = 0; -void nomem __P((void)); -void onsig __P((int)); +void nomem(void); +void onsig(int); int main(argc, argv) diff --git a/games/wump/wump.c b/games/wump/wump.c index b9274f6e690..adfeb3cbb47 100644 --- a/games/wump/wump.c +++ b/games/wump/wump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wump.c,v 1.16 2001/07/09 07:04:30 deraadt Exp $ */ +/* $OpenBSD: wump.c,v 1.17 2002/02/16 21:27:12 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: wump.c,v 1.16 2001/07/09 07:04:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: wump.c,v 1.17 2002/02/16 21:27:12 millert Exp $"; #endif #endif /* not lint */ @@ -118,34 +118,34 @@ int arrow_num = NUMBER_OF_ARROWS; /* arrow inventory */ char answer[20]; /* user input */ -int bats_nearby __P((void)); -void cave_init __P((void)); -void clear_things_in_cave __P((void)); -void display_room_stats __P((void)); -void dodecahedral_cave_init __P((void)); -int gcd __P((int, int)); -int getans __P((const char *)); -void initialize_things_in_cave __P((void)); -void instructions __P((void)); -int int_compare __P((const void *, const void *)); -/* void jump __P((int)); */ -void kill_wump __P((void)); -int main __P((int, char **)); -int move_to __P((const char *)); -void move_wump __P((void)); -void no_arrows __P((void)); -void pit_kill __P((void)); -void pit_kill_bat __P((void)); -int pit_nearby __P((void)); -void pit_survive __P((void)); -int shoot __P((char *)); -void shoot_self __P((void)); -int take_action __P((void)); -void usage __P((void)); -void wump_kill __P((void)); -void wump_bat_kill __P((void)); -void wump_walk_kill __P((void)); -int wump_nearby __P((void)); +int bats_nearby(void); +void cave_init(void); +void clear_things_in_cave(void); +void display_room_stats(void); +void dodecahedral_cave_init(void); +int gcd(int, int); +int getans(const char *); +void initialize_things_in_cave(void); +void instructions(void); +int int_compare(const void *, const void *); +/* void jump(int); */ +void kill_wump(void); +int main(int, char **); +int move_to(const char *); +void move_wump(void); +void no_arrows(void); +void pit_kill(void); +void pit_kill_bat(void); +int pit_nearby(void); +void pit_survive(void); +int shoot(char *); +void shoot_self(void); +int take_action(void); +void usage(void); +void wump_kill(void); +void wump_bat_kill(void); +void wump_walk_kill(void); +int wump_nearby(void); int diff --git a/include/arpa/inet.h b/include/arpa/inet.h index d649a96dbb9..0f212fa81c1 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.h,v 1.4 1997/04/05 20:58:30 millert Exp $ */ +/* $OpenBSD: inet.h,v 1.5 2002/02/16 21:27:18 millert Exp $ */ /* * ++Copyright++ 1983, 1993 @@ -74,20 +74,20 @@ #include <sys/cdefs.h> __BEGIN_DECLS -in_addr_t inet_addr __P((const char *)); -int inet_aton __P((const char *, struct in_addr *)); -in_addr_t inet_lnaof __P((struct in_addr)); -struct in_addr inet_makeaddr __P((in_addr_t , in_addr_t)); -char * inet_neta __P((in_addr_t, char *, size_t)); -in_addr_t inet_netof __P((struct in_addr)); -in_addr_t inet_network __P((const char *)); -char *inet_net_ntop __P((int, const void *, int, char *, size_t)); -int inet_net_pton __P((int, const char *, void *, size_t)); -char *inet_ntoa __P((struct in_addr)); -int inet_pton __P((int, const char *, void *)); -const char *inet_ntop __P((int, const void *, char *, size_t)); -u_int inet_nsap_addr __P((const char *, u_char *, int)); -char *inet_nsap_ntoa __P((int, const u_char *, char *)); +in_addr_t inet_addr(const char *); +int inet_aton(const char *, struct in_addr *); +in_addr_t inet_lnaof(struct in_addr); +struct in_addr inet_makeaddr(in_addr_t , in_addr_t); +char * inet_neta(in_addr_t, char *, size_t); +in_addr_t inet_netof(struct in_addr); +in_addr_t inet_network(const char *); +char *inet_net_ntop(int, const void *, int, char *, size_t); +int inet_net_pton(int, const char *, void *, size_t); +char *inet_ntoa(struct in_addr); +int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *, char *, size_t); +u_int inet_nsap_addr(const char *, u_char *, int); +char *inet_nsap_ntoa(int, const u_char *, char *); __END_DECLS #endif /* !_INET_H_ */ diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index 7fd5ee320b1..c147724ac78 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nameser.h,v 1.6 2001/07/31 22:02:18 jakob Exp $ */ +/* $OpenBSD: nameser.h,v 1.7 2002/02/16 21:27:18 millert Exp $ */ /* * ++Copyright++ 1983, 1989, 1993 @@ -352,8 +352,8 @@ typedef struct { */ #define INDIR_MASK 0xc0 -extern u_int16_t _getshort __P((const u_char *)); -extern u_int32_t _getlong __P((const u_char *)); +extern u_int16_t _getshort(const u_char *); +extern u_int32_t _getlong(const u_char *); /* * Inline versions of get/put short/long. Pointer is advanced. diff --git a/include/assert.h b/include/assert.h index c51d000da51..b5951f6d344 100644 --- a/include/assert.h +++ b/include/assert.h @@ -1,4 +1,4 @@ -/* $OpenBSD: assert.h,v 1.2 1997/09/21 10:45:25 niklas Exp $ */ +/* $OpenBSD: assert.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $ */ /*- @@ -64,5 +64,5 @@ #include <sys/cdefs.h> __BEGIN_DECLS -void __assert __P((const char *, int, const char *)); +void __assert(const char *, int, const char *); __END_DECLS diff --git a/include/blf.h b/include/blf.h index 5bdc43484d0..6c9085a6e6f 100644 --- a/include/blf.h +++ b/include/blf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.h,v 1.5 2000/12/21 16:35:32 aaron Exp $ */ +/* $OpenBSD: blf.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier * @@ -56,26 +56,26 @@ typedef struct BlowfishContext { * Blowfish_expand0state( state, key, keylen ) */ -void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *)); -void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *)); -void Blowfish_initstate __P((blf_ctx *)); -void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t)); +void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *); +void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *); +void Blowfish_initstate(blf_ctx *); +void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t); void Blowfish_expandstate - __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t)); +(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t); /* Standard Blowfish */ -void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t)); -void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t)); -void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t)); +void blf_key(blf_ctx *, const u_int8_t *, u_int16_t); +void blf_enc(blf_ctx *, u_int32_t *, u_int16_t); +void blf_dec(blf_ctx *, u_int32_t *, u_int16_t); -void blf_ecb_encrypt __P((blf_ctx *, u_int8_t *, u_int32_t)); -void blf_ecb_decrypt __P((blf_ctx *, u_int8_t *, u_int32_t)); +void blf_ecb_encrypt(blf_ctx *, u_int8_t *, u_int32_t); +void blf_ecb_decrypt(blf_ctx *, u_int8_t *, u_int32_t); -void blf_cbc_encrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t)); -void blf_cbc_decrypt __P((blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t)); +void blf_cbc_encrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t); +void blf_cbc_decrypt(blf_ctx *, u_int8_t *, u_int8_t *, u_int32_t); /* Converts u_int8_t to u_int32_t */ -u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *)); +u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *); #endif diff --git a/include/bm.h b/include/bm.h index f4e45ae5210..d69033e6ae5 100644 --- a/include/bm.h +++ b/include/bm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bm.h,v 1.2 1997/09/21 10:45:27 niklas Exp $ */ +/* $OpenBSD: bm.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: bm.h,v 1.3 1994/10/26 00:55:46 cgd Exp $ */ /*- @@ -54,9 +54,9 @@ typedef struct { #include <sys/cdefs.h> __BEGIN_DECLS -bm_pat *bm_comp __P((u_char const *, size_t, u_char const *)); -u_char *bm_exec __P((bm_pat *, u_char *, size_t)); -void bm_free __P((bm_pat *)); +bm_pat *bm_comp(u_char const *, size_t, u_char const *); +u_char *bm_exec(bm_pat *, u_char *, size_t); +void bm_free(bm_pat *); __END_DECLS #endif /* !_BM_H_ */ diff --git a/include/bsd_auth.h b/include/bsd_auth.h index 0720d63e323..08f1cb5bcb3 100644 --- a/include/bsd_auth.h +++ b/include/bsd_auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bsd_auth.h,v 1.3 2001/01/28 23:43:15 niklas Exp $ */ +/* $OpenBSD: bsd_auth.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /*- * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. @@ -52,46 +52,46 @@ typedef enum { #include <sys/cdefs.h> __BEGIN_DECLS -char * auth_getitem __P((auth_session_t *, auth_item_t)); -int auth_setitem __P((auth_session_t *, auth_item_t, char *)); +char * auth_getitem(auth_session_t *, auth_item_t); +int auth_setitem(auth_session_t *, auth_item_t, char *); -auth_session_t *auth_open __P((void)); -auth_session_t *auth_verify __P((auth_session_t *, char *, char *, ...)); -auth_session_t *auth_userchallenge __P((char *, char *, char *, char **)); -auth_session_t *auth_usercheck __P((char *, char *, char *, char *)); +auth_session_t *auth_open(void); +auth_session_t *auth_verify(auth_session_t *, char *, char *, ...); +auth_session_t *auth_userchallenge(char *, char *, char *, char **); +auth_session_t *auth_usercheck(char *, char *, char *, char *); -int auth_userresponse __P((auth_session_t *, char *, int)); -int auth_userokay __P((char *, char *, char *, char *)); -int auth_approval __P((auth_session_t *, login_cap_t *, char *, char *)); +int auth_userresponse(auth_session_t *, char *, int); +int auth_userokay(char *, char *, char *, char *); +int auth_approval(auth_session_t *, login_cap_t *, char *, char *); -int auth_close __P((auth_session_t *)); -void auth_clean __P((auth_session_t *)); +int auth_close(auth_session_t *); +void auth_clean(auth_session_t *); -char * auth_getvalue __P((auth_session_t *, char *)); -int auth_getstate __P((auth_session_t *)); -char * auth_challenge __P((auth_session_t *)); -void auth_setenv __P((auth_session_t *)); -void auth_clrenv __P((auth_session_t *)); +char * auth_getvalue(auth_session_t *, char *); +int auth_getstate(auth_session_t *); +char * auth_challenge(auth_session_t *); +void auth_setenv(auth_session_t *); +void auth_clrenv(auth_session_t *); -void auth_setstate __P((auth_session_t *, int)); -int auth_call __P((auth_session_t *, char *, ...)); +void auth_setstate(auth_session_t *, int); +int auth_call(auth_session_t *, char *, ...); -int auth_setdata __P((auth_session_t *, void *, size_t)); -int auth_setoption __P((auth_session_t *, char *, char *)); -int auth_setpwd __P((auth_session_t *, struct passwd *pwd)); -void auth_set_va_list __P((auth_session_t *, _BSD_VA_LIST_)); +int auth_setdata(auth_session_t *, void *, size_t); +int auth_setoption(auth_session_t *, char *, char *); +int auth_setpwd(auth_session_t *, struct passwd *pwd); +void auth_set_va_list(auth_session_t *, _BSD_VA_LIST_); -struct passwd *auth_getpwd __P((auth_session_t *)); +struct passwd *auth_getpwd(auth_session_t *); -quad_t auth_check_expire __P((auth_session_t *)); -quad_t auth_check_change __P((auth_session_t *)); +quad_t auth_check_expire(auth_session_t *); +quad_t auth_check_change(auth_session_t *); -void auth_clroptions __P((auth_session_t *)); -void auth_clroption __P((auth_session_t *, char *)); +void auth_clroptions(auth_session_t *); +void auth_clroption(auth_session_t *, char *); -char * auth_mkvalue __P((char *)); -void auth_checknologin __P((login_cap_t *)); -int auth_cat __P((char *)); +char * auth_mkvalue(char *); +void auth_checknologin(login_cap_t *); +int auth_cat(char *); __END_DECLS diff --git a/include/ctype.h b/include/ctype.h index 942bfc8660a..73f3a7d6a67 100644 --- a/include/ctype.h +++ b/include/ctype.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ctype.h,v 1.3 1998/04/30 05:49:21 deraadt Exp $ */ +/* $OpenBSD: ctype.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: ctype.h,v 1.14 1994/10/26 00:55:47 cgd Exp $ */ /* @@ -59,26 +59,26 @@ extern const short *_tolower_tab_; extern const short *_toupper_tab_; __BEGIN_DECLS -extern int isalnum __P ((int)); -extern int isalpha __P ((int)); -extern int iscntrl __P ((int)); -extern int isdigit __P ((int)); -extern int isgraph __P ((int)); -extern int islower __P ((int)); -extern int isprint __P ((int)); -extern int ispunct __P ((int)); -extern int isspace __P ((int)); -extern int isupper __P ((int)); -extern int isxdigit __P ((int)); -extern int tolower __P ((int)); -extern int toupper __P ((int)); +extern int isalnum(int); +extern int isalpha(int); +extern int iscntrl(int); +extern int isdigit(int); +extern int isgraph(int); +extern int islower(int); +extern int isprint(int); +extern int ispunct(int); +extern int isspace(int); +extern int isupper(int); +extern int isxdigit(int); +extern int tolower(int); +extern int toupper(int); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern int isblank __P ((int)); -extern int isascii __P ((int)); -extern int toascii __P ((int)); -extern int _tolower __P ((int)); -extern int _toupper __P ((int)); +extern int isblank(int); +extern int isascii(int); +extern int toascii(int); +extern int _tolower(int); +extern int _toupper(int); #endif __END_DECLS diff --git a/include/db.h b/include/db.h index d8336ece161..5ab191fd2c6 100644 --- a/include/db.h +++ b/include/db.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db.h,v 1.4 1999/11/15 01:47:54 aaron Exp $ */ +/* $OpenBSD: db.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: db.h,v 1.13 1994/10/26 00:55:48 cgd Exp $ */ /*- @@ -118,14 +118,14 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE; /* Access method description structure. */ typedef struct __db { DBTYPE type; /* Underlying db type. */ - int (*close) __P((struct __db *)); - int (*del) __P((const struct __db *, const DBT *, u_int)); - int (*get) __P((const struct __db *, const DBT *, DBT *, u_int)); - int (*put) __P((const struct __db *, DBT *, const DBT *, u_int)); - int (*seq) __P((const struct __db *, DBT *, DBT *, u_int)); - int (*sync) __P((const struct __db *, u_int)); + int (*close)(struct __db *); + int (*del)(const struct __db *, const DBT *, u_int); + int (*get)(const struct __db *, const DBT *, DBT *, u_int); + int (*put)(const struct __db *, DBT *, const DBT *, u_int); + int (*seq)(const struct __db *, DBT *, DBT *, u_int); + int (*sync)(const struct __db *, u_int); void *internal; /* Access method private. */ - int (*fd) __P((const struct __db *)); + int (*fd)(const struct __db *); } DB; #define BTREEMAGIC 0x053162 @@ -140,9 +140,9 @@ typedef struct { int minkeypage; /* minimum keys per page */ u_int psize; /* page size */ int (*compare) /* comparison function */ - __P((const DBT *, const DBT *)); +(const DBT *, const DBT *); size_t (*prefix) /* prefix function */ - __P((const DBT *, const DBT *)); +(const DBT *, const DBT *); int lorder; /* byte order */ } BTREEINFO; @@ -156,7 +156,7 @@ typedef struct { u_int nelem; /* number of elements */ u_int cachesize; /* bytes to cache */ u_int32_t /* hash function */ - (*hash) __P((const void *, size_t)); + (*hash)(const void *, size_t); int lorder; /* byte order */ } HASHINFO; @@ -225,13 +225,13 @@ typedef struct { #endif __BEGIN_DECLS -DB *dbopen __P((const char *, int, int, DBTYPE, const void *)); +DB *dbopen(const char *, int, int, DBTYPE, const void *); #ifdef __DBINTERFACE_PRIVATE -DB *__bt_open __P((const char *, int, int, const BTREEINFO *, int)); -DB *__hash_open __P((const char *, int, int, const HASHINFO *, int)); -DB *__rec_open __P((const char *, int, int, const RECNOINFO *, int)); -void __dbpanic __P((DB *dbp)); +DB *__bt_open(const char *, int, int, const BTREEINFO *, int); +DB *__hash_open(const char *, int, int, const HASHINFO *, int); +DB *__rec_open(const char *, int, int, const RECNOINFO *, int); +void __dbpanic(DB *dbp); #endif __END_DECLS #endif /* !_DB_H_ */ diff --git a/include/dbm.h b/include/dbm.h index 665651ec946..ca4250b03fe 100644 --- a/include/dbm.h +++ b/include/dbm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dbm.h,v 1.3 2001/01/28 23:43:15 niklas Exp $ */ +/* $OpenBSD: dbm.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com> @@ -33,13 +33,13 @@ #include <ndbm.h> __BEGIN_DECLS -int dbmclose __P((void)); -int dbminit __P((const char *)); -int delete __P((datum)); -datum fetch __P((datum)); -datum firstkey __P((void)); -datum nextkey __P((datum)); -int store __P((datum, datum)); +int dbmclose(void); +int dbminit(const char *); +int delete(datum); +datum fetch(datum); +datum firstkey(void); +datum nextkey(datum); +int store(datum, datum); __END_DECLS #endif /* _DBM_H_ */ diff --git a/include/dirent.h b/include/dirent.h index 54291f535a1..012e8006073 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dirent.h,v 1.6 1999/09/17 13:13:46 espie Exp $ */ +/* $OpenBSD: dirent.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $ */ /*- @@ -96,20 +96,20 @@ typedef struct _dirdesc { #include <sys/cdefs.h> __BEGIN_DECLS -DIR *opendir __P((const char *)); -struct dirent *readdir __P((DIR *)); -void rewinddir __P((DIR *)); -int closedir __P((DIR *)); +DIR *opendir(const char *); +struct dirent *readdir(DIR *); +void rewinddir(DIR *); +int closedir(DIR *); #ifndef _POSIX_SOURCE -DIR *__opendir2 __P((const char *, int)); -long telldir __P((const DIR *)); -void seekdir __P((DIR *, long)); +DIR *__opendir2(const char *, int); +long telldir(const DIR *); +void seekdir(DIR *, long); int scandir __P((const char *, struct dirent ***, int (*)(struct dirent *), int (*)(const void *, const void *))); -int alphasort __P((const void *, const void *)); -int getdirentries __P((int, char *, int, long *)); +int alphasort(const void *, const void *); +int getdirentries(int, char *, int, long *); #endif /* not POSIX */ -int readdir_r __P((DIR *, struct dirent *, struct dirent **)); +int readdir_r(DIR *, struct dirent *, struct dirent **); __END_DECLS #endif /* !_KERNEL */ diff --git a/include/dlfcn.h b/include/dlfcn.h index b96b018498d..88e0515cd3d 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.h,v 1.4 2001/05/31 14:04:09 art Exp $ */ +/* $OpenBSD: dlfcn.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: dlfcn.h,v 1.2 1995/06/05 19:38:00 pk Exp $ */ /* @@ -40,11 +40,11 @@ * User interface to the run-time linker. */ __BEGIN_DECLS -extern void *dlopen __P((const char *, int)); -extern int dlclose __P((void *)); -extern void *dlsym __P((void *, const char *)); -extern int dlctl __P((void *, int, void *)); -extern const char *dlerror __P((void)); +extern void *dlopen(const char *, int); +extern int dlclose(void *); +extern void *dlsym(void *, const char *); +extern int dlctl(void *, int, void *); +extern const char *dlerror(void); __END_DECLS /* Values for dlopen `mode'. */ diff --git a/include/err.h b/include/err.h index d494281396c..434a01c2edf 100644 --- a/include/err.h +++ b/include/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.7 2001/08/07 21:34:42 millert Exp $ */ +/* $OpenBSD: err.h,v 1.8 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: err.h,v 1.11 1994/10/26 00:55:52 cgd Exp $ */ /*- @@ -51,42 +51,42 @@ __BEGIN_DECLS -__dead void err __P((int, const char *, ...)) +__dead void err(int, const char *, ...) __attribute__((__format__ (printf, 2, 3))); -__dead void verr __P((int, const char *, _BSD_VA_LIST_)) +__dead void verr(int, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 2, 0))); -__dead void errx __P((int, const char *, ...)) +__dead void errx(int, const char *, ...) __attribute__((__format__ (printf, 2, 3))); -__dead void verrx __P((int, const char *, _BSD_VA_LIST_)) +__dead void verrx(int, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 2, 0))); -void warn __P((const char *, ...)) +void warn(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void vwarn __P((const char *, _BSD_VA_LIST_)) +void vwarn(const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 1, 0))); -void warnx __P((const char *, ...)) +void warnx(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void vwarnx __P((const char *, _BSD_VA_LIST_)) +void vwarnx(const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 1, 0))); /* * The _* versions are for use in library functions so user-defined * versions of err*,warn* do not get used. */ -__dead void _err __P((int, const char *, ...)) +__dead void _err(int, const char *, ...) __attribute__((__format__ (printf, 2, 3))); -__dead void _verr __P((int, const char *, _BSD_VA_LIST_)) +__dead void _verr(int, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 2, 0))); -__dead void _errx __P((int, const char *, ...)) +__dead void _errx(int, const char *, ...) __attribute__((__format__ (printf, 2, 3))); -__dead void _verrx __P((int, const char *, _BSD_VA_LIST_)) +__dead void _verrx(int, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 2, 0))); -void _warn __P((const char *, ...)) +void _warn(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void _vwarn __P((const char *, _BSD_VA_LIST_)) +void _vwarn(const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 1, 0))); -void _warnx __P((const char *, ...)) +void _warnx(const char *, ...) __attribute__((__format__ (printf, 1, 2))); -void _vwarnx __P((const char *, _BSD_VA_LIST_)) +void _vwarnx(const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 1, 0))); __END_DECLS diff --git a/include/fnmatch.h b/include/fnmatch.h index 70a5fec6d7c..579e752ce65 100644 --- a/include/fnmatch.h +++ b/include/fnmatch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fnmatch.h,v 1.5 2000/03/24 17:13:23 millert Exp $ */ +/* $OpenBSD: fnmatch.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: fnmatch.h,v 1.5 1994/10/26 00:55:53 cgd Exp $ */ /*- @@ -55,7 +55,7 @@ #include <sys/cdefs.h> __BEGIN_DECLS -int fnmatch __P((const char *, const char *, int)); +int fnmatch(const char *, const char *, int); __END_DECLS #endif /* !_FNMATCH_H_ */ diff --git a/include/fstab.h b/include/fstab.h index 01d3d1be751..8376aadb344 100644 --- a/include/fstab.h +++ b/include/fstab.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fstab.h,v 1.3 1997/09/21 10:45:34 niklas Exp $ */ +/* $OpenBSD: fstab.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: fstab.h,v 1.3 1994/10/26 00:55:53 cgd Exp $ */ /* @@ -72,11 +72,11 @@ struct fstab { #include <sys/cdefs.h> __BEGIN_DECLS -struct fstab *getfsent __P((void)); -struct fstab *getfsspec __P((const char *)); -struct fstab *getfsfile __P((const char *)); -int setfsent __P((void)); -void endfsent __P((void)); +struct fstab *getfsent(void); +struct fstab *getfsspec(const char *); +struct fstab *getfsfile(const char *); +int setfsent(void); +void endfsent(void); __END_DECLS #endif /* !_FSTAB_H_ */ diff --git a/include/fts.h b/include/fts.h index eb40c7a14d9..8f01f294886 100644 --- a/include/fts.h +++ b/include/fts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.h,v 1.6 2001/05/15 21:14:37 millert Exp $ */ +/* $OpenBSD: fts.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $ */ /* @@ -120,12 +120,12 @@ typedef struct _ftsent { #include <sys/cdefs.h> __BEGIN_DECLS -FTSENT *fts_children __P((FTS *, int)); -int fts_close __P((FTS *)); +FTSENT *fts_children(FTS *, int); +int fts_close(FTS *); FTS *fts_open __P((char * const *, int, int (*)(const FTSENT **, const FTSENT **))); -FTSENT *fts_read __P((FTS *)); -int fts_set __P((FTS *, FTSENT *, int)); +FTSENT *fts_read(FTS *); +int fts_set(FTS *, FTSENT *, int); __END_DECLS #endif /* !_FTS_H_ */ diff --git a/include/glob.h b/include/glob.h index d744001f737..6766660bcb9 100644 --- a/include/glob.h +++ b/include/glob.h @@ -1,4 +1,4 @@ -/* $OpenBSD: glob.h,v 1.5 2001/03/18 17:18:58 deraadt Exp $ */ +/* $OpenBSD: glob.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: glob.h,v 1.5 1994/10/26 00:55:56 cgd Exp $ */ /* @@ -52,18 +52,18 @@ typedef struct { int gl_flags; /* Copy of flags parameter to glob. */ char **gl_pathv; /* List of paths matching pattern. */ /* Copy of errfunc parameter to glob. */ - int (*gl_errfunc) __P((const char *, int)); + int (*gl_errfunc)(const char *, int); /* * Alternate filesystem access methods for glob; replacement * versions of closedir(3), readdir(3), opendir(3), stat(2) * and lstat(2). */ - void (*gl_closedir) __P((void *)); - struct dirent *(*gl_readdir) __P((void *)); - void *(*gl_opendir) __P((const char *)); - int (*gl_lstat) __P((const char *, struct stat *)); - int (*gl_stat) __P((const char *, struct stat *)); + void (*gl_closedir)(void *); + struct dirent *(*gl_readdir)(void *); + void *(*gl_opendir)(const char *); + int (*gl_lstat)(const char *, struct stat *); + int (*gl_stat)(const char *, struct stat *); } glob_t; /* Flags */ @@ -94,7 +94,7 @@ typedef struct { __BEGIN_DECLS int glob __P((const char *, int, int (*)(const char *, int), glob_t *)); -void globfree __P((glob_t *)); +void globfree(glob_t *); __END_DECLS #endif /* !_GLOB_H_ */ diff --git a/include/grp.h b/include/grp.h index 31bfeddfaa7..514a8bbafb1 100644 --- a/include/grp.h +++ b/include/grp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grp.h,v 1.3 1997/09/21 10:45:35 niklas Exp $ */ +/* $OpenBSD: grp.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: grp.h,v 1.7 1995/04/29 05:30:40 cgd Exp $ */ /*- @@ -59,16 +59,16 @@ struct group { }; __BEGIN_DECLS -struct group *getgrgid __P((gid_t)); -struct group *getgrnam __P((const char *)); +struct group *getgrgid(gid_t); +struct group *getgrnam(const char *); #ifndef _POSIX_SOURCE -struct group *getgrent __P((void)); -void setgrent __P((void)); -void endgrent __P((void)); -void setgrfile __P((const char *)); +struct group *getgrent(void); +void setgrent(void); +void endgrent(void); +void setgrfile(const char *); #ifndef _XOPEN_SOURCE -char *group_from_gid __P((gid_t, int)); -int setgroupent __P((int)); +char *group_from_gid(gid_t, int); +int setgroupent(int); #endif /* !_XOPEN_SOURCE */ #endif /* !_POSIX_SOURCE */ __END_DECLS diff --git a/include/ieeefp.h b/include/ieeefp.h index 5b8fa9af18d..8812f6bf52e 100644 --- a/include/ieeefp.h +++ b/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieeefp.h,v 1.2 1997/09/21 10:45:36 niklas Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -11,11 +11,11 @@ #include <sys/cdefs.h> #include <machine/ieeefp.h> -extern fp_rnd fpgetround __P((void)); -extern fp_rnd fpsetround __P((fp_rnd)); -extern fp_except fpgetmask __P((void)); -extern fp_except fpsetmask __P((fp_except)); -extern fp_except fpgetsticky __P((void)); -extern fp_except fpsetsticky __P((fp_except)); +extern fp_rnd fpgetround(void); +extern fp_rnd fpsetround(fp_rnd); +extern fp_except fpgetmask(void); +extern fp_except fpsetmask(fp_except); +extern fp_except fpgetsticky(void); +extern fp_except fpsetsticky(fp_except); #endif /* _IEEEFP_H_ */ diff --git a/include/ifaddrs.h b/include/ifaddrs.h index c0872e469e3..373e6014ac9 100644 --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ifaddrs.h,v 1.2 2000/02/23 15:39:53 itojun Exp $ */ +/* $OpenBSD: ifaddrs.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (c) 1995, 1999 @@ -49,8 +49,8 @@ struct ifaddrs { #include <sys/cdefs.h> __BEGIN_DECLS -extern int getifaddrs __P((struct ifaddrs **)); -extern void freeifaddrs __P((struct ifaddrs *)); +extern int getifaddrs(struct ifaddrs **); +extern void freeifaddrs(struct ifaddrs *); __END_DECLS #endif diff --git a/include/kvm.h b/include/kvm.h index c51d34de174..9ecc806fcd7 100644 --- a/include/kvm.h +++ b/include/kvm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm.h,v 1.3 1997/09/21 10:45:37 niklas Exp $ */ +/* $OpenBSD: kvm.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: kvm.h,v 1.7 1996/04/19 12:02:50 leo Exp $ */ /*- @@ -52,24 +52,24 @@ __BEGIN_DECLS typedef struct __kvm kvm_t; struct kinfo_proc; -int kvm_close __P((kvm_t *)); -int kvm_dump_inval __P((kvm_t *)); -int kvm_dump_mkheader __P((kvm_t *, off_t)); -int kvm_dump_wrtheader __P((kvm_t *, FILE *, int)); -char **kvm_getargv __P((kvm_t *, const struct kinfo_proc *, int)); -char **kvm_getenvv __P((kvm_t *, const struct kinfo_proc *, int)); -char *kvm_geterr __P((kvm_t *)); -int kvm_getloadavg __P((kvm_t *, double [], int)); -char *kvm_getfiles __P((kvm_t *, int, int, int *)); +int kvm_close(kvm_t *); +int kvm_dump_inval(kvm_t *); +int kvm_dump_mkheader(kvm_t *, off_t); +int kvm_dump_wrtheader(kvm_t *, FILE *, int); +char **kvm_getargv(kvm_t *, const struct kinfo_proc *, int); +char **kvm_getenvv(kvm_t *, const struct kinfo_proc *, int); +char *kvm_geterr(kvm_t *); +int kvm_getloadavg(kvm_t *, double [], int); +char *kvm_getfiles(kvm_t *, int, int, int *); struct kinfo_proc * - kvm_getprocs __P((kvm_t *, int, int, int *)); -int kvm_nlist __P((kvm_t *, struct nlist *)); + kvm_getprocs(kvm_t *, int, int, int *); +int kvm_nlist(kvm_t *, struct nlist *); kvm_t *kvm_open - __P((const char *, const char *, const char *, int, const char *)); +(const char *, const char *, const char *, int, const char *); kvm_t *kvm_openfiles - __P((const char *, const char *, const char *, int, char *)); -ssize_t kvm_read __P((kvm_t *, u_long, void *, size_t)); -ssize_t kvm_write __P((kvm_t *, u_long, const void *, size_t)); +(const char *, const char *, const char *, int, char *); +ssize_t kvm_read(kvm_t *, u_long, void *, size_t); +ssize_t kvm_write(kvm_t *, u_long, const void *, size_t); __END_DECLS diff --git a/include/langinfo.h b/include/langinfo.h index bae00d5a033..b3aafd04500 100644 --- a/include/langinfo.h +++ b/include/langinfo.h @@ -1,4 +1,4 @@ -/* $OpenBSD: langinfo.h,v 1.3 2001/01/29 01:32:37 naddy Exp $ */ +/* $OpenBSD: langinfo.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: langinfo.h,v 1.3 1995/04/28 23:30:54 jtc Exp $ */ /* @@ -70,7 +70,7 @@ #define CRNCYSTR 50 /* Currency symbol */ __BEGIN_DECLS -char *nl_langinfo __P((nl_item)); +char *nl_langinfo(nl_item); __END_DECLS #endif /* _LANGINFO_H_ */ diff --git a/include/libgen.h b/include/libgen.h index 89d0ba5ada0..ce005ec66f8 100644 --- a/include/libgen.h +++ b/include/libgen.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $ */ +/* $OpenBSD: libgen.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -34,11 +34,11 @@ __BEGIN_DECLS -char *basename __P((const char *)); -char *dirname __P((const char *)); +char *basename(const char *); +char *dirname(const char *); #if 0 -char *regcmp __P((const char *, ...)); -char *regex __P((const char *, const char *, ...)); +char *regcmp(const char *, ...); +char *regex(const char *, const char *, ...); extern char *__loc1; #endif diff --git a/include/link.h b/include/link.h index ab1b244516f..a45eacd0300 100644 --- a/include/link.h +++ b/include/link.h @@ -1,4 +1,4 @@ -/* $OpenBSD: link.h,v 1.8 2001/06/08 07:45:18 art Exp $ */ +/* $OpenBSD: link.h,v 1.9 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: link.h,v 1.10 1996/01/09 00:00:11 pk Exp $ */ /* @@ -202,12 +202,12 @@ struct r_debug { * Entry points into ld.so - user interface to the run-time linker. */ struct ld_entry { - void *(*dlopen) __P((const char *, int)); - int (*dlclose) __P((void *)); - void *(*dlsym) __P((void *, const char *)); - int (*dlctl) __P((void *, int, void *)); - void (*dlexit) __P((void)); - void (*dlrsrvd[3]) __P((void)); + void *(*dlopen)(const char *, int); + int (*dlclose)(void *); + void *(*dlsym)(void *, const char *); + int (*dlctl)(void *, int, void *); + void (*dlexit)(void); + void (*dlrsrvd[3])(void); }; /* diff --git a/include/locale.h b/include/locale.h index 5644acbd193..4bd430b6183 100644 --- a/include/locale.h +++ b/include/locale.h @@ -1,4 +1,4 @@ -/* $OpenBSD: locale.h,v 1.3 1999/06/11 22:47:48 espie Exp $ */ +/* $OpenBSD: locale.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $ */ /* @@ -81,8 +81,8 @@ struct lconv { #include <sys/cdefs.h> __BEGIN_DECLS -struct lconv *localeconv __P((void)); -char *setlocale __P((int, const char *)); +struct lconv *localeconv(void); +char *setlocale(int, const char *); __END_DECLS #endif /* _LOCALE_H_ */ diff --git a/include/login_cap.h b/include/login_cap.h index 6b150583e4a..3955f12a207 100644 --- a/include/login_cap.h +++ b/include/login_cap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: login_cap.h,v 1.6 2001/07/15 21:32:25 millert Exp $ */ +/* $OpenBSD: login_cap.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /*- * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved. @@ -89,18 +89,18 @@ typedef struct login_cap { __BEGIN_DECLS struct passwd; -login_cap_t *login_getclass __P((char *)); -void login_close __P((login_cap_t *)); -int login_getcapbool __P((login_cap_t *, char *, u_int)); -quad_t login_getcapnum __P((login_cap_t *, char *, quad_t, quad_t)); -quad_t login_getcapsize __P((login_cap_t *, char *, quad_t, quad_t)); -char *login_getcapstr __P((login_cap_t *, char *, char *, char *)); -quad_t login_getcaptime __P((login_cap_t *, char *, quad_t, quad_t)); -char *login_getstyle __P((login_cap_t *, char *, char *)); +login_cap_t *login_getclass(char *); +void login_close(login_cap_t *); +int login_getcapbool(login_cap_t *, char *, u_int); +quad_t login_getcapnum(login_cap_t *, char *, quad_t, quad_t); +quad_t login_getcapsize(login_cap_t *, char *, quad_t, quad_t); +char *login_getcapstr(login_cap_t *, char *, char *, char *); +quad_t login_getcaptime(login_cap_t *, char *, quad_t, quad_t); +char *login_getstyle(login_cap_t *, char *, char *); -int secure_path __P((char *)); -int setclasscontext __P((char *, u_int)); -int setusercontext __P((login_cap_t *, struct passwd *, uid_t, u_int)); +int secure_path(char *); +int setclasscontext(char *, u_int); +int setusercontext(login_cap_t *, struct passwd *, uid_t, u_int); __END_DECLS diff --git a/include/math.h b/include/math.h index d9d2a9ca447..4daefae3426 100644 --- a/include/math.h +++ b/include/math.h @@ -1,4 +1,4 @@ -/* $OpenBSD: math.h,v 1.5 2001/05/26 01:49:25 millert Exp $ */ +/* $OpenBSD: math.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -99,167 +99,167 @@ __BEGIN_DECLS /* * ANSI/POSIX */ -extern double acos __P((double)); -extern double asin __P((double)); -extern double atan __P((double)); -extern double atan2 __P((double, double)); -extern double cos __P((double)); -extern double sin __P((double)); -extern double tan __P((double)); - -extern double cosh __P((double)); -extern double sinh __P((double)); -extern double tanh __P((double)); - -extern double exp __P((double)); -extern double frexp __P((double, int *)); -extern double ldexp __P((double, int)); -extern double log __P((double)); -extern double log10 __P((double)); -extern double modf __P((double, double *)); - -extern double pow __P((double, double)); -extern double sqrt __P((double)); - -extern double ceil __P((double)); -extern double fabs __P((double)); -extern double floor __P((double)); -extern double fmod __P((double, double)); +extern double acos(double); +extern double asin(double); +extern double atan(double); +extern double atan2(double, double); +extern double cos(double); +extern double sin(double); +extern double tan(double); + +extern double cosh(double); +extern double sinh(double); +extern double tanh(double); + +extern double exp(double); +extern double frexp(double, int *); +extern double ldexp(double, int); +extern double log(double); +extern double log10(double); +extern double modf(double, double *); + +extern double pow(double, double); +extern double sqrt(double); + +extern double ceil(double); +extern double fabs(double); +extern double floor(double); +extern double fmod(double, double); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern double erf __P((double)); -extern double erfc __P((double)); -extern double gamma __P((double)); -extern double hypot __P((double, double)); -extern int isinf __P((double)); -extern int isnan __P((double)); -extern int finite __P((double)); -extern double j0 __P((double)); -extern double j1 __P((double)); -extern double jn __P((int, double)); -extern double lgamma __P((double)); -extern double y0 __P((double)); -extern double y1 __P((double)); -extern double yn __P((int, double)); +extern double erf(double); +extern double erfc(double); +extern double gamma(double); +extern double hypot(double, double); +extern int isinf(double); +extern int isnan(double); +extern int finite(double); +extern double j0(double); +extern double j1(double); +extern double jn(int, double); +extern double lgamma(double); +extern double y0(double); +extern double y1(double); +extern double yn(int, double); #if !defined(_XOPEN_SOURCE) -extern double acosh __P((double)); -extern double asinh __P((double)); -extern double atanh __P((double)); -extern double cbrt __P((double)); -extern double logb __P((double)); -extern double nextafter __P((double, double)); -extern double remainder __P((double, double)); -extern double scalb __P((double, double)); +extern double acosh(double); +extern double asinh(double); +extern double atanh(double); +extern double cbrt(double); +extern double logb(double); +extern double nextafter(double, double); +extern double remainder(double, double); +extern double scalb(double, double); #ifdef __LIBM_PRIVATE -extern int matherr __P((struct exception *)); +extern int matherr(struct exception *); #endif /* * IEEE Test Vector */ -extern double significand __P((double)); +extern double significand(double); /* * Functions callable from C, intended to support IEEE arithmetic. */ -extern double copysign __P((double, double)); -extern int ilogb __P((double)); -extern double rint __P((double)); -extern double scalbn __P((double, int)); +extern double copysign(double, double); +extern int ilogb(double); +extern double rint(double); +extern double scalbn(double, int); /* * BSD math library entry points */ extern double cabs(); -extern double drem __P((double, double)); -extern double expm1 __P((double)); -extern double log1p __P((double)); +extern double drem(double, double); +extern double expm1(double); +extern double log1p(double); /* * Reentrant version of gamma & lgamma; passes signgam back by reference * as the second argument; user must allocate space for signgam. */ #ifdef _REENTRANT -extern double gamma_r __P((double, int *)); -extern double lgamma_r __P((double, int *)); +extern double gamma_r(double, int *); +extern double lgamma_r(double, int *); #endif /* _REENTRANT */ /* float versions of ANSI/POSIX functions */ -extern float acosf __P((float)); -extern float asinf __P((float)); -extern float atanf __P((float)); -extern float atan2f __P((float, float)); -extern float cosf __P((float)); -extern float sinf __P((float)); -extern float tanf __P((float)); - -extern float coshf __P((float)); -extern float sinhf __P((float)); -extern float tanhf __P((float)); - -extern float expf __P((float)); -extern float frexpf __P((float, int *)); -extern float ldexpf __P((float, int)); -extern float logf __P((float)); -extern float log10f __P((float)); -extern float modff __P((float, float *)); - -extern float powf __P((float, float)); -extern float sqrtf __P((float)); - -extern float ceilf __P((float)); -extern float fabsf __P((float)); -extern float floorf __P((float)); -extern float fmodf __P((float, float)); - -extern float erff __P((float)); -extern float erfcf __P((float)); -extern float gammaf __P((float)); -extern float hypotf __P((float, float)); -extern int isinff __P((float)); -extern int isnanf __P((float)); -extern int finitef __P((float)); -extern float j0f __P((float)); -extern float j1f __P((float)); -extern float jnf __P((int, float)); -extern float lgammaf __P((float)); -extern float y0f __P((float)); -extern float y1f __P((float)); -extern float ynf __P((int, float)); - -extern float acoshf __P((float)); -extern float asinhf __P((float)); -extern float atanhf __P((float)); -extern float cbrtf __P((float)); -extern float logbf __P((float)); -extern float nextafterf __P((float, float)); -extern float remainderf __P((float, float)); -extern float scalbf __P((float, float)); +extern float acosf(float); +extern float asinf(float); +extern float atanf(float); +extern float atan2f(float, float); +extern float cosf(float); +extern float sinf(float); +extern float tanf(float); + +extern float coshf(float); +extern float sinhf(float); +extern float tanhf(float); + +extern float expf(float); +extern float frexpf(float, int *); +extern float ldexpf(float, int); +extern float logf(float); +extern float log10f(float); +extern float modff(float, float *); + +extern float powf(float, float); +extern float sqrtf(float); + +extern float ceilf(float); +extern float fabsf(float); +extern float floorf(float); +extern float fmodf(float, float); + +extern float erff(float); +extern float erfcf(float); +extern float gammaf(float); +extern float hypotf(float, float); +extern int isinff(float); +extern int isnanf(float); +extern int finitef(float); +extern float j0f(float); +extern float j1f(float); +extern float jnf(int, float); +extern float lgammaf(float); +extern float y0f(float); +extern float y1f(float); +extern float ynf(int, float); + +extern float acoshf(float); +extern float asinhf(float); +extern float atanhf(float); +extern float cbrtf(float); +extern float logbf(float); +extern float nextafterf(float, float); +extern float remainderf(float, float); +extern float scalbf(float, float); /* * float version of IEEE Test Vector */ -extern float significandf __P((float)); +extern float significandf(float); /* * Float versions of functions callable from C, intended to support * IEEE arithmetic. */ -extern float copysignf __P((float, float)); -extern int ilogbf __P((float)); -extern float rintf __P((float)); -extern float scalbnf __P((float, int)); +extern float copysignf(float, float); +extern int ilogbf(float); +extern float rintf(float); +extern float scalbnf(float, int); /* * float versions of BSD math library entry points */ extern float cabsf (); -extern float dremf __P((float, float)); -extern float expm1f __P((float)); -extern float log1pf __P((float)); +extern float dremf(float, float); +extern float expm1f(float); +extern float log1pf(float); /* * Float versions of reentrant version of gamma & lgamma; passes @@ -267,8 +267,8 @@ extern float log1pf __P((float)); * allocate space for signgam. */ #ifdef _REENTRANT -extern float gammaf_r __P((float, int *)); -extern float lgammaf_r __P((float, int *)); +extern float gammaf_r(float, int *); +extern float lgammaf_r(float, int *); #endif /* _REENTRANT */ #endif /* !_XOPEN_SOURCE */ diff --git a/include/md4.h b/include/md4.h index ca3ff1664c1..89cabf7436d 100644 --- a/include/md4.h +++ b/include/md4.h @@ -1,5 +1,5 @@ /* MD4.H - header file for MD4C.C - * $OpenBSD: md4.h,v 1.5 2000/03/28 17:35:07 millert Exp $ + * $OpenBSD: md4.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All @@ -33,12 +33,12 @@ typedef struct MD4Context { unsigned char buffer[64]; /* input buffer */ } MD4_CTX; -void MD4Init __P((MD4_CTX *)); -void MD4Update __P((MD4_CTX *, const unsigned char *, size_t)); -void MD4Final __P((unsigned char [16], MD4_CTX *)); -void MD4Transform __P ((u_int32_t [4], const unsigned char [64])); -char * MD4End __P((MD4_CTX *, char *)); -char * MD4File __P((char *, char *)); -char * MD4Data __P((const unsigned char *, size_t, char *)); +void MD4Init(MD4_CTX *); +void MD4Update(MD4_CTX *, const unsigned char *, size_t); +void MD4Final(unsigned char [16], MD4_CTX *); +void MD4Transform(u_int32_t [4], const unsigned char [64]); +char * MD4End(MD4_CTX *, char *); +char * MD4File(char *, char *); +char * MD4Data(const unsigned char *, size_t, char *); #endif /* _MD4_H_ */ diff --git a/include/md5.h b/include/md5.h index 3d67a5cb5e5..8190b176186 100644 --- a/include/md5.h +++ b/include/md5.h @@ -1,5 +1,5 @@ /* MD5.H - header file for MD5C.C - * $OpenBSD: md5.h,v 1.5 2000/03/28 17:35:08 millert Exp $ + * $OpenBSD: md5.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All @@ -34,12 +34,12 @@ typedef struct MD5Context { unsigned char buffer[64]; /* input buffer */ } MD5_CTX; -void MD5Init __P((MD5_CTX *)); -void MD5Update __P((MD5_CTX *, const unsigned char *, size_t)); -void MD5Final __P((unsigned char [16], MD5_CTX *)); -void MD5Transform __P ((u_int32_t [4], const unsigned char [64])); -char * MD5End __P((MD5_CTX *, char *)); -char * MD5File __P((char *, char *)); -char * MD5Data __P((const unsigned char *, size_t, char *)); +void MD5Init(MD5_CTX *); +void MD5Update(MD5_CTX *, const unsigned char *, size_t); +void MD5Final(unsigned char [16], MD5_CTX *); +void MD5Transform(u_int32_t [4], const unsigned char [64]); +char * MD5End(MD5_CTX *, char *); +char * MD5File(char *, char *); +char * MD5Data(const unsigned char *, size_t, char *); #endif /* _MD5_H_ */ diff --git a/include/mpool.h b/include/mpool.h index 49055b77f35..3d5a249c607 100644 --- a/include/mpool.h +++ b/include/mpool.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpool.h,v 1.6 1999/02/15 21:17:48 millert Exp $ */ +/* $OpenBSD: mpool.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: mpool.h,v 1.7 1996/05/03 21:13:41 cgd Exp $ */ /*- @@ -74,9 +74,9 @@ typedef struct MPOOL { u_long pagesize; /* file page size */ int fd; /* file descriptor */ /* page in conversion routine */ - void (*pgin) __P((void *, pgno_t, void *)); + void (*pgin)(void *, pgno_t, void *); /* page out conversion routine */ - void (*pgout) __P((void *, pgno_t, void *)); + void (*pgout)(void *, pgno_t, void *); void *pgcookie; /* cookie for page in/out routines */ #ifdef STATISTICS u_long cachehit; @@ -98,17 +98,17 @@ typedef struct MPOOL { page number. */ __BEGIN_DECLS -MPOOL *mpool_open __P((void *, int, pgno_t, pgno_t)); +MPOOL *mpool_open(void *, int, pgno_t, pgno_t); void mpool_filter __P((MPOOL *, void (*)(void *, pgno_t, void *), void (*)(void *, pgno_t, void *), void *)); -void *mpool_new __P((MPOOL *, pgno_t *, u_int)); -void *mpool_get __P((MPOOL *, pgno_t, u_int)); -int mpool_delete __P((MPOOL *, void *)); -int mpool_put __P((MPOOL *, void *, u_int)); -int mpool_sync __P((MPOOL *)); -int mpool_close __P((MPOOL *)); +void *mpool_new(MPOOL *, pgno_t *, u_int); +void *mpool_get(MPOOL *, pgno_t, u_int); +int mpool_delete(MPOOL *, void *); +int mpool_put(MPOOL *, void *, u_int); +int mpool_sync(MPOOL *); +int mpool_close(MPOOL *); #ifdef STATISTICS -void mpool_stat __P((MPOOL *)); +void mpool_stat(MPOOL *); #endif __END_DECLS diff --git a/include/ndbm.h b/include/ndbm.h index 0d815fa0e62..aba2d3d348c 100644 --- a/include/ndbm.h +++ b/include/ndbm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ndbm.h,v 1.3 1999/02/16 21:57:53 millert Exp $ */ +/* $OpenBSD: ndbm.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: ndbm.h,v 1.6 1995/07/20 23:31:11 jtc Exp $ */ /*- @@ -66,18 +66,18 @@ typedef DB DBM; #define dbm_pagfno(a) DBM_PAGFNO_NOT_AVAILABLE __BEGIN_DECLS -void dbm_close __P((DBM *)); -int dbm_delete __P((DBM *, datum)); -datum dbm_fetch __P((DBM *, datum)); -datum dbm_firstkey __P((DBM *)); -long dbm_forder __P((DBM *, datum)); -datum dbm_nextkey __P((DBM *)); -DBM *dbm_open __P((const char *, int, int)); -int dbm_store __P((DBM *, datum, datum, int)); -int dbm_dirfno __P((DBM *)); -int dbm_error __P((DBM *)); -int dbm_clearerr __P((DBM *)); -int dbm_rdonly __P((DBM *)); +void dbm_close(DBM *); +int dbm_delete(DBM *, datum); +datum dbm_fetch(DBM *, datum); +datum dbm_firstkey(DBM *); +long dbm_forder(DBM *, datum); +datum dbm_nextkey(DBM *); +DBM *dbm_open(const char *, int, int); +int dbm_store(DBM *, datum, datum, int); +int dbm_dirfno(DBM *); +int dbm_error(DBM *); +int dbm_clearerr(DBM *); +int dbm_rdonly(DBM *); __END_DECLS #endif /* !_NDBM_H_ */ diff --git a/include/netdb.h b/include/netdb.h index 87adb107497..6dd03a21c87 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netdb.h,v 1.14 2001/08/06 14:40:47 jakob Exp $ */ +/* $OpenBSD: netdb.h,v 1.15 2002/02/16 21:27:17 millert Exp $ */ /* * ++Copyright++ 1980, 1983, 1988, 1993 @@ -240,39 +240,39 @@ struct rrsetinfo { }; __BEGIN_DECLS -void endhostent __P((void)); -void endnetent __P((void)); -void endprotoent __P((void)); -void endservent __P((void)); -struct hostent *gethostbyaddr __P((const char *, int, int)); -struct hostent *gethostbyname __P((const char *)); -struct hostent *gethostbyname2 __P((const char *, int)); -struct hostent *gethostent __P((void)); -struct netent *getnetbyaddr __P((in_addr_t, int)); -struct netent *getnetbyname __P((const char *)); -struct netent *getnetent __P((void)); -struct protoent *getprotobyname __P((const char *)); -struct protoent *getprotobynumber __P((int)); -struct protoent *getprotoent __P((void)); -struct servent *getservbyname __P((const char *, const char *)); -struct servent *getservbyport __P((int, const char *)); -struct servent *getservent __P((void)); -void herror __P((const char *)); -const char *hstrerror __P((int)); -void sethostent __P((int)); -/* void sethostfile __P((const char *)); */ -void setnetent __P((int)); -void setprotoent __P((int)); -void setservent __P((int)); +void endhostent(void); +void endnetent(void); +void endprotoent(void); +void endservent(void); +struct hostent *gethostbyaddr(const char *, int, int); +struct hostent *gethostbyname(const char *); +struct hostent *gethostbyname2(const char *, int); +struct hostent *gethostent(void); +struct netent *getnetbyaddr(in_addr_t, int); +struct netent *getnetbyname(const char *); +struct netent *getnetent(void); +struct protoent *getprotobyname(const char *); +struct protoent *getprotobynumber(int); +struct protoent *getprotoent(void); +struct servent *getservbyname(const char *, const char *); +struct servent *getservbyport(int, const char *); +struct servent *getservent(void); +void herror(const char *); +const char *hstrerror(int); +void sethostent(int); +/* void sethostfile(const char *); */ +void setnetent(int); +void setprotoent(int); +void setservent(int); int getaddrinfo __P((const char *, const char *, const struct addrinfo *, struct addrinfo **)); -void freeaddrinfo __P((struct addrinfo *)); +void freeaddrinfo(struct addrinfo *); int getnameinfo __P((const struct sockaddr *, socklen_t, char *, size_t, char *, size_t, int)); -char *gai_strerror __P((int)); -int net_addrcmp __P((struct sockaddr *, struct sockaddr *)); +char *gai_strerror(int); +int net_addrcmp(struct sockaddr *, struct sockaddr *); int getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **); void freerrset(struct rrsetinfo *); __END_DECLS diff --git a/include/netgroup.h b/include/netgroup.h index 01d5485539f..ac68a0b835a 100644 --- a/include/netgroup.h +++ b/include/netgroup.h @@ -1,4 +1,4 @@ -/* * $OpenBSD: netgroup.h,v 1.3 1997/09/21 10:45:44 niklas Exp $*/ +/* * $OpenBSD: netgroup.h,v 1.4 2002/02/16 21:27:17 millert Exp $*/ /* * Copyright (c) 1994 Christos Zoulas * All rights reserved. @@ -58,21 +58,21 @@ struct netgroup { #include <sys/cdefs.h> __BEGIN_DECLS -void setnetgrent __P((const char *)); -int getnetgrent __P((const char **, const char **, const char **)); -void endnetgrent __P((void)); +void setnetgrent(const char *); +int getnetgrent(const char **, const char **, const char **); +void endnetgrent(void); int innetgr __P((const char *, const char *, const char *, const char *)); #ifdef _NETGROUP_PRIVATE struct stringlist; -struct stringlist *_ng_sl_init __P((void)); -void _ng_sl_add __P((struct stringlist *, char *)); -void _ng_sl_free __P((struct stringlist *, int)); -char *_ng_sl_find __P((struct stringlist *, char *)); -char *_ng_makekey __P((const char *, const char *, size_t)); -int _ng_parse __P((char **, char **, struct netgroup **)); -void _ng_print __P((char *, size_t, const struct netgroup *)); +struct stringlist *_ng_sl_init(void); +void _ng_sl_add(struct stringlist *, char *); +void _ng_sl_free(struct stringlist *, int); +char *_ng_sl_find(struct stringlist *, char *); +char *_ng_makekey(const char *, const char *, size_t); +int _ng_parse(char **, char **, struct netgroup **); +void _ng_print(char *, size_t, const struct netgroup *); #endif /* _NETGROUP_PRIVATE */ __END_DECLS diff --git a/include/nl_types.h b/include/nl_types.h index 55219d62b97..56179b14899 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nl_types.h,v 1.6 1997/09/21 10:45:45 niklas Exp $ */ +/* $OpenBSD: nl_types.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: nl_types.h,v 1.6 1996/05/13 23:11:15 jtc Exp $ */ /*- @@ -90,9 +90,9 @@ typedef struct _nl_catd { typedef long nl_item; __BEGIN_DECLS -extern nl_catd catopen __P((const char *, int)); -extern char *catgets __P((nl_catd, int, int, const char *)); -extern int catclose __P((nl_catd)); +extern nl_catd catopen(const char *, int); +extern char *catgets(nl_catd, int, int, const char *); +extern int catclose(nl_catd); __END_DECLS #endif /* _NL_TYPES_H_ */ diff --git a/include/nlist.h b/include/nlist.h index e27a647264e..af6ab3cfdc8 100644 --- a/include/nlist.h +++ b/include/nlist.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nlist.h,v 1.2 1997/09/21 10:45:46 niklas Exp $ */ +/* $OpenBSD: nlist.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: nlist.h,v 1.5 1994/10/26 00:56:11 cgd Exp $ */ /*- @@ -85,7 +85,7 @@ struct nlist { #include <sys/cdefs.h> __BEGIN_DECLS -int nlist __P((const char *, struct nlist *)); +int nlist(const char *, struct nlist *); __END_DECLS #endif /* !_NLIST_H_ */ diff --git a/include/ohash.h b/include/ohash.h index 2c6f3aed034..b53121d7c5e 100644 --- a/include/ohash.h +++ b/include/ohash.h @@ -1,6 +1,6 @@ #ifndef OHASH_H #define OHASH_H -/* $OpenBSD: ohash.h,v 1.1 2001/03/02 13:27:05 espie Exp $ */ +/* $OpenBSD: ohash.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */ /* ex:ts=8 sw=4: */ @@ -39,9 +39,9 @@ struct ohash_info { ptrdiff_t key_offset; void *data; /* user data */ - void *(*halloc) __P((size_t, void *)); - void (*hfree) __P((void *, size_t, void *)); - void *(*alloc) __P((size_t, void *)); + void *(*halloc)(size_t, void *); + void (*hfree)(void *, size_t, void *); + void *(*alloc)(size_t, void *); }; struct _ohash_record; @@ -61,25 +61,25 @@ struct ohash { * The keys are stored at a known position in the client data. */ __BEGIN_DECLS -void ohash_init __P((struct ohash *, unsigned, struct ohash_info *)); -void ohash_delete __P((struct ohash *)); +void ohash_init(struct ohash *, unsigned, struct ohash_info *); +void ohash_delete(struct ohash *); -unsigned int ohash_lookup_string __P((struct ohash *, const char *, u_int32_t)); +unsigned int ohash_lookup_string(struct ohash *, const char *, u_int32_t); unsigned int ohash_lookup_interval __P((struct ohash *, const char *, \ const char *, u_int32_t)); unsigned int ohash_lookup_memory __P((struct ohash *, const char *, \ size_t, u_int32_t)); -void *ohash_find __P((struct ohash *, unsigned int)); -void *ohash_remove __P((struct ohash *, unsigned int)); -void *ohash_insert __P((struct ohash *, unsigned int, void *)); -void *ohash_first __P((struct ohash *, unsigned int *)); -void *ohash_next __P((struct ohash *, unsigned int *)); -unsigned int ohash_entries __P((struct ohash *)); +void *ohash_find(struct ohash *, unsigned int); +void *ohash_remove(struct ohash *, unsigned int); +void *ohash_insert(struct ohash *, unsigned int, void *); +void *ohash_first(struct ohash *, unsigned int *); +void *ohash_next(struct ohash *, unsigned int *); +unsigned int ohash_entries(struct ohash *); -void *ohash_create_entry __P((struct ohash_info *, const char *, const char **)); -u_int32_t ohash_interval __P((const char *, const char **)); +void *ohash_create_entry(struct ohash_info *, const char *, const char **); +u_int32_t ohash_interval(const char *, const char **); -unsigned int ohash_qlookupi __P((struct ohash *, const char *, const char **)); -unsigned int ohash_qlookup __P((struct ohash *, const char *)); +unsigned int ohash_qlookupi(struct ohash *, const char *, const char **); +unsigned int ohash_qlookup(struct ohash *, const char *); __END_DECLS #endif diff --git a/include/pwd.h b/include/pwd.h index 6307980c7fc..41c36179941 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd.h,v 1.12 2001/08/26 03:28:30 millert Exp $ */ +/* $OpenBSD: pwd.h,v 1.13 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $ */ /*- @@ -97,18 +97,18 @@ struct passwd { #include <sys/cdefs.h> __BEGIN_DECLS -struct passwd *getpwuid __P((uid_t)); -struct passwd *getpwnam __P((const char *)); +struct passwd *getpwuid(uid_t); +struct passwd *getpwnam(const char *); #ifndef _POSIX_SOURCE -struct passwd *getpwent __P((void)); +struct passwd *getpwent(void); #ifndef _XOPEN_SOURCE -int setpassent __P((int)); -char *user_from_uid __P((uid_t, int)); -char *bcrypt_gensalt __P((u_int8_t)); -struct passwd *pw_dup __P((const struct passwd *)); +int setpassent(int); +char *user_from_uid(uid_t, int); +char *bcrypt_gensalt(u_int8_t); +struct passwd *pw_dup(const struct passwd *); #endif -void setpwent __P((void)); -void endpwent __P((void)); +void setpwent(void); +void endpwent(void); #endif __END_DECLS diff --git a/include/re_comp.h b/include/re_comp.h index 3864e5b81f8..58b9c3cc8d5 100644 --- a/include/re_comp.h +++ b/include/re_comp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: re_comp.h,v 1.2 1997/09/21 10:45:47 niklas Exp $ */ +/* $OpenBSD: re_comp.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: re_comp.h,v 1.1 1996/02/05 22:34:12 jtc Exp $ */ /*- @@ -42,8 +42,8 @@ #include <sys/cdefs.h> __BEGIN_DECLS -char *re_comp __P((const char *)); -int re_exec __P((const char *)); +char *re_comp(const char *); +int re_exec(const char *); __END_DECLS #endif /* _RE_COMP_H_ */ diff --git a/include/readpassphrase.h b/include/readpassphrase.h index f32c464f75b..8d0b47b97fa 100644 --- a/include/readpassphrase.h +++ b/include/readpassphrase.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readpassphrase.h,v 1.1 2000/11/21 00:48:38 millert Exp $ */ +/* $OpenBSD: readpassphrase.h,v 1.2 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -40,7 +40,7 @@ #include <sys/cdefs.h> __BEGIN_DECLS -char * readpassphrase __P((const char *, char *, size_t, int)); +char * readpassphrase(const char *, char *, size_t, int); __END_DECLS #endif /* !_READPASSPHRASE_H_ */ diff --git a/include/regex.h b/include/regex.h index 8c4a8f1ca3f..7e70e07d8e1 100644 --- a/include/regex.h +++ b/include/regex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: regex.h,v 1.3 1997/09/21 10:45:48 niklas Exp $ */ +/* $OpenBSD: regex.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: regex.h,v 1.4.6.1 1996/06/10 18:57:07 explorer Exp $ */ /*- @@ -100,11 +100,11 @@ typedef struct { #define REG_BACKR 02000 /* force use of backref code */ __BEGIN_DECLS -int regcomp __P((regex_t *, const char *, int)); -size_t regerror __P((int, const regex_t *, char *, size_t)); +int regcomp(regex_t *, const char *, int); +size_t regerror(int, const regex_t *, char *, size_t); int regexec __P((const regex_t *, const char *, size_t, regmatch_t [], int)); -void regfree __P((regex_t *)); +void regfree(regex_t *); __END_DECLS #endif /* !_REGEX_H_ */ diff --git a/include/resolv.h b/include/resolv.h index 70f250128df..2a866edea98 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolv.h,v 1.7 2001/07/31 22:02:18 jakob Exp $ */ +/* $OpenBSD: resolv.h,v 1.8 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -300,56 +300,56 @@ extern const struct res_sym __p_type_syms[]; #endif __BEGIN_DECLS -int res_hnok __P((const char *)); -int res_ownok __P((const char *)); -int res_mailok __P((const char *)); -int res_dnok __P((const char *)); -int sym_ston __P((const struct res_sym *, char *, int *)); -const char * sym_ntos __P((const struct res_sym *, int, int *)); -const char * sym_ntop __P((const struct res_sym *, int, int *)); -int b64_ntop __P((u_char const *, size_t, char *, size_t)); -int b64_pton __P((char const *, u_char *, size_t)); -int loc_aton __P((const char *, u_char *)); -const char * loc_ntoa __P((const u_char *, char *)); -int dn_skipname __P((const u_char *, const u_char *)); -void fp_resstat __P((struct __res_state *, FILE *)); -void fp_query __P((const u_char *, FILE *)); -void fp_nquery __P((const u_char *, int, FILE *)); -const char * hostalias __P((const char *)); -void putlong __P((u_int32_t, u_char *)); -void putshort __P((u_int16_t, u_char *)); -const char * p_class __P((int)); -const char * p_time __P((u_int32_t)); -const char * p_type __P((int)); -void p_query __P((const u_char *)); -const u_char * p_cdnname __P((const u_char *, const u_char *, int, FILE *)); -const u_char * p_cdname __P((const u_char *, const u_char *, FILE *)); +int res_hnok(const char *); +int res_ownok(const char *); +int res_mailok(const char *); +int res_dnok(const char *); +int sym_ston(const struct res_sym *, char *, int *); +const char * sym_ntos(const struct res_sym *, int, int *); +const char * sym_ntop(const struct res_sym *, int, int *); +int b64_ntop(u_char const *, size_t, char *, size_t); +int b64_pton(char const *, u_char *, size_t); +int loc_aton(const char *, u_char *); +const char * loc_ntoa(const u_char *, char *); +int dn_skipname(const u_char *, const u_char *); +void fp_resstat(struct __res_state *, FILE *); +void fp_query(const u_char *, FILE *); +void fp_nquery(const u_char *, int, FILE *); +const char * hostalias(const char *); +void putlong(u_int32_t, u_char *); +void putshort(u_int16_t, u_char *); +const char * p_class(int); +const char * p_time(u_int32_t); +const char * p_type(int); +void p_query(const u_char *); +const u_char * p_cdnname(const u_char *, const u_char *, int, FILE *); +const u_char * p_cdname(const u_char *, const u_char *, FILE *); const u_char * p_fqnname __P((const u_char *cp, const u_char *msg, int, char *, int)); -const u_char * p_fqname __P((const u_char *, const u_char *, FILE *)); -const u_char * p_rr __P((const u_char *, const u_char *, FILE *)); -const char * p_option __P((u_long option)); -char * p_secstodate __P((u_long)); -int dn_count_labels __P((char *)); +const u_char * p_fqname(const u_char *, const u_char *, FILE *); +const u_char * p_rr(const u_char *, const u_char *, FILE *); +const char * p_option(u_long option); +char * p_secstodate(u_long); +int dn_count_labels(char *); int dn_comp __P((const char *, u_char *, int, u_char **, u_char **)); int dn_expand __P((const u_char *, const u_char *, const u_char *, char *, int)); -int res_init __P((void)); -u_int res_randomid __P((void)); -int res_query __P((const char *, int, int, u_char *, int)); -int res_search __P((const char *, int, int, u_char *, int)); +int res_init(void); +u_int res_randomid(void); +int res_query(const char *, int, int, u_char *, int); +int res_search(const char *, int, int, u_char *, int); int res_querydomain __P((const char *, const char *, int, int, u_char *, int)); int res_mkquery __P((int, const char *, int, int, const u_char *, int, const u_char *, u_char *, int)); -int res_send __P((const u_char *, int, u_char *, int)); -int res_isourserver __P((const struct sockaddr_in *)); +int res_send(const u_char *, int, u_char *, int); +int res_isourserver(const struct sockaddr_in *); int res_nameinquery __P((const char *, int, int, const u_char *, const u_char *)); int res_queriesmatch __P((const u_char *, const u_char *, const u_char *, const u_char *)); -void res_close __P((void)); +void res_close(void); __END_DECLS #endif /* !_RESOLV_H_ */ diff --git a/include/rmd160.h b/include/rmd160.h index 67f6695021d..b950fd7f393 100644 --- a/include/rmd160.h +++ b/include/rmd160.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rmd160.h,v 1.5 2001/10/01 20:36:17 markus Exp $ */ +/* $OpenBSD: rmd160.h,v 1.6 2002/02/16 21:27:17 millert Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -32,12 +32,12 @@ typedef struct RMD160Context { u_char buffer[64]; /* input buffer */ } RMD160_CTX; -void RMD160Init __P((RMD160_CTX *)); -void RMD160Transform __P ((u_int32_t [5], const u_char [64])); -void RMD160Update __P((RMD160_CTX *, const u_char *, u_int32_t)); -void RMD160Final __P((u_char [20], RMD160_CTX *)); -char *RMD160End __P((RMD160_CTX *, char *)); -char *RMD160File __P((char *, char *)); -char *RMD160Data __P((const u_char *, size_t, char *)); +void RMD160Init(RMD160_CTX *); +void RMD160Transform(u_int32_t [5], const u_char [64]); +void RMD160Update(RMD160_CTX *, const u_char *, u_int32_t); +void RMD160Final(u_char [20], RMD160_CTX *); +char *RMD160End(RMD160_CTX *, char *); +char *RMD160File(char *, char *); +char *RMD160Data(const u_char *, size_t, char *); #endif /* _RMD160_H */ diff --git a/include/rpc/auth.h b/include/rpc/auth.h index df6ab831ebf..7787659b9d0 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.2 1997/09/21 10:46:09 niklas Exp $ */ +/* $OpenBSD: auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $ */ /* @@ -81,7 +81,7 @@ union des_block { }; typedef union des_block des_block; __BEGIN_DECLS -extern bool_t xdr_des_block __P((XDR *, des_block *)); +extern bool_t xdr_des_block(XDR *, des_block *); __END_DECLS /* @@ -102,16 +102,16 @@ typedef struct __rpc_auth { struct opaque_auth ah_verf; union des_block ah_key; struct auth_ops { - void (*ah_nextverf) __P((struct __rpc_auth *)); + void (*ah_nextverf)(struct __rpc_auth *); /* nextverf & serialize */ - int (*ah_marshal) __P((struct __rpc_auth *, XDR *)); + int (*ah_marshal)(struct __rpc_auth *, XDR *); /* validate varifier */ int (*ah_validate) __P((struct __rpc_auth *, struct opaque_auth *)); /* refresh credentials */ - int (*ah_refresh) __P((struct __rpc_auth *)); + int (*ah_refresh)(struct __rpc_auth *); /* destroy this structure */ - void (*ah_destroy) __P((struct __rpc_auth *)); + void (*ah_destroy)(struct __rpc_auth *); } *ah_ops; caddr_t ah_private; } AUTH; @@ -169,9 +169,9 @@ extern struct opaque_auth _null_auth; */ __BEGIN_DECLS struct sockaddr_in; -extern AUTH *authunix_create __P((char *, int, int, int, int *)); -extern AUTH *authunix_create_default __P((void)); -extern AUTH *authnone_create __P((void)); +extern AUTH *authunix_create(char *, int, int, int, int *); +extern AUTH *authunix_create_default(void); +extern AUTH *authnone_create(void); extern AUTH *authdes_create __P((char *, u_int, struct sockaddr_in *, des_block *)); __END_DECLS diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index 8d146d5dee5..e65f224fe62 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth_unix.h,v 1.2 1997/09/21 10:46:09 niklas Exp $ */ +/* $OpenBSD: auth_unix.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: auth_unix.h,v 1.4 1994/10/26 00:56:56 cgd Exp $ */ /* @@ -69,7 +69,7 @@ struct authunix_parms { }; __BEGIN_DECLS -extern bool_t xdr_authunix_parms __P((XDR *, struct authunix_parms *)); +extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *); __END_DECLS /* diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 0c28612cb5a..93c9b78350a 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clnt.h,v 1.5 2001/09/15 13:51:00 deraadt Exp $ */ +/* $OpenBSD: clnt.h,v 1.6 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $ */ /* @@ -124,7 +124,7 @@ typedef struct __rpc_client { u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, struct timeval)); /* abort a call */ - void (*cl_abort) __P((struct __rpc_client *)); + void (*cl_abort)(struct __rpc_client *); /* get specific error code */ void (*cl_geterr) __P((struct __rpc_client *, struct rpc_err *)); @@ -132,7 +132,7 @@ typedef struct __rpc_client { bool_t (*cl_freeres) __P((struct __rpc_client *, xdrproc_t, caddr_t)); /* destroy this structure */ - void (*cl_destroy) __P((struct __rpc_client *)); + void (*cl_destroy)(struct __rpc_client *); /* the ioctl() of rpc */ bool_t (*cl_control) __P((struct __rpc_client *, u_int, void *)); @@ -255,7 +255,7 @@ typedef struct __rpc_client { * u_long vers; */ __BEGIN_DECLS -extern CLIENT *clntraw_create __P((u_long, u_long)); +extern CLIENT *clntraw_create(u_long, u_long); __END_DECLS @@ -269,7 +269,7 @@ __END_DECLS * char *prot; -- protocol */ __BEGIN_DECLS -extern CLIENT *clnt_create __P((char *, u_long, u_long, char *)); +extern CLIENT *clnt_create(char *, u_long, u_long, char *); __END_DECLS @@ -335,24 +335,24 @@ __END_DECLS * Print why creation failed */ __BEGIN_DECLS -extern void clnt_pcreateerror __P((char *)); /* stderr */ -extern char *clnt_spcreateerror __P((char *)); /* string */ +extern void clnt_pcreateerror(char *); /* stderr */ +extern char *clnt_spcreateerror(char *); /* string */ __END_DECLS /* * Like clnt_perror(), but is more verbose in its output */ __BEGIN_DECLS -extern void clnt_perrno __P((enum clnt_stat)); /* stderr */ -extern char *clnt_sperrno __P((enum clnt_stat)); /* string */ +extern void clnt_perrno(enum clnt_stat); /* stderr */ +extern char *clnt_sperrno(enum clnt_stat); /* string */ __END_DECLS /* * Print an English error message, given the client error code */ __BEGIN_DECLS -extern void clnt_perror __P((CLIENT *, char *)); /* stderr */ -extern char *clnt_sperror __P((CLIENT *, char *)); /* string */ +extern void clnt_perror(CLIENT *, char *); /* stderr */ +extern char *clnt_sperror(CLIENT *, char *); /* string */ __END_DECLS diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index d3b5883f690..9e54c50243e 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_clnt.h,v 1.3 1998/08/29 18:57:14 deraadt Exp $ */ +/* $OpenBSD: pmap_clnt.h,v 1.4 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $ */ /* @@ -67,9 +67,9 @@ #include <sys/cdefs.h> __BEGIN_DECLS -extern bool_t pmap_set __P((u_long, u_long, u_int, int)); -extern bool_t pmap_unset __P((u_long, u_long)); -extern struct pmaplist *pmap_getmaps __P((struct sockaddr_in *)); +extern bool_t pmap_set(u_long, u_long, u_int, int); +extern bool_t pmap_unset(u_long, u_long); +extern struct pmaplist *pmap_getmaps(struct sockaddr_in *); extern enum clnt_stat pmap_rmtcall __P((struct sockaddr_in *, u_long, u_long, u_long, xdrproc_t, caddr_t, diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 4b96be75714..32e88323b2f 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_prot.h,v 1.3 1998/02/10 06:25:32 deraadt Exp $ */ +/* $OpenBSD: pmap_prot.h,v 1.4 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: pmap_prot.h,v 1.4 1994/10/26 00:57:00 cgd Exp $ */ /* @@ -99,8 +99,8 @@ struct pmaplist { }; __BEGIN_DECLS -extern bool_t xdr_pmap __P((XDR *, struct pmap *)); -extern bool_t xdr_pmaplist __P((XDR *, struct pmaplist **)); +extern bool_t xdr_pmap(XDR *, struct pmap *); +extern bool_t xdr_pmaplist(XDR *, struct pmaplist **); __END_DECLS #endif /* !_RPC_PMAPPROT_H */ diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index ad5021df85e..ca3a4d66457 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_rmt.h,v 1.2 1997/09/21 10:46:13 niklas Exp $ */ +/* $OpenBSD: pmap_rmt.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: pmap_rmt.h,v 1.4 1994/10/26 00:57:01 cgd Exp $ */ /* @@ -58,8 +58,8 @@ struct rmtcallres { }; __BEGIN_DECLS -extern bool_t xdr_rmtcall_args __P((XDR *, struct rmtcallargs *)); -extern bool_t xdr_rmtcallres __P((XDR *, struct rmtcallres *)); +extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *); +extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *); __END_DECLS #endif /* !_RPC_PMAPRMT_H */ diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index 52efff1ddc7..1d929e86a8c 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc.h,v 1.8 2000/10/12 09:44:26 deraadt Exp $ */ +/* $OpenBSD: rpc.h,v 1.9 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: rpc.h,v 1.5 1994/12/04 01:15:30 cgd Exp $ */ /* @@ -86,22 +86,22 @@ struct rpcent { }; __BEGIN_DECLS -extern struct rpcent *getrpcbyname __P((char *)); -extern struct rpcent *getrpcbynumber __P((int)); -extern struct rpcent *getrpcent __P((void)); -extern void setrpcent __P((int)); -extern void endrpcent __P((void)); - -extern int get_myaddress __P((struct sockaddr_in *)); -extern int registerrpc __P((int, int, int, char *(*) __P((char [UDPMSGSIZE])), +extern struct rpcent *getrpcbyname(char *); +extern struct rpcent *getrpcbynumber(int); +extern struct rpcent *getrpcent(void); +extern void setrpcent(int); +extern void endrpcent(void); + +extern int get_myaddress(struct sockaddr_in *); +extern int registerrpc __P((int, int, int, char *(*)(char [UDPMSGSIZE]), xdrproc_t, xdrproc_t)); extern int callrpc __P((char *, int, int, int, xdrproc_t, char *, xdrproc_t , char *)); -extern int getrpcport __P((char *, int, int, int)); +extern int getrpcport(char *, int, int, int); -extern bool_t xdr_opaque_auth __P((XDR *, struct opaque_auth *)); +extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); -extern int _rpc_dtablesize __P((void)); +extern int _rpc_dtablesize(void); __END_DECLS diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index d4e4d89f85a..1305959c8f7 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_msg.h,v 1.2 1997/09/21 10:46:15 niklas Exp $ */ +/* $OpenBSD: rpc_msg.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: rpc_msg.h,v 1.5 1995/04/29 05:28:00 cgd Exp $ */ /* @@ -167,7 +167,7 @@ __BEGIN_DECLS * XDR *xdrs; * struct rpc_msg *cmsg; */ -extern bool_t xdr_callmsg __P((XDR *, struct rpc_msg *)); +extern bool_t xdr_callmsg(XDR *, struct rpc_msg *); /* * XDR routine to pre-serialize the static part of a rpc message. @@ -175,7 +175,7 @@ extern bool_t xdr_callmsg __P((XDR *, struct rpc_msg *)); * XDR *xdrs; * struct rpc_msg *cmsg; */ -extern bool_t xdr_callhdr __P((XDR *, struct rpc_msg *)); +extern bool_t xdr_callhdr(XDR *, struct rpc_msg *); /* * XDR routine to handle a rpc reply. @@ -183,7 +183,7 @@ extern bool_t xdr_callhdr __P((XDR *, struct rpc_msg *)); * XDR *xdrs; * struct rpc_msg *rmsg; */ -extern bool_t xdr_replymsg __P((XDR *, struct rpc_msg *)); +extern bool_t xdr_replymsg(XDR *, struct rpc_msg *); /* * Fills in the error part of a reply message. @@ -191,7 +191,7 @@ extern bool_t xdr_replymsg __P((XDR *, struct rpc_msg *)); * struct rpc_msg *msg; * struct rpc_err *error; */ -extern void _seterr_reply __P((struct rpc_msg *, struct rpc_err *)); +extern void _seterr_reply(struct rpc_msg *, struct rpc_err *); __END_DECLS #endif /* !_RPC_RPCMSG_H */ diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 0ade6063889..be428e2f4ef 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svc.h,v 1.5 2001/09/15 13:51:00 deraadt Exp $ */ +/* $OpenBSD: svc.h,v 1.6 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $ */ /* @@ -82,7 +82,7 @@ typedef struct __rpc_svcxprt { bool_t (*xp_recv) __P((struct __rpc_svcxprt *, struct rpc_msg *)); /* get transport status */ - enum xprt_stat (*xp_stat) __P((struct __rpc_svcxprt *)); + enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *); /* get arguments */ bool_t (*xp_getargs) __P((struct __rpc_svcxprt *, xdrproc_t, caddr_t)); @@ -93,7 +93,7 @@ typedef struct __rpc_svcxprt { bool_t (*xp_freeargs) __P((struct __rpc_svcxprt *, xdrproc_t, caddr_t)); /* destroy this struct */ - void (*xp_destroy) __P((struct __rpc_svcxprt *)); + void (*xp_destroy)(struct __rpc_svcxprt *); } *xp_ops; socklen_t xp_addrlen; /* length of remote address */ struct sockaddr_in xp_raddr; /* remote address */ @@ -171,7 +171,7 @@ struct svc_req { */ __BEGIN_DECLS extern bool_t svc_register __P((SVCXPRT *, u_long, u_long, - void (*) __P((struct svc_req *, SVCXPRT *)), int)); + void (*)(struct svc_req *, SVCXPRT *), int)); __END_DECLS /* @@ -182,7 +182,7 @@ __END_DECLS * u_long vers; */ __BEGIN_DECLS -extern void svc_unregister __P((u_long, u_long)); +extern void svc_unregister(u_long, u_long); __END_DECLS /* @@ -192,8 +192,8 @@ __END_DECLS * SVCXPRT *xprt; */ __BEGIN_DECLS -extern void xprt_register __P((SVCXPRT *)); -extern int __xprt_register __P((SVCXPRT *)); +extern void xprt_register(SVCXPRT *); +extern int __xprt_register(SVCXPRT *); __END_DECLS /* @@ -203,7 +203,7 @@ __END_DECLS * SVCXPRT *xprt; */ __BEGIN_DECLS -extern void xprt_unregister __P((SVCXPRT *)); +extern void xprt_unregister(SVCXPRT *); __END_DECLS @@ -236,14 +236,14 @@ __END_DECLS */ __BEGIN_DECLS -extern bool_t svc_sendreply __P((SVCXPRT *, xdrproc_t, char *)); -extern void svcerr_decode __P((SVCXPRT *)); -extern void svcerr_weakauth __P((SVCXPRT *)); -extern void svcerr_noproc __P((SVCXPRT *)); -extern void svcerr_progvers __P((SVCXPRT *, u_long, u_long)); -extern void svcerr_auth __P((SVCXPRT *, enum auth_stat)); -extern void svcerr_noprog __P((SVCXPRT *)); -extern void svcerr_systemerr __P((SVCXPRT *)); +extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, char *); +extern void svcerr_decode(SVCXPRT *); +extern void svcerr_weakauth(SVCXPRT *); +extern void svcerr_noproc(SVCXPRT *); +extern void svcerr_progvers(SVCXPRT *, u_long, u_long); +extern void svcerr_auth(SVCXPRT *, enum auth_stat); +extern void svcerr_noprog(SVCXPRT *); +extern void svcerr_systemerr(SVCXPRT *); __END_DECLS /* @@ -276,10 +276,10 @@ extern int svc_fds; extern void rpctest_service(); /* XXX relic? */ __BEGIN_DECLS -extern void svc_getreq __P((int)); -extern void svc_getreqset __P((fd_set *)); -extern void svc_getreqset2 __P((fd_set *, int)); -extern void svc_run __P((void)); +extern void svc_getreq(int); +extern void svc_getreqset(fd_set *); +extern void svc_getreqset2(fd_set *, int); +extern void svc_run(void); __END_DECLS /* @@ -295,7 +295,7 @@ __END_DECLS * Memory based rpc for testing and timing. */ __BEGIN_DECLS -extern SVCXPRT *svcraw_create __P((void)); +extern SVCXPRT *svcraw_create(void); __END_DECLS @@ -303,8 +303,8 @@ __END_DECLS * Udp based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcudp_create __P((int)); -extern SVCXPRT *svcudp_bufcreate __P((int, u_int, u_int)); +extern SVCXPRT *svcudp_create(int); +extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int); __END_DECLS @@ -312,14 +312,14 @@ __END_DECLS * Tcp based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svctcp_create __P((int, u_int, u_int)); +extern SVCXPRT *svctcp_create(int, u_int, u_int); __END_DECLS /* * Fd based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcfd_create __P((int, u_int, u_int)); +extern SVCXPRT *svcfd_create(int, u_int, u_int); __END_DECLS #endif /* !_RPC_SVC_H */ diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h index d775ae8772a..89f96ce5a8d 100644 --- a/include/rpc/svc_auth.h +++ b/include/rpc/svc_auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svc_auth.h,v 1.2 1997/09/21 10:46:16 niklas Exp $ */ +/* $OpenBSD: svc_auth.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: svc_auth.h,v 1.4 1994/10/26 00:57:07 cgd Exp $ */ /* @@ -46,7 +46,7 @@ * Server side authenticator */ __BEGIN_DECLS -extern enum auth_stat _authenticate __P((struct svc_req *, struct rpc_msg *)); +extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *); __END_DECLS #endif /* !_RPC_SVCAUTH_H */ diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index abbfb341a25..3b9076ea4ca 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xdr.h,v 1.2 1997/09/21 10:46:18 niklas Exp $ */ +/* $OpenBSD: xdr.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $ */ /* @@ -101,21 +101,21 @@ typedef struct __rpc_xdr { enum xdr_op x_op; /* operation; fast additional param */ struct xdr_ops { /* get a long from underlying stream */ - bool_t (*x_getlong) __P((struct __rpc_xdr *, long *)); + bool_t (*x_getlong)(struct __rpc_xdr *, long *); /* put a long to " */ - bool_t (*x_putlong) __P((struct __rpc_xdr *, long *)); + bool_t (*x_putlong)(struct __rpc_xdr *, long *); /* get some bytes from " */ - bool_t (*x_getbytes) __P((struct __rpc_xdr *, caddr_t, u_int)); + bool_t (*x_getbytes)(struct __rpc_xdr *, caddr_t, u_int); /* put some bytes to " */ - bool_t (*x_putbytes) __P((struct __rpc_xdr *, caddr_t, u_int)); + bool_t (*x_putbytes)(struct __rpc_xdr *, caddr_t, u_int); /* returns bytes off from beginning */ - u_int (*x_getpostn) __P((struct __rpc_xdr *)); + u_int (*x_getpostn)(struct __rpc_xdr *); /* lets you reposition the stream */ - bool_t (*x_setpostn) __P((struct __rpc_xdr *, u_int)); + bool_t (*x_setpostn)(struct __rpc_xdr *, u_int); /* buf quick ptr to buffered data */ - int32_t *(*x_inline) __P((struct __rpc_xdr *, u_int)); + int32_t *(*x_inline)(struct __rpc_xdr *, u_int); /* free privates of this xdr_stream */ - void (*x_destroy) __P((struct __rpc_xdr *)); + void (*x_destroy)(struct __rpc_xdr *); } *x_ops; caddr_t x_public; /* users' data */ caddr_t x_private; /* pointer to private data */ @@ -133,7 +133,7 @@ typedef struct __rpc_xdr { * * XXX can't actually prototype it, because some take three args!!! */ -typedef bool_t (*xdrproc_t) __P((/* XDR *, void *, u_int */)); +typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */); /* * Operations defined on a XDR handle @@ -236,33 +236,33 @@ struct xdr_discrim { * These are the "generic" xdr routines. */ __BEGIN_DECLS -extern bool_t xdr_void __P((void)); -extern bool_t xdr_int __P((XDR *, int *)); -extern bool_t xdr_u_int __P((XDR *, u_int *)); -extern bool_t xdr_long __P((XDR *, long *)); -extern bool_t xdr_u_long __P((XDR *, u_long *)); -extern bool_t xdr_short __P((XDR *, short *)); -extern bool_t xdr_u_short __P((XDR *, u_short *)); -extern bool_t xdr_int16_t __P((XDR *, int16_t *)); -extern bool_t xdr_u_int16_t __P((XDR *, u_int16_t *)); -extern bool_t xdr_int32_t __P((XDR *, int32_t *)); -extern bool_t xdr_u_int32_t __P((XDR *, u_int32_t *)); -extern bool_t xdr_bool __P((XDR *, bool_t *)); -extern bool_t xdr_enum __P((XDR *, enum_t *)); -extern bool_t xdr_array __P((XDR *, char **, u_int *, u_int, u_int, xdrproc_t)); -extern bool_t xdr_bytes __P((XDR *, char **, u_int *, u_int)); -extern bool_t xdr_opaque __P((XDR *, caddr_t, u_int)); -extern bool_t xdr_string __P((XDR *, char **, u_int)); -extern bool_t xdr_union __P((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t)); -extern bool_t xdr_char __P((XDR *, char *)); -extern bool_t xdr_u_char __P((XDR *, u_char *)); -extern bool_t xdr_vector __P((XDR *, char *, u_int, u_int, xdrproc_t)); -extern bool_t xdr_float __P((XDR *, float *)); -extern bool_t xdr_double __P((XDR *, double *)); -extern bool_t xdr_reference __P((XDR *, caddr_t *, u_int, xdrproc_t)); -extern bool_t xdr_pointer __P((XDR *, caddr_t *, u_int, xdrproc_t)); -extern bool_t xdr_wrapstring __P((XDR *, char **)); -extern void xdr_free __P((xdrproc_t, char *)); +extern bool_t xdr_void(void); +extern bool_t xdr_int(XDR *, int *); +extern bool_t xdr_u_int(XDR *, u_int *); +extern bool_t xdr_long(XDR *, long *); +extern bool_t xdr_u_long(XDR *, u_long *); +extern bool_t xdr_short(XDR *, short *); +extern bool_t xdr_u_short(XDR *, u_short *); +extern bool_t xdr_int16_t(XDR *, int16_t *); +extern bool_t xdr_u_int16_t(XDR *, u_int16_t *); +extern bool_t xdr_int32_t(XDR *, int32_t *); +extern bool_t xdr_u_int32_t(XDR *, u_int32_t *); +extern bool_t xdr_bool(XDR *, bool_t *); +extern bool_t xdr_enum(XDR *, enum_t *); +extern bool_t xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t); +extern bool_t xdr_bytes(XDR *, char **, u_int *, u_int); +extern bool_t xdr_opaque(XDR *, caddr_t, u_int); +extern bool_t xdr_string(XDR *, char **, u_int); +extern bool_t xdr_union(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t); +extern bool_t xdr_char(XDR *, char *); +extern bool_t xdr_u_char(XDR *, u_char *); +extern bool_t xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t); +extern bool_t xdr_float(XDR *, float *); +extern bool_t xdr_double(XDR *, double *); +extern bool_t xdr_reference(XDR *, caddr_t *, u_int, xdrproc_t); +extern bool_t xdr_pointer(XDR *, caddr_t *, u_int, xdrproc_t); +extern bool_t xdr_wrapstring(XDR *, char **); +extern void xdr_free(xdrproc_t, char *); __END_DECLS /* @@ -275,7 +275,7 @@ struct netobj { char *n_bytes; }; typedef struct netobj netobj; -extern bool_t xdr_netobj __P((XDR *, struct netobj *)); +extern bool_t xdr_netobj(XDR *, struct netobj *); /* * These are the public routines for the various implementations of @@ -283,26 +283,26 @@ extern bool_t xdr_netobj __P((XDR *, struct netobj *)); */ __BEGIN_DECLS /* XDR using memory buffers */ -extern void xdrmem_create __P((XDR *, char *, u_int, enum xdr_op)); +extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op); #ifdef _STDIO_H_ /* XDR using stdio library */ -extern void xdrstdio_create __P((XDR *, FILE *, enum xdr_op)); +extern void xdrstdio_create(XDR *, FILE *, enum xdr_op); #endif /* XDR pseudo records for tcp */ extern void xdrrec_create __P((XDR *, u_int, u_int, char *, - int (*) __P((caddr_t, caddr_t, int)), - int (*) __P((caddr_t, caddr_t, int)))); + int (*)(caddr_t, caddr_t, int), + int (*)(caddr_t, caddr_t, int))); /* make end of xdr record */ -extern bool_t xdrrec_endofrecord __P((XDR *, int)); +extern bool_t xdrrec_endofrecord(XDR *, int); /* move to beginning of next record */ -extern bool_t xdrrec_skiprecord __P((XDR *)); +extern bool_t xdrrec_skiprecord(XDR *); /* true if no more input */ -extern bool_t xdrrec_eof __P((XDR *)); +extern bool_t xdrrec_eof(XDR *); __END_DECLS #endif /* !_RPC_XDR_H */ diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h index 1265927373f..0da57917c6c 100644 --- a/include/rpcsvc/yp_prot.h +++ b/include/rpcsvc/yp_prot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yp_prot.h,v 1.4 2000/03/15 03:56:48 todd Exp $ */ +/* $OpenBSD: yp_prot.h,v 1.5 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: yp_prot.h,v 1.6 1995/07/14 21:10:58 christos Exp $ */ /* @@ -319,27 +319,27 @@ struct yppushresp_xfr { #define YPPUSH_REFUSED ((unsigned long)-14) /* Transfer request refused by ypserv */ __BEGIN_DECLS -bool_t xdr_domainname __P((XDR *, char *)); -bool_t xdr_peername __P((XDR *, char *)); -bool_t xdr_datum __P((XDR *, datum *)); -bool_t xdr_mapname __P((XDR *, char *)); -bool_t xdr_ypreq_key __P((XDR *, struct ypreq_key *)); -bool_t xdr_ypreq_nokey __P((XDR *, struct ypreq_nokey *)); -bool_t xdr_yp_inaddr __P((XDR *, struct in_addr *)); -bool_t xdr_ypbind_binding __P((XDR *, struct ypbind_binding *)); -bool_t xdr_ypbind_resptype __P((XDR *, enum ypbind_resptype *)); -bool_t xdr_ypstat __P((XDR *, enum ypbind_resptype *)); -bool_t xdr_ypbind_resp __P((XDR *, struct ypbind_resp *)); -bool_t xdr_ypresp_val __P((XDR *, struct ypresp_val *)); -bool_t xdr_ypbind_setdom __P((XDR *, struct ypbind_setdom *)); -bool_t xdr_ypresp_key_val __P((XDR *, struct ypresp_key_val *)); -bool_t xdr_ypresp_all __P((XDR *, struct ypresp_all *)); -bool_t xdr_ypresp_all_seq __P((XDR *, u_long *)); -bool_t xdr_ypresp_master __P((XDR *, struct ypresp_master *)); -bool_t xdr_ypmaplist_str __P((XDR *, char *)); -bool_t xdr_ypmaplist __P((XDR *, struct ypmaplist *)); -bool_t xdr_ypresp_maplist __P((XDR *, struct ypresp_maplist *)); -bool_t xdr_ypresp_order __P((XDR *, struct ypresp_order *)); +bool_t xdr_domainname(XDR *, char *); +bool_t xdr_peername(XDR *, char *); +bool_t xdr_datum(XDR *, datum *); +bool_t xdr_mapname(XDR *, char *); +bool_t xdr_ypreq_key(XDR *, struct ypreq_key *); +bool_t xdr_ypreq_nokey(XDR *, struct ypreq_nokey *); +bool_t xdr_yp_inaddr(XDR *, struct in_addr *); +bool_t xdr_ypbind_binding(XDR *, struct ypbind_binding *); +bool_t xdr_ypbind_resptype(XDR *, enum ypbind_resptype *); +bool_t xdr_ypstat(XDR *, enum ypbind_resptype *); +bool_t xdr_ypbind_resp(XDR *, struct ypbind_resp *); +bool_t xdr_ypresp_val(XDR *, struct ypresp_val *); +bool_t xdr_ypbind_setdom(XDR *, struct ypbind_setdom *); +bool_t xdr_ypresp_key_val(XDR *, struct ypresp_key_val *); +bool_t xdr_ypresp_all(XDR *, struct ypresp_all *); +bool_t xdr_ypresp_all_seq(XDR *, u_long *); +bool_t xdr_ypresp_master(XDR *, struct ypresp_master *); +bool_t xdr_ypmaplist_str(XDR *, char *); +bool_t xdr_ypmaplist(XDR *, struct ypmaplist *); +bool_t xdr_ypresp_maplist(XDR *, struct ypresp_maplist *); +bool_t xdr_ypresp_order(XDR *, struct ypresp_order *); __END_DECLS #endif /* _RPCSVC_YP_PROT_H_ */ diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index c132f5bf250..8a4d6cf2594 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ypclnt.h,v 1.4 1997/09/21 10:46:20 niklas Exp $ */ +/* $OpenBSD: ypclnt.h,v 1.5 2002/02/16 21:27:18 millert Exp $ */ /* $NetBSD: ypclnt.h,v 1.7 1995/07/14 21:11:10 christos Exp $ */ /* @@ -62,30 +62,30 @@ struct ypall_callback { /* return non-0 to stop getting called */ - int (*foreach) __P((u_long, char *, int, char *, int, void *)); + int (*foreach)(u_long, char *, int, char *, int, void *); char *data; /* opaque pointer for use of callback fn */ }; __BEGIN_DECLS -int yp_bind __P((const char *)); +int yp_bind(const char *); struct dom_binding; -int _yp_dobind __P((const char *, struct dom_binding **)); -void yp_unbind __P((const char *)); -int yp_get_default_domain __P((char **)); +int _yp_dobind(const char *, struct dom_binding **); +void yp_unbind(const char *); +int yp_get_default_domain(char **); int yp_match __P((const char *, const char *, const char *, int , char **, int *)); int yp_first __P((const char *, const char *, char **, int *, char **, int *)); int yp_next __P((const char *, const char *, const char *, int, char **, int *, char **, int *)); -int yp_master __P((const char *, const char *, char **)); -int yp_order __P((const char *, const char *, int *)); +int yp_master(const char *, const char *, char **); +int yp_order(const char *, const char *, int *); int yp_all __P((const char *, const char *, struct ypall_callback *)); -char * yperr_string __P((int)); -int ypprot_err __P((unsigned int)); +char * yperr_string(int); +int ypprot_err(unsigned int); struct ypmaplist; -int yp_maplist __P((const char *, struct ypmaplist **)); +int yp_maplist(const char *, struct ypmaplist **); __END_DECLS #endif /* _RPCSVC_YPCLNT_H_ */ diff --git a/include/search.h b/include/search.h index 528d6414a40..53efbadba50 100644 --- a/include/search.h +++ b/include/search.h @@ -1,4 +1,4 @@ -/* $OpenBSD: search.h,v 1.3 1997/09/21 10:45:49 niklas Exp $ */ +/* $OpenBSD: search.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: search.h,v 1.9 1995/08/08 21:14:45 jtc Exp $ */ /* @@ -35,16 +35,16 @@ typedef enum { __BEGIN_DECLS extern void *bsearch __P((const void *, const void *, size_t, size_t, int (*)(const void *, const void *))); -extern int hcreate __P((unsigned int)); -extern void hdestroy __P((void)); -extern ENTRY *hsearch __P((ENTRY, ACTION)); +extern int hcreate(unsigned int); +extern void hdestroy(void); +extern ENTRY *hsearch(ENTRY, ACTION); extern void *lfind __P((const void *, const void *, size_t *, size_t, int (*)(const void *, const void *))); extern void *lsearch __P((const void *, const void *, size_t *, size_t, int (*)(const void *, const void *))); -extern void insque __P((void *, void *)); -extern void remque __P((void *)); +extern void insque(void *, void *); +extern void remque(void *); extern void *tdelete __P((const void *, void **, int (*)(const void *, const void *))); diff --git a/include/setjmp.h b/include/setjmp.h index f13d08ff6c1..a4dfd1a2aac 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: setjmp.h,v 1.2 1997/09/21 10:45:50 niklas Exp $ */ +/* $OpenBSD: setjmp.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: setjmp.h,v 1.11 1994/12/20 10:35:44 cgd Exp $ */ /*- @@ -55,18 +55,18 @@ typedef long jmp_buf[_JBLEN]; #include <sys/cdefs.h> __BEGIN_DECLS -int setjmp __P((jmp_buf)); -void longjmp __P((jmp_buf, int)); +int setjmp(jmp_buf); +void longjmp(jmp_buf, int); #ifndef _ANSI_SOURCE -int sigsetjmp __P((sigjmp_buf, int)); -void siglongjmp __P((sigjmp_buf, int)); +int sigsetjmp(sigjmp_buf, int); +void siglongjmp(sigjmp_buf, int); #endif /* not ANSI */ #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -int _setjmp __P((jmp_buf)); -void _longjmp __P((jmp_buf, int)); -void longjmperror __P((void)); +int _setjmp(jmp_buf); +void _longjmp(jmp_buf, int); +void longjmperror(void); #endif /* neither ANSI nor POSIX */ __END_DECLS diff --git a/include/sgtty.h b/include/sgtty.h index 3da15f64290..ea27bae383b 100644 --- a/include/sgtty.h +++ b/include/sgtty.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sgtty.h,v 1.2 1997/09/21 10:45:51 niklas Exp $ */ +/* $OpenBSD: sgtty.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: sgtty.h,v 1.4 1995/06/05 19:40:33 pk Exp $ */ /* @@ -43,6 +43,6 @@ #include <sys/cdefs.h> __BEGIN_DECLS -int gtty __P((int, struct sgttyb *)); -int stty __P((int, struct sgttyb *)); +int gtty(int, struct sgttyb *); +int stty(int, struct sgttyb *); __END_DECLS diff --git a/include/sha1.h b/include/sha1.h index 6da7e22f0f1..58733f1632d 100644 --- a/include/sha1.h +++ b/include/sha1.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sha1.h,v 1.9 1999/02/03 03:13:18 angelos Exp $ */ +/* $OpenBSD: sha1.h,v 1.10 2002/02/16 21:27:17 millert Exp $ */ /* * SHA-1 in C @@ -15,13 +15,13 @@ typedef struct { u_char buffer[64]; } SHA1_CTX; -void SHA1Transform __P((u_int32_t state[5], const u_char buffer[64])); -void SHA1Init __P((SHA1_CTX *context)); -void SHA1Update __P((SHA1_CTX *context, const u_char *data, u_int len)); -void SHA1Final __P((u_char digest[20], SHA1_CTX *context)); -char *SHA1End __P((SHA1_CTX *, char *)); -char *SHA1File __P((char *, char *)); -char *SHA1Data __P((const u_char *, size_t, char *)); +void SHA1Transform(u_int32_t state[5], const u_char buffer[64]); +void SHA1Init(SHA1_CTX *context); +void SHA1Update(SHA1_CTX *context, const u_char *data, u_int len); +void SHA1Final(u_char digest[20], SHA1_CTX *context); +char *SHA1End(SHA1_CTX *, char *); +char *SHA1File(char *, char *); +char *SHA1Data(const u_char *, size_t, char *); #define SHA1_DIGESTSIZE 20 #define SHA1_BLOCKSIZE 64 diff --git a/include/signal.h b/include/signal.h index 82f39b14f11..84d20e6280c 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.4 1998/11/20 11:18:26 d Exp $ */ +/* $OpenBSD: signal.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $ */ /*- @@ -51,18 +51,18 @@ extern __const char *__const sys_siglist[_NSIG]; #endif __BEGIN_DECLS -int raise __P((int)); +int raise(int); #ifndef _ANSI_SOURCE -int kill __P((pid_t, int)); -int sigaction __P((int, const struct sigaction *, struct sigaction *)); -int sigaddset __P((sigset_t *, int)); -int sigdelset __P((sigset_t *, int)); -int sigemptyset __P((sigset_t *)); -int sigfillset __P((sigset_t *)); -int sigismember __P((const sigset_t *, int)); -int sigpending __P((sigset_t *)); -int sigprocmask __P((int, const sigset_t *, sigset_t *)); -int sigsuspend __P((const sigset_t *)); +int kill(pid_t, int); +int sigaction(int, const struct sigaction *, struct sigaction *); +int sigaddset(sigset_t *, int); +int sigdelset(sigset_t *, int); +int sigemptyset(sigset_t *); +int sigfillset(sigset_t *); +int sigismember(const sigset_t *, int); +int sigpending(sigset_t *); +int sigprocmask(int, const sigset_t *, sigset_t *); +int sigsuspend(const sigset_t *); #if defined(__GNUC__) && defined(__STDC__) extern __inline int sigaddset(sigset_t *set, int signo) { @@ -103,17 +103,17 @@ extern __inline int sigismember(const sigset_t *set, int signo) { #define sigfillset(set) (*(set) = ~(sigset_t)0, 0) #ifndef _POSIX_SOURCE -int killpg __P((pid_t, int)); -int sigblock __P((int)); -int siginterrupt __P((int, int)); -int sigpause __P((int)); -int sigreturn __P((struct sigcontext *)); -int sigsetmask __P((int)); -int sigstack __P((const struct sigstack *, struct sigstack *)); -int sigaltstack __P((const struct sigaltstack *, struct sigaltstack *)); -int sigvec __P((int, struct sigvec *, struct sigvec *)); -void psignal __P((unsigned int, const char *)); -int sigwait __P((const sigset_t *, int *)); +int killpg(pid_t, int); +int sigblock(int); +int siginterrupt(int, int); +int sigpause(int); +int sigreturn(struct sigcontext *); +int sigsetmask(int); +int sigstack(const struct sigstack *, struct sigstack *); +int sigaltstack(const struct sigaltstack *, struct sigaltstack *); +int sigvec(int, struct sigvec *, struct sigvec *); +void psignal(unsigned int, const char *); +int sigwait(const sigset_t *, int *); #endif /* !_POSIX_SOURCE */ #endif /* !_ANSI_SOURCE */ __END_DECLS diff --git a/include/skipjack.h b/include/skipjack.h index 37c141d5f49..ae1b0e3ff16 100644 --- a/include/skipjack.h +++ b/include/skipjack.h @@ -1,4 +1,4 @@ -/* $OpenBSD: skipjack.h,v 1.2 2001/01/28 23:43:15 niklas Exp $ */ +/* $OpenBSD: skipjack.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* * Further optimized test implementation of SKIPJACK algorithm @@ -13,6 +13,6 @@ * 29 May 1998 */ -extern void skipjack_forwards __P((u_int8_t *plain, u_int8_t *cipher, u_int8_t **key)); -extern void skipjack_backwards __P((u_int8_t *cipher, u_int8_t *plain, u_int8_t **key)); -extern void subkey_table_gen __P((u_int8_t *key, u_int8_t **key_tables)); +extern void skipjack_forwards(u_int8_t *plain, u_int8_t *cipher, u_int8_t **key); +extern void skipjack_backwards(u_int8_t *cipher, u_int8_t *plain, u_int8_t **key); +extern void subkey_table_gen(u_int8_t *key, u_int8_t **key_tables); diff --git a/include/stdio.h b/include/stdio.h index 060a3f810df..4bf6c0242c8 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.19 2001/11/02 00:19:10 espie Exp $ */ +/* $OpenBSD: stdio.h,v 1.20 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -118,10 +118,10 @@ typedef struct __sFILE { /* operations */ void *_cookie; /* cookie passed to io functions */ - int (*_close) __P((void *)); - int (*_read) __P((void *, char *, int)); - fpos_t (*_seek) __P((void *, fpos_t, int)); - int (*_write) __P((void *, const char *, int)); + int (*_close)(void *); + int (*_read)(void *, char *, int); + fpos_t (*_seek)(void *, fpos_t, int); + int (*_write)(void *, const char *, int); /* separate buffer for long sequences of ungetc() */ struct __sbuf _ub; /* ungetc buffer */ @@ -210,55 +210,55 @@ __END_DECLS * Functions defined in ANSI C standard. */ __BEGIN_DECLS -void clearerr __P((FILE *)); -int fclose __P((FILE *)); -int feof __P((FILE *)); -int ferror __P((FILE *)); -int fflush __P((FILE *)); -int fgetc __P((FILE *)); -int fgetpos __P((FILE *, fpos_t *)); -char *fgets __P((char *, int, FILE *)); -FILE *fopen __P((const char *, const char *)); -int fprintf __P((FILE *, const char *, ...)); -int fputc __P((int, FILE *)); -int fputs __P((const char *, FILE *)); -size_t fread __P((void *, size_t, size_t, FILE *)); -FILE *freopen __P((const char *, const char *, FILE *)); -int fscanf __P((FILE *, const char *, ...)); -int fseek __P((FILE *, long, int)); -int fseeko __P((FILE *, off_t, int)); -int fsetpos __P((FILE *, const fpos_t *)); -long ftell __P((FILE *)); -off_t ftello __P((FILE *)); -size_t fwrite __P((const void *, size_t, size_t, FILE *)); -int getc __P((FILE *)); -int getchar __P((void)); -char *gets __P((char *)); +void clearerr(FILE *); +int fclose(FILE *); +int feof(FILE *); +int ferror(FILE *); +int fflush(FILE *); +int fgetc(FILE *); +int fgetpos(FILE *, fpos_t *); +char *fgets(char *, int, FILE *); +FILE *fopen(const char *, const char *); +int fprintf(FILE *, const char *, ...); +int fputc(int, FILE *); +int fputs(const char *, FILE *); +size_t fread(void *, size_t, size_t, FILE *); +FILE *freopen(const char *, const char *, FILE *); +int fscanf(FILE *, const char *, ...); +int fseek(FILE *, long, int); +int fseeko(FILE *, off_t, int); +int fsetpos(FILE *, const fpos_t *); +long ftell(FILE *); +off_t ftello(FILE *); +size_t fwrite(const void *, size_t, size_t, FILE *); +int getc(FILE *); +int getchar(void); +char *gets(char *); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) && !defined(__SYS_ERRLIST) #define __SYS_ERRLIST extern int sys_nerr; /* perror(3) external variables */ extern char *sys_errlist[]; #endif -void perror __P((const char *)); -int printf __P((const char *, ...)); -int putc __P((int, FILE *)); -int putchar __P((int)); -int puts __P((const char *)); -int remove __P((const char *)); -int rename __P((const char *, const char *)); -void rewind __P((FILE *)); -int scanf __P((const char *, ...)); -void setbuf __P((FILE *, char *)); -int setvbuf __P((FILE *, char *, int, size_t)); -int sprintf __P((char *, const char *, ...)); -int sscanf __P((const char *, const char *, ...)); -FILE *tmpfile __P((void)); -char *tmpnam __P((char *)); -int ungetc __P((int, FILE *)); -int vfprintf __P((FILE *, const char *, _BSD_VA_LIST_)); -int vprintf __P((const char *, _BSD_VA_LIST_)); -int vsprintf __P((char *, const char *, _BSD_VA_LIST_)); +void perror(const char *); +int printf(const char *, ...); +int putc(int, FILE *); +int putchar(int); +int puts(const char *); +int remove(const char *); +int rename(const char *, const char *); +void rewind(FILE *); +int scanf(const char *, ...); +void setbuf(FILE *, char *); +int setvbuf(FILE *, char *, int, size_t); +int sprintf(char *, const char *, ...); +int sscanf(const char *, const char *, ...); +FILE *tmpfile(void); +char *tmpnam(char *); +int ungetc(int, FILE *); +int vfprintf(FILE *, const char *, _BSD_VA_LIST_); +int vprintf(const char *, _BSD_VA_LIST_); +int vsprintf(char *, const char *, _BSD_VA_LIST_); __END_DECLS /* @@ -269,19 +269,19 @@ __END_DECLS #define L_cuserid 9 /* size for cuserid(); UT_NAMESIZE + 1 */ __BEGIN_DECLS -char *ctermid __P((char *)); -char *ctermid_r __P((char *)); -char *cuserid __P((char *)); -FILE *fdopen __P((int, const char *)); -int fileno __P((FILE *)); -void flockfile __P((FILE *)); -int ftrylockfile __P((FILE *)); -void funlockfile __P((FILE *)); -void _flockfile_debug __P((FILE *, char *, int)); -int getc_unlocked __P((FILE *)); -int putc_unlocked __P((int, FILE *)); -int getchar_unlocked __P((void)); -int putchar_unlocked __P((int)); +char *ctermid(char *); +char *ctermid_r(char *); +char *cuserid(char *); +FILE *fdopen(int, const char *); +int fileno(FILE *); +void flockfile(FILE *); +int ftrylockfile(FILE *); +void funlockfile(FILE *); +void _flockfile_debug(FILE *, char *, int); +int getc_unlocked(FILE *); +int putc_unlocked(int, FILE *); +int getchar_unlocked(void); +int putchar_unlocked(int); __END_DECLS #ifndef _POSIX_THREADS @@ -302,31 +302,31 @@ __END_DECLS */ #if !defined (_ANSI_SOURCE) && !defined(_POSIX_SOURCE) __BEGIN_DECLS -int asprintf __P((char **, const char *, ...)) +int asprintf(char **, const char *, ...) __attribute__((__format__ (printf, 2, 3))) __attribute__((__nonnull__ (2))); -char *fgetln __P((FILE *, size_t *)); -int fpurge __P((FILE *)); -int getw __P((FILE *)); -int pclose __P((FILE *)); -FILE *popen __P((const char *, const char *)); -int putw __P((int, FILE *)); -void setbuffer __P((FILE *, char *, int)); -int setlinebuf __P((FILE *)); -char *tempnam __P((const char *, const char *)); -int snprintf __P((char *, size_t, const char *, ...)) +char *fgetln(FILE *, size_t *); +int fpurge(FILE *); +int getw(FILE *); +int pclose(FILE *); +FILE *popen(const char *, const char *); +int putw(int, FILE *); +void setbuffer(FILE *, char *, int); +int setlinebuf(FILE *); +char *tempnam(const char *, const char *); +int snprintf(char *, size_t, const char *, ...) __attribute__((__format__ (printf, 3, 4))) __attribute__((__nonnull__ (3))); -int vasprintf __P((char **, const char *, _BSD_VA_LIST_)) +int vasprintf(char **, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 2, 0))) __attribute__((__nonnull__ (2))); -int vsnprintf __P((char *, size_t, const char *, _BSD_VA_LIST_)) +int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) __attribute__((__format__ (printf, 3, 0))) __attribute__((__nonnull__ (3))); -int vscanf __P((const char *, _BSD_VA_LIST_)) +int vscanf(const char *, _BSD_VA_LIST_) __attribute__((__format__ (scanf, 1, 0))) __attribute__((__nonnull__ (1))); -int vsscanf __P((const char *, const char *, _BSD_VA_LIST_)) +int vsscanf(const char *, const char *, _BSD_VA_LIST_) __attribute__((__format__ (scanf, 2, 0))) __attribute__((__nonnull__ (2))); __END_DECLS @@ -356,9 +356,9 @@ __END_DECLS * Functions internal to the implementation. */ __BEGIN_DECLS -int __srget __P((FILE *)); -int __svfscanf __P((FILE *, const char *, _BSD_VA_LIST_)); -int __swbuf __P((int, FILE *)); +int __srget(FILE *); +int __svfscanf(FILE *, const char *, _BSD_VA_LIST_); +int __swbuf(int, FILE *); __END_DECLS /* diff --git a/include/stdlib.h b/include/stdlib.h index 35cc374813b..32b91157ffb 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdlib.h,v 1.15 2001/11/04 23:27:54 krw Exp $ */ +/* $OpenBSD: stdlib.h,v 1.16 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $ */ /*- @@ -93,77 +93,77 @@ typedef struct { #include <sys/cdefs.h> __BEGIN_DECLS -__dead void abort __P((void)); -int abs __P((int)); +__dead void abort(void); +int abs(int); int atexit __P((void (*)(void))); -double atof __P((const char *)); -int atoi __P((const char *)); -long atol __P((const char *)); +double atof(const char *); +int atoi(const char *); +long atol(const char *); void *bsearch __P((const void *, const void *, size_t, size_t, int (*)(const void *, const void *))); -void *calloc __P((size_t, size_t)); -div_t div __P((int, int)); -__dead void exit __P((int)); -void free __P((void *)); -char *getenv __P((const char *)); -long labs __P((long)); -ldiv_t ldiv __P((long, long)); -void *malloc __P((size_t)); +void *calloc(size_t, size_t); +div_t div(int, int); +__dead void exit(int); +void free(void *); +char *getenv(const char *); +long labs(long); +ldiv_t ldiv(long, long); +void *malloc(size_t); void qsort __P((void *, size_t, size_t, int (*)(const void *, const void *))); -int rand __P((void)); -int rand_r __P((unsigned int *)); -void *realloc __P((void *, size_t)); -void srand __P((unsigned)); -double strtod __P((const char *, char **)); -long strtol __P((const char *, char **, int)); +int rand(void); +int rand_r(unsigned int *); +void *realloc(void *, size_t); +void srand(unsigned); +double strtod(const char *, char **); +long strtol(const char *, char **, int); unsigned long - strtoul __P((const char *, char **, int)); -int system __P((const char *)); + strtoul(const char *, char **, int); +int system(const char *); /* these are currently just stubs */ -int mblen __P((const char *, size_t)); -size_t mbstowcs __P((wchar_t *, const char *, size_t)); -int wctomb __P((char *, wchar_t)); -int mbtowc __P((wchar_t *, const char *, size_t)); -size_t wcstombs __P((char *, const wchar_t *, size_t)); +int mblen(const char *, size_t); +size_t mbstowcs(wchar_t *, const char *, size_t); +int wctomb(char *, wchar_t); +int mbtowc(wchar_t *, const char *, size_t); +size_t wcstombs(char *, const wchar_t *, size_t); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) #if defined(alloca) && (alloca == __builtin_alloca) && (__GNUC__ < 2) -void *alloca __P((int)); /* built-in for gcc */ +void *alloca(int); /* built-in for gcc */ #else -void *alloca __P((size_t)); +void *alloca(size_t); #endif /* __GNUC__ */ -char *getbsize __P((int *, long *)); -char *cgetcap __P((char *, const char *, int)); -int cgetclose __P((void)); -int cgetent __P((char **, char **, const char *)); -int cgetfirst __P((char **, char **)); -int cgetmatch __P((char *, const char *)); -int cgetnext __P((char **, char **)); -int cgetnum __P((char *, const char *, long *)); -int cgetset __P((const char *)); -int cgetusedb __P((int)); -int cgetstr __P((char *, const char *, char **)); -int cgetustr __P((char *, const char *, char **)); - -int daemon __P((int, int)); -char *devname __P((int, int)); -int getloadavg __P((double [], int)); - -long a64l __P((const char *)); -char *l64a __P((long)); - -void cfree __P((void *)); - -int getopt __P((int, char * const *, const char *)); +char *getbsize(int *, long *); +char *cgetcap(char *, const char *, int); +int cgetclose(void); +int cgetent(char **, char **, const char *); +int cgetfirst(char **, char **); +int cgetmatch(char *, const char *); +int cgetnext(char **, char **); +int cgetnum(char *, const char *, long *); +int cgetset(const char *); +int cgetusedb(int); +int cgetstr(char *, const char *, char **); +int cgetustr(char *, const char *, char **); + +int daemon(int, int); +char *devname(int, int); +int getloadavg(double [], int); + +long a64l(const char *); +char *l64a(long); + +void cfree(void *); + +int getopt(int, char * const *, const char *); extern char *optarg; /* getopt(3) external variables */ extern int opterr; extern int optind; extern int optopt; extern int optreset; -int getsubopt __P((char **, char * const *, char **)); +int getsubopt(char **, char * const *, char **); extern char *suboptarg; /* getsubopt(3) external variable */ int heapsort __P((void *, size_t, size_t, @@ -175,37 +175,37 @@ int radixsort __P((const unsigned char **, int, const unsigned char *, int sradixsort __P((const unsigned char **, int, const unsigned char *, unsigned)); -char *initstate __P((unsigned int, char *, size_t)); -long random __P((void)); -char *realpath __P((const char *, char *)); -char *setstate __P((const char *)); -void srandom __P((unsigned int)); -void srandomdev __P((void)); - -int putenv __P((const char *)); -int setenv __P((const char *, const char *, int)); -void unsetenv __P((const char *)); -void setproctitle __P((const char *, ...)) +char *initstate(unsigned int, char *, size_t); +long random(void); +char *realpath(const char *, char *); +char *setstate(const char *); +void srandom(unsigned int); +void srandomdev(void); + +int putenv(const char *); +int setenv(const char *, const char *, int); +void unsetenv(const char *); +void setproctitle(const char *, ...) __attribute__((__format__ (__printf__, 1, 2))); -quad_t qabs __P((quad_t)); -qdiv_t qdiv __P((quad_t, quad_t)); -quad_t strtoq __P((const char *, char **, int)); -u_quad_t strtouq __P((const char *, char **, int)); - -double drand48 __P((void)); -double erand48 __P((unsigned short[3])); -long jrand48 __P((unsigned short[3])); -void lcong48 __P((unsigned short[7])); -long lrand48 __P((void)); -long mrand48 __P((void)); -long nrand48 __P((unsigned short[3])); -unsigned short *seed48 __P((unsigned short[3])); -void srand48 __P((long)); - -u_int32_t arc4random __P((void)); -void arc4random_stir __P((void)); -void arc4random_addrandom __P((unsigned char *, int)); +quad_t qabs(quad_t); +qdiv_t qdiv(quad_t, quad_t); +quad_t strtoq(const char *, char **, int); +u_quad_t strtouq(const char *, char **, int); + +double drand48(void); +double erand48(unsigned short[3]); +long jrand48(unsigned short[3]); +void lcong48(unsigned short[7]); +long lrand48(void); +long mrand48(void); +long nrand48(unsigned short[3]); +unsigned short *seed48(unsigned short[3]); +void srand48(long); + +u_int32_t arc4random(void); +void arc4random_stir(void); +void arc4random_addrandom(unsigned char *, int); #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ __END_DECLS diff --git a/include/string.h b/include/string.h index 7be111260a7..af469e99d1f 100644 --- a/include/string.h +++ b/include/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.6 1999/09/17 13:13:46 espie Exp $ */ +/* $OpenBSD: string.h,v 1.7 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: string.h,v 1.6 1994/10/26 00:56:30 cgd Exp $ */ /*- @@ -56,47 +56,47 @@ typedef _BSD_SIZE_T_ size_t; #include <sys/cdefs.h> __BEGIN_DECLS -void *memchr __P((const void *, int, size_t)); -int memcmp __P((const void *, const void *, size_t)); -void *memcpy __P((void *, const void *, size_t)); -void *memmove __P((void *, const void *, size_t)); -void *memset __P((void *, int, size_t)); -char *strcat __P((char *, const char *)); -char *strchr __P((const char *, int)); -int strcmp __P((const char *, const char *)); -int strcoll __P((const char *, const char *)); -char *strcpy __P((char *, const char *)); -size_t strcspn __P((const char *, const char *)); -char *strerror __P((int)); -size_t strlen __P((const char *)); -char *strncat __P((char *, const char *, size_t)); -int strncmp __P((const char *, const char *, size_t)); -char *strncpy __P((char *, const char *, size_t)); -char *strpbrk __P((const char *, const char *)); -char *strrchr __P((const char *, int)); -size_t strspn __P((const char *, const char *)); -char *strstr __P((const char *, const char *)); -char *strtok __P((char *, const char *)); -char *strtok_r __P((char *, const char *, char **)); -size_t strxfrm __P((char *, const char *, size_t)); +void *memchr(const void *, int, size_t); +int memcmp(const void *, const void *, size_t); +void *memcpy(void *, const void *, size_t); +void *memmove(void *, const void *, size_t); +void *memset(void *, int, size_t); +char *strcat(char *, const char *); +char *strchr(const char *, int); +int strcmp(const char *, const char *); +int strcoll(const char *, const char *); +char *strcpy(char *, const char *); +size_t strcspn(const char *, const char *); +char *strerror(int); +size_t strlen(const char *); +char *strncat(char *, const char *, size_t); +int strncmp(const char *, const char *, size_t); +char *strncpy(char *, const char *, size_t); +char *strpbrk(const char *, const char *); +char *strrchr(const char *, int); +size_t strspn(const char *, const char *); +char *strstr(const char *, const char *); +char *strtok(char *, const char *); +char *strtok_r(char *, const char *, char **); +size_t strxfrm(char *, const char *, size_t); /* Nonstandard routines */ #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -int bcmp __P((const void *, const void *, size_t)); -void bcopy __P((const void *, void *, size_t)); -void bzero __P((void *, size_t)); -int ffs __P((int)); -char *index __P((const char *, int)); -void *memccpy __P((void *, const void *, int, size_t)); -char *rindex __P((const char *, int)); -int strcasecmp __P((const char *, const char *)); -char *strdup __P((const char *)); -size_t strlcat __P((char *, const char *, size_t)); -size_t strlcpy __P((char *, const char *, size_t)); -void strmode __P((int, char *)); -int strncasecmp __P((const char *, const char *, size_t)); -char *strsep __P((char **, const char *)); -char *strsignal __P((int)); +int bcmp(const void *, const void *, size_t); +void bcopy(const void *, void *, size_t); +void bzero(void *, size_t); +int ffs(int); +char *index(const char *, int); +void *memccpy(void *, const void *, int, size_t); +char *rindex(const char *, int); +int strcasecmp(const char *, const char *); +char *strdup(const char *); +size_t strlcat(char *, const char *, size_t); +size_t strlcpy(char *, const char *, size_t); +void strmode(int, char *); +int strncasecmp(const char *, const char *, size_t); +char *strsep(char **, const char *); +char *strsignal(int); #endif __END_DECLS diff --git a/include/time.h b/include/time.h index 800bc442f4b..9ba1a60de23 100644 --- a/include/time.h +++ b/include/time.h @@ -1,4 +1,4 @@ -/* $OpenBSD: time.h,v 1.10 2001/03/09 02:18:00 millert Exp $ */ +/* $OpenBSD: time.h,v 1.11 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: time.h,v 1.9 1994/10/26 00:56:35 cgd Exp $ */ /* @@ -90,34 +90,34 @@ struct tm { __BEGIN_DECLS struct timespec; -char *asctime __P((const struct tm *)); -clock_t clock __P((void)); -char *ctime __P((const time_t *)); -double difftime __P((time_t, time_t)); -struct tm *gmtime __P((const time_t *)); -struct tm *localtime __P((const time_t *)); -time_t mktime __P((struct tm *)); -size_t strftime __P((char *, size_t, const char *, const struct tm *)); -char *strptime __P((const char *, const char *, struct tm *)); -time_t time __P((time_t *)); -char *asctime_r __P((const struct tm *, char *)); -char *ctime_r __P((const time_t *, char *)); -struct tm *gmtime_r __P((const time_t *, struct tm *)); -struct tm *localtime_r __P((const time_t *, struct tm *)); -int nanosleep __P((const struct timespec *, struct timespec *)); +char *asctime(const struct tm *); +clock_t clock(void); +char *ctime(const time_t *); +double difftime(time_t, time_t); +struct tm *gmtime(const time_t *); +struct tm *localtime(const time_t *); +time_t mktime(struct tm *); +size_t strftime(char *, size_t, const char *, const struct tm *); +char *strptime(const char *, const char *, struct tm *); +time_t time(time_t *); +char *asctime_r(const struct tm *, char *); +char *ctime_r(const time_t *, char *); +struct tm *gmtime_r(const time_t *, struct tm *); +struct tm *localtime_r(const time_t *, struct tm *); +int nanosleep(const struct timespec *, struct timespec *); #if !defined(_ANSI_SOURCE) #define CLK_TCK 100 extern char *tzname[2]; -void tzset __P((void)); +void tzset(void); #endif /* not ANSI */ #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -char *timezone __P((int, int)); -void tzsetwall __P((void)); -time_t timelocal __P((struct tm *)); -time_t timegm __P((struct tm *)); -time_t timeoff __P((struct tm *, const long)); +char *timezone(int, int); +void tzsetwall(void); +time_t timelocal(struct tm *); +time_t timegm(struct tm *); +time_t timeoff(struct tm *, const long); #endif /* neither ANSI nor POSIX */ __END_DECLS diff --git a/include/ttyent.h b/include/ttyent.h index 032c50065c8..7f3b95dff56 100644 --- a/include/ttyent.h +++ b/include/ttyent.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ttyent.h,v 1.2 1997/09/21 10:45:58 niklas Exp $ */ +/* $OpenBSD: ttyent.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: ttyent.h,v 1.5 1994/10/26 00:56:36 cgd Exp $ */ /* @@ -68,10 +68,10 @@ struct ttyent { #include <sys/cdefs.h> __BEGIN_DECLS -struct ttyent *getttyent __P((void)); -struct ttyent *getttynam __P((const char *)); -int setttyent __P((void)); -int endttyent __P((void)); +struct ttyent *getttyent(void); +struct ttyent *getttynam(const char *); +int setttyent(void); +int endttyent(void); __END_DECLS #endif /* !_TTYENT_H_ */ diff --git a/include/unistd.h b/include/unistd.h index 01d71c996fe..bae73c5b05b 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unistd.h,v 1.35 2001/08/07 21:34:42 millert Exp $ */ +/* $OpenBSD: unistd.h,v 1.36 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: unistd.h,v 1.26.4.1 1996/05/28 02:31:51 mrg Exp $ */ /*- @@ -56,57 +56,57 @@ #endif __BEGIN_DECLS -__dead void _exit __P((int)); -int access __P((const char *, int)); -unsigned int alarm __P((unsigned int)); -int chdir __P((const char *)); -int chown __P((const char *, uid_t, gid_t)); -int close __P((int)); -size_t confstr __P((int, char *, size_t)); -char *cuserid __P((char *)); -int dup __P((int)); -int dup2 __P((int, int)); -int execl __P((const char *, const char *, ...)); -int execle __P((const char *, const char *, ...)); -int execlp __P((const char *, const char *, ...)); -int execv __P((const char *, char * const *)); -int execve __P((const char *, char * const *, char * const *)); -int execvp __P((const char *, char * const *)); -pid_t fork __P((void)); -long fpathconf __P((int, int)); -char *getcwd __P((char *, size_t)); -gid_t getegid __P((void)); -uid_t geteuid __P((void)); -gid_t getgid __P((void)); -int getgroups __P((int, gid_t *)); -char *getlogin __P((void)); -int getlogin_r __P((char *, size_t)); -pid_t getpgrp __P((void)); -pid_t getpid __P((void)); -pid_t getpgid __P((pid_t)); -pid_t getppid __P((void)); -pid_t getsid __P((pid_t)); -uid_t getuid __P((void)); -int isatty __P((int)); -int link __P((const char *, const char *)); -off_t lseek __P((int, off_t, int)); -long pathconf __P((const char *, int)); -int pause __P((void)); -int pipe __P((int *)); -ssize_t read __P((int, void *, size_t)); -int rmdir __P((const char *)); -int setgid __P((gid_t)); -int setpgid __P((pid_t, pid_t)); -pid_t setsid __P((void)); -int setuid __P((uid_t)); -unsigned int sleep __P((unsigned int)); -long sysconf __P((int)); -pid_t tcgetpgrp __P((int)); -int tcsetpgrp __P((int, pid_t)); -char *ttyname __P((int)); -int ttyname_r __P((int, char *, size_t)); -int unlink __P((const char *)); -ssize_t write __P((int, const void *, size_t)); +__dead void _exit(int); +int access(const char *, int); +unsigned int alarm(unsigned int); +int chdir(const char *); +int chown(const char *, uid_t, gid_t); +int close(int); +size_t confstr(int, char *, size_t); +char *cuserid(char *); +int dup(int); +int dup2(int, int); +int execl(const char *, const char *, ...); +int execle(const char *, const char *, ...); +int execlp(const char *, const char *, ...); +int execv(const char *, char * const *); +int execve(const char *, char * const *, char * const *); +int execvp(const char *, char * const *); +pid_t fork(void); +long fpathconf(int, int); +char *getcwd(char *, size_t); +gid_t getegid(void); +uid_t geteuid(void); +gid_t getgid(void); +int getgroups(int, gid_t *); +char *getlogin(void); +int getlogin_r(char *, size_t); +pid_t getpgrp(void); +pid_t getpid(void); +pid_t getpgid(pid_t); +pid_t getppid(void); +pid_t getsid(pid_t); +uid_t getuid(void); +int isatty(int); +int link(const char *, const char *); +off_t lseek(int, off_t, int); +long pathconf(const char *, int); +int pause(void); +int pipe(int *); +ssize_t read(int, void *, size_t); +int rmdir(const char *); +int setgid(gid_t); +int setpgid(pid_t, pid_t); +pid_t setsid(void); +int setuid(uid_t); +unsigned int sleep(unsigned int); +long sysconf(int); +pid_t tcgetpgrp(int); +int tcsetpgrp(int, pid_t); +char *ttyname(int); +int ttyname_r(int, char *, size_t); +int unlink(const char *); +ssize_t write(int, const void *, size_t); #ifndef _POSIX_SOURCE @@ -118,107 +118,107 @@ ssize_t write __P((int, const void *, size_t)); */ #if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \ (_XOPEN_VERSION - 0) >= 500 -ssize_t pread __P((int, void *, size_t, off_t)); -ssize_t pwrite __P((int, const void *, size_t, off_t)); +ssize_t pread(int, void *, size_t, off_t); +ssize_t pwrite(int, const void *, size_t, off_t); #endif -int acct __P((const char *)); -char *brk __P((const char *)); -int chroot __P((const char *)); -char *crypt __P((const char *, const char *)); -int des_cipher __P((const char *, char *, long, int)); -int des_setkey __P((const char *key)); -int encrypt __P((char *, int)); -void endusershell __P((void)); -int exect __P((const char *, char * const *, char * const *)); -int fchdir __P((int)); -int fchown __P((int, uid_t, gid_t)); -char *fflagstostr __P((u_int32_t)); -int fsync __P((int)); -int ftruncate __P((int, off_t)); -int getdomainname __P((char *, size_t)); -int getdtablesize __P((void)); -int getgrouplist __P((const char *, gid_t, gid_t *, int *)); -long gethostid __P((void)); -int gethostname __P((char *, size_t)); -mode_t getmode __P((const void *, mode_t)); -int getpagesize __P((void)); -char *getpass __P((const char *)); -char *getusershell __P((void)); -char *getwd __P((char *)); /* obsoleted by getcwd() */ -int initgroups __P((const char *, gid_t)); -int iruserok __P((u_int32_t, int, const char *, const char *)); -int iruserok_sa __P((const void *, int, int, const char *, const char *)); -int lchown __P((const char *, uid_t, gid_t)); -char *mkdtemp __P((char *)); -int mkstemp __P((char *)); -int mkstemps __P((char *, int)); -char *mktemp __P((char *)); -int nfssvc __P((int, void *)); -int nice __P((int)); -void psignal __P((unsigned int, const char *)); +int acct(const char *); +char *brk(const char *); +int chroot(const char *); +char *crypt(const char *, const char *); +int des_cipher(const char *, char *, long, int); +int des_setkey(const char *key); +int encrypt(char *, int); +void endusershell(void); +int exect(const char *, char * const *, char * const *); +int fchdir(int); +int fchown(int, uid_t, gid_t); +char *fflagstostr(u_int32_t); +int fsync(int); +int ftruncate(int, off_t); +int getdomainname(char *, size_t); +int getdtablesize(void); +int getgrouplist(const char *, gid_t, gid_t *, int *); +long gethostid(void); +int gethostname(char *, size_t); +mode_t getmode(const void *, mode_t); +int getpagesize(void); +char *getpass(const char *); +char *getusershell(void); +char *getwd(char *); /* obsoleted by getcwd() */ +int initgroups(const char *, gid_t); +int iruserok(u_int32_t, int, const char *, const char *); +int iruserok_sa(const void *, int, int, const char *, const char *); +int lchown(const char *, uid_t, gid_t); +char *mkdtemp(char *); +int mkstemp(char *); +int mkstemps(char *, int); +char *mktemp(char *); +int nfssvc(int, void *); +int nice(int); +void psignal(unsigned int, const char *); extern __const char *__const sys_siglist[]; -int profil __P((char *, size_t, unsigned long, unsigned int)); +int profil(char *, size_t, unsigned long, unsigned int); int rcmd __P((char **, int, const char *, const char *, const char *, int *)); int rcmd_af __P((char **, int, const char *, const char *, const char *, int *, int)); int rcmdsh __P((char **, int, const char *, const char *, const char *, char *)); -char *re_comp __P((const char *)); -int re_exec __P((const char *)); -int readlink __P((const char *, char *, size_t)); -int reboot __P((int)); -int revoke __P((const char *)); -int rfork __P((int opts)); -int rresvport __P((int *)); -int rresvport_af __P((int *, int)); -int ruserok __P((const char *, int, const char *, const char *)); -int quotactl __P((const char *, int, int, char *)); -char *sbrk __P((int)); +char *re_comp(const char *); +int re_exec(const char *); +int readlink(const char *, char *, size_t); +int reboot(int); +int revoke(const char *); +int rfork(int opts); +int rresvport(int *); +int rresvport_af(int *, int); +int ruserok(const char *, int, const char *, const char *); +int quotactl(const char *, int, int, char *); +char *sbrk(int); #if !defined(_XOPEN_SOURCE) -int select __P((int, fd_set *, fd_set *, fd_set *, struct timeval *)); +int select(int, fd_set *, fd_set *, fd_set *, struct timeval *); #endif -int setdomainname __P((const char *, size_t)); -int setegid __P((gid_t)); -int seteuid __P((uid_t)); -int setgroups __P((int, const gid_t *)); -int sethostid __P((long)); -int sethostname __P((const char *, size_t)); -int setkey __P((const char *)); -int setlogin __P((const char *)); -void *setmode __P((const char *)); -int setpgrp __P((pid_t pid, pid_t pgrp)); /* obsoleted by setpgid() */ -int setregid __P((int, int)); -int setreuid __P((int, int)); -int setrgid __P((gid_t)); -int setruid __P((uid_t)); -void setusershell __P((void)); -int strtofflags __P((char **, u_int32_t *, u_int32_t *)); -void swab __P((const void *, void *, size_t)); -int swapon __P((const char *)); -int swapctl __P((int cmd, const void *arg, int misc)); -int symlink __P((const char *, const char *)); -void sync __P((void)); -int syscall __P((int, ...)); -int truncate __P((const char *, off_t)); -int ttyslot __P((void)); -unsigned int ualarm __P((unsigned int, unsigned int)); -int undelete __P((const char *)); -int usleep __P((useconds_t)); -void *valloc __P((size_t)); /* obsoleted by malloc() */ -pid_t vfork __P((void)); -int issetugid __P((void)); +int setdomainname(const char *, size_t); +int setegid(gid_t); +int seteuid(uid_t); +int setgroups(int, const gid_t *); +int sethostid(long); +int sethostname(const char *, size_t); +int setkey(const char *); +int setlogin(const char *); +void *setmode(const char *); +int setpgrp(pid_t pid, pid_t pgrp); /* obsoleted by setpgid() */ +int setregid(int, int); +int setreuid(int, int); +int setrgid(gid_t); +int setruid(uid_t); +void setusershell(void); +int strtofflags(char **, u_int32_t *, u_int32_t *); +void swab(const void *, void *, size_t); +int swapon(const char *); +int swapctl(int cmd, const void *arg, int misc); +int symlink(const char *, const char *); +void sync(void); +int syscall(int, ...); +int truncate(const char *, off_t); +int ttyslot(void); +unsigned int ualarm(unsigned int, unsigned int); +int undelete(const char *); +int usleep(useconds_t); +void *valloc(size_t); /* obsoleted by malloc() */ +pid_t vfork(void); +int issetugid(void); -int getopt __P((int, char * const *, const char *)); +int getopt(int, char * const *, const char *); extern char *optarg; /* getopt(3) external variables */ extern int opterr; extern int optind; extern int optopt; extern int optreset; -int getsubopt __P((char **, char * const *, char **)); +int getsubopt(char **, char * const *, char **); extern char *suboptarg; /* getsubopt(3) external variable */ #endif /* !_POSIX_SOURCE */ @@ -229,7 +229,7 @@ extern char *suboptarg; /* getsubopt(3) external variable */ #define F_LOCK 1 #define F_TLOCK 2 #define F_TEST 3 -int lockf __P((int, int, off_t)); +int lockf(int, int, off_t); #endif /* (!defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)) || ... */ __END_DECLS diff --git a/include/utime.h b/include/utime.h index 97591d0466f..785f40ebd00 100644 --- a/include/utime.h +++ b/include/utime.h @@ -1,4 +1,4 @@ -/* $OpenBSD: utime.h,v 1.3 1998/05/13 08:39:21 deraadt Exp $ */ +/* $OpenBSD: utime.h,v 1.4 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: utime.h,v 1.3 1994/10/26 00:56:39 cgd Exp $ */ /*- @@ -54,7 +54,7 @@ struct utimbuf { #include <sys/cdefs.h> __BEGIN_DECLS -int utime __P((const char *, const struct utimbuf *)); +int utime(const char *, const struct utimbuf *); __END_DECLS #endif /* !_UTIME_H_ */ diff --git a/include/vis.h b/include/vis.h index 3bc7f178ee5..f2fd419b4da 100644 --- a/include/vis.h +++ b/include/vis.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vis.h,v 1.4 2000/11/21 00:48:49 millert Exp $ */ +/* $OpenBSD: vis.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ /* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */ /*- @@ -77,12 +77,12 @@ #include <sys/cdefs.h> __BEGIN_DECLS -char *vis __P((char *, int, int, int)); -int strvis __P((char *, const char *, int)); -int strnvis __P((char *, const char *, size_t, int)); -int strvisx __P((char *, const char *, size_t, int)); -int strunvis __P((char *, const char *)); -int unvis __P((char *, char, int *, int)); +char *vis(char *, int, int, int); +int strvis(char *, const char *, int); +int strnvis(char *, const char *, size_t, int); +int strvisx(char *, const char *, size_t, int); +int strunvis(char *, const char *); +int unvis(char *, char, int *, int); __END_DECLS #endif /* !_VIS_H_ */ diff --git a/lib/csu/alpha/crt0.c b/lib/csu/alpha/crt0.c index 41e18ad4acc..b3ae7d48bb1 100644 --- a/lib/csu/alpha/crt0.c +++ b/lib/csu/alpha/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.6 2001/02/03 23:16:16 art Exp $ */ +/* $OpenBSD: crt0.c,v 1.7 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crt0.c,v 1.1 1996/09/12 16:59:02 cgd Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou @@ -32,26 +32,26 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.6 2001/02/03 23:16:16 art Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.7 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> -static char *_strrchr __P((char *, char)); +static char *_strrchr(char *, char); char **environ; char *__progname = ""; #ifdef MCRT0 -extern void monstartup __P((u_long, u_long)); -extern void _mcleanup __P((void)); +extern void monstartup(u_long, u_long); +extern void _mcleanup(void); extern unsigned char _etext, _eprol; #endif /* MCRT0 */ void __start(sp, cleanup, obj) char **sp; - void (*cleanup) __P((void)); /* from shared loader */ + void (*cleanup)(void); /* from shared loader */ const void *obj; /* from shared loader */ { long argc; diff --git a/lib/csu/c++/c++rt0.c b/lib/csu/c++/c++rt0.c index 4e22ced6537..7219c32ca58 100644 --- a/lib/csu/c++/c++rt0.c +++ b/lib/csu/c++/c++rt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: c++rt0.c,v 1.6 1999/02/01 17:02:47 pefo Exp $ */ +/* $OpenBSD: c++rt0.c,v 1.7 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: c++rt0.c,v 1.6 1997/12/29 15:36:50 pk Exp $ */ /* @@ -48,18 +48,18 @@ * include a dummy local function in the set. This keeps references * to these symbols local to the shared object this module is linked to. */ -static void dummy __P((void)) { return; } +static void dummy(void) { return; } /* Note: this is "a.out" dependent. */ __asm(".stabs \"___CTOR_LIST__\",22,0,0,_dummy"); __asm(".stabs \"___DTOR_LIST__\",22,0,0,_dummy"); #endif -extern void (*__CTOR_LIST__[]) __P((void)); -extern void (*__DTOR_LIST__[]) __P((void)); +extern void (*__CTOR_LIST__[])(void); +extern void (*__DTOR_LIST__[])(void); -static void __dtors __P((void)); -static void __ctors __P((void)); +static void __dtors(void); +static void __ctors(void); static void __dtors() @@ -81,11 +81,11 @@ __ctors() } #if !defined(NATIVE_EXEC_ELF) -extern void __init __P((void)) asm(".init"); -extern void __fini __P((void)) asm(".fini"); +extern void __init(void) asm(".init"); +extern void __fini(void) asm(".fini"); #else -extern void __init __P((void)) __attribute__ ((section (".init"))); -extern void __fini __P((void)) __attribute__ ((section (".fini"))); +extern void __init(void) __attribute__ ((section (".init"))); +extern void __fini(void) __attribute__ ((section (".fini"))); #endif void diff --git a/lib/csu/common.c b/lib/csu/common.c index 5fd41c70edd..7862270eab5 100644 --- a/lib/csu/common.c +++ b/lib/csu/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.7 2001/06/01 18:17:56 deraadt Exp $ */ +/* $OpenBSD: common.c,v 1.8 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: common.c,v 1.4 1995/09/23 22:34:20 pk Exp $ */ /* * Copyright (c) 1993,1995 Paul Kranenburg @@ -33,7 +33,7 @@ #ifdef DYNAMIC -typedef int (*rtld_entry_fn) __P((int, struct crt_ldso *)); +typedef int (*rtld_entry_fn)(int, struct crt_ldso *); static struct ld_entry *ld_entry; static void diff --git a/lib/csu/common.h b/lib/csu/common.h index 11eafb43c2d..11badd67c30 100644 --- a/lib/csu/common.h +++ b/lib/csu/common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: common.h,v 1.2 1998/05/14 17:36:26 niklas Exp $ */ +/* $OpenBSD: common.h,v 1.3 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: common.h,v 1.3 1995/06/15 21:41:48 pk Exp $ */ /* @@ -55,13 +55,13 @@ #include <dlfcn.h> extern struct _dynamic _DYNAMIC; -static void __load_rtld __P((struct _dynamic *)); -extern int __syscall __P((int, ...)); -int _callmain __P((void)); -static char *_strrchr __P((char *, char)); +static void __load_rtld(struct _dynamic *); +extern int __syscall(int, ...); +int _callmain(void); +static char *_strrchr(char *, char); #ifdef DEBUG -static char *_getenv __P((char *)); -static int _strncmp __P((char *, char *, int)); +static char *_getenv(char *); +static int _strncmp(char *, char *, int); #endif #ifdef sun @@ -96,10 +96,10 @@ static int _strncmp __P((char *, char *, int)); #endif /* DYNAMIC */ -extern int main __P((int, char **, char **)); +extern int main(int, char **, char **); #ifdef MCRT0 -extern void monstartup __P((u_long, u_long)); -extern void _mcleanup __P((void)); +extern void monstartup(u_long, u_long); +extern void _mcleanup(void); #endif char **environ; diff --git a/lib/csu/common_elf/crtbegin.c b/lib/csu/common_elf/crtbegin.c index b5be9e6f014..cb7da3b2a14 100644 --- a/lib/csu/common_elf/crtbegin.c +++ b/lib/csu/common_elf/crtbegin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crtbegin.c,v 1.5 2001/02/03 23:11:23 art Exp $ */ +/* $OpenBSD: crtbegin.c,v 1.6 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtbegin.c,v 1.1 1996/09/12 16:59:03 cgd Exp $ */ /* @@ -43,13 +43,13 @@ #include "os-note-elf.h" -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)-1 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)-1 }; /* XXX */ -static void __dtors __P((void)); -static void __ctors __P((void)); +static void __dtors(void); +static void __ctors(void); static void __dtors() diff --git a/lib/csu/common_elf/crtbeginS.c b/lib/csu/common_elf/crtbeginS.c index 6945484f55c..74c21a888c9 100644 --- a/lib/csu/common_elf/crtbeginS.c +++ b/lib/csu/common_elf/crtbeginS.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crtbeginS.c,v 1.1 2001/05/28 21:38:13 drahn Exp $ */ +/* $OpenBSD: crtbeginS.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtbegin.c,v 1.1 1996/09/12 16:59:03 cgd Exp $ */ /* @@ -42,13 +42,13 @@ */ #include <stdlib.h> -static void (*__CTOR_LIST__[0]) __P((void)) +static void (*__CTOR_LIST__[0])(void) __attribute__((section(".ctors"))) = { (void *)-1 }; /* XXX */ -static void (*__DTOR_LIST__[0]) __P((void)) +static void (*__DTOR_LIST__[0])(void) __attribute__((section(".dtors"))) = { (void *)-1 }; /* XXX */ -static void __dtors __P((void)); -static void __ctors __P((void)); +static void __dtors(void); +static void __ctors(void); void __dtors() diff --git a/lib/csu/common_elf/crtend.c b/lib/csu/common_elf/crtend.c index a44627276a2..e81d17481f2 100644 --- a/lib/csu/common_elf/crtend.c +++ b/lib/csu/common_elf/crtend.c @@ -1,13 +1,13 @@ -/* $OpenBSD: crtend.c,v 1.1 2001/02/03 22:47:01 art Exp $ */ +/* $OpenBSD: crtend.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtend.c,v 1.1 1996/09/12 16:59:04 cgd Exp $ */ #ifndef ECOFF_COMPAT #include <sys/cdefs.h> -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)0 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)0 }; /* XXX */ #endif /* !ECOFF_COMPAT */ diff --git a/lib/csu/common_elf/crtendS.c b/lib/csu/common_elf/crtendS.c index 2b3dbb174a1..264189126e8 100644 --- a/lib/csu/common_elf/crtendS.c +++ b/lib/csu/common_elf/crtendS.c @@ -1,9 +1,9 @@ -/* $OpenBSD: crtendS.c,v 1.1 2001/05/28 21:38:13 drahn Exp $ */ +/* $OpenBSD: crtendS.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtend.c,v 1.1 1997/04/16 19:38:24 thorpej Exp $ */ #include <sys/cdefs.h> -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)0 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)0 }; /* XXX */ diff --git a/lib/csu/crtbegin.c b/lib/csu/crtbegin.c index b5be9e6f014..cb7da3b2a14 100644 --- a/lib/csu/crtbegin.c +++ b/lib/csu/crtbegin.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crtbegin.c,v 1.5 2001/02/03 23:11:23 art Exp $ */ +/* $OpenBSD: crtbegin.c,v 1.6 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtbegin.c,v 1.1 1996/09/12 16:59:03 cgd Exp $ */ /* @@ -43,13 +43,13 @@ #include "os-note-elf.h" -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)-1 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)-1 }; /* XXX */ -static void __dtors __P((void)); -static void __ctors __P((void)); +static void __dtors(void); +static void __ctors(void); static void __dtors() diff --git a/lib/csu/crtbeginS.c b/lib/csu/crtbeginS.c index 6945484f55c..74c21a888c9 100644 --- a/lib/csu/crtbeginS.c +++ b/lib/csu/crtbeginS.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crtbeginS.c,v 1.1 2001/05/28 21:38:13 drahn Exp $ */ +/* $OpenBSD: crtbeginS.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtbegin.c,v 1.1 1996/09/12 16:59:03 cgd Exp $ */ /* @@ -42,13 +42,13 @@ */ #include <stdlib.h> -static void (*__CTOR_LIST__[0]) __P((void)) +static void (*__CTOR_LIST__[0])(void) __attribute__((section(".ctors"))) = { (void *)-1 }; /* XXX */ -static void (*__DTOR_LIST__[0]) __P((void)) +static void (*__DTOR_LIST__[0])(void) __attribute__((section(".dtors"))) = { (void *)-1 }; /* XXX */ -static void __dtors __P((void)); -static void __ctors __P((void)); +static void __dtors(void); +static void __ctors(void); void __dtors() diff --git a/lib/csu/crtend.c b/lib/csu/crtend.c index a44627276a2..e81d17481f2 100644 --- a/lib/csu/crtend.c +++ b/lib/csu/crtend.c @@ -1,13 +1,13 @@ -/* $OpenBSD: crtend.c,v 1.1 2001/02/03 22:47:01 art Exp $ */ +/* $OpenBSD: crtend.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtend.c,v 1.1 1996/09/12 16:59:04 cgd Exp $ */ #ifndef ECOFF_COMPAT #include <sys/cdefs.h> -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)0 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)0 }; /* XXX */ #endif /* !ECOFF_COMPAT */ diff --git a/lib/csu/crtendS.c b/lib/csu/crtendS.c index 2b3dbb174a1..264189126e8 100644 --- a/lib/csu/crtendS.c +++ b/lib/csu/crtendS.c @@ -1,9 +1,9 @@ -/* $OpenBSD: crtendS.c,v 1.1 2001/05/28 21:38:13 drahn Exp $ */ +/* $OpenBSD: crtendS.c,v 1.2 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crtend.c,v 1.1 1997/04/16 19:38:24 thorpej Exp $ */ #include <sys/cdefs.h> -static void (*__CTOR_LIST__[1]) __P((void)) +static void (*__CTOR_LIST__[1])(void) __attribute__((section(".ctors"))) = { (void *)0 }; /* XXX */ -static void (*__DTOR_LIST__[1]) __P((void)) +static void (*__DTOR_LIST__[1])(void) __attribute__((section(".dtors"))) = { (void *)0 }; /* XXX */ diff --git a/lib/csu/hppa/crt0.c b/lib/csu/hppa/crt0.c index 6df1e08e659..e578e3bdd0c 100644 --- a/lib/csu/hppa/crt0.c +++ b/lib/csu/hppa/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.2 2002/02/02 20:45:58 mickey Exp $ */ +/* $OpenBSD: crt0.c,v 1.3 2002/02/16 21:27:20 millert Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -35,7 +35,7 @@ int global __asm ("$global$") = 0; int sh_func_adrs __asm ("$$sh_func_adrs") = 0; #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$OpenBSD: crt0.c,v 1.2 2002/02/02 20:45:58 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: crt0.c,v 1.3 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> @@ -55,12 +55,12 @@ typedef char Obj_Entry; char **environ; -extern void __init __P((void)); -extern void __fini __P((void)); +extern void __init(void); +extern void __fini(void); #ifdef MCRT0 -extern void monstartup __P((u_long, u_long)); -extern void _mcleanup __P((void)); +extern void monstartup(u_long, u_long); +extern void _mcleanup(void); extern u_int etext, eprol; #endif /* MCRT0 */ @@ -69,7 +69,7 @@ void __start(char **, void (*)(void), const Obj_Entry *); void __start(sp, cleanup, obj) char **sp; - void (*cleanup) __P((void)); /* from shared loader */ + void (*cleanup)(void); /* from shared loader */ const Obj_Entry *obj; /* from shared loader */ { struct ps_strings *arginfo = (struct ps_strings *)sp; diff --git a/lib/csu/i386/crt0.c b/lib/csu/i386/crt0.c index 3d17d1c3c03..bfbef1874a1 100644 --- a/lib/csu/i386/crt0.c +++ b/lib/csu/i386/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.5 2001/08/12 12:03:01 heko Exp $ */ +/* $OpenBSD: crt0.c,v 1.6 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crt0.c,v 1.20 1995/06/03 13:16:08 pk Exp $ */ /* @@ -34,7 +34,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.5 2001/08/12 12:03:01 heko Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.6 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -42,7 +42,7 @@ static char rcsid[] = "$OpenBSD: crt0.c,v 1.5 2001/08/12 12:03:01 heko Exp $"; #include "common.h" -extern void start __P((void)) asm("start"); +extern void start(void) asm("start"); void start() diff --git a/lib/csu/m68k/crt0.c b/lib/csu/m68k/crt0.c index dc590f76057..06ab3cdcb54 100644 --- a/lib/csu/m68k/crt0.c +++ b/lib/csu/m68k/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $ */ +/* $OpenBSD: crt0.c,v 1.5 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crt0.c,v 1.14 1995/06/03 13:16:11 pk Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.5 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -41,7 +41,7 @@ static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $"; #include "common.h" -extern void start __P((void)) asm("start"); +extern void start(void) asm("start"); void start() diff --git a/lib/csu/sparc/crt0.c b/lib/csu/sparc/crt0.c index 7e5d5e030ca..4a4717f64f5 100644 --- a/lib/csu/sparc/crt0.c +++ b/lib/csu/sparc/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $ */ +/* $OpenBSD: crt0.c,v 1.4 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crt0.c,v 1.15 1995/06/15 21:41:55 pk Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -43,10 +43,10 @@ static char rcsid[] = "$OpenBSD: crt0.c,v 1.3 1999/08/20 14:11:36 niklas Exp $"; extern unsigned char etext; extern unsigned char eprol asm ("eprol"); -extern void start __P((void)) asm("start"); +extern void start(void) asm("start"); #if defined(sun) && defined(sparc) -static void __call __P((void)); +static void __call(void); #endif #ifdef BSD @@ -54,7 +54,7 @@ static void __call __P((void)); #define mmap(addr, len, prot, flags, fd, off) \ __syscall2((quad_t)SYS_mmap, (addr), (len), (prot), (flags), \ (fd), 0, (off_t)(off)) -extern int __syscall2 __P((quad_t, ...)); +extern int __syscall2(quad_t, ...); #endif asm (" .global start"); diff --git a/lib/csu/sparc64/crt0.c b/lib/csu/sparc64/crt0.c index db48fc43630..bc0b88d99fa 100644 --- a/lib/csu/sparc64/crt0.c +++ b/lib/csu/sparc64/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.2 2001/09/02 14:00:39 art Exp $ */ +/* $OpenBSD: crt0.c,v 1.3 2002/02/16 21:27:20 millert Exp $ */ /* * Copyright (c) 1995 Christopher G. Demetriou @@ -33,14 +33,14 @@ #include <stdlib.h> -static char *_strrchr __P((char *, char)); +static char *_strrchr(char *, char); char **environ; char *__progname = ""; #ifdef MCRT0 -extern void monstartup __P((u_long, u_long)); -extern void _mcleanup __P((void)); +extern void monstartup(u_long, u_long); +extern void _mcleanup(void); extern unsigned char _etext, _eprol; #endif /* MCRT0 */ @@ -59,7 +59,7 @@ __start: "); -void ___start __P((char **, void (*) __P((void)), const void *)); +void ___start __P((char **, void (*)(void), const void *)); void ___start(char **sp, void (*cleanup)(void), const void *obj) diff --git a/lib/csu/vax/crt0.c b/lib/csu/vax/crt0.c index e2ea4200ba1..b42b65417ac 100644 --- a/lib/csu/vax/crt0.c +++ b/lib/csu/vax/crt0.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $ */ +/* $OpenBSD: crt0.c,v 1.5 2002/02/16 21:27:20 millert Exp $ */ /* $NetBSD: crt0.c,v 1.1.2.1 1995/10/15 19:40:04 ragge Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -33,7 +33,7 @@ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $"; +static char rcsid[] = "$OpenBSD: crt0.c,v 1.5 2002/02/16 21:27:20 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -41,7 +41,7 @@ static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $"; #include "common.h" -extern void start __P((void)) asm("start"); +extern void start(void) asm("start"); void start() diff --git a/lib/libc/arch/m88k/gen/modf.c b/lib/libc/arch/m88k/gen/modf.c index 08eaff90473..f896fe392ed 100644 --- a/lib/libc/arch/m88k/gen/modf.c +++ b/lib/libc/arch/m88k/gen/modf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.c,v 1.2 2000/03/01 17:31:20 todd Exp $ */ +/* $OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $ */ /* @(#)s_modf.c 5.1 93/09/24 */ /* * ==================================================== @@ -12,7 +12,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: modf.c,v 1.2 2000/03/01 17:31:20 todd Exp $"; +static char rcsid[] = "$OpenBSD: modf.c,v 1.3 2002/02/16 21:27:21 millert Exp $"; #endif /* @@ -181,76 +181,76 @@ do { \ } while (0) /* ieee style elementary functions */ -extern double __ieee754_sqrt __P((double)); -extern double __ieee754_acos __P((double)); -extern double __ieee754_acosh __P((double)); -extern double __ieee754_log __P((double)); -extern double __ieee754_atanh __P((double)); -extern double __ieee754_asin __P((double)); -extern double __ieee754_atan2 __P((double,double)); -extern double __ieee754_exp __P((double)); -extern double __ieee754_cosh __P((double)); -extern double __ieee754_fmod __P((double,double)); -extern double __ieee754_pow __P((double,double)); -extern double __ieee754_lgamma_r __P((double,int *)); -extern double __ieee754_gamma_r __P((double,int *)); -extern double __ieee754_lgamma __P((double)); -extern double __ieee754_gamma __P((double)); -extern double __ieee754_log10 __P((double)); -extern double __ieee754_sinh __P((double)); -extern double __ieee754_hypot __P((double,double)); -extern double __ieee754_j0 __P((double)); -extern double __ieee754_j1 __P((double)); -extern double __ieee754_y0 __P((double)); -extern double __ieee754_y1 __P((double)); -extern double __ieee754_jn __P((int,double)); -extern double __ieee754_yn __P((int,double)); -extern double __ieee754_remainder __P((double,double)); -extern int __ieee754_rem_pio2 __P((double,double*)); -extern double __ieee754_scalb __P((double,double)); +extern double __ieee754_sqrt(double); +extern double __ieee754_acos(double); +extern double __ieee754_acosh(double); +extern double __ieee754_log(double); +extern double __ieee754_atanh(double); +extern double __ieee754_asin(double); +extern double __ieee754_atan2(double,double); +extern double __ieee754_exp(double); +extern double __ieee754_cosh(double); +extern double __ieee754_fmod(double,double); +extern double __ieee754_pow(double,double); +extern double __ieee754_lgamma_r(double,int *); +extern double __ieee754_gamma_r(double,int *); +extern double __ieee754_lgamma(double); +extern double __ieee754_gamma(double); +extern double __ieee754_log10(double); +extern double __ieee754_sinh(double); +extern double __ieee754_hypot(double,double); +extern double __ieee754_j0(double); +extern double __ieee754_j1(double); +extern double __ieee754_y0(double); +extern double __ieee754_y1(double); +extern double __ieee754_jn(int,double); +extern double __ieee754_yn(int,double); +extern double __ieee754_remainder(double,double); +extern int __ieee754_rem_pio2(double,double*); +extern double __ieee754_scalb(double,double); /* fdlibm kernel function */ -extern double __kernel_standard __P((double,double,int)); -extern double __kernel_sin __P((double,double,int)); -extern double __kernel_cos __P((double,double)); -extern double __kernel_tan __P((double,double,int)); -extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*)); +extern double __kernel_standard(double,double,int); +extern double __kernel_sin(double,double,int); +extern double __kernel_cos(double,double); +extern double __kernel_tan(double,double,int); +extern int __kernel_rem_pio2(double*,double*,int,int,int,const int*); /* ieee style elementary float functions */ -extern float __ieee754_sqrtf __P((float)); -extern float __ieee754_acosf __P((float)); -extern float __ieee754_acoshf __P((float)); -extern float __ieee754_logf __P((float)); -extern float __ieee754_atanhf __P((float)); -extern float __ieee754_asinf __P((float)); -extern float __ieee754_atan2f __P((float,float)); -extern float __ieee754_expf __P((float)); -extern float __ieee754_coshf __P((float)); -extern float __ieee754_fmodf __P((float,float)); -extern float __ieee754_powf __P((float,float)); -extern float __ieee754_lgammaf_r __P((float,int *)); -extern float __ieee754_gammaf_r __P((float,int *)); -extern float __ieee754_lgammaf __P((float)); -extern float __ieee754_gammaf __P((float)); -extern float __ieee754_log10f __P((float)); -extern float __ieee754_sinhf __P((float)); -extern float __ieee754_hypotf __P((float,float)); -extern float __ieee754_j0f __P((float)); -extern float __ieee754_j1f __P((float)); -extern float __ieee754_y0f __P((float)); -extern float __ieee754_y1f __P((float)); -extern float __ieee754_jnf __P((int,float)); -extern float __ieee754_ynf __P((int,float)); -extern float __ieee754_remainderf __P((float,float)); -extern int __ieee754_rem_pio2f __P((float,float*)); -extern float __ieee754_scalbf __P((float,float)); +extern float __ieee754_sqrtf(float); +extern float __ieee754_acosf(float); +extern float __ieee754_acoshf(float); +extern float __ieee754_logf(float); +extern float __ieee754_atanhf(float); +extern float __ieee754_asinf(float); +extern float __ieee754_atan2f(float,float); +extern float __ieee754_expf(float); +extern float __ieee754_coshf(float); +extern float __ieee754_fmodf(float,float); +extern float __ieee754_powf(float,float); +extern float __ieee754_lgammaf_r(float,int *); +extern float __ieee754_gammaf_r(float,int *); +extern float __ieee754_lgammaf(float); +extern float __ieee754_gammaf(float); +extern float __ieee754_log10f(float); +extern float __ieee754_sinhf(float); +extern float __ieee754_hypotf(float,float); +extern float __ieee754_j0f(float); +extern float __ieee754_j1f(float); +extern float __ieee754_y0f(float); +extern float __ieee754_y1f(float); +extern float __ieee754_jnf(int,float); +extern float __ieee754_ynf(int,float); +extern float __ieee754_remainderf(float,float); +extern int __ieee754_rem_pio2f(float,float*); +extern float __ieee754_scalbf(float,float); /* float versions of fdlibm kernel functions */ -extern float __kernel_sinf __P((float,float,int)); -extern float __kernel_cosf __P((float,float)); -extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*)); +extern float __kernel_sinf(float,float,int); +extern float __kernel_cosf(float,float); +extern float __kernel_tanf(float,float,int); +extern int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #endif /* _MATH_PRIVATE_H_ */ #ifdef __STDC__ diff --git a/lib/libc/arch/powerpc/gen/modf.c b/lib/libc/arch/powerpc/gen/modf.c index 9e9765e7253..73cf1bc85b8 100644 --- a/lib/libc/arch/powerpc/gen/modf.c +++ b/lib/libc/arch/powerpc/gen/modf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modf.c,v 1.4 2000/03/01 17:31:23 todd Exp $ */ +/* $OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $ */ /* @(#)s_modf.c 5.1 93/09/24 */ /* * ==================================================== @@ -12,7 +12,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: modf.c,v 1.4 2000/03/01 17:31:23 todd Exp $"; +static char rcsid[] = "$OpenBSD: modf.c,v 1.5 2002/02/16 21:27:21 millert Exp $"; #endif /* @@ -181,76 +181,76 @@ do { \ } while (0) /* ieee style elementary functions */ -extern double __ieee754_sqrt __P((double)); -extern double __ieee754_acos __P((double)); -extern double __ieee754_acosh __P((double)); -extern double __ieee754_log __P((double)); -extern double __ieee754_atanh __P((double)); -extern double __ieee754_asin __P((double)); -extern double __ieee754_atan2 __P((double,double)); -extern double __ieee754_exp __P((double)); -extern double __ieee754_cosh __P((double)); -extern double __ieee754_fmod __P((double,double)); -extern double __ieee754_pow __P((double,double)); -extern double __ieee754_lgamma_r __P((double,int *)); -extern double __ieee754_gamma_r __P((double,int *)); -extern double __ieee754_lgamma __P((double)); -extern double __ieee754_gamma __P((double)); -extern double __ieee754_log10 __P((double)); -extern double __ieee754_sinh __P((double)); -extern double __ieee754_hypot __P((double,double)); -extern double __ieee754_j0 __P((double)); -extern double __ieee754_j1 __P((double)); -extern double __ieee754_y0 __P((double)); -extern double __ieee754_y1 __P((double)); -extern double __ieee754_jn __P((int,double)); -extern double __ieee754_yn __P((int,double)); -extern double __ieee754_remainder __P((double,double)); -extern int __ieee754_rem_pio2 __P((double,double*)); -extern double __ieee754_scalb __P((double,double)); +extern double __ieee754_sqrt(double); +extern double __ieee754_acos(double); +extern double __ieee754_acosh(double); +extern double __ieee754_log(double); +extern double __ieee754_atanh(double); +extern double __ieee754_asin(double); +extern double __ieee754_atan2(double,double); +extern double __ieee754_exp(double); +extern double __ieee754_cosh(double); +extern double __ieee754_fmod(double,double); +extern double __ieee754_pow(double,double); +extern double __ieee754_lgamma_r(double,int *); +extern double __ieee754_gamma_r(double,int *); +extern double __ieee754_lgamma(double); +extern double __ieee754_gamma(double); +extern double __ieee754_log10(double); +extern double __ieee754_sinh(double); +extern double __ieee754_hypot(double,double); +extern double __ieee754_j0(double); +extern double __ieee754_j1(double); +extern double __ieee754_y0(double); +extern double __ieee754_y1(double); +extern double __ieee754_jn(int,double); +extern double __ieee754_yn(int,double); +extern double __ieee754_remainder(double,double); +extern int __ieee754_rem_pio2(double,double*); +extern double __ieee754_scalb(double,double); /* fdlibm kernel function */ -extern double __kernel_standard __P((double,double,int)); -extern double __kernel_sin __P((double,double,int)); -extern double __kernel_cos __P((double,double)); -extern double __kernel_tan __P((double,double,int)); -extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*)); +extern double __kernel_standard(double,double,int); +extern double __kernel_sin(double,double,int); +extern double __kernel_cos(double,double); +extern double __kernel_tan(double,double,int); +extern int __kernel_rem_pio2(double*,double*,int,int,int,const int*); /* ieee style elementary float functions */ -extern float __ieee754_sqrtf __P((float)); -extern float __ieee754_acosf __P((float)); -extern float __ieee754_acoshf __P((float)); -extern float __ieee754_logf __P((float)); -extern float __ieee754_atanhf __P((float)); -extern float __ieee754_asinf __P((float)); -extern float __ieee754_atan2f __P((float,float)); -extern float __ieee754_expf __P((float)); -extern float __ieee754_coshf __P((float)); -extern float __ieee754_fmodf __P((float,float)); -extern float __ieee754_powf __P((float,float)); -extern float __ieee754_lgammaf_r __P((float,int *)); -extern float __ieee754_gammaf_r __P((float,int *)); -extern float __ieee754_lgammaf __P((float)); -extern float __ieee754_gammaf __P((float)); -extern float __ieee754_log10f __P((float)); -extern float __ieee754_sinhf __P((float)); -extern float __ieee754_hypotf __P((float,float)); -extern float __ieee754_j0f __P((float)); -extern float __ieee754_j1f __P((float)); -extern float __ieee754_y0f __P((float)); -extern float __ieee754_y1f __P((float)); -extern float __ieee754_jnf __P((int,float)); -extern float __ieee754_ynf __P((int,float)); -extern float __ieee754_remainderf __P((float,float)); -extern int __ieee754_rem_pio2f __P((float,float*)); -extern float __ieee754_scalbf __P((float,float)); +extern float __ieee754_sqrtf(float); +extern float __ieee754_acosf(float); +extern float __ieee754_acoshf(float); +extern float __ieee754_logf(float); +extern float __ieee754_atanhf(float); +extern float __ieee754_asinf(float); +extern float __ieee754_atan2f(float,float); +extern float __ieee754_expf(float); +extern float __ieee754_coshf(float); +extern float __ieee754_fmodf(float,float); +extern float __ieee754_powf(float,float); +extern float __ieee754_lgammaf_r(float,int *); +extern float __ieee754_gammaf_r(float,int *); +extern float __ieee754_lgammaf(float); +extern float __ieee754_gammaf(float); +extern float __ieee754_log10f(float); +extern float __ieee754_sinhf(float); +extern float __ieee754_hypotf(float,float); +extern float __ieee754_j0f(float); +extern float __ieee754_j1f(float); +extern float __ieee754_y0f(float); +extern float __ieee754_y1f(float); +extern float __ieee754_jnf(int,float); +extern float __ieee754_ynf(int,float); +extern float __ieee754_remainderf(float,float); +extern int __ieee754_rem_pio2f(float,float*); +extern float __ieee754_scalbf(float,float); /* float versions of fdlibm kernel functions */ -extern float __kernel_sinf __P((float,float,int)); -extern float __kernel_cosf __P((float,float)); -extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*)); +extern float __kernel_sinf(float,float,int); +extern float __kernel_cosf(float,float); +extern float __kernel_tanf(float,float,int); +extern int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #endif /* _MATH_PRIVATE_H_ */ #ifdef __STDC__ diff --git a/lib/libc/compat-43/setregid.c b/lib/libc/compat-43/setregid.c index 66ffe347b1d..ee25b1ac0b3 100644 --- a/lib/libc/compat-43/setregid.c +++ b/lib/libc/compat-43/setregid.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setregid.c,v 1.3 1997/01/19 22:32:14 graichen Exp $"; +static char *rcsid = "$OpenBSD: setregid.c,v 1.4 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <unistd.h> -extern int __setregid __P((gid_t, gid_t)); +extern int __setregid(gid_t, gid_t); #ifndef NO_WARN_REFERENCES __warn_references(setregid, "warning: this program uses setregid(), which is deprecated."); diff --git a/lib/libc/compat-43/setreuid.c b/lib/libc/compat-43/setreuid.c index 5cd28bb6406..7b48b2b0d15 100644 --- a/lib/libc/compat-43/setreuid.c +++ b/lib/libc/compat-43/setreuid.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setreuid.c,v 1.4 1997/01/20 07:46:51 graichen Exp $"; +static char *rcsid = "$OpenBSD: setreuid.c,v 1.5 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <unistd.h> -extern int __setreuid __P((uid_t, uid_t)); +extern int __setreuid(uid_t, uid_t); __warn_references(setreuid, "warning: this program uses setreuid(), which is deprecated."); diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c index 0cd59fd4be5..20540d0affa 100644 --- a/lib/libc/compat-43/setrgid.c +++ b/lib/libc/compat-43/setrgid.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setrgid.c,v 1.6 1997/01/20 07:46:52 graichen Exp $"; +static char *rcsid = "$OpenBSD: setrgid.c,v 1.7 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -40,7 +40,7 @@ static char *rcsid = "$OpenBSD: setrgid.c,v 1.6 1997/01/20 07:46:52 graichen Exp __warn_references(setrgid, "warning: this program uses setrgid(), which is deprecated."); -extern int __setregid __P((gid_t, gid_t)); +extern int __setregid(gid_t, gid_t); int #ifdef __STDC__ diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c index 615e03ef8a7..b4b85cf7267 100644 --- a/lib/libc/compat-43/setruid.c +++ b/lib/libc/compat-43/setruid.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: setruid.c,v 1.6 1997/01/20 07:46:52 graichen Exp $"; +static char *rcsid = "$OpenBSD: setruid.c,v 1.7 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -40,7 +40,7 @@ static char *rcsid = "$OpenBSD: setruid.c,v 1.6 1997/01/20 07:46:52 graichen Exp __warn_references(setruid, "warning: this program uses setruid(), which is deprecated."); -extern int __setreuid __P((uid_t, uid_t)); +extern int __setreuid(uid_t, uid_t); int #ifdef __STDC__ diff --git a/lib/libc/crypt/bcrypt.c b/lib/libc/crypt/bcrypt.c index be049baa74c..f3ea849f006 100644 --- a/lib/libc/crypt/bcrypt.c +++ b/lib/libc/crypt/bcrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcrypt.c,v 1.14 2001/01/04 21:45:30 todd Exp $ */ +/* $OpenBSD: bcrypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -66,11 +66,11 @@ #define BCRYPT_BLOCKS 6 /* Ciphertext blocks */ #define BCRYPT_MINROUNDS 16 /* we have log2(rounds) in salt */ -char *bcrypt_gensalt __P((u_int8_t)); +char *bcrypt_gensalt(u_int8_t); -static void encode_salt __P((char *, u_int8_t *, u_int16_t, u_int8_t)); -static void encode_base64 __P((u_int8_t *, u_int8_t *, u_int16_t)); -static void decode_base64 __P((u_int8_t *, u_int16_t, u_int8_t *)); +static void encode_salt(char *, u_int8_t *, u_int16_t, u_int8_t); +static void encode_base64(u_int8_t *, u_int8_t *, u_int16_t); +static void decode_base64(u_int8_t *, u_int16_t, u_int8_t *); static char encrypted[_PASSWORD_LEN]; static char gsalt[BCRYPT_MAXSALT * 4 / 3 + 1]; diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c index d1a342c1787..6a0b6243fe6 100644 --- a/lib/libc/crypt/crypt.c +++ b/lib/libc/crypt/crypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $ */ +/* $OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $ */ /* * FreeSec: libcrypt @@ -52,7 +52,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crypt.c,v 1.14 2001/06/27 00:58:53 lebel Exp $"; +static char rcsid[] = "$OpenBSD: crypt.c,v 1.15 2002/02/16 21:27:21 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -594,8 +594,8 @@ crypt(key, setting) u_int32_t count, salt, l, r0, r1, keybuf[2]; u_char *p, *q; static u_char output[21]; - extern char *md5crypt __P((const char *, const char *)); - extern char *bcrypt __P((const char *, const char *)); + extern char *md5crypt(const char *, const char *); + extern char *bcrypt(const char *, const char *); if (setting[0] == '$') { switch (setting[1]) { diff --git a/lib/libc/crypt/md5crypt.c b/lib/libc/crypt/md5crypt.c index 7ec60f38e0c..56ab66fbb59 100644 --- a/lib/libc/crypt/md5crypt.c +++ b/lib/libc/crypt/md5crypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $ */ +/* $OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $ */ /* * ---------------------------------------------------------------------------- @@ -13,7 +13,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.10 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <unistd.h> @@ -25,7 +25,7 @@ static char rcsid[] = "$OpenBSD: md5crypt.c,v 1.9 1997/07/23 20:58:27 kstailey E static unsigned char itoa64[] = /* 0 ... 63 => ascii - 64 */ "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -static void to64 __P((char *, u_int32_t, int)); +static void to64(char *, u_int32_t, int); static void to64(s, v, n) diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c index 492155b0efc..f56e235a9f5 100644 --- a/lib/libc/db/btree/bt_close.c +++ b/lib/libc/db/btree/bt_close.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Exp $ */ +/* $OpenBSD: bt_close.c,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_close.c 8.7 (Berkeley) 8/17/94"; #else -static char rcsid[] = "$OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_close.c,v 1.5 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -55,7 +55,7 @@ static char rcsid[] = "$OpenBSD: bt_close.c,v 1.4 1999/02/15 05:11:22 millert Ex #include <db.h> #include "btree.h" -static int bt_meta __P((BTREE *)); +static int bt_meta(BTREE *); /* * BT_CLOSE -- Close a btree. diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c index 7272a69278e..064495e224e 100644 --- a/lib/libc/db/btree/bt_conv.c +++ b/lib/libc/db/btree/bt_conv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp $ */ +/* $OpenBSD: bt_conv.c,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_conv.c 8.5 (Berkeley) 8/17/94"; #else -static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.5 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: bt_conv.c,v 1.4 1999/02/15 05:11:22 millert Exp #include <db.h> #include "btree.h" -static void mswap __P((PAGE *)); +static void mswap(PAGE *); /* * __BT_BPGIN, __BT_BPGOUT -- diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c index a000bdba5e0..1c70309bb50 100644 --- a/lib/libc/db/btree/bt_delete.c +++ b/lib/libc/db/btree/bt_delete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert Exp $ */ +/* $OpenBSD: bt_delete.c,v 1.6 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_delete.c 8.13 (Berkeley) 7/28/94"; #else -static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.6 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -53,11 +53,11 @@ static char rcsid[] = "$OpenBSD: bt_delete.c,v 1.5 1999/02/15 05:11:22 millert E #include <db.h> #include "btree.h" -static int __bt_bdelete __P((BTREE *, const DBT *)); -static int __bt_curdel __P((BTREE *, const DBT *, PAGE *, u_int)); -static int __bt_pdelete __P((BTREE *, PAGE *)); -static int __bt_relink __P((BTREE *, PAGE *)); -static int __bt_stkacq __P((BTREE *, PAGE **, CURSOR *)); +static int __bt_bdelete(BTREE *, const DBT *); +static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int); +static int __bt_pdelete(BTREE *, PAGE *); +static int __bt_relink(BTREE *, PAGE *); +static int __bt_stkacq(BTREE *, PAGE **, CURSOR *); /* * __bt_delete diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c index 1ab8d163e03..fd888c395f7 100644 --- a/lib/libc/db/btree/bt_open.c +++ b/lib/libc/db/btree/bt_open.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp $ */ +/* $OpenBSD: bt_open.c,v 1.8 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_open.c 8.11 (Berkeley) 11/2/95"; #else -static char rcsid[] = "$OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp $"; +static char rcsid[] = "$OpenBSD: bt_open.c,v 1.8 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -72,9 +72,9 @@ static char rcsid[] = "$OpenBSD: bt_open.c,v 1.7 2000/10/03 18:16:48 mickey Exp #define MINPSIZE 128 #endif -static int byteorder __P((void)); -static int nroot __P((BTREE *)); -static int tmp __P((void)); +static int byteorder(void); +static int nroot(BTREE *); +static int tmp(void); /* * __BT_OPEN -- Open a btree. diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c index 91535e1fa0d..59f6cef4cc5 100644 --- a/lib/libc/db/btree/bt_put.c +++ b/lib/libc/db/btree/bt_put.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: bt_put.c,v 1.7 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94"; #else -static char rcsid[] = "$OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_put.c,v 1.7 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: bt_put.c,v 1.6 1999/02/15 05:11:23 millert Exp #include <db.h> #include "btree.h" -static EPG *bt_fast __P((BTREE *, const DBT *, const DBT *, int *)); +static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *); /* * __BT_PUT -- Add a btree item to the tree. diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c index b1d6ee75294..d93b12080af 100644 --- a/lib/libc/db/btree/bt_search.c +++ b/lib/libc/db/btree/bt_search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: bt_search.c,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_search.c 8.8 (Berkeley) 7/31/94"; #else -static char rcsid[] = "$OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_search.c,v 1.5 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: bt_search.c,v 1.4 1999/02/15 05:11:23 millert E #include <db.h> #include "btree.h" -static int __bt_snext __P((BTREE *, PAGE *, const DBT *, int *)); -static int __bt_sprev __P((BTREE *, PAGE *, const DBT *, int *)); +static int __bt_snext(BTREE *, PAGE *, const DBT *, int *); +static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *); /* * __bt_search -- diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c index e26c8606cb4..b871df4e1fe 100644 --- a/lib/libc/db/btree/bt_seq.c +++ b/lib/libc/db/btree/bt_seq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $ */ +/* $OpenBSD: bt_seq.c,v 1.6 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)bt_seq.c 8.7 (Berkeley) 7/20/94"; #else -static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $"; +static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.6 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -54,9 +54,9 @@ static char rcsid[] = "$OpenBSD: bt_seq.c,v 1.5 2001/09/16 13:08:55 art Exp $"; #include <db.h> #include "btree.h" -static int __bt_first __P((BTREE *, const DBT *, EPG *, int *)); -static int __bt_seqadv __P((BTREE *, EPG *, int)); -static int __bt_seqset __P((BTREE *, EPG *, DBT *, int)); +static int __bt_first(BTREE *, const DBT *, EPG *, int *); +static int __bt_seqadv(BTREE *, EPG *, int); +static int __bt_seqset(BTREE *, EPG *, DBT *, int); /* * Sequential scan support. diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c index 727d04d335a..b0b0cb3aea0 100644 --- a/lib/libc/db/btree/bt_split.c +++ b/lib/libc/db/btree/bt_split.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bt_split.c,v 1.7 2002/02/01 18:10:39 millert Exp $ */ +/* $OpenBSD: bt_split.c,v 1.8 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -38,7 +38,7 @@ #if defined(LIBC_SCCS) && !defined(lint) #if 0 -static char rcsid[] = "$OpenBSD: bt_split.c,v 1.7 2002/02/01 18:10:39 millert Exp $"; +static char rcsid[] = "$OpenBSD: bt_split.c,v 1.8 2002/02/16 21:27:22 millert Exp $"; #else static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95"; #endif @@ -54,16 +54,16 @@ static char sccsid[] = "@(#)bt_split.c 8.10 (Berkeley) 1/9/95"; #include <db.h> #include "btree.h" -static int bt_broot __P((BTREE *, PAGE *, PAGE *, PAGE *)); +static int bt_broot(BTREE *, PAGE *, PAGE *, PAGE *); static PAGE *bt_page - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_preserve __P((BTREE *, pgno_t)); +(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_preserve(BTREE *, pgno_t); static PAGE *bt_psplit - __P((BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t)); +(BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t); static PAGE *bt_root - __P((BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t)); -static int bt_rroot __P((BTREE *, PAGE *, PAGE *, PAGE *)); -static recno_t rec_total __P((PAGE *)); +(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t); +static int bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *); +static recno_t rec_total(PAGE *); #ifdef STATISTICS u_long bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved; diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h index 5baeea5d9ea..6ee9f5b4352 100644 --- a/lib/libc/db/btree/btree.h +++ b/lib/libc/db/btree/btree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: btree.h,v 1.4 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: btree.h,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -337,11 +337,11 @@ typedef struct _btree { EPGNO bt_last; /* last insert */ /* B: key comparison function */ - int (*bt_cmp) __P((const DBT *, const DBT *)); + int (*bt_cmp)(const DBT *, const DBT *); /* B: prefix comparison function */ - size_t (*bt_pfx) __P((const DBT *, const DBT *)); + size_t (*bt_pfx)(const DBT *, const DBT *); /* R: recno input function */ - int (*bt_irec) __P((struct _btree *, recno_t)); + int (*bt_irec)(struct _btree *, recno_t); FILE *bt_rfp; /* R: record FILE pointer */ int bt_rfd; /* R: record file descriptor */ diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h index 2abb91dabc7..e985a9aa0ba 100644 --- a/lib/libc/db/btree/extern.h +++ b/lib/libc/db/btree/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -35,38 +35,38 @@ * @(#)extern.h 8.10 (Berkeley) 7/20/94 */ -int __bt_close __P((DB *)); -int __bt_cmp __P((BTREE *, const DBT *, EPG *)); -int __bt_crsrdel __P((BTREE *, EPGNO *)); -int __bt_defcmp __P((const DBT *, const DBT *)); -size_t __bt_defpfx __P((const DBT *, const DBT *)); -int __bt_delete __P((const DB *, const DBT *, u_int)); -int __bt_dleaf __P((BTREE *, const DBT *, PAGE *, u_int)); -int __bt_fd __P((const DB *)); -int __bt_free __P((BTREE *, PAGE *)); -int __bt_get __P((const DB *, const DBT *, DBT *, u_int)); -PAGE *__bt_new __P((BTREE *, pgno_t *)); -void __bt_pgin __P((void *, pgno_t, void *)); -void __bt_pgout __P((void *, pgno_t, void *)); -int __bt_push __P((BTREE *, pgno_t, int)); -int __bt_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __bt_ret __P((BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int)); -EPG *__bt_search __P((BTREE *, const DBT *, int *)); -int __bt_seq __P((const DB *, DBT *, DBT *, u_int)); -void __bt_setcur __P((BTREE *, pgno_t, u_int)); +int __bt_close(DB *); +int __bt_cmp(BTREE *, const DBT *, EPG *); +int __bt_crsrdel(BTREE *, EPGNO *); +int __bt_defcmp(const DBT *, const DBT *); +size_t __bt_defpfx(const DBT *, const DBT *); +int __bt_delete(const DB *, const DBT *, u_int); +int __bt_dleaf(BTREE *, const DBT *, PAGE *, u_int); +int __bt_fd(const DB *); +int __bt_free(BTREE *, PAGE *); +int __bt_get(const DB *, const DBT *, DBT *, u_int); +PAGE *__bt_new(BTREE *, pgno_t *); +void __bt_pgin(void *, pgno_t, void *); +void __bt_pgout(void *, pgno_t, void *); +int __bt_push(BTREE *, pgno_t, int); +int __bt_put(const DB *dbp, DBT *, const DBT *, u_int); +int __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int); +EPG *__bt_search(BTREE *, const DBT *, int *); +int __bt_seq(const DB *, DBT *, DBT *, u_int); +void __bt_setcur(BTREE *, pgno_t, u_int); int __bt_split __P((BTREE *, PAGE *, const DBT *, const DBT *, int, size_t, u_int32_t)); -int __bt_sync __P((const DB *, u_int)); +int __bt_sync(const DB *, u_int); -int __ovfl_delete __P((BTREE *, void *)); -int __ovfl_get __P((BTREE *, void *, size_t *, void **, size_t *)); -int __ovfl_put __P((BTREE *, const DBT *, pgno_t *)); +int __ovfl_delete(BTREE *, void *); +int __ovfl_get(BTREE *, void *, size_t *, void **, size_t *); +int __ovfl_put(BTREE *, const DBT *, pgno_t *); #ifdef DEBUG -void __bt_dnpage __P((DB *, pgno_t)); -void __bt_dpage __P((PAGE *)); -void __bt_dump __P((DB *)); +void __bt_dnpage(DB *, pgno_t); +void __bt_dpage(PAGE *); +void __bt_dump(DB *); #endif #ifdef STATISTICS -void __bt_stat __P((DB *)); +void __bt_stat(DB *); #endif diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h index eae7a00deb3..03ef3964fde 100644 --- a/lib/libc/db/hash/extern.h +++ b/lib/libc/db/hash/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1999/02/15 05:11:23 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -35,32 +35,32 @@ * @(#)extern.h 8.4 (Berkeley) 6/16/94 */ -BUFHEAD *__add_ovflpage __P((HTAB *, BUFHEAD *)); -int __addel __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_delete __P((HTAB *, BUFHEAD *)); -int __big_insert __P((HTAB *, BUFHEAD *, const DBT *, const DBT *)); -int __big_keydata __P((HTAB *, BUFHEAD *, DBT *, DBT *, int)); -int __big_return __P((HTAB *, BUFHEAD *, int, DBT *, int)); +BUFHEAD *__add_ovflpage(HTAB *, BUFHEAD *); +int __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_delete(HTAB *, BUFHEAD *); +int __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *); +int __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int); +int __big_return(HTAB *, BUFHEAD *, int, DBT *, int); int __big_split __P((HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, int, u_int32_t, SPLIT_RETURN *)); -int __buf_free __P((HTAB *, int, int)); -void __buf_init __P((HTAB *, int)); -u_int32_t __call_hash __P((HTAB *, char *, int)); -int __delpair __P((HTAB *, BUFHEAD *, int)); -int __expand_table __P((HTAB *)); -int __find_bigpair __P((HTAB *, BUFHEAD *, int, char *, int)); -u_int16_t __find_last_page __P((HTAB *, BUFHEAD **)); -void __free_ovflpage __P((HTAB *, BUFHEAD *)); -BUFHEAD *__get_buf __P((HTAB *, u_int32_t, BUFHEAD *, int)); -int __get_page __P((HTAB *, char *, u_int32_t, int, int, int)); -int __ibitmap __P((HTAB *, int, int, int)); -u_int32_t __log2 __P((u_int32_t)); -int __put_page __P((HTAB *, char *, u_int32_t, int, int)); -void __reclaim_buf __P((HTAB *, BUFHEAD *)); -int __split_page __P((HTAB *, u_int32_t, u_int32_t)); +int __buf_free(HTAB *, int, int); +void __buf_init(HTAB *, int); +u_int32_t __call_hash(HTAB *, char *, int); +int __delpair(HTAB *, BUFHEAD *, int); +int __expand_table(HTAB *); +int __find_bigpair(HTAB *, BUFHEAD *, int, char *, int); +u_int16_t __find_last_page(HTAB *, BUFHEAD **); +void __free_ovflpage(HTAB *, BUFHEAD *); +BUFHEAD *__get_buf(HTAB *, u_int32_t, BUFHEAD *, int); +int __get_page(HTAB *, char *, u_int32_t, int, int, int); +int __ibitmap(HTAB *, int, int, int); +u_int32_t __log2(u_int32_t); +int __put_page(HTAB *, char *, u_int32_t, int, int); +void __reclaim_buf(HTAB *, BUFHEAD *); +int __split_page(HTAB *, u_int32_t, u_int32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash) __P((const void *, size_t)); +extern u_int32_t (*__default_hash)(const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index 88c07a0fef4..4f0399bbf10 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $ */ +/* $OpenBSD: hash.c,v 1.12 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94"; #else -static char rcsid[] = "$OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash.c,v 1.12 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -62,23 +62,23 @@ static char rcsid[] = "$OpenBSD: hash.c,v 1.11 2002/01/31 03:51:21 millert Exp $ #include "page.h" #include "extern.h" -static int alloc_segs __P((HTAB *, int)); -static int flush_meta __P((HTAB *)); -static int hash_access __P((HTAB *, ACTION, DBT *, DBT *)); -static int hash_close __P((DB *)); -static int hash_delete __P((const DB *, const DBT *, u_int32_t)); -static int hash_fd __P((const DB *)); -static int hash_get __P((const DB *, const DBT *, DBT *, u_int32_t)); -static int hash_put __P((const DB *, DBT *, const DBT *, u_int32_t)); -static void *hash_realloc __P((SEGMENT **, int, int)); -static int hash_seq __P((const DB *, DBT *, DBT *, u_int32_t)); -static int hash_sync __P((const DB *, u_int32_t)); -static int hdestroy __P((HTAB *)); -static HTAB *init_hash __P((HTAB *, const char *, HASHINFO *)); -static int init_htab __P((HTAB *, int)); +static int alloc_segs(HTAB *, int); +static int flush_meta(HTAB *); +static int hash_access(HTAB *, ACTION, DBT *, DBT *); +static int hash_close(DB *); +static int hash_delete(const DB *, const DBT *, u_int32_t); +static int hash_fd(const DB *); +static int hash_get(const DB *, const DBT *, DBT *, u_int32_t); +static int hash_put(const DB *, DBT *, const DBT *, u_int32_t); +static void *hash_realloc(SEGMENT **, int, int); +static int hash_seq(const DB *, DBT *, DBT *, u_int32_t); +static int hash_sync(const DB *, u_int32_t); +static int hdestroy(HTAB *); +static HTAB *init_hash(HTAB *, const char *, HASHINFO *); +static int init_htab(HTAB *, int); #if BYTE_ORDER == LITTLE_ENDIAN -static void swap_header __P((HTAB *)); -static void swap_header_copy __P((HASHHDR *, HASHHDR *)); +static void swap_header(HTAB *); +static void swap_header_copy(HASHHDR *, HASHHDR *); #endif /* Fast arithmetic, relying on powers of 2, */ diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h index bd96da9e137..dfda2af4d99 100644 --- a/lib/libc/db/hash/hash.h +++ b/lib/libc/db/hash/hash.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.h,v 1.5 2001/01/04 21:45:30 todd Exp $ */ +/* $OpenBSD: hash.h,v 1.6 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -97,7 +97,7 @@ typedef struct htab { /* Memory resident data structure */ int exsegs; /* Number of extra allocated * segments */ u_int32_t /* Hash function */ - (*hash)__P((const void *, size_t)); + (*hash)(const void *, size_t); int flags; /* Flag values */ int fp; /* File pointer */ char *tmp_buf; /* Temporary Buffer for BIG data */ diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c index 6859d0dec55..c7cf9760e80 100644 --- a/lib/libc/db/hash/hash_bigkey.c +++ b/lib/libc/db/hash/hash_bigkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert Exp $ */ +/* $OpenBSD: hash_bigkey.c,v 1.9 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94"; #else -static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.9 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -78,8 +78,8 @@ static char rcsid[] = "$OpenBSD: hash_bigkey.c,v 1.8 2002/02/01 18:15:24 millert #include "page.h" #include "extern.h" -static int collect_key __P((HTAB *, BUFHEAD *, int, DBT *, int)); -static int collect_data __P((HTAB *, BUFHEAD *, int, int)); +static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int); +static int collect_data(HTAB *, BUFHEAD *, int, int); /* * Big_insert diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c index 45dfbaaca49..5e6fcbadb9e 100644 --- a/lib/libc/db/hash/hash_buf.c +++ b/lib/libc/db/hash/hash_buf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp $ */ +/* $OpenBSD: hash_buf.c,v 1.9 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94"; #else -static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp $"; +static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.9 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: hash_buf.c,v 1.8 2000/10/03 18:16:48 mickey Exp #include "page.h" #include "extern.h" -static BUFHEAD *newbuf __P((HTAB *, u_int32_t, BUFHEAD *)); +static BUFHEAD *newbuf(HTAB *, u_int32_t, BUFHEAD *); /* Unlink B from its place in the lru */ #define BUF_REMOVE(B) { \ diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c index b24fc5eb466..2b054569e86 100644 --- a/lib/libc/db/hash/hash_func.c +++ b/lib/libc/db/hash/hash_func.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert Exp $ */ +/* $OpenBSD: hash_func.c,v 1.6 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash_func.c 8.4 (Berkeley) 11/7/95"; #else -static char rcsid[] = "$OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash_func.c,v 1.6 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -52,14 +52,14 @@ static char rcsid[] = "$OpenBSD: hash_func.c,v 1.5 1999/02/15 05:11:24 millert E #include "extern.h" #ifdef notdef -static u_int32_t hash1 __P((const void *, size_t)); -static u_int32_t hash2 __P((const void *, size_t)); -static u_int32_t hash3 __P((const void *, size_t)); +static u_int32_t hash1(const void *, size_t); +static u_int32_t hash2(const void *, size_t); +static u_int32_t hash3(const void *, size_t); #endif -static u_int32_t hash4 __P((const void *, size_t)); +static u_int32_t hash4(const void *, size_t); /* Default hash function. */ -u_int32_t (*__default_hash) __P((const void *, size_t)) = hash4; +u_int32_t (*__default_hash)(const void *, size_t) = hash4; #ifdef notdef /* diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c index 7a01277657e..ebdd14651e0 100644 --- a/lib/libc/db/hash/hash_page.c +++ b/lib/libc/db/hash/hash_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert Exp $ */ +/* $OpenBSD: hash_page.c,v 1.11 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94"; #else -static char rcsid[] = "$OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert Exp $"; +static char rcsid[] = "$OpenBSD: hash_page.c,v 1.11 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -79,14 +79,14 @@ static char rcsid[] = "$OpenBSD: hash_page.c,v 1.10 2002/02/01 18:18:08 millert #include "page.h" #include "extern.h" -static u_int32_t *fetch_bitmap __P((HTAB *, int)); -static u_int32_t first_free __P((u_int32_t)); -static int open_temp __P((HTAB *)); -static u_int16_t overflow_page __P((HTAB *)); -static void putpair __P((char *, const DBT *, const DBT *)); -static void squeeze_key __P((u_int16_t *, const DBT *, const DBT *)); +static u_int32_t *fetch_bitmap(HTAB *, int); +static u_int32_t first_free(u_int32_t); +static int open_temp(HTAB *); +static u_int16_t overflow_page(HTAB *); +static void putpair(char *, const DBT *, const DBT *); +static void squeeze_key(u_int16_t *, const DBT *, const DBT *); static int ugly_split - __P((HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int)); +(HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int); #define PAGE_INIT(P) { \ ((u_int16_t *)(P))[0] = 0; \ diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c index 73e9274b440..e6f3dad6ac9 100644 --- a/lib/libc/db/hash/ndbm.c +++ b/lib/libc/db/hash/ndbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $ */ +/* $OpenBSD: ndbm.c,v 1.13 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)dbm.c 8.6 (Berkeley) 11/7/95"; #else -static char rcsid[] = "$OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $"; +static char rcsid[] = "$OpenBSD: ndbm.c,v 1.13 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -62,7 +62,7 @@ static char rcsid[] = "$OpenBSD: ndbm.c,v 1.12 2000/08/01 21:26:10 millert Exp $ */ static DBM *__cur_db; -static DBM *_dbm_open __P((const char *, const char *, int, int)); +static DBM *_dbm_open(const char *, const char *, int, int); /* * Returns: diff --git a/lib/libc/db/hash/search.h b/lib/libc/db/hash/search.h index 956094166b4..1f336685405 100644 --- a/lib/libc/db/hash/search.h +++ b/lib/libc/db/hash/search.h @@ -1,4 +1,4 @@ -/* $OpenBSD: search.h,v 1.4 1999/02/15 05:11:24 millert Exp $ */ +/* $OpenBSD: search.h,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -48,6 +48,6 @@ typedef enum { FIND, ENTER } ACTION; -int hcreate __P((unsigned int)); -void hdestroy __P((void)); -ENTRY *hsearch __P((ENTRY, ACTION)); +int hcreate(unsigned int); +void hdestroy(void); +ENTRY *hsearch(ENTRY, ACTION); diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 89cab031741..edcd9395e25 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $ */ +/* $OpenBSD: mpool.c,v 1.9 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)mpool.c 8.7 (Berkeley) 11/2/95"; #else -static char rcsid[] = "$OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: mpool.c,v 1.9 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -56,9 +56,9 @@ static char rcsid[] = "$OpenBSD: mpool.c,v 1.8 2002/02/01 18:13:33 millert Exp $ #define __MPOOLINTERFACE_PRIVATE #include <mpool.h> -static BKT *mpool_bkt __P((MPOOL *)); -static BKT *mpool_look __P((MPOOL *, pgno_t)); -static int mpool_write __P((MPOOL *, BKT *)); +static BKT *mpool_bkt(MPOOL *); +static BKT *mpool_look(MPOOL *, pgno_t); +static int mpool_write(MPOOL *, BKT *); /* * mpool_open -- @@ -108,8 +108,8 @@ mpool_open(key, fd, pagesize, maxcache) void mpool_filter(mp, pgin, pgout, pgcookie) MPOOL *mp; - void (*pgin) __P((void *, pgno_t, void *)); - void (*pgout) __P((void *, pgno_t, void *)); + void (*pgin)(void *, pgno_t, void *); + void (*pgout)(void *, pgno_t, void *); void *pgcookie; { mp->pgin = pgin; diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h index 8860878e2bd..0e50b7a5edb 100644 --- a/lib/libc/db/recno/extern.h +++ b/lib/libc/db/recno/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.4 1999/02/15 05:11:25 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -37,20 +37,20 @@ #include "../btree/extern.h" -int __rec_close __P((DB *)); -int __rec_delete __P((const DB *, const DBT *, u_int)); -int __rec_dleaf __P((BTREE *, PAGE *, u_int32_t)); -int __rec_fd __P((const DB *)); -int __rec_fmap __P((BTREE *, recno_t)); -int __rec_fout __P((BTREE *)); -int __rec_fpipe __P((BTREE *, recno_t)); -int __rec_get __P((const DB *, const DBT *, DBT *, u_int)); -int __rec_iput __P((BTREE *, recno_t, const DBT *, u_int)); -int __rec_put __P((const DB *dbp, DBT *, const DBT *, u_int)); -int __rec_ret __P((BTREE *, EPG *, recno_t, DBT *, DBT *)); -EPG *__rec_search __P((BTREE *, recno_t, enum SRCHOP)); -int __rec_seq __P((const DB *, DBT *, DBT *, u_int)); -int __rec_sync __P((const DB *, u_int)); -int __rec_vmap __P((BTREE *, recno_t)); -int __rec_vout __P((BTREE *)); -int __rec_vpipe __P((BTREE *, recno_t)); +int __rec_close(DB *); +int __rec_delete(const DB *, const DBT *, u_int); +int __rec_dleaf(BTREE *, PAGE *, u_int32_t); +int __rec_fd(const DB *); +int __rec_fmap(BTREE *, recno_t); +int __rec_fout(BTREE *); +int __rec_fpipe(BTREE *, recno_t); +int __rec_get(const DB *, const DBT *, DBT *, u_int); +int __rec_iput(BTREE *, recno_t, const DBT *, u_int); +int __rec_put(const DB *dbp, DBT *, const DBT *, u_int); +int __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *); +EPG *__rec_search(BTREE *, recno_t, enum SRCHOP); +int __rec_seq(const DB *, DBT *, DBT *, u_int); +int __rec_sync(const DB *, u_int); +int __rec_vmap(BTREE *, recno_t); +int __rec_vout(BTREE *); +int __rec_vpipe(BTREE *, recno_t); diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c index a331b5e427f..d20d433844b 100644 --- a/lib/libc/db/recno/rec_delete.c +++ b/lib/libc/db/recno/rec_delete.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert Exp $ */ +/* $OpenBSD: rec_delete.c,v 1.5 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)rec_delete.c 8.7 (Berkeley) 7/14/94"; #else -static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.5 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: rec_delete.c,v 1.4 1999/02/15 05:11:25 millert #include <db.h> #include "recno.h" -static int rec_rdelete __P((BTREE *, recno_t)); +static int rec_rdelete(BTREE *, recno_t); /* * __REC_DELETE -- Delete the item(s) referenced by a key. diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index 4ceabf90cf5..f6c8fce726c 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: disklabel.c,v 1.6 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: disklabel.c,v 1.5 2000/07/19 15:25:13 deraadt E #include <string.h> #include <unistd.h> -static int gettype __P((char *, char **)); +static int gettype(char *, char **); struct disklabel * getdiskbyname(name) diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c index 3424488af79..53bf7965a37 100644 --- a/lib/libc/gen/fnmatch.c +++ b/lib/libc/gen/fnmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $ */ +/* $OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp $"; +static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.8 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: fnmatch.c,v 1.7 2000/03/23 19:13:51 millert Exp #define RANGE_NOMATCH 0 #define RANGE_ERROR (-1) -static int rangematch __P((const char *, char, int, char **)); +static int rangematch(const char *, char, int, char **); int fnmatch(pattern, string, flags) diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c index 4ed7d62cfb5..431018414fb 100644 --- a/lib/libc/gen/fstab.c +++ b/lib/libc/gen/fstab.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $"; +static char rcsid[] = "$OpenBSD: fstab.c,v 1.10 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: fstab.c,v 1.9 2001/06/27 00:58:54 lebel Exp $"; static FILE *_fs_fp; static struct fstab _fs_fstab; -static void error __P((int)); -static int fstabscan __P((void)); +static void error(int); +static int fstabscan(void); static int fstabscan() diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index 60409450cfd..90828ba3b19 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $ */ +/* $OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #else -static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $"; +static char rcsid[] = "$OpenBSD: fts.c,v 1.30 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -52,16 +52,16 @@ static char rcsid[] = "$OpenBSD: fts.c,v 1.29 2001/08/27 21:42:06 millert Exp $" #include <string.h> #include <unistd.h> -static FTSENT *fts_alloc __P((FTS *, char *, size_t)); -static FTSENT *fts_build __P((FTS *, int)); -static void fts_lfree __P((FTSENT *)); -static void fts_load __P((FTS *, FTSENT *)); -static size_t fts_maxarglen __P((char * const *)); -static void fts_padjust __P((FTS *, FTSENT *)); -static int fts_palloc __P((FTS *, size_t)); -static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); -static u_short fts_stat __P((FTS *, FTSENT *, int)); -static int fts_safe_changedir __P((FTS *, FTSENT *, int, char *)); +static FTSENT *fts_alloc(FTS *, char *, size_t); +static FTSENT *fts_build(FTS *, int); +static void fts_lfree(FTSENT *); +static void fts_load(FTS *, FTSENT *); +static size_t fts_maxarglen(char * const *); +static void fts_padjust(FTS *, FTSENT *); +static int fts_palloc(FTS *, size_t); +static FTSENT *fts_sort(FTS *, FTSENT *, int); +static u_short fts_stat(FTS *, FTSENT *, int); +static int fts_safe_changedir(FTS *, FTSENT *, int, char *); #define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) @@ -80,7 +80,7 @@ FTS * fts_open(argv, options, compar) char * const *argv; int options; - int (*compar) __P((const FTSENT **, const FTSENT **)); + int (*compar)(const FTSENT **, const FTSENT **); { FTS *sp; FTSENT *p, *root; diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c index e4339cebe04..c7ad4b37f79 100644 --- a/lib/libc/gen/getcap.c +++ b/lib/libc/gen/getcap.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$OpenBSD: getcap.c,v 1.19 2001/09/22 18:36:40 millert Exp $"; +static const char rcsid[] = "$OpenBSD: getcap.c,v 1.20 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -64,9 +64,9 @@ static size_t topreclen; /* toprec length */ static char *toprec; /* Additional record specified by cgetset() */ static int gottoprec; /* Flag indicating retrieval of toprecord */ -static int cdbget __P((DB *, char **, const char *)); -static int getent __P((char **, u_int *, char **, int, const char *, int, char *)); -static int nfcmp __P((const char *, char *)); +static int cdbget(DB *, char **, const char *); +static int getent(char **, u_int *, char **, int, const char *, int, char *); +static int nfcmp(const char *, char *); static int usedb = 1; diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c index 0b2e1b3e8cc..28c5024b5e8 100644 --- a/lib/libc/gen/getgrent.c +++ b/lib/libc/gen/getgrent.c @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getgrent.c,v 1.14 2001/09/11 04:52:50 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: getgrent.c,v 1.15 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -67,9 +67,9 @@ _THREAD_PRIVATE_MUTEX(gr); static FILE *_gr_fp; static struct group _gr_group; static int _gr_stayopen; -static int grscan __P((int, gid_t, const char *, struct group *, struct group_storage *)); -static int start_gr __P((void)); -static void endgrent_basic __P((void)); +static int grscan(int, gid_t, const char *, struct group *, struct group_storage *); +static int start_gr(void); +static void endgrent_basic(void); static struct group *getgrnam_gs(const char *, struct group *, struct group_storage *); diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c index e8094863ec3..ae9e11bc0cf 100644 --- a/lib/libc/gen/getlogin.c +++ b/lib/libc/gen/getlogin.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getlogin.c,v 1.6 2002/01/23 21:02:41 fgsch Exp $"; +static char rcsid[] = "$OpenBSD: getlogin.c,v 1.7 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -48,8 +48,8 @@ _THREAD_PRIVATE_MUTEX(logname); static int logname_valid = 0; static char logname[MAXLOGNAME + 1]; -int _getlogin __P((char *, size_t)); -int _setlogin __P((const char *)); +int _getlogin(char *, size_t); +int _setlogin(const char *); char * getlogin() diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c index 8af519a8fc9..a4976fc0b05 100644 --- a/lib/libc/gen/getnetgrent.c +++ b/lib/libc/gen/getnetgrent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $ */ +/* $OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.10 2000/12/09 23:04:16 deraadt Exp $"; +static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.11 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -68,10 +68,10 @@ struct stringlist { size_t sl_cur; }; -static int getstring __P((char **, int, char **)); -static struct netgroup *getnetgroup __P((char **)); -static int lookup __P((const char *, char *, char **, int)); -static void addgroup __P((char *, struct stringlist *, char *)); +static int getstring(char **, int, char **); +static struct netgroup *getnetgroup(char **); +static int lookup(const char *, char *, char **, int); +static void addgroup(char *, struct stringlist *, char *); static int in_check __P((const char *, const char *, const char *, struct netgroup *)); static int in_find __P((char *, struct stringlist *, diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index baf37a57a86..aa071665213 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getpwent.c,v 1.22 2001/07/10 16:46:25 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getpwent.c,v 1.23 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -61,8 +61,8 @@ static DB *_pw_db; /* password database */ static int _pw_keynum; /* key counter */ static int _pw_stayopen; /* keep fd's open */ static int _pw_flags; /* password flags */ -static int __hashpw __P((DBT *)); -static int __initdb __P((void)); +static int __hashpw(DBT *); +static int __initdb(void); #ifdef YP enum _ypmode { YPMODE_NONE, YPMODE_FULL, YPMODE_USER, YPMODE_NETGRP }; @@ -76,13 +76,13 @@ static char __ypline[1024]; static long __yppbuf[1024 / sizeof(long)]; static int __yp_override_passwd = 0; -static int __has_yppw __P((void)); -static int __has_ypmaster __P((void)); +static int __has_yppw(void); +static int __has_ypmaster(void); -static int __ypexclude_add __P((const char *)); -static int __ypexclude_is __P((const char *)); -static void __ypexclude_free __P((void)); -static void __ypproto_set __P((void)); +static int __ypexclude_add(const char *); +static int __ypexclude_is(const char *); +static void __ypexclude_free(void); +static void __ypproto_set(void); /* macro for deciding which YP maps to use. */ #define PASSWD_BYNAME \ diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index 6638849d460..27a397d1cd9 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: getttyent.c,v 1.5 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <ttyent.h> @@ -43,8 +43,8 @@ static char rcsid[] = "$OpenBSD: getttyent.c,v 1.4 1997/07/09 00:28:22 millert E static char zapchar; static FILE *tf; -static char *skip __P((char *)); -static char *value __P((char *)); +static char *skip(char *); +static char *value(char *); struct ttyent * getttynam(tty) diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c index b3fe0ed0b57..d987a7da9a8 100644 --- a/lib/libc/gen/getusershell.c +++ b/lib/libc/gen/getusershell.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo Exp $"; +static char rcsid[] = "$OpenBSD: getusershell.c,v 1.3 2002/02/16 21:27:22 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: getusershell.c,v 1.2 1996/08/19 08:24:15 tholo static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; static char **curshell, **shells, *strings; -static char **initshells __P((void)); +static char **initshells(void); /* * Get a list of shells from _PATH_SHELLS, if it exists. diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c index 83d3754cda8..3048ee8318f 100644 --- a/lib/libc/gen/glob.c +++ b/lib/libc/gen/glob.c @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #else -static char rcsid[] = "$OpenBSD: glob.c,v 1.16 2001/04/05 18:36:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: glob.c,v 1.17 2002/02/16 21:27:22 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -130,32 +130,32 @@ typedef char Char; #define ismeta(c) (((c)&M_QUOTE) != 0) -static int compare __P((const void *, const void *)); -static int g_Ctoc __P((const Char *, char *, u_int)); -static int g_lstat __P((Char *, struct stat *, glob_t *)); -static DIR *g_opendir __P((Char *, glob_t *)); -static Char *g_strchr __P((Char *, int)); -static int g_stat __P((Char *, struct stat *, glob_t *)); -static int glob0 __P((const Char *, glob_t *)); -static int glob1 __P((Char *, Char *, glob_t *, size_t *)); +static int compare(const void *, const void *); +static int g_Ctoc(const Char *, char *, u_int); +static int g_lstat(Char *, struct stat *, glob_t *); +static DIR *g_opendir(Char *, glob_t *); +static Char *g_strchr(Char *, int); +static int g_stat(Char *, struct stat *, glob_t *); +static int glob0(const Char *, glob_t *); +static int glob1(Char *, Char *, glob_t *, size_t *); static int glob2 __P((Char *, Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *)); static int glob3 __P((Char *, Char *, Char *, Char *, Char *, Char *, Char *, Char *, glob_t *, size_t *)); -static int globextend __P((const Char *, glob_t *, size_t *)); +static int globextend(const Char *, glob_t *, size_t *); static const Char * - globtilde __P((const Char *, Char *, size_t, glob_t *)); -static int globexp1 __P((const Char *, glob_t *)); -static int globexp2 __P((const Char *, const Char *, glob_t *, int *)); -static int match __P((Char *, Char *, Char *)); + globtilde(const Char *, Char *, size_t, glob_t *); +static int globexp1(const Char *, glob_t *); +static int globexp2(const Char *, const Char *, glob_t *, int *); +static int match(Char *, Char *, Char *); #ifdef DEBUG -static void qprintf __P((const char *, Char *)); +static void qprintf(const char *, Char *); #endif int glob(pattern, flags, errfunc, pglob) const char *pattern; - int flags, (*errfunc) __P((const char *, int)); + int flags, (*errfunc)(const char *, int); glob_t *pglob; { const u_char *patnext; diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c index d4da2b573cc..4ac866e3102 100644 --- a/lib/libc/gen/login_cap.c +++ b/lib/libc/gen/login_cap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_cap.c,v 1.9 2002/01/29 08:08:57 mpech Exp $ */ +/* $OpenBSD: login_cap.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */ /*- * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved. @@ -53,10 +53,10 @@ static char *_authtypes[] = { LOGIN_DEFSTYLE, 0 }; -static int setuserpath __P((login_cap_t *, char *)); -static u_quad_t multiply __P((u_quad_t, u_quad_t)); -static u_quad_t strtolimit __P((char *, char **, int)); -static u_quad_t strtosize __P((char *, char **, int)); +static int setuserpath(login_cap_t *, char *); +static u_quad_t multiply(u_quad_t, u_quad_t); +static u_quad_t strtolimit(char *, char **, int); +static u_quad_t strtosize(char *, char **, int); login_cap_t * login_getclass(class) diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index bad454b25c6..f0d8b992ea2 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: nlist.c,v 1.40 2001/07/09 06:57:43 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: nlist.c,v 1.41 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -485,7 +485,7 @@ elf_done: static struct nlist_handlers { - int (*fn) __P((int fd, struct nlist *list)); + int (*fn)(int fd, struct nlist *list); } nlist_fn[] = { #ifdef _NLIST_DO_AOUT { __aout_fdnlist }, diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c index c248a4a3251..75a87161b48 100644 --- a/lib/libc/gen/psignal.c +++ b/lib/libc/gen/psignal.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: psignal.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: psignal.c,v 1.3 1999/09/16 19:06:00 deraadt Exp #include <unistd.h> #include <limits.h> -extern char *__strsignal __P((int , char *)); +extern char *__strsignal(int , char *); void psignal(sig, s) diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c index b863e719078..9f3d3d2e7d0 100644 --- a/lib/libc/gen/rewinddir.c +++ b/lib/libc/gen/rewinddir.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.3 1997/07/09 00:28:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: rewinddir.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <dirent.h> -void __seekdir __P((DIR *, long)); +void __seekdir(DIR *, long); void rewinddir(dirp) diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c index d4c2281a438..10ab99dd52c 100644 --- a/lib/libc/gen/scandir.c +++ b/lib/libc/gen/scandir.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: scandir.c,v 1.4 1998/08/14 21:39:32 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: scandir.c,v 1.5 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -63,8 +63,8 @@ int scandir(dirname, namelist, select, dcomp) const char *dirname; struct dirent ***namelist; - int (*select) __P((struct dirent *)); - int (*dcomp) __P((const void *, const void *)); + int (*select)(struct dirent *); + int (*dcomp)(const void *, const void *); { register struct dirent *d, *p, **names; register size_t nitems; diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c index a2049ee8a9d..cead0047897 100644 --- a/lib/libc/gen/seekdir.c +++ b/lib/libc/gen/seekdir.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: seekdir.c,v 1.3 1997/09/22 05:09:39 millert Exp $"; +static char rcsid[] = "$OpenBSD: seekdir.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <dirent.h> -void __seekdir __P((DIR *, long)); +void __seekdir(DIR *, long); /* * Seek to an entry in a directory. diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c index c33521496f7..228a046560d 100644 --- a/lib/libc/gen/setmode.c +++ b/lib/libc/gen/setmode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $ */ +/* $OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */ /* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: setmode.c,v 1.9 1998/11/18 23:28:34 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: setmode.c,v 1.10 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -73,10 +73,10 @@ typedef struct bitcmd { #define CMD2_OBITS 0x08 #define CMD2_UBITS 0x10 -static BITCMD *addcmd __P((BITCMD *, int, int, int, u_int)); -static void compress_mode __P((BITCMD *)); +static BITCMD *addcmd(BITCMD *, int, int, int, u_int); +static void compress_mode(BITCMD *); #ifdef SETMODE_DEBUG -static void dumpmode __P((BITCMD *)); +static void dumpmode(BITCMD *); #endif /* diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c index 02fbf85befa..fc59f586613 100644 --- a/lib/libc/gen/sysctl.c +++ b/lib/libc/gen/sysctl.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp $"; +static char rcsid[] = "$OpenBSD: sysctl.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -45,7 +45,7 @@ static char rcsid[] = "$OpenBSD: sysctl.c,v 1.3 1997/08/24 21:25:46 millert Exp #include <string.h> #include <unistd.h> -int __sysctl __P((int *, u_int, void *, size_t *, void *, size_t)); +int __sysctl(int *, u_int, void *, size_t *, void *, size_t); int sysctl(name, namelen, oldp, oldlenp, newp, newlen) diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c index 3ad279804fa..cb646e29785 100644 --- a/lib/libc/gen/syslog.c +++ b/lib/libc/gen/syslog.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: syslog.c,v 1.13 2001/10/31 14:24:11 fgsch Exp $"; +static char rcsid[] = "$OpenBSD: syslog.c,v 1.14 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -60,10 +60,10 @@ static struct syslog_data sdata = SYSLOG_DATA_INIT; extern char *__progname; /* Program name, from crt0. */ -static void disconnectlog __P((void)); /* disconnect from syslogd */ -static void connectlog __P((void)); /* (re)connect to syslogd */ -static void disconnectlog_r __P((struct syslog_data *)); -static void connectlog_r __P((struct syslog_data *)); +static void disconnectlog(void); /* disconnect from syslogd */ +static void connectlog(void); /* (re)connect to syslogd */ +static void disconnectlog_r(struct syslog_data *); +static void connectlog_r(struct syslog_data *); /* * syslog, vsyslog -- diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c index 0a1a9208585..5d0fb5759a4 100644 --- a/lib/libc/gen/ttyname.c +++ b/lib/libc/gen/ttyname.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $"; +static char rcsid[] = "$OpenBSD: ttyname.c,v 1.8 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -49,8 +49,8 @@ static char rcsid[] = "$OpenBSD: ttyname.c,v 1.7 2000/01/06 08:24:16 d Exp $"; #include "thread_private.h" static char buf[TTY_NAME_MAX]; -static int oldttyname __P((int, struct stat *, char *, size_t)); -static int __ttyname_r_basic __P((int, char *, size_t)); +static int oldttyname(int, struct stat *, char *, size_t); +static int __ttyname_r_basic(int, char *, size_t); int ttyname_r(int fd, char *buf, size_t buflen) diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c index 850d5caa82f..fa828c054fe 100644 --- a/lib/libc/gmon/gmon.c +++ b/lib/libc/gmon/gmon.c @@ -32,7 +32,7 @@ */ #if !defined(lint) && defined(LIBC_SCCS) -static char rcsid[] = "$OpenBSD: gmon.c,v 1.11 1998/07/15 18:59:04 millert Exp $"; +static char rcsid[] = "$OpenBSD: gmon.c,v 1.12 2002/02/16 21:27:23 millert Exp $"; #endif #include <sys/param.h> @@ -57,8 +57,8 @@ static int s_scale; #define ERR(s) write(STDERR_FILENO, s, sizeof(s)) -void moncontrol __P((int)); -static int hertz __P((void)); +void moncontrol(int); +static int hertz(void); void monstartup(lowpc, highpc) diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c index 88b6e516875..1b9193af017 100644 --- a/lib/libc/gmon/mcount.c +++ b/lib/libc/gmon/mcount.c @@ -32,7 +32,7 @@ */ #if !defined(lint) && !defined(_KERNEL) && defined(LIBC_SCCS) -static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp $"; +static char rcsid[] = "$OpenBSD: mcount.c,v 1.7 2002/02/16 21:27:23 millert Exp $"; #endif #include <sys/param.h> @@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: mcount.c,v 1.6 1997/07/23 21:11:27 kstailey Exp * both frompcindex and frompc. Any reasonable, modern compiler will * perform this optimization. */ -_MCOUNT_DECL __P((u_long frompc, u_long selfpc)); +_MCOUNT_DECL(u_long frompc, u_long selfpc); _MCOUNT_DECL(frompc, selfpc) /* _mcount; may be static, inline, etc */ register u_long frompc, selfpc; { diff --git a/lib/libc/include/thread_private.h b/lib/libc/include/thread_private.h index 723bed5f518..8cf06a86c41 100644 --- a/lib/libc/include/thread_private.h +++ b/lib/libc/include/thread_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: thread_private.h,v 1.10 2001/09/04 22:17:45 fgsch Exp $ */ +/* $OpenBSD: thread_private.h,v 1.11 2002/02/16 21:27:23 millert Exp $ */ #ifndef _THREAD_PRIVATE_H_ #define _THREAD_PRIVATE_H_ @@ -55,7 +55,7 @@ extern int __isthreaded; struct _thread_private_key_struct { pthread_once_t once; - void (*cleanfn)__P((void *)); + void (*cleanfn)(void *); pthread_key_t key; }; diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c index 42363d5c4e2..b26d4892f1a 100644 --- a/lib/libc/locale/setlocale.c +++ b/lib/libc/locale/setlocale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setlocale.c,v 1.7 2001/06/27 00:58:54 lebel Exp $ */ +/* $OpenBSD: setlocale.c,v 1.8 2002/02/16 21:27:23 millert Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -36,7 +36,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: setlocale.c,v 1.7 2001/06/27 00:58:54 lebel Exp $"; +static char rcsid[] = "$OpenBSD: setlocale.c,v 1.8 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/localedef.h> @@ -82,8 +82,8 @@ static char new_categories[_LC_LAST][32]; static char current_locale_string[_LC_LAST * 33]; static char *PathLocale; -static char *currentlocale __P((void)); -static char *loadlocale __P((int)); +static char *currentlocale(void); +static char *loadlocale(int); char * setlocale(category, locale) diff --git a/lib/libc/md/md4c.c b/lib/libc/md/md4c.c index 63131d8ed79..bcfe702b421 100644 --- a/lib/libc/md/md4c.c +++ b/lib/libc/md/md4c.c @@ -22,7 +22,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: md4c.c,v 1.12 2000/03/28 17:35:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: md4c.c,v 1.13 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <string.h> @@ -51,8 +51,8 @@ typedef unsigned char *POINTER; #define Encode memcpy #define Decode memcpy #else /* BIG_ENDIAN */ -static void Encode __P ((void *, const void *, size_t)); -static void Decode __P ((void *, const void *, size_t)); +static void Encode(void *, const void *, size_t); +static void Decode(void *, const void *, size_t); #endif /* LITTLE_ENDIAN */ static unsigned char PADDING[64] = { diff --git a/lib/libc/md/md5c.c b/lib/libc/md/md5c.c index d4c57966b38..a14c42d153c 100644 --- a/lib/libc/md/md5c.c +++ b/lib/libc/md/md5c.c @@ -23,7 +23,7 @@ documentation and/or software. */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: md5c.c,v 1.12 2000/03/28 17:35:09 millert Exp $"; +static char rcsid[] = "$OpenBSD: md5c.c,v 1.13 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <string.h> @@ -56,8 +56,8 @@ typedef unsigned char *POINTER; #define Encode memcpy #define Decode memcpy #else /* BIG_ENDIAN */ -static void Encode __P((void *, const void *, size_t)); -static void Decode __P((void *, const void *, size_t)); +static void Encode(void *, const void *, size_t); +static void Decode(void *, const void *, size_t); #endif /* LITTLE_ENDIAN */ static unsigned char PADDING[64] = { diff --git a/lib/libc/net/ethers.c b/lib/libc/net/ethers.c index 2c8328a9ba0..e7781438c1f 100644 --- a/lib/libc/net/ethers.c +++ b/lib/libc/net/ethers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $ */ +/* $OpenBSD: ethers.c,v 1.13 2002/02/16 21:27:23 millert Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $"; +static char rcsid[] = "$OpenBSD: ethers.c,v 1.13 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -57,7 +57,7 @@ static char rcsid[] = "$OpenBSD: ethers.c,v 1.12 2001/06/27 00:58:54 lebel Exp $ #define _PATH_ETHERS "/etc/ethers" #endif -static char * _ether_aton __P((char *, struct ether_addr *)); +static char * _ether_aton(char *, struct ether_addr *); char * ether_ntoa(e) diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c index 5b36626ceb0..72183d260ba 100644 --- a/lib/libc/net/getaddrinfo.c +++ b/lib/libc/net/getaddrinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getaddrinfo.c,v 1.31 2002/01/02 23:00:10 deraadt Exp $ */ +/* $OpenBSD: getaddrinfo.c,v 1.32 2002/02/16 21:27:23 millert Exp $ */ /* $KAME: getaddrinfo.c,v 1.31 2000/08/31 17:36:43 itojun Exp $ */ /* @@ -199,7 +199,7 @@ struct res_target { int n; /* result length */ }; -static int str_isnumber __P((const char *)); +static int str_isnumber(const char *); static int explore_fqdn __P((const struct addrinfo *, const char *, const char *, struct addrinfo **)); static int explore_null __P((const struct addrinfo *, @@ -212,32 +212,32 @@ static int get_canonname __P((const struct addrinfo *, struct addrinfo *, const char *)); static struct addrinfo *get_ai __P((const struct addrinfo *, const struct afd *, const char *)); -static int get_portmatch __P((const struct addrinfo *, const char *)); -static int get_port __P((struct addrinfo *, const char *, int)); -static const struct afd *find_afd __P((int)); +static int get_portmatch(const struct addrinfo *, const char *); +static int get_port(struct addrinfo *, const char *, int); +static const struct afd *find_afd(int); #if 0 -static int addrconfig __P((const struct addrinfo *)); +static int addrconfig(const struct addrinfo *); #endif #ifdef INET6 -static int ip6_str2scopeid __P((char *, struct sockaddr_in6 *)); +static int ip6_str2scopeid(char *, struct sockaddr_in6 *); #endif -static void _sethtent __P((void)); -static void _endhtent __P((void)); -static struct addrinfo * _gethtent __P((const char *, const struct addrinfo *)); +static void _sethtent(void); +static void _endhtent(void); +static struct addrinfo * _gethtent(const char *, const struct addrinfo *); static struct addrinfo *_files_getaddrinfo __P((const char *, const struct addrinfo *)); #ifdef YP -static struct addrinfo *_yphostent __P((char *, const struct addrinfo *)); +static struct addrinfo *_yphostent(char *, const struct addrinfo *); static struct addrinfo *_yp_getaddrinfo __P((const char *, const struct addrinfo *)); #endif static struct addrinfo *getanswer __P((const querybuf *, int, const char *, int, const struct addrinfo *)); -static int res_queryN __P((const char *, struct res_target *)); -static int res_searchN __P((const char *, struct res_target *)); +static int res_queryN(const char *, struct res_target *); +static int res_searchN(const char *, struct res_target *); static int res_querydomainN __P((const char *, const char *, struct res_target *)); static struct addrinfo *_dns_getaddrinfo __P((const char *, @@ -1037,7 +1037,7 @@ getanswer(answer, anslen, qname, qtype, pai) int type, class, buflen, ancount, qdcount; int haveanswer, had_error; char tbuf[MAXDNAME]; - int (*name_ok) __P((const char *)); + int (*name_ok)(const char *); char hostbuf[8*1024]; memset(&sentinel, 0, sizeof(sentinel)); @@ -1509,9 +1509,9 @@ _yp_getaddrinfo(name, pai) /* resolver logic */ -extern const char *__hostalias __P((const char *)); +extern const char *__hostalias(const char *); extern int h_errno; -extern int res_opt __P((int, u_char *, int, int)); +extern int res_opt(int, u_char *, int, int); /* * Formulate a normal query, send, and await answer. diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c index d7d6c621cf0..d4e3c5e6f00 100644 --- a/lib/libc/net/gethostnamadr.c +++ b/lib/libc/net/gethostnamadr.c @@ -52,7 +52,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.43 2001/06/27 00:58:55 lebel Exp $"; +static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.44 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -98,14 +98,14 @@ static union { static FILE *hostf = NULL; static int stayopen = 0; -static void map_v4v6_address __P((const char *src, char *dst)); -static void map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len)); +static void map_v4v6_address(const char *src, char *dst); +static void map_v4v6_hostent(struct hostent *hp, char **bp, int *len); #ifdef RESOLVSORT -static void addrsort __P((char **, int)); +static void addrsort(char **, int); #endif -int _hokchar __P((const char *)); +int _hokchar(const char *); static const char AskedForGot[] = "gethostby*.getanswer: asked for \"%s\", got \"%s\""; @@ -175,7 +175,7 @@ getanswer(answer, anslen, qname, qtype) int toobig = 0; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok)(const char *); tname = qname; host.h_name = NULL; diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c index 0ae09ca30f6..c19603f2d17 100644 --- a/lib/libc/net/getnameinfo.c +++ b/lib/libc/net/getnameinfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnameinfo.c,v 1.21 2001/11/15 04:56:15 itojun Exp $ */ +/* $OpenBSD: getnameinfo.c,v 1.22 2002/02/16 21:27:23 millert Exp $ */ /* $KAME: getnameinfo.c,v 1.45 2000/09/25 22:43:56 itojun Exp $ */ /* @@ -83,7 +83,7 @@ struct sockinet { #ifdef INET6 static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *, size_t, int)); -static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int)); +static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int); #endif int diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c index f755cd9b149..834ddf11ae2 100644 --- a/lib/libc/net/getnetnamadr.c +++ b/lib/libc/net/getnetnamadr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $ */ +/* $OpenBSD: getnetnamadr.c,v 1.15 2002/02/16 21:27:23 millert Exp $ */ /* * Copyright (c) 1997, Jason Downs. All rights reserved. @@ -77,7 +77,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93"; static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03"; static char rcsid[] = "$From: getnetnamadr.c,v 8.7 1996/08/05 08:31:35 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel Exp $"; +static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.15 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -97,10 +97,10 @@ static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.14 2001/06/27 00:58:55 lebel extern int h_errno; -struct netent *_getnetbyaddr __P((in_addr_t net, int type)); -struct netent *_getnetbyname __P((const char *name)); +struct netent *_getnetbyaddr(in_addr_t net, int type); +struct netent *_getnetbyname(const char *name); -int _hokchar __P((const char *)); +int _hokchar(const char *); #define BYADDR 0 #define BYNAME 1 diff --git a/lib/libc/net/inet_ntop.c b/lib/libc/net/inet_ntop.c index 64d0d137680..00b8f6b22e6 100644 --- a/lib/libc/net/inet_ntop.c +++ b/lib/libc/net/inet_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $ */ +/* $OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:27:23 millert Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -20,7 +20,7 @@ #if 0 static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $"; +static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -39,8 +39,8 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Ex * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)); -static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)); +static const char *inet_ntop4(const u_char *src, char *dst, size_t size); +static const char *inet_ntop6(const u_char *src, char *dst, size_t size); /* char * * inet_ntop(af, src, dst, size) diff --git a/lib/libc/net/inet_pton.c b/lib/libc/net/inet_pton.c index 0cb13baa31e..b04ef05c317 100644 --- a/lib/libc/net/inet_pton.c +++ b/lib/libc/net/inet_pton.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Exp $ */ +/* $OpenBSD: inet_pton.c,v 1.4 2002/02/16 21:27:23 millert Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -20,7 +20,7 @@ #if 0 static char rcsid[] = "$From: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Exp $"; +static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -38,8 +38,8 @@ static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.3 1999/12/08 09:31:15 itojun Ex * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static int inet_pton4 __P((const char *src, u_char *dst)); -static int inet_pton6 __P((const char *src, u_char *dst)); +static int inet_pton4(const char *src, u_char *dst); +static int inet_pton6(const char *src, u_char *dst); /* int * inet_pton(af, src, dst) diff --git a/lib/libc/net/ns_addr.c b/lib/libc/net/ns_addr.c index 7dcc988afeb..0d1b45858f8 100644 --- a/lib/libc/net/ns_addr.c +++ b/lib/libc/net/ns_addr.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.6 2001/06/27 00:58:55 lebel Exp $"; +static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.7 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -45,8 +45,8 @@ static char rcsid[] = "$OpenBSD: ns_addr.c,v 1.6 2001/06/27 00:58:55 lebel Exp $ static struct ns_addr addr, zero_addr; -static void Field __P((char *, u_int8_t *, int)); -static void cvtbase __P((long, int, int[], int, u_int8_t[], int)); +static void Field(char *, u_int8_t *, int); +static void cvtbase(long, int, int[], int, u_int8_t[], int); struct ns_addr ns_addr(name) diff --git a/lib/libc/net/ns_ntoa.c b/lib/libc/net/ns_ntoa.c index c33f7109669..130ccd388bf 100644 --- a/lib/libc/net/ns_ntoa.c +++ b/lib/libc/net/ns_ntoa.c @@ -32,14 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.7 1997/08/24 21:25:48 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_ntoa.c,v 1.8 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> #include <netns/ns.h> #include <stdio.h> -static char *spectHex __P((char *)); +static char *spectHex(char *); char * ns_ntoa(addr) diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index a9fdc1b1d04..95d481a7f64 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: rcmd.c,v 1.39 2001/09/04 23:35:58 millert Exp $"; +static char *rcsid = "$OpenBSD: rcmd.c,v 1.40 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -57,11 +57,11 @@ static char *rcsid = "$OpenBSD: rcmd.c,v 1.39 2001/09/04 23:35:58 millert Exp $" #include <stdlib.h> #include <netgroup.h> -int __ivaliduser __P((FILE *, in_addr_t, const char *, const char *)); +int __ivaliduser(FILE *, in_addr_t, const char *, const char *); int __ivaliduser_sa __P((FILE *, struct sockaddr *, socklen_t, const char *, const char *)); -static int __icheckhost __P((struct sockaddr *, socklen_t, const char *)); -static char *__gethostloop __P((struct sockaddr *, socklen_t)); +static int __icheckhost(struct sockaddr *, socklen_t, const char *); +static char *__gethostloop(struct sockaddr *, socklen_t); int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) diff --git a/lib/libc/net/res_init.c b/lib/libc/net/res_init.c index c74e0339bad..121606ac489 100644 --- a/lib/libc/net/res_init.c +++ b/lib/libc/net/res_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Exp $ */ +/* $OpenBSD: res_init.c,v 1.25 2002/02/16 21:27:23 millert Exp $ */ /* * ++Copyright++ 1985, 1989, 1993 @@ -64,7 +64,7 @@ static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static char rcsid[] = "$From: res_init.c,v 8.7 1996/09/28 06:51:07 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Exp $"; +static char rcsid[] = "$OpenBSD: res_init.c,v 1.25 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -109,12 +109,12 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.24 2001/09/14 23:49:29 itojun Ex * property. */ -static void res_setoptions __P((char *, char *)); +static void res_setoptions(char *, char *); #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask __P((struct in_addr)); +static u_int32_t net_mask(struct in_addr); #endif /* diff --git a/lib/libc/net/res_query.c b/lib/libc/net/res_query.c index 3cf79283027..24c07491a9a 100644 --- a/lib/libc/net/res_query.c +++ b/lib/libc/net/res_query.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Exp $ */ +/* $OpenBSD: res_query.c,v 1.17 2002/02/16 21:27:23 millert Exp $ */ /* * ++Copyright++ 1988, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_query.c,v 8.9 1996/09/22 00:13:28 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Exp $"; +static char rcsid[] = "$OpenBSD: res_query.c,v 1.17 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -85,9 +85,9 @@ static char rcsid[] = "$OpenBSD: res_query.c,v 1.16 2001/07/31 22:02:18 jakob Ex #define MAXPACKET 1024 #endif -const char *hostalias __P((const char *)); +const char *hostalias(const char *); int h_errno; -extern int res_opt __P((int, u_char *, int, int)); +extern int res_opt(int, u_char *, int, int); /* * Formulate a normal query, send, and await answer. diff --git a/lib/libc/net/res_random.c b/lib/libc/net/res_random.c index a11241246d1..6a6a142e96b 100644 --- a/lib/libc/net/res_random.c +++ b/lib/libc/net/res_random.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_random.c,v 1.9 2001/01/04 21:45:31 todd Exp $ */ +/* $OpenBSD: res_random.c,v 1.10 2002/02/16 21:27:23 millert Exp $ */ /* * Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> @@ -92,8 +92,8 @@ static long ru_reseed; static u_int32_t tmp; /* Storage for unused random */ static struct timeval tv; -static u_int16_t pmod __P((u_int16_t, u_int16_t, u_int16_t)); -static void res_initid __P((void)); +static u_int16_t pmod(u_int16_t, u_int16_t, u_int16_t); +static void res_initid(void); /* * Do a fast modular exponation, returned value will be in the range diff --git a/lib/libc/net/res_send.c b/lib/libc/net/res_send.c index ab50559de6e..81bf23ba9ff 100644 --- a/lib/libc/net/res_send.c +++ b/lib/libc/net/res_send.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_send.c,v 1.10 2001/09/14 23:49:29 itojun Exp $ */ +/* $OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $ */ /* * ++Copyright++ 1985, 1989, 1993 @@ -64,7 +64,7 @@ static char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_send.c,v 8.12 1996/10/08 04:51:06 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_send.c,v 1.10 2001/09/14 23:49:29 itojun Exp $"; +static char rcsid[] = "$OpenBSD: res_send.c,v 1.11 2002/02/16 21:27:23 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -126,8 +126,8 @@ static int af = 0; /* address family of socket */ } else {} static char abuf[NI_MAXHOST]; static char pbuf[NI_MAXSERV]; -static void Aerror __P((FILE *, char *, int, struct sockaddr *)); -static void Perror __P((FILE *, char *, int)); +static void Aerror(FILE *, char *, int, struct sockaddr *); +static void Perror(FILE *, char *, int); static void Aerror(file, string, error, address) @@ -186,7 +186,7 @@ res_send_setrhook(hook) } #ifdef INET6 -static struct sockaddr * get_nsaddr __P((size_t)); +static struct sockaddr * get_nsaddr(size_t); /* * pick appropriate nsaddr_list for use. see res_init() for initialization. diff --git a/lib/libc/nls/_catclose.c b/lib/libc/nls/_catclose.c index d5c8aa258c8..4fab66e00b1 100644 --- a/lib/libc/nls/_catclose.c +++ b/lib/libc/nls/_catclose.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: _catclose.c,v 1.2 1996/08/19 08:30:01 tholo Exp $"; +static char rcsid[] = "$OpenBSD: _catclose.c,v 1.3 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> @@ -15,7 +15,7 @@ __indr_reference(_catclose,catclose); #include <nl_types.h> -extern int _catclose __P((nl_catd)); +extern int _catclose(nl_catd); int catclose(catd) diff --git a/lib/libc/nls/_catgets.c b/lib/libc/nls/_catgets.c index 13e8d56d00b..c9bd9a5a347 100644 --- a/lib/libc/nls/_catgets.c +++ b/lib/libc/nls/_catgets.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: _catgets.c,v 1.2 1996/08/19 08:30:02 tholo Exp $"; +static char rcsid[] = "$OpenBSD: _catgets.c,v 1.3 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> @@ -15,7 +15,7 @@ __indr_reference(_catgets,catgets); #include <nl_types.h> -extern char * _catgets __P((nl_catd, int, int, const char *)); +extern char * _catgets(nl_catd, int, int, const char *); char * catgets(catd, set_id, msg_id, s) diff --git a/lib/libc/nls/_catopen.c b/lib/libc/nls/_catopen.c index c146156edf7..a9dc798ddce 100644 --- a/lib/libc/nls/_catopen.c +++ b/lib/libc/nls/_catopen.c @@ -4,7 +4,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: _catopen.c,v 1.3 1996/09/15 09:31:21 tholo Exp $"; +static char rcsid[] = "$OpenBSD: _catopen.c,v 1.4 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> @@ -15,7 +15,7 @@ __indr_reference(_catopen,catopen); #include <nl_types.h> -extern nl_catd _catopen __P((const char *, int)); +extern nl_catd _catopen(const char *, int); nl_catd catopen(name, oflag) diff --git a/lib/libc/nls/catopen.c b/lib/libc/nls/catopen.c index 4b41b44e57a..53b1cec706b 100644 --- a/lib/libc/nls/catopen.c +++ b/lib/libc/nls/catopen.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: catopen.c,v 1.9 2001/05/11 15:30:14 art Exp $"; +static char rcsid[] = "$OpenBSD: catopen.c,v 1.10 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #define _NLS_PRIVATE @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: catopen.c,v 1.9 2001/05/11 15:30:14 art Exp $"; #define NLS_DEFAULT_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L" #define NLS_DEFAULT_LANG "C" -static nl_catd load_msgcat __P((const char *)); +static nl_catd load_msgcat(const char *); /* ARGSUSED */ nl_catd diff --git a/lib/libc/ohash/ohash_do.c b/lib/libc/ohash/ohash_do.c index efc3e9b2570..159b5999e74 100644 --- a/lib/libc/ohash/ohash_do.c +++ b/lib/libc/ohash/ohash_do.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohash_do.c,v 1.2 2001/03/02 15:47:53 espie Exp $ */ +/* $OpenBSD: ohash_do.c,v 1.3 2002/02/16 21:27:23 millert Exp $ */ /* ex:ts=8 sw=4: */ @@ -31,7 +31,7 @@ #include "ohash_int.h" -static void ohash_resize __P((struct ohash *)); +static void ohash_resize(struct ohash *); static void ohash_resize(h) diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c index 033a08d260e..2429e1331a7 100644 --- a/lib/libc/quad/qdivrem.c +++ b/lib/libc/quad/qdivrem.c @@ -36,7 +36,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.2 1996/08/19 08:30:42 tholo Exp $"; +static char rcsid[] = "$OpenBSD: qdivrem.c,v 1.3 2002/02/16 21:27:23 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -58,7 +58,7 @@ typedef unsigned short digit; typedef u_long digit; #endif -static void shl __P((digit *p, int len, int sh)); +static void shl(digit *p, int len, int sh); /* * __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v. diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h index cb42001bd9b..7f8740fd17c 100644 --- a/lib/libc/quad/quad.h +++ b/lib/libc/quad/quad.h @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: quad.h,v 1.2 1996/08/19 08:30:44 tholo Exp $ + * $OpenBSD: quad.h,v 1.3 2002/02/16 21:27:23 millert Exp $ */ /* @@ -95,7 +95,7 @@ union uu { #define LHALF(x) ((u_long)(x) & (((long)1 << HALF_BITS) - 1)) #define LHUP(x) ((u_long)(x) << HALF_BITS) -extern u_quad_t __qdivrem __P((u_quad_t u, u_quad_t v, u_quad_t *rem)); +extern u_quad_t __qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem); /* * XXX diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c index a815669ed66..d5f0d2f3e84 100644 --- a/lib/libc/regex/engine.c +++ b/lib/libc/regex/engine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: engine.c,v 1.4 1997/04/28 20:44:57 millert Exp $ */ +/* $OpenBSD: engine.c,v 1.5 2002/02/16 21:27:24 millert Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 Henry Spencer. @@ -40,7 +40,7 @@ */ #if defined(SNAMES) && defined(LIBC_SCCS) && !defined(lint) -static char enginercsid[] = "$OpenBSD: engine.c,v 1.4 1997/04/28 20:44:57 millert Exp $"; +static char enginercsid[] = "$OpenBSD: engine.c,v 1.5 2002/02/16 21:27:24 millert Exp $"; #endif /* SNAMES and LIBC_SCCS and not lint */ /* @@ -96,12 +96,12 @@ extern "C" { #endif /* === engine.c === */ -static int matcher __P((struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags)); -static char *dissect __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *backref __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev)); -static char *fast __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static char *slow __P((struct match *m, char *start, char *stop, sopno startst, sopno stopst)); -static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft)); +static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags); +static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev); +static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst); +static states step(struct re_guts *g, sopno start, sopno stop, states bef, int ch, states aft); #define BOL (OUT+1) #define EOL (BOL+1) #define BOLEOL (BOL+2) @@ -112,13 +112,13 @@ static states step __P((struct re_guts *g, sopno start, sopno stop, states bef, #define NONCHAR(c) ((c) > CHAR_MAX) #define NNONCHAR (CODEMAX-CHAR_MAX) #ifdef REDEBUG -static void print __P((struct match *m, char *caption, states st, int ch, FILE *d)); +static void print(struct match *m, char *caption, states st, int ch, FILE *d); #endif #ifdef REDEBUG -static void at __P((struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst)); +static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst); #endif #ifdef REDEBUG -static char *pchar __P((int ch)); +static char *pchar(int ch); #endif #ifdef __cplusplus diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index c614b0be2aa..10224be9240 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #else -static char rcsid[] = "$OpenBSD: regcomp.c,v 1.7 2001/11/01 23:27:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: regcomp.c,v 1.8 2002/02/16 21:27:24 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -83,43 +83,43 @@ extern "C" { #endif /* === regcomp.c === */ -static void p_ere __P((struct parse *p, int stop)); -static void p_ere_exp __P((struct parse *p)); -static void p_str __P((struct parse *p)); -static void p_bre __P((struct parse *p, int end1, int end2)); -static int p_simp_re __P((struct parse *p, int starordinary)); -static int p_count __P((struct parse *p)); -static void p_bracket __P((struct parse *p)); -static void p_b_term __P((struct parse *p, cset *cs)); -static void p_b_cclass __P((struct parse *p, cset *cs)); -static void p_b_eclass __P((struct parse *p, cset *cs)); -static char p_b_symbol __P((struct parse *p)); -static char p_b_coll_elem __P((struct parse *p, int endc)); -static char othercase __P((int ch)); -static void bothcases __P((struct parse *p, int ch)); -static void ordinary __P((struct parse *p, int ch)); -static void nonnewline __P((struct parse *p)); -static void repeat __P((struct parse *p, sopno start, int from, int to)); -static int seterr __P((struct parse *p, int e)); -static cset *allocset __P((struct parse *p)); -static void freeset __P((struct parse *p, cset *cs)); -static int freezeset __P((struct parse *p, cset *cs)); -static int firstch __P((struct parse *p, cset *cs)); -static int nch __P((struct parse *p, cset *cs)); -static void mcadd __P((struct parse *p, cset *cs, char *cp)); -static void mcinvert __P((struct parse *p, cset *cs)); -static void mccase __P((struct parse *p, cset *cs)); -static int isinsets __P((struct re_guts *g, int c)); -static int samesets __P((struct re_guts *g, int c1, int c2)); -static void categorize __P((struct parse *p, struct re_guts *g)); -static sopno dupl __P((struct parse *p, sopno start, sopno finish)); -static void doemit __P((struct parse *p, sop op, size_t opnd)); -static void doinsert __P((struct parse *p, sop op, size_t opnd, sopno pos)); -static void dofwd __P((struct parse *p, sopno pos, sop value)); -static void enlarge __P((struct parse *p, sopno size)); -static void stripsnug __P((struct parse *p, struct re_guts *g)); -static void findmust __P((struct parse *p, struct re_guts *g)); -static sopno pluscount __P((struct parse *p, struct re_guts *g)); +static void p_ere(struct parse *p, int stop); +static void p_ere_exp(struct parse *p); +static void p_str(struct parse *p); +static void p_bre(struct parse *p, int end1, int end2); +static int p_simp_re(struct parse *p, int starordinary); +static int p_count(struct parse *p); +static void p_bracket(struct parse *p); +static void p_b_term(struct parse *p, cset *cs); +static void p_b_cclass(struct parse *p, cset *cs); +static void p_b_eclass(struct parse *p, cset *cs); +static char p_b_symbol(struct parse *p); +static char p_b_coll_elem(struct parse *p, int endc); +static char othercase(int ch); +static void bothcases(struct parse *p, int ch); +static void ordinary(struct parse *p, int ch); +static void nonnewline(struct parse *p); +static void repeat(struct parse *p, sopno start, int from, int to); +static int seterr(struct parse *p, int e); +static cset *allocset(struct parse *p); +static void freeset(struct parse *p, cset *cs); +static int freezeset(struct parse *p, cset *cs); +static int firstch(struct parse *p, cset *cs); +static int nch(struct parse *p, cset *cs); +static void mcadd(struct parse *p, cset *cs, char *cp); +static void mcinvert(struct parse *p, cset *cs); +static void mccase(struct parse *p, cset *cs); +static int isinsets(struct re_guts *g, int c); +static int samesets(struct re_guts *g, int c1, int c2); +static void categorize(struct parse *p, struct re_guts *g); +static sopno dupl(struct parse *p, sopno start, sopno finish); +static void doemit(struct parse *p, sop op, size_t opnd); +static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos); +static void dofwd(struct parse *p, sopno pos, sop value); +static void enlarge(struct parse *p, sopno size); +static void stripsnug(struct parse *p, struct re_guts *g); +static void findmust(struct parse *p, struct re_guts *g); +static sopno pluscount(struct parse *p, struct re_guts *g); #ifdef __cplusplus } diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c index a5c26f60122..da328c41f25 100644 --- a/lib/libc/regex/regerror.c +++ b/lib/libc/regex/regerror.c @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)regerror.c 8.4 (Berkeley) 3/20/94"; #else -static char rcsid[] = "$OpenBSD: regerror.c,v 1.6 2001/06/27 00:58:55 lebel Exp $"; +static char rcsid[] = "$OpenBSD: regerror.c,v 1.7 2002/02/16 21:27:24 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -61,7 +61,7 @@ extern "C" { #endif /* === regerror.c === */ -static char *regatoi __P((const regex_t *preg, char *localbuf)); +static char *regatoi(const regex_t *preg, char *localbuf); #ifdef __cplusplus } diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c index a4e28364391..05f5ee848e6 100644 --- a/lib/libc/rpc/svc.c +++ b/lib/libc/rpc/svc.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: svc.c,v 1.14 2001/09/15 13:51:01 deraadt Exp $"; +static char *rcsid = "$OpenBSD: svc.c,v 1.15 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -416,7 +416,7 @@ svc_getreq(rdfds) svc_getreqset(&readfds); } -void svc_getreqset2 __P((fd_set *, int)); +void svc_getreqset2(fd_set *, int); void svc_getreqset(readfds) diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c index 600c7f03c88..754605c0117 100644 --- a/lib/libc/rpc/svc_run.c +++ b/lib/libc/rpc/svc_run.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: svc_run.c,v 1.11 1999/11/23 22:37:28 deraadt Exp $"; +static char *rcsid = "$OpenBSD: svc_run.c,v 1.12 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -45,7 +45,7 @@ static char *rcsid = "$OpenBSD: svc_run.c,v 1.11 1999/11/23 22:37:28 deraadt Exp extern int __svc_fdsetsize; extern fd_set *__svc_fdset; -void svc_getreqset2 __P((fd_set *, int)); +void svc_getreqset2(fd_set *, int); void svc_run() diff --git a/lib/libc/rpc/svc_udp.c b/lib/libc/rpc/svc_udp.c index 50dbc879a77..bf456045543 100644 --- a/lib/libc/rpc/svc_udp.c +++ b/lib/libc/rpc/svc_udp.c @@ -28,7 +28,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: svc_udp.c,v 1.10 2001/09/15 13:51:01 deraadt Exp $"; +static char *rcsid = "$OpenBSD: svc_udp.c,v 1.11 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -57,8 +57,8 @@ static bool_t svcudp_getargs(SVCXPRT *, xdrproc_t, caddr_t); static bool_t svcudp_reply(SVCXPRT *, struct rpc_msg *); static bool_t svcudp_freeargs(SVCXPRT *, xdrproc_t, caddr_t); static void svcudp_destroy(SVCXPRT *); -static void cache_set __P((SVCXPRT *, u_long)); -static int cache_get __P((SVCXPRT *, struct rpc_msg *, char **, u_long *)); +static void cache_set(SVCXPRT *, u_long); +static int cache_get(SVCXPRT *, struct rpc_msg *, char **, u_long *); static struct xp_ops svcudp_op = { svcudp_recv, diff --git a/lib/libc/rpc/xdr_rec.c b/lib/libc/rpc/xdr_rec.c index d77bdca7254..347cc5c7100 100644 --- a/lib/libc/rpc/xdr_rec.c +++ b/lib/libc/rpc/xdr_rec.c @@ -27,7 +27,7 @@ * Mountain View, California 94043 */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: xdr_rec.c,v 1.8 2001/09/15 13:51:01 deraadt Exp $"; +static char *rcsid = "$OpenBSD: xdr_rec.c,v 1.9 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -95,7 +95,7 @@ typedef struct rec_strm { /* * out-goung bits */ - int (*writeit) __P((caddr_t, caddr_t, int)); + int (*writeit)(caddr_t, caddr_t, int); caddr_t out_base; /* output buffer (points to frag header) */ caddr_t out_finger; /* next output position */ caddr_t out_boundry; /* data cannot up to this address */ @@ -104,7 +104,7 @@ typedef struct rec_strm { /* * in-coming bits */ - int (*readit) __P((caddr_t, caddr_t, int)); + int (*readit)(caddr_t, caddr_t, int); u_long in_size; /* fixed size of the input buffer */ caddr_t in_base; caddr_t in_finger; /* location of next byte to be had */ diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index 8063c6a0d9b..3a2881d9767 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fseek.c,v 1.3 2000/02/21 22:11:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: fseek.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -58,7 +58,7 @@ fseeko(fp, offset, whence) off_t offset; int whence; { - register fpos_t (*seekfn) __P((void *, fpos_t, int)); + register fpos_t (*seekfn)(void *, fpos_t, int); fpos_t target, curoff; size_t n; struct stat st; diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h index 53af82defae..8efe61030ef 100644 --- a/lib/libc/stdio/local.h +++ b/lib/libc/stdio/local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: local.h,v 1.2 1996/08/19 08:32:54 tholo Exp $ */ +/* $OpenBSD: local.h,v 1.3 2002/02/16 21:27:24 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -41,21 +41,21 @@ * in particular, macros and private variables. */ -int __sflush __P((FILE *)); -FILE *__sfp __P((void)); -int __srefill __P((FILE *)); -int __sread __P((void *, char *, int)); -int __swrite __P((void *, char const *, int)); -fpos_t __sseek __P((void *, fpos_t, int)); -int __sclose __P((void *)); -void __sinit __P((void)); -void _cleanup __P((void)); -void (*__cleanup) __P((void)); -void __smakebuf __P((FILE *)); -int __swhatbuf __P((FILE *, size_t *, int *)); +int __sflush(FILE *); +FILE *__sfp(void); +int __srefill(FILE *); +int __sread(void *, char *, int); +int __swrite(void *, char const *, int); +fpos_t __sseek(void *, fpos_t, int); +int __sclose(void *); +void __sinit(void); +void _cleanup(void); +void (*__cleanup)(void); +void __smakebuf(FILE *); +int __swhatbuf(FILE *, size_t *, int *); int _fwalk __P((int (*)(FILE *))); -int __swsetup __P((FILE *)); -int __sflags __P((const char *, int *)); +int __swsetup(FILE *); +int __sflags(const char *, int *); extern int __sdidinit; diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c index 875c3ca2298..477328d268e 100644 --- a/lib/libc/stdio/mktemp.c +++ b/lib/libc/stdio/mktemp.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2002/01/02 20:18:32 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mktemp.c,v 1.15 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -44,7 +44,7 @@ static char rcsid[] = "$OpenBSD: mktemp.c,v 1.14 2002/01/02 20:18:32 deraadt Exp #include <ctype.h> #include <unistd.h> -static int _gettemp __P((char *, int *, int, int)); +static int _gettemp(char *, int *, int, int); int mkstemps(path, slen) @@ -72,7 +72,7 @@ mkdtemp(path) return(_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL); } -char *_mktemp __P((char *)); +char *_mktemp(char *); char * _mktemp(path) diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c index 2eceac1511b..5c683d982ac 100644 --- a/lib/libc/stdio/perror.c +++ b/lib/libc/stdio/perror.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: perror.c,v 1.3 1998/09/10 06:44:53 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: perror.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -48,7 +48,7 @@ static char rcsid[] = "$OpenBSD: perror.c,v 1.3 1998/09/10 06:44:53 deraadt Exp * internal function __strerror(). */ -extern char *__strerror __P((int , char *)); +extern char *__strerror(int , char *); void perror(s) diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c index 80af80f790b..3721eaf89cc 100644 --- a/lib/libc/stdio/tempnam.c +++ b/lib/libc/stdio/tempnam.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tempnam.c,v 1.10 2001/07/09 06:57:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tempnam.c,v 1.11 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: tempnam.c,v 1.10 2001/07/09 06:57:44 deraadt Ex __warn_references(tempnam, "warning: tempnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp(char *); char * tempnam(dir, pfx) diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c index d209e3c1c42..be841cce470 100644 --- a/lib/libc/stdio/tmpnam.c +++ b/lib/libc/stdio/tmpnam.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.6 1997/04/03 05:31:38 millert Exp $"; +static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.7 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: tmpnam.c,v 1.6 1997/04/03 05:31:38 millert Exp __warn_references(tmpnam, "warning: tmpnam() possibly used unsafely; consider using mkstemp()"); -extern char *_mktemp __P((char *)); +extern char *_mktemp(char *); char * tmpnam(s) diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c index fa60aafac09..3e728d53096 100644 --- a/lib/libc/stdio/ungetc.c +++ b/lib/libc/stdio/ungetc.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ungetc.c,v 1.3 2001/07/09 06:57:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ungetc.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdio.h> @@ -43,7 +43,7 @@ static char rcsid[] = "$OpenBSD: ungetc.c,v 1.3 2001/07/09 06:57:45 deraadt Exp #include <string.h> #include "local.h" -static int __submore __P((FILE *)); +static int __submore(FILE *); /* * Expand the ungetc buffer `in place'. That is, adjust fp->_p when * the buffer moves, so that it points the same distance from the end, diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index e97114d2213..086547819ea 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: vfprintf.c,v 1.14 2001/12/05 10:20:06 deraadt Exp $"; +static char *rcsid = "$OpenBSD: vfprintf.c,v 1.15 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -130,8 +130,8 @@ __sbprintf(fp, fmt, ap) #define BUF (MAXEXP+MAXFRACT+1) /* + decimal point */ #define DEFPREC 6 -static char *cvt __P((double, int, int, char *, int *, int, int *)); -static int exponent __P((char *, int, int)); +static char *cvt(double, int, int, char *, int *, int, int *); +static int exponent(char *, int, int); #else /* no FLOATING_POINT */ #define BUF 40 @@ -1094,7 +1094,7 @@ __grow_type_table(typetable, tablesize) #ifdef FLOATING_POINT -extern char *__dtoa __P((double, int, int, int *, int *, char **)); +extern char *__dtoa(double, int, int, int *, int *, char **); static char * cvt(value, ndigits, flags, sign, decpt, ch, length) diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c index eeef9bffc66..1903202b6c2 100644 --- a/lib/libc/stdlib/bsearch.c +++ b/lib/libc/stdlib/bsearch.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: bsearch.c,v 1.2 1996/08/19 08:33:26 tholo Exp $"; +static char *rcsid = "$OpenBSD: bsearch.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> @@ -59,7 +59,7 @@ bsearch(key, base0, nmemb, size, compar) const void *base0; size_t nmemb; register size_t size; - register int (*compar) __P((const void *, const void *)); + register int (*compar)(const void *, const void *); { register const char *base = base0; register int lim, cmp; diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c index e3e4392e055..2770e5b977c 100644 --- a/lib/libc/stdlib/heapsort.c +++ b/lib/libc/stdlib/heapsort.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: heapsort.c,v 1.2 1996/08/19 08:33:32 tholo Exp $"; +static char *rcsid = "$OpenBSD: heapsort.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -141,7 +141,7 @@ int heapsort(vbase, nmemb, size, compar) void *vbase; size_t nmemb, size; - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { register int cnt, i, j, l; register char tmp, *tmp1, *tmp2; diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 6fae6fe5651..bca7bb7c4e1 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -8,7 +8,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $"; +static char rcsid[] = "$OpenBSD: malloc.c,v 1.47 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -88,7 +88,7 @@ static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $ * we use the unwrapped syscall _thread_sys_write() */ # define write _thread_sys_write - ssize_t write __P((int, const void *, size_t)); + ssize_t write(int, const void *, size_t); # undef malloc # undef realloc # undef free @@ -243,7 +243,7 @@ static int malloc_utrace; struct ut { void *p; size_t s; void *r; }; -void utrace __P((struct ut *, int)); +void utrace(struct ut *, int); #define UTRACE(a, b, c) \ if (malloc_utrace) \ diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 0a1015ad9dd..345eb2fd8ba 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $"; +static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -99,7 +99,7 @@ mergesort(base, nmemb, size, cmp) void *base; size_t nmemb; register size_t size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); { register int i, sense; int big, iflag; @@ -257,7 +257,7 @@ COPY: b = t; void setup(list1, list2, n, size, cmp) size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); u_char *list1, *list2; { int i, length, size2, tmp, sense; @@ -332,7 +332,7 @@ static void insertionsort(a, n, size, cmp) u_char *a; size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); { u_char *ai, *s, *t, *u, tmp; int i; diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c index 1c3020b5958..d16ed7b0bd7 100644 --- a/lib/libc/stdlib/qsort.c +++ b/lib/libc/stdlib/qsort.c @@ -32,14 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: qsort.c,v 1.5 1997/06/20 11:19:38 deraadt Exp $"; +static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <stdlib.h> static __inline char *med3 __P((char *, char *, char *, int (*)())); -static __inline void swapfunc __P((char *, char *, int, int)); +static __inline void swapfunc(char *, char *, int, int); #define min(a, b) (a) < (b) ? a : b diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c index 41ed9624663..40d7c0789f6 100644 --- a/lib/libc/stdlib/radixsort.c +++ b/lib/libc/stdlib/radixsort.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: radixsort.c,v 1.3 1996/08/19 08:33:44 tholo Exp $"; +static char *rcsid = "$OpenBSD: radixsort.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -61,8 +61,8 @@ typedef struct { } stack; static __inline void simplesort - __P((const u_char **, int, int, const u_char *, u_int)); -static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int)); +(const u_char **, int, int, const u_char *, u_int); +static void r_sort_a(const u_char **, int, int, const u_char *, u_int); static void r_sort_b __P((const u_char **, const u_char **, int, int, const u_char *, u_int)); diff --git a/lib/libc/stdlib/rand48.h b/lib/libc/stdlib/rand48.h index e7cb3e03330..afa49f65f3c 100644 --- a/lib/libc/stdlib/rand48.h +++ b/lib/libc/stdlib/rand48.h @@ -10,7 +10,7 @@ * of any kind. I shall in no event be liable for anything that happens * to anyone/anything when using this software. * - * $OpenBSD: rand48.h,v 1.2 1996/08/19 08:33:45 tholo Exp $ + * $OpenBSD: rand48.h,v 1.3 2002/02/16 21:27:24 millert Exp $ */ #ifndef _RAND48_H_ @@ -19,7 +19,7 @@ #include <math.h> #include <stdlib.h> -void __dorand48 __P((unsigned short[3])); +void __dorand48(unsigned short[3]); #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c index 9e5bd4b0f25..5c3b8c17f57 100644 --- a/lib/libc/stdlib/tfind.c +++ b/lib/libc/stdlib/tfind.c @@ -22,7 +22,7 @@ void * tfind(vkey, vrootp, compar) const void *vkey; /* key to be found */ void *const *vrootp; /* address of the tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { char *key = (char *)vkey; node **rootp = (node **)vrootp; diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c index 562ace1845b..0ad5866172a 100644 --- a/lib/libc/stdlib/tsearch.c +++ b/lib/libc/stdlib/tsearch.c @@ -23,7 +23,7 @@ void * tsearch(vkey, vrootp, compar) const void *vkey; /* key to be located */ void **vrootp; /* address of tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { register node *q; char *key = (char *)vkey; @@ -54,7 +54,7 @@ void * tdelete(vkey, vrootp, compar) const void *vkey; /* key to be deleted */ void **vrootp; /* address of the root of tree */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { node **rootp = (node **)vrootp; char *key = (char *)vkey; @@ -117,7 +117,7 @@ trecurse(root, action, level) void twalk(vroot, action) const void *vroot; /* Root of the tree to be walked */ - void (*action) __P((const void *, VISIT, int)); + void (*action)(const void *, VISIT, int); { node *root = (node *)vroot; diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c index 0e2690c3dd4..b884a67df39 100644 --- a/lib/libc/string/strerror.c +++ b/lib/libc/string/strerror.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strerror.c,v 1.2 1996/08/19 08:34:17 tholo Exp $"; +static char *rcsid = "$OpenBSD: strerror.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <string.h> @@ -44,7 +44,7 @@ static char *rcsid = "$OpenBSD: strerror.c,v 1.2 1996/08/19 08:34:17 tholo Exp $ * internal function __strerror(). */ -extern char *__strerror __P((int, char *)); +extern char *__strerror(int, char *); char * strerror(num) diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c index cf03af5963e..90118f70f94 100644 --- a/lib/libc/string/strsignal.c +++ b/lib/libc/string/strsignal.c @@ -32,13 +32,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: strsignal.c,v 1.2 1996/08/19 08:34:25 tholo Exp $"; +static char *rcsid = "$OpenBSD: strsignal.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <string.h> #include <limits.h> -extern char *__strsignal __P((int, char *)); +extern char *__strsignal(int, char *); char * strsignal(sig) diff --git a/lib/libc/sys/ptrace.c b/lib/libc/sys/ptrace.c index 5e95a94941c..f0d02dd7ae5 100644 --- a/lib/libc/sys/ptrace.c +++ b/lib/libc/sys/ptrace.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ptrace.c,v 1.1 1999/02/01 08:13:01 d Exp $ */ +/* $OpenBSD: ptrace.c,v 1.2 2002/02/16 21:27:24 millert Exp $ */ /* David Leonard <d@openbsd.org>, 1999. Public domain. */ #include <sys/types.h> #include <sys/ptrace.h> #include <sys/errno.h> -int _ptrace __P((int, pid_t, caddr_t, int)); +int _ptrace(int, pid_t, caddr_t, int); int ptrace(request, pid, addr, data) diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2 index 584332ac478..45e60a6928d 100644 --- a/lib/libc/sys/sigaction.2 +++ b/lib/libc/sys/sigaction.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sigaction.2,v 1.30 2002/01/07 16:16:32 millert Exp $ +.\" $OpenBSD: sigaction.2,v 1.31 2002/02/16 21:27:24 millert Exp $ .\" $NetBSD: sigaction.2,v 1.7 1995/10/12 15:41:16 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -46,8 +46,8 @@ struct sigaction { union { /* signal handler */ - void (*__sa_handler) __P((int)); - void (*__sa_sigaction) __P((int, siginfo_t *, void *)); + void (*__sa_handler)(int); + void (*__sa_sigaction)(int, siginfo_t *, void *); } __sigaction_u; sigset_t sa_mask; /* signal mask to apply */ int sa_flags; /* see signal options below */ diff --git a/lib/libc/time/strptime.c b/lib/libc/time/strptime.c index b4e5d31ec74..5b56e23e953 100644 --- a/lib/libc/time/strptime.c +++ b/lib/libc/time/strptime.c @@ -36,7 +36,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: strptime.c,v 1.7 2001/08/23 16:32:19 espie Exp $"; +static char rcsid[] = "$OpenBSD: strptime.c,v 1.8 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/localedef.h> @@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: strptime.c,v 1.7 2001/08/23 16:32:19 espie Exp #define _LEGAL_ALT(x) { if (alt_format & ~(x)) return (0); } -static int _conv_num __P((const char **, int *, int, int)); -static char *_strptime __P((const char *, const char *, struct tm *, int)); +static int _conv_num(const char **, int *, int, int); +static char *_strptime(const char *, const char *, struct tm *, int); char * diff --git a/lib/libc/yp/ypinternal.h b/lib/libc/yp/ypinternal.h index 8e89ed28935..eb842d71935 100644 --- a/lib/libc/yp/ypinternal.h +++ b/lib/libc/yp/ypinternal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ypinternal.h,v 1.2 1996/09/15 09:32:00 tholo Exp $ */ +/* $OpenBSD: ypinternal.h,v 1.3 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com> @@ -49,15 +49,15 @@ struct dom_binding { #define BINDINGDIR "/var/yp/binding" #define YPBINDLOCK "/var/run/ypbind.lock" -int (*ypresp_allfn) __P((u_long, char *, int, char *, int, void *)); +int (*ypresp_allfn)(u_long, char *, int, char *, int, void *); void *ypresp_data; extern struct dom_binding *_ypbindlist; extern char _yp_domain[MAXHOSTNAMELEN]; extern int _yplib_timeout; -void _yp_unbind __P((struct dom_binding *)); -int _yp_check __P((char **)); +void _yp_unbind(struct dom_binding *); +int _yp_check(char **); #ifdef YPMATCHCACHE diff --git a/lib/libc_r/include/pthread.h b/lib/libc_r/include/pthread.h index 16224681331..c81cf953901 100644 --- a/lib/libc_r/include/pthread.h +++ b/lib/libc_r/include/pthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread.h,v 1.14 2002/01/10 00:45:30 fgsch Exp $ */ +/* $OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu @@ -143,7 +143,7 @@ typedef struct pthread_rwlockattr *pthread_rwlockattr_t; * use in header symbols. */ typedef void *pthread_addr_t; -typedef void *(*pthread_startroutine_t) __P((void *)); +typedef void *(*pthread_startroutine_t)(void *); /* * Once definitions. @@ -204,20 +204,20 @@ enum pthread_mutextype { * Thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_destroy __P((pthread_attr_t *)); -int pthread_attr_getstacksize __P((pthread_attr_t *, size_t *)); -int pthread_attr_getstackaddr __P((pthread_attr_t *, void **)); +int pthread_attr_destroy(pthread_attr_t *); +int pthread_attr_getstacksize(pthread_attr_t *, size_t *); +int pthread_attr_getstackaddr(pthread_attr_t *, void **); int pthread_attr_getdetachstate __P((const pthread_attr_t *, int *)); -int pthread_attr_init __P((pthread_attr_t *)); -int pthread_attr_setstacksize __P((pthread_attr_t *, size_t)); -int pthread_attr_setstackaddr __P((pthread_attr_t *, void *)); -int pthread_attr_setdetachstate __P((pthread_attr_t *, int)); -void pthread_cleanup_pop __P((int execute)); +int pthread_attr_init(pthread_attr_t *); +int pthread_attr_setstacksize(pthread_attr_t *, size_t); +int pthread_attr_setstackaddr(pthread_attr_t *, void *); +int pthread_attr_setdetachstate(pthread_attr_t *, int); +void pthread_cleanup_pop(int execute); void pthread_cleanup_push __P((void (*routine) (void *), void *routine_arg)); -int pthread_condattr_destroy __P((pthread_condattr_t *attr)); -int pthread_condattr_init __P((pthread_condattr_t *attr)); +int pthread_condattr_destroy(pthread_condattr_t *attr); +int pthread_condattr_init(pthread_condattr_t *attr); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_condattr_getpshared __P((const pthread_condattr_t *attr, @@ -226,63 +226,63 @@ int pthread_condattr_setpshared __P((pthread_condattr_t *attr, int pshared)); #endif -int pthread_cond_broadcast __P((pthread_cond_t *)); -int pthread_cond_destroy __P((pthread_cond_t *)); +int pthread_cond_broadcast(pthread_cond_t *); +int pthread_cond_destroy(pthread_cond_t *); int pthread_cond_init __P((pthread_cond_t *, const pthread_condattr_t *)); -int pthread_cond_signal __P((pthread_cond_t *)); +int pthread_cond_signal(pthread_cond_t *); int pthread_cond_timedwait __P((pthread_cond_t *, pthread_mutex_t *, const struct timespec * abstime)); -int pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *)); +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); int pthread_create __P((pthread_t *, const pthread_attr_t *, void *(*start_routine) (void *), void *)); -int pthread_detach __P((pthread_t)); -int pthread_equal __P((pthread_t, pthread_t)); -__dead void pthread_exit __P((void *)) __attribute__((__noreturn__)); -void *pthread_getspecific __P((pthread_key_t)); -int pthread_join __P((pthread_t, void **)); +int pthread_detach(pthread_t); +int pthread_equal(pthread_t, pthread_t); +__dead void pthread_exit(void *) __attribute__((__noreturn__)); +void *pthread_getspecific(pthread_key_t); +int pthread_join(pthread_t, void **); int pthread_key_create __P((pthread_key_t *, void (*routine) (void *))); -int pthread_key_delete __P((pthread_key_t)); -int pthread_kill __P((struct pthread *, int)); -int pthread_mutexattr_init __P((pthread_mutexattr_t *)); -int pthread_mutexattr_destroy __P((pthread_mutexattr_t *)); -int pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *)); -int pthread_mutexattr_settype __P((pthread_mutexattr_t *, int)); -int pthread_mutex_destroy __P((pthread_mutex_t *)); +int pthread_key_delete(pthread_key_t); +int pthread_kill(struct pthread *, int); +int pthread_mutexattr_init(pthread_mutexattr_t *); +int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); +int pthread_mutexattr_settype(pthread_mutexattr_t *, int); +int pthread_mutex_destroy(pthread_mutex_t *); int pthread_mutex_init __P((pthread_mutex_t *, const pthread_mutexattr_t *)); -int pthread_mutex_lock __P((pthread_mutex_t *)); -int pthread_mutex_trylock __P((pthread_mutex_t *)); -int pthread_mutex_unlock __P((pthread_mutex_t *)); +int pthread_mutex_lock(pthread_mutex_t *); +int pthread_mutex_trylock(pthread_mutex_t *); +int pthread_mutex_unlock(pthread_mutex_t *); int pthread_once __P((pthread_once_t *, void (*) (void))); -int pthread_rwlock_destroy __P((pthread_rwlock_t *)); +int pthread_rwlock_destroy(pthread_rwlock_t *); int pthread_rwlock_init __P((pthread_rwlock_t *, const pthread_rwlockattr_t *)); -int pthread_rwlock_rdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_tryrdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_trywrlock __P((pthread_rwlock_t *)); -int pthread_rwlock_unlock __P((pthread_rwlock_t *)); -int pthread_rwlock_wrlock __P((pthread_rwlock_t *)); -int pthread_rwlockattr_init __P((pthread_rwlockattr_t *)); +int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_tryrdlock(pthread_rwlock_t *); +int pthread_rwlock_trywrlock(pthread_rwlock_t *); +int pthread_rwlock_unlock(pthread_rwlock_t *); +int pthread_rwlock_wrlock(pthread_rwlock_t *); +int pthread_rwlockattr_init(pthread_rwlockattr_t *); int pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *, int *)); int pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *, int)); -int pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *)); -pthread_t pthread_self __P((void)); -int pthread_setspecific __P((pthread_key_t, const void *)); -int pthread_sigmask __P((int, const sigset_t *, sigset_t *)); +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); +pthread_t pthread_self(void); +int pthread_setspecific(pthread_key_t, const void *); +int pthread_sigmask(int, const sigset_t *, sigset_t *); -int pthread_cancel __P((pthread_t)); -int pthread_setcancelstate __P((int, int *)); -int pthread_setcanceltype __P((int, int *)); -void pthread_testcancel __P((void)); +int pthread_cancel(pthread_t); +int pthread_setcancelstate(int, int *); +int pthread_setcanceltype(int, int *); +void pthread_testcancel(void); -int pthread_getprio __P((pthread_t)); -int pthread_setprio __P((pthread_t, int)); -void pthread_yield __P((void)); +int pthread_getprio(pthread_t); +int pthread_setprio(pthread_t, int); +void pthread_yield(void); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_mutexattr_getpshared __P((pthread_mutexattr_t *, @@ -296,7 +296,7 @@ int pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *, int *prioceiling)); int pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *, int prioceiling)); -int pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *)); +int pthread_mutex_getprioceiling(pthread_mutex_t *, int *); int pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *)); #endif @@ -314,20 +314,20 @@ int pthread_setschedparam __P((pthread_t pthread, int policy, const struct sched_param * param)); #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) -int pthread_attr_getinheritsched __P((const pthread_attr_t *, int *)); +int pthread_attr_getinheritsched(const pthread_attr_t *, int *); int pthread_attr_getschedparam __P((const pthread_attr_t *, struct sched_param *)); -int pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *)); -int pthread_attr_getscope __P((const pthread_attr_t *, int *)); -int pthread_attr_setinheritsched __P((pthread_attr_t *, int)); +int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); +int pthread_attr_getscope(const pthread_attr_t *, int *); +int pthread_attr_setinheritsched(pthread_attr_t *, int); int pthread_attr_setschedparam __P((pthread_attr_t *, const struct sched_param *)); -int pthread_attr_setschedpolicy __P((pthread_attr_t *, int)); -int pthread_attr_setscope __P((pthread_attr_t *, int)); +int pthread_attr_setschedpolicy(pthread_attr_t *, int); +int pthread_attr_setscope(pthread_attr_t *, int); #endif -int pthread_attr_setfloatstate __P((pthread_attr_t *, int)); -int pthread_attr_getfloatstate __P((pthread_attr_t *, int *)); +int pthread_attr_setfloatstate(pthread_attr_t *, int); +int pthread_attr_getfloatstate(pthread_attr_t *, int *); int pthread_attr_setcleanup __P((pthread_attr_t *, void (*routine) (void *), void *)); @@ -343,8 +343,8 @@ int pthread_attr_getguardsize __P((const pthread_attr_t *, size_t *)); int pthread_attr_setguardsize __P((const pthread_attr_t *, size_t)); -int pthread_getconcurrency __P((void)); -int pthread_setconcurrency __P((int)); +int pthread_getconcurrency(void); +int pthread_setconcurrency(int); #endif /* susv2 */ __END_DECLS diff --git a/lib/libc_r/include/pthread_np.h b/lib/libc_r/include/pthread_np.h index 014b0f7c67b..a7eded4b025 100644 --- a/lib/libc_r/include/pthread_np.h +++ b/lib/libc_r/include/pthread_np.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_np.h,v 1.4 2001/08/17 22:44:15 pvalchev Exp $ */ +/* $OpenBSD: pthread_np.h,v 1.5 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -37,23 +37,23 @@ /* * Non-POSIX type definitions: */ -typedef void (*pthread_switch_routine_t) __P((pthread_t, pthread_t)); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); /* * Non-POSIX thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_setcreatesuspend_np __P((pthread_attr_t *)); -int pthread_multi_np __P((void)); -int pthread_resume_np __P((pthread_t)); -int pthread_single_np __P((void)); -int pthread_suspend_np __P((pthread_t)); -int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t)); -int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int)); -void pthread_set_name_np __P((pthread_t, char *)); -int pthread_switch_add_np __P((pthread_switch_routine_t)); -int pthread_switch_delete_np __P((pthread_switch_routine_t)); -int pthread_main_np __P((void)); +int pthread_attr_setcreatesuspend_np(pthread_attr_t *); +int pthread_multi_np(void); +int pthread_resume_np(pthread_t); +int pthread_single_np(void); +int pthread_suspend_np(pthread_t); +int pthread_mutexattr_getkind_np(pthread_mutexattr_t); +int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); +void pthread_set_name_np(pthread_t, char *); +int pthread_switch_add_np(pthread_switch_routine_t); +int pthread_switch_delete_np(pthread_switch_routine_t); +int pthread_main_np(void); __END_DECLS #endif diff --git a/lib/libc_r/include/sched.h b/lib/libc_r/include/sched.h index 898d4ae6b16..81b91b2a682 100644 --- a/lib/libc_r/include/sched.h +++ b/lib/libc_r/include/sched.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sched.h,v 1.5 2002/01/18 00:38:12 fgsch Exp $ */ +/* $OpenBSD: sched.h,v 1.6 2002/02/16 21:27:25 millert Exp $ */ /* sched.h: POSIX 1003.1b Process Scheduling header */ @@ -60,17 +60,17 @@ struct sched_param #include <sys/cdefs.h> __BEGIN_DECLS -int sched_setparam __P((pid_t, const struct sched_param *)); -int sched_getparam __P((pid_t, struct sched_param *)); +int sched_setparam(pid_t, const struct sched_param *); +int sched_getparam(pid_t, struct sched_param *); -int sched_setscheduler __P((pid_t, int, const struct sched_param *)); -int sched_getscheduler __P((pid_t)); +int sched_setscheduler(pid_t, int, const struct sched_param *); +int sched_getscheduler(pid_t); -int sched_yield __P((void)); -int sched_get_priority_max __P((int)); -int sched_get_priority_min __P((int)); +int sched_yield(void); +int sched_get_priority_max(int); +int sched_get_priority_min(int); struct timespec; -int sched_rr_get_interval __P((pid_t, struct timespec *)); +int sched_rr_get_interval(pid_t, struct timespec *); __END_DECLS #endif /* KERNEL */ diff --git a/lib/libc_r/include/semaphore.h b/lib/libc_r/include/semaphore.h index eab8e356121..4735f9c29f9 100644 --- a/lib/libc_r/include/semaphore.h +++ b/lib/libc_r/include/semaphore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: semaphore.h,v 1.2 2002/01/18 20:36:25 fgsch Exp $ */ +/* $OpenBSD: semaphore.h,v 1.3 2002/02/16 21:27:25 millert Exp $ */ /* semaphore.h: POSIX 1003.1b semaphores */ @@ -52,15 +52,15 @@ typedef struct sem *sem_t; #include <sys/cdefs.h> __BEGIN_DECLS -int sem_init __P((sem_t *, int, unsigned int)); -int sem_destroy __P((sem_t *)); -sem_t *sem_open __P((const char *, int, ...)); -int sem_close __P((sem_t *)); -int sem_unlink __P((const char *)); -int sem_wait __P((sem_t *)); -int sem_trywait __P((sem_t *)); -int sem_post __P((sem_t *)); -int sem_getvalue __P((sem_t *, int *)); +int sem_init(sem_t *, int, unsigned int); +int sem_destroy(sem_t *); +sem_t *sem_open(const char *, int, ...); +int sem_close(sem_t *); +int sem_unlink(const char *); +int sem_wait(sem_t *); +int sem_trywait(sem_t *); +int sem_post(sem_t *); +int sem_getvalue(sem_t *, int *); __END_DECLS #endif /* _KERNEL */ diff --git a/lib/libc_r/include/spinlock.h b/lib/libc_r/include/spinlock.h index 51dc5fba4de..8c87e963de1 100644 --- a/lib/libc_r/include/spinlock.h +++ b/lib/libc_r/include/spinlock.h @@ -29,8 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ - * $OpenBSD: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ + * $Id: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ + * $OpenBSD: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ * * Lock definitions used in both libc and libpthread. * @@ -67,13 +67,13 @@ typedef volatile struct { * Thread function prototype definitions: */ __BEGIN_DECLS -void _spinlock __P((spinlock_t *)); -void _spinlock_debug __P((spinlock_t *, char *, int)); +void _spinlock(spinlock_t *); +void _spinlock_debug(spinlock_t *, char *, int); /* lock() functions return 0 if lock was acquired. */ /* is_locked functions() return 1 if lock is locked. */ -int _atomic_lock __P((volatile _spinlock_lock_t *)); -int _atomic_is_locked __P((volatile _spinlock_lock_t *)); +int _atomic_lock(volatile _spinlock_lock_t *); +int _atomic_is_locked(volatile _spinlock_lock_t *); __END_DECLS #endif /* _SPINLOCK_H_ */ diff --git a/lib/libc_r/thread/thread_storage.c b/lib/libc_r/thread/thread_storage.c index 7dedd52f2f2..fa8357c85ec 100644 --- a/lib/libc_r/thread/thread_storage.c +++ b/lib/libc_r/thread/thread_storage.c @@ -30,7 +30,7 @@ _libc_private_storage(volkey, init, initsz, error) void * error; { void *result; - void (*cleanfn) __P((void *)); + void (*cleanfn)(void *); struct _thread_private_key_struct * key; /* Use static storage while not threaded: */ diff --git a/lib/libc_r/uthread/uthread_autoinit.c b/lib/libc_r/uthread/uthread_autoinit.c index 43f50a2778e..5753d434c7f 100644 --- a/lib/libc_r/uthread/uthread_autoinit.c +++ b/lib/libc_r/uthread/uthread_autoinit.c @@ -1,7 +1,7 @@ /* * David Leonard, 1998. Public Domain. <david.leonard@csee.uq.edu.au> * - * $OpenBSD: uthread_autoinit.c,v 1.9 2002/01/24 18:39:46 pefo Exp $ + * $OpenBSD: uthread_autoinit.c,v 1.10 2002/02/16 21:27:25 millert Exp $ */ #include <stdio.h> @@ -9,7 +9,7 @@ #include "pthread_private.h" __BEGIN_DECLS -extern void _thread_init __P((void)); +extern void _thread_init(void); __END_DECLS #ifdef DEBUG @@ -36,7 +36,7 @@ Init _thread_initialiser; * The a.out ld.so dynamic linker calls the function * at symbol ".init" if it exists, just after linkage. */ -extern void _thread_dot_init __P((void)) asm(".init"); +extern void _thread_dot_init(void) asm(".init"); void _thread_dot_init() { @@ -53,7 +53,7 @@ _thread_dot_init() * to call it. */ #if defined(__GNUC__) /* && defined(notyet) */ /* internal compiler error??? */ -void _thread_init_constructor __P((void)) __attribute__((constructor)); +void _thread_init_constructor(void) __attribute__((constructor)); void _thread_init_constructor() { diff --git a/lib/libcom_err/com_err.h b/lib/libcom_err/com_err.h index 642e51cdffe..af9ffff8f54 100644 --- a/lib/libcom_err/com_err.h +++ b/lib/libcom_err/com_err.h @@ -83,16 +83,16 @@ void free_error_table(struct et_list *); #endif /* __COM_RIGHT_H__ */ -typedef void (*errf) __P((const char *, long, const char *, va_list)); +typedef void (*errf)(const char *, long, const char *, va_list); -const char * error_message __P((long)); -int init_error_table __P((const char**, long, int)); +const char * error_message(long); +int init_error_table(const char**, long, int); -void com_err_va __P((const char *, long, const char *, va_list)); -void com_err __P((const char *, long, const char *, ...)); +void com_err_va(const char *, long, const char *, va_list); +void com_err(const char *, long, const char *, ...); -errf set_com_err_hook __P((errf)); -errf reset_com_err_hook __P((void)); +errf set_com_err_hook(errf); +errf reset_com_err_hook(void); const char *error_table_name(int num); diff --git a/lib/libcompat/4.3/lsearch.c b/lib/libcompat/4.3/lsearch.c index da3d9731eaf..9cc27856bb3 100644 --- a/lib/libcompat/4.3/lsearch.c +++ b/lib/libcompat/4.3/lsearch.c @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)lsearch.c 8.1 (Berkeley) 6/4/93"; #include <string.h> #include <search.h> -typedef int (*cmp_fn_t) __P((const void *, const void *)); +typedef int (*cmp_fn_t)(const void *, const void *); static void *linear_base __P((const void *, const void *, size_t *, size_t, cmp_fn_t, int)); diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c index 829ced38f4e..e2d6811bd52 100644 --- a/lib/libcompat/4.3/regex.c +++ b/lib/libcompat/4.3/regex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regex.c,v 1.3 2000/03/02 00:29:48 todd Exp $ */ +/* $OpenBSD: regex.c,v 1.4 2002/02/16 21:27:25 millert Exp $ */ /*- * Copyright (c) 1992 The Regents of the University of California. @@ -45,7 +45,7 @@ #if defined(LIBC_SCCS) && !defined(lint) /*static char sccsid[] = "from: @(#)regex.c 5.1 (Berkeley) 3/29/92";*/ -static char rcsid[] = "$OpenBSD: regex.c,v 1.3 2000/03/02 00:29:48 todd Exp $"; +static char rcsid[] = "$OpenBSD: regex.c,v 1.4 2002/02/16 21:27:25 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -58,7 +58,7 @@ static regexp *re_regexp; static int re_goterr; static char *re_errstr; -static void re_error __P((const char *)); +static void re_error(const char *); char * re_comp(s) diff --git a/lib/libcompat/4.3/rexec.c b/lib/libcompat/4.3/rexec.c index 346caa01874..1f1413f3a7a 100644 --- a/lib/libcompat/4.3/rexec.c +++ b/lib/libcompat/4.3/rexec.c @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)rexec.c 8.1 (Berkeley) 6/4/93"; int rexecoptions; -void ruserpass __P((const char *, char **, char **)); +void ruserpass(const char *, char **, char **); int rexec(ahost, rport, name, pass, cmd, fd2p) diff --git a/lib/libcompat/regexp/regexp.c b/lib/libcompat/regexp/regexp.c index 2b2abe42f5f..e473c53a9d3 100644 --- a/lib/libcompat/regexp/regexp.c +++ b/lib/libcompat/regexp/regexp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regexp.c,v 1.2 1996/07/24 05:39:11 downsj Exp $ */ +/* $OpenBSD: regexp.c,v 1.3 2002/02/16 21:27:26 millert Exp $ */ /* * regcomp and regexec -- regsub and regerror are elsewhere @@ -36,7 +36,7 @@ */ #ifndef lint -static char *rcsid = "$OpenBSD: regexp.c,v 1.2 1996/07/24 05:39:11 downsj Exp $"; +static char *rcsid = "$OpenBSD: regexp.c,v 1.3 2002/02/16 21:27:26 millert Exp $"; #endif /* not lint */ #include <regexp.h> @@ -177,18 +177,18 @@ static long regsize; /* Code size. */ #ifndef STATIC #define STATIC static #endif -STATIC char *reg __P((int, int *)); -STATIC char *regbranch __P((int *)); -STATIC char *regpiece __P((int *)); -STATIC char *regatom __P((int *)); -STATIC char *regnode __P((char)); -STATIC char *regnext __P((char *)); -STATIC void regc __P((char)); -STATIC void reginsert __P((char, char *)); -STATIC void regtail __P((char *, char *)); -STATIC void regoptail __P((char *, char *)); +STATIC char *reg(int, int *); +STATIC char *regbranch(int *); +STATIC char *regpiece(int *); +STATIC char *regatom(int *); +STATIC char *regnode(char); +STATIC char *regnext(char *); +STATIC void regc(char); +STATIC void reginsert(char, char *); +STATIC void regtail(char *, char *); +STATIC void regoptail(char *, char *); #ifdef STRCSPN -STATIC int strcspn __P((char *, char *)); +STATIC int strcspn(char *, char *); #endif /* @@ -777,14 +777,14 @@ static char **regendp; /* Ditto for endp. */ /* * Forwards. */ -STATIC int regtry __P((const regexp *, const char *)); -STATIC int regmatch __P((char *)); -STATIC int regrepeat __P((char *)); +STATIC int regtry(const regexp *, const char *); +STATIC int regmatch(char *); +STATIC int regrepeat(char *); #ifdef DEBUG int regnarrate = 0; -void regdump __P((regexp *)); -STATIC char *regprop __P((char *)); +void regdump(regexp *); +STATIC char *regprop(char *); #endif /* diff --git a/lib/libcompat/regexp/regexp.h b/lib/libcompat/regexp/regexp.h index c195195fedc..28c866acfe7 100644 --- a/lib/libcompat/regexp/regexp.h +++ b/lib/libcompat/regexp/regexp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: regexp.h,v 1.3 1996/07/24 05:56:57 downsj Exp $ */ +/* $OpenBSD: regexp.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: regexp.h,v 1.3 1994/10/26 00:56:15 cgd Exp $ */ /* @@ -72,10 +72,10 @@ typedef struct regexp { #include <sys/cdefs.h> __BEGIN_DECLS -regexp *v8_regcomp __P((const char *)); -int v8_regexec __P((const regexp *, const char *)); -void v8_regsub __P((const regexp *, const char *, char *)); -void v8_regerror __P((const char *)); +regexp *v8_regcomp(const char *); +int v8_regexec(const regexp *, const char *); +void v8_regsub(const regexp *, const char *, char *); +void v8_regerror(const char *); __END_DECLS #endif /* !_REGEXP_H_ */ diff --git a/lib/libcurses/tinfo/read_bsd_terminfo.c b/lib/libcurses/tinfo/read_bsd_terminfo.c index 7ff1b6e243f..f22e0205a4a 100644 --- a/lib/libcurses/tinfo/read_bsd_terminfo.c +++ b/lib/libcurses/tinfo/read_bsd_terminfo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read_bsd_terminfo.c,v 1.9 2000/10/08 22:47:02 millert Exp $ */ +/* $OpenBSD: read_bsd_terminfo.c,v 1.10 2002/02/16 21:27:26 millert Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: read_bsd_terminfo.c,v 1.9 2000/10/08 22:47:02 millert Exp $"; +static char rcsid[] = "$OpenBSD: read_bsd_terminfo.c,v 1.10 2002/02/16 21:27:26 millert Exp $"; #endif #include <curses.priv.h> @@ -39,7 +39,7 @@ static char rcsid[] = "$OpenBSD: read_bsd_terminfo.c,v 1.9 2000/10/08 22:47:02 m #define _PATH_TERMINFO "/usr/share/misc/terminfo" /* Function prototypes for private functions, */ -static int _nc_lookup_bsd_terminfo_entry __P((const char *const, const char *const, TERMTYPE *)); +static int _nc_lookup_bsd_terminfo_entry(const char *const, const char *const, TERMTYPE *); /* * Look up ``tn'' in the BSD terminfo.db file and fill in ``tp'' diff --git a/lib/libedit/chared.c b/lib/libedit/chared.c index dd42d448e13..00d39e93b8f 100644 --- a/lib/libedit/chared.c +++ b/lib/libedit/chared.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chared.c,v 1.3 1997/03/14 05:12:41 millert Exp $ */ +/* $OpenBSD: chared.c,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: chared.c,v 1.2 1997/01/11 06:47:48 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)chared.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: chared.c,v 1.3 1997/03/14 05:12:41 millert Exp $"; +static char rcsid[] = "$OpenBSD: chared.c,v 1.4 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -177,7 +177,7 @@ protected char * c__prev_word(p, low, n, wtest) register char *p, *low; register int n; - int (*wtest) __P((int)); + int (*wtest)(int); { p--; @@ -204,7 +204,7 @@ protected char * c__next_word(p, high, n, wtest) register char *p, *high; register int n; - int (*wtest) __P((int)); + int (*wtest)(int); { while (n--) { while ((p < high) && !(*wtest)((unsigned char) *p)) @@ -226,7 +226,7 @@ cv_next_word(el, p, high, n, wtest) EditLine *el; register char *p, *high; register int n; - int (*wtest) __P((int)); + int (*wtest)(int); { int test; @@ -259,7 +259,7 @@ cv_prev_word(el, p, low, n, wtest) EditLine *el; register char *p, *low; register int n; - int (*wtest) __P((int)); + int (*wtest)(int); { int test; diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h index c4c1d94f2be..91cdf7f253e 100644 --- a/lib/libedit/chared.h +++ b/lib/libedit/chared.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chared.h,v 1.3 1997/03/14 05:12:42 millert Exp $ */ +/* $OpenBSD: chared.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: chared.h,v 1.2 1997/01/11 06:47:49 lukem Exp $ */ /*- @@ -137,25 +137,25 @@ typedef struct el_chared_t { #include "fcns.h" -protected int cv__isword __P((int)); -protected void cv_delfini __P((EditLine *)); -protected char *cv__endword __P((char *, char *, int)); -protected int ce__isword __P((int)); -protected void cv_undo __P((EditLine *, int, int, char *)); +protected int cv__isword(int); +protected void cv_delfini(EditLine *); +protected char *cv__endword(char *, char *, int); +protected int ce__isword(int); +protected void cv_undo(EditLine *, int, int, char *); protected char *cv_next_word __P((EditLine*, char *, char *, int, int (*)(int))); protected char *cv_prev_word __P((EditLine*, char *, char *, int, int (*)(int))); protected char *c__next_word __P((char *, char *, int, int (*)(int))); protected char *c__prev_word __P((char *, char *, int, int (*)(int))); -protected void c_insert __P((EditLine *, int)); -protected void c_delbefore __P((EditLine *, int)); -protected void c_delafter __P((EditLine *, int)); -protected int c_gets __P((EditLine *, char *)); -protected int c_hpos __P((EditLine *)); - -protected int ch_init __P((EditLine *)); -protected void ch_reset __P((EditLine *)); -protected void ch_end __P((EditLine *)); +protected void c_insert(EditLine *, int); +protected void c_delbefore(EditLine *, int); +protected void c_delafter(EditLine *, int); +protected int c_gets(EditLine *, char *); +protected int c_hpos(EditLine *); + +protected int ch_init(EditLine *); +protected void ch_reset(EditLine *); +protected void ch_end(EditLine *); #endif /* _h_el_chared */ diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h index c64bed49d5a..8113b21b1f0 100644 --- a/lib/libedit/hist.h +++ b/lib/libedit/hist.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hist.h,v 1.4 1997/03/14 05:12:49 millert Exp $ */ +/* $OpenBSD: hist.h,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: hist.h,v 1.3 1997/01/11 06:47:56 lukem Exp $ */ /*- @@ -47,7 +47,7 @@ #include "histedit.h" -typedef const HistEvent * (*hist_fun_t) __P((ptr_t, int, ...)); +typedef const HistEvent * (*hist_fun_t)(ptr_t, int, ...); typedef struct el_history_t { char *buf; /* The history buffer */ @@ -71,10 +71,10 @@ typedef struct el_history_t { #define HIST_LOAD(el, fname) HIST_FUN(el, H_LOAD fname) #define HIST_SAVE(el, fname) HIST_FUN(el, H_SAVE fname) -protected int hist_init __P((EditLine *)); -protected void hist_end __P((EditLine *)); -protected el_action_t hist_get __P((EditLine *)); -protected int hist_set __P((EditLine *, hist_fun_t, ptr_t)); -protected int hist_list __P((EditLine *, int, char **)); +protected int hist_init(EditLine *); +protected void hist_end(EditLine *); +protected el_action_t hist_get(EditLine *); +protected int hist_set(EditLine *, hist_fun_t, ptr_t); +protected int hist_list(EditLine *, int, char **); #endif /* _h_el_hist */ diff --git a/lib/libedit/histedit.h b/lib/libedit/histedit.h index 7da08c8ed57..aa65004ff0a 100644 --- a/lib/libedit/histedit.h +++ b/lib/libedit/histedit.h @@ -1,4 +1,4 @@ -/* $OpenBSD: histedit.h,v 1.5 1997/06/29 23:40:49 millert Exp $ */ +/* $OpenBSD: histedit.h,v 1.6 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: histedit.h,v 1.5 1997/04/11 17:52:45 christos Exp $ */ /*- @@ -80,28 +80,28 @@ typedef struct lineinfo { /* * Initialization, cleanup, and resetting */ -EditLine *el_init __P((const char *, FILE *, FILE *)); -void el_reset __P((EditLine *)); -void el_end __P((EditLine *)); +EditLine *el_init(const char *, FILE *, FILE *); +void el_reset(EditLine *); +void el_end(EditLine *); /* * Get a line, a character or push a string back in the input queue */ -const char *el_gets __P((EditLine *, int *)); -int el_getc __P((EditLine *, char *)); -void el_push __P((EditLine *, const char *)); +const char *el_gets(EditLine *, int *); +int el_getc(EditLine *, char *); +void el_push(EditLine *, const char *); /* * High level function internals control * Parses argc, argv array and executes builtin editline commands */ -int el_parse __P((EditLine *, int, char **)); +int el_parse(EditLine *, int, char **); /* * Low level editline access function */ -int el_set __P((EditLine *, int, ...)); +int el_set(EditLine *, int, ...); /* * el_set/el_get parameters @@ -122,22 +122,22 @@ int el_set __P((EditLine *, int, ...)); /* * Source named file or $PWD/.editrc or $HOME/.editrc */ -int el_source __P((EditLine *, const char *)); +int el_source(EditLine *, const char *); /* * Must be called when the terminal changes size; If EL_SIGNAL * is set this is done automatically otherwise it is the responsibility * of the application */ -void el_resize __P((EditLine *)); +void el_resize(EditLine *); /* * User-defined function interface. */ -const LineInfo *el_line __P((EditLine *)); -int el_insertstr __P((EditLine *, char *)); -void el_deletestr __P((EditLine *, int)); +const LineInfo *el_line(EditLine *); +int el_insertstr(EditLine *, char *); +void el_deletestr(EditLine *, int); /* * ==== History ==== @@ -153,10 +153,10 @@ typedef struct HistEvent { /* * History access functions. */ -History * history_init __P((void)); -void history_end __P((History *)); +History * history_init(void); +void history_end(History *); -const HistEvent * history __P((History *, int, ...)); +const HistEvent * history(History *, int, ...); #define H_FUNC 0 /* , UTSL */ #define H_EVENT 1 /* , const int); */ diff --git a/lib/libedit/history.c b/lib/libedit/history.c index 4155dd023c8..d266b82c077 100644 --- a/lib/libedit/history.c +++ b/lib/libedit/history.c @@ -1,4 +1,4 @@ -/* $OpenBSD: history.c,v 1.5 1997/06/29 23:40:49 millert Exp $ */ +/* $OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: history.c,v 1.5 1997/04/11 17:52:46 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)history.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: history.c,v 1.5 1997/06/29 23:40:49 millert Exp $"; +static char rcsid[] = "$OpenBSD: history.c,v 1.6 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -62,9 +62,9 @@ static const char hist_cookie[] = "_HiStOrY_V1_\n"; #include "histedit.h" -typedef const HistEvent * (*history_gfun_t) __P((ptr_t)); -typedef const HistEvent * (*history_efun_t) __P((ptr_t, const char *)); -typedef void (*history_vfun_t) __P((ptr_t)); +typedef const HistEvent * (*history_gfun_t)(ptr_t); +typedef const HistEvent * (*history_efun_t)(ptr_t, const char *); +typedef void (*history_vfun_t)(ptr_t); struct history { ptr_t h_ref; /* Argument for history fcns */ @@ -91,14 +91,14 @@ struct history { #define h_free(a) free(a) -private int history_set_num __P((History *, int)); -private int history_set_fun __P((History *, History *)); -private int history_load __P((History *, const char *)); -private int history_save __P((History *, const char *)); -private const HistEvent *history_prev_event __P((History *, int)); -private const HistEvent *history_next_event __P((History *, int)); -private const HistEvent *history_next_string __P((History *, const char *)); -private const HistEvent *history_prev_string __P((History *, const char *)); +private int history_set_num(History *, int); +private int history_set_fun(History *, History *); +private int history_load(History *, const char *); +private int history_save(History *, const char *); +private const HistEvent *history_prev_event(History *, int); +private const HistEvent *history_next_event(History *, int); +private const HistEvent *history_next_string(History *, const char *); +private const HistEvent *history_prev_string(History *, const char *); /***********************************************************************/ @@ -120,17 +120,17 @@ typedef struct history_t { int eventno; /* Current event number */ } history_t; -private const HistEvent *history_def_first __P((ptr_t)); -private const HistEvent *history_def_last __P((ptr_t)); -private const HistEvent *history_def_next __P((ptr_t)); -private const HistEvent *history_def_prev __P((ptr_t)); -private const HistEvent *history_def_curr __P((ptr_t)); -private const HistEvent *history_def_enter __P((ptr_t, const char *)); -private const HistEvent *history_def_add __P((ptr_t, const char *)); -private void history_def_init __P((ptr_t *, int)); -private void history_def_clear __P((ptr_t)); -private const HistEvent *history_def_insert __P((history_t *, const char *)); -private void history_def_delete __P((history_t *, hentry_t *)); +private const HistEvent *history_def_first(ptr_t); +private const HistEvent *history_def_last(ptr_t); +private const HistEvent *history_def_next(ptr_t); +private const HistEvent *history_def_prev(ptr_t); +private const HistEvent *history_def_curr(ptr_t); +private const HistEvent *history_def_enter(ptr_t, const char *); +private const HistEvent *history_def_add(ptr_t, const char *); +private void history_def_init(ptr_t *, int); +private void history_def_clear(ptr_t); +private const HistEvent *history_def_insert(history_t *, const char *); +private void history_def_delete(history_t *, hentry_t *); #define history_def_set(p, num) (void)(((history_t *) p)->max = (num)) diff --git a/lib/libedit/key.c b/lib/libedit/key.c index 5a81521e52f..e108095f350 100644 --- a/lib/libedit/key.c +++ b/lib/libedit/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.3 1997/03/14 05:12:52 millert Exp $ */ +/* $OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: key.c,v 1.2 1997/01/11 06:47:58 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)key.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: key.c,v 1.3 1997/03/14 05:12:52 millert Exp $"; +static char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -89,13 +89,13 @@ private int node_trav __P((EditLine *, key_node_t *, char *, key_value_t *)); private int node__try __P((key_node_t *, char *, key_value_t *, int)); -private key_node_t *node__get __P((int)); -private void node__put __P((key_node_t *)); -private int node__delete __P((key_node_t **, char *)); +private key_node_t *node__get(int); +private void node__put(key_node_t *); +private int node__delete(key_node_t **, char *); private int node_lookup __P((EditLine *, char *, key_node_t *, int)); -private int node_enum __P((EditLine *, key_node_t *, int)); -private int key__decode_char __P((char *, int, int)); +private int node_enum(EditLine *, key_node_t *, int); +private int key__decode_char(char *, int, int); #define KEY_BUFSIZ EL_BUFSIZ diff --git a/lib/libedit/key.h b/lib/libedit/key.h index 924154bd4b9..256d48b72a7 100644 --- a/lib/libedit/key.h +++ b/lib/libedit/key.h @@ -1,4 +1,4 @@ -/* $OpenBSD: key.h,v 1.3 1997/03/14 05:12:52 millert Exp $ */ +/* $OpenBSD: key.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: key.h,v 1.2 1997/01/11 06:47:59 lukem Exp $ */ /*- @@ -63,21 +63,21 @@ typedef struct el_key_t { #define XK_NOD 2 #define XK_EXE 3 -protected int key_init __P((EditLine *)); -protected void key_end __P((EditLine *)); -protected key_value_t * key_map_cmd __P((EditLine *, int)); -protected key_value_t * key_map_str __P((EditLine *, char *)); -protected void key_reset __P((EditLine *)); +protected int key_init(EditLine *); +protected void key_end(EditLine *); +protected key_value_t * key_map_cmd(EditLine *, int); +protected key_value_t * key_map_str(EditLine *, char *); +protected void key_reset(EditLine *); protected int key_get __P((EditLine *, char *, key_value_t *)); protected void key_add __P((EditLine *, char *, key_value_t *, int)); protected void key_clear __P((EditLine *, el_action_t *, char *)); -protected int key_delete __P((EditLine *, char *)); -protected void key_print __P((EditLine *, char *)); +protected int key_delete(EditLine *, char *); +protected void key_print(EditLine *, char *); protected void key_kprint __P((EditLine *, char *, key_value_t *, int)); -protected char *key__decode_str __P((char *, char *, char *)); +protected char *key__decode_str(char *, char *, char *); #endif /* _h_el_key */ diff --git a/lib/libedit/makelist b/lib/libedit/makelist index 2204cfc3583..51e7b2454c5 100644 --- a/lib/libedit/makelist +++ b/lib/libedit/makelist @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: makelist,v 1.3 1997/03/14 05:12:53 millert Exp $ +# $OpenBSD: makelist,v 1.4 2002/02/16 21:27:26 millert Exp $ # $NetBSD: makelist,v 1.3 1997/01/11 06:48:00 lukem Exp $ # # Copyright (c) 1992, 1993 @@ -67,7 +67,7 @@ case $FLAG in pr = substr($2, 1, 2); if (pr == "vi" || pr == "em" || pr == "ed") { name = substr($2, 1, length($2) - 3); - printf("protected el_action_t\t%-25.25s __P((EditLine *, int));\n", name); + printf("protected el_action_t\t%-25.25s(EditLine *, int);\n", name); } } END { @@ -122,7 +122,7 @@ case $FLAG in BEGIN { printf("/* Automatically generated file, do not edit */\n"); printf("#ifndef _h_help_c\n#define _h_help_c\n"); - printf("protected el_bindings_t *help__get\t__P((void));\n"); + printf("protected el_bindings_t *help__get\t(void);\n"); printf("#endif /* _h_help_c */\n"); }' /dev/null;; -fh) @@ -139,8 +139,8 @@ case $FLAG in END { printf("#define\t%-30.30s\t%3d\n", "EL_NUM_FCNS", count); - printf("typedef el_action_t (*el_func_t) __P((EditLine *, int));"); - printf("\nprotected el_func_t* func__get __P((void));\n"); + printf("typedef el_action_t (*el_func_t)(EditLine *, int);"); + printf("\nprotected el_func_t* func__get(void);\n"); printf("#endif /* _h_fcns_c */\n"); }';; -fc) diff --git a/lib/libedit/map.c b/lib/libedit/map.c index 00283efa6cc..70429ed3bbc 100644 --- a/lib/libedit/map.c +++ b/lib/libedit/map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $ */ +/* $OpenBSD: map.c,v 1.6 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: map.c,v 1.3 1997/01/11 06:48:00 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)map.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: map.c,v 1.6 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -54,11 +54,11 @@ static char rcsid[] = "$OpenBSD: map.c,v 1.5 2001/04/13 20:35:19 millert Exp $"; #define N_KEYS 256 -private void map_print_key __P((EditLine *, el_action_t *, char *)); -private void map_print_some_keys __P((EditLine *, el_action_t *, int, int)); -private void map_print_all_keys __P((EditLine *)); -private void map_init_nls __P((EditLine *)); -private void map_init_meta __P((EditLine *)); +private void map_print_key(EditLine *, el_action_t *, char *); +private void map_print_some_keys(EditLine *, el_action_t *, int, int); +private void map_print_all_keys(EditLine *); +private void map_init_nls(EditLine *); +private void map_init_meta(EditLine *); /* keymap tables ; should be N_KEYS*sizeof(KEYCMD) bytes long */ diff --git a/lib/libedit/map.h b/lib/libedit/map.h index a6c73ed6cca..c63f11c60a3 100644 --- a/lib/libedit/map.h +++ b/lib/libedit/map.h @@ -1,4 +1,4 @@ -/* $OpenBSD: map.h,v 1.3 1997/03/14 05:12:55 millert Exp $ */ +/* $OpenBSD: map.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: map.h,v 1.2 1997/01/11 06:48:01 lukem Exp $ */ /*- @@ -68,12 +68,12 @@ typedef struct el_map_t { #define MAP_EMACS 0 #define MAP_VI 1 -protected int map_bind __P((EditLine *, int, char **)); -protected int map_init __P((EditLine *)); -protected void map_end __P((EditLine *)); -protected void map_init_vi __P((EditLine *)); -protected void map_init_emacs __P((EditLine *)); -protected int map_set_editor __P((EditLine *, char *)); +protected int map_bind(EditLine *, int, char **); +protected int map_init(EditLine *); +protected void map_end(EditLine *); +protected void map_init_vi(EditLine *); +protected void map_init_emacs(EditLine *); +protected int map_set_editor(EditLine *, char *); protected int map_addfunc __P((EditLine *, const char *, const char *, el_func_t)); diff --git a/lib/libedit/parse.c b/lib/libedit/parse.c index b113983a20d..a1096d05bc7 100644 --- a/lib/libedit/parse.c +++ b/lib/libedit/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $ */ +/* $OpenBSD: parse.c,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: parse.c,v 1.5 1997/01/11 09:57:08 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $"; +static char rcsid[] = "$OpenBSD: parse.c,v 1.4 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -63,7 +63,7 @@ static char rcsid[] = "$OpenBSD: parse.c,v 1.3 1997/03/14 05:12:55 millert Exp $ private struct { char *name; - int (*func) __P((EditLine *, int, char **)); + int (*func)(EditLine *, int, char **); } cmds[] = { { "bind", map_bind }, { "echotc", term_echotc }, diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h index f11f849a9a1..619b2a0a71c 100644 --- a/lib/libedit/parse.h +++ b/lib/libedit/parse.h @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.h,v 1.3 1997/03/14 05:12:56 millert Exp $ */ +/* $OpenBSD: parse.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: parse.h,v 1.2 1997/01/11 06:48:03 lukem Exp $ */ /*- @@ -45,9 +45,9 @@ #ifndef _h_el_parse #define _h_el_parse -protected int parse_line __P((EditLine *, const char *)); -protected int parse__escape __P((const char ** const)); -protected char * parse__string __P((char *, const char *)); -protected int parse_cmd __P((EditLine *, const char *)); +protected int parse_line(EditLine *, const char *); +protected int parse__escape(const char ** const); +protected char * parse__string(char *, const char *); +protected int parse_cmd(EditLine *, const char *); #endif /* _h_el_parse */ diff --git a/lib/libedit/prompt.c b/lib/libedit/prompt.c index 82d4f5d3e93..264b0cd667f 100644 --- a/lib/libedit/prompt.c +++ b/lib/libedit/prompt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp $ */ +/* $OpenBSD: prompt.c,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: prompt.c,v 1.2 1997/01/11 06:48:04 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)prompt.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp $"; +static char rcsid[] = "$OpenBSD: prompt.c,v 1.4 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: prompt.c,v 1.3 1997/03/14 05:12:57 millert Exp #include <stdio.h> #include "el.h" -private char *prompt_default __P((EditLine *)); +private char *prompt_default(EditLine *); /* prompt_default(): * Just a default prompt, in case the user did not provide one diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h index 4b456acdb4e..9985b6ce619 100644 --- a/lib/libedit/prompt.h +++ b/lib/libedit/prompt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prompt.h,v 1.3 1997/03/14 05:12:58 millert Exp $ */ +/* $OpenBSD: prompt.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: prompt.h,v 1.2 1997/01/11 06:48:05 lukem Exp $ */ /*- @@ -47,16 +47,16 @@ #include "histedit.h" -typedef char * (*el_pfunc_t) __P((EditLine*)); +typedef char * (*el_pfunc_t)(EditLine*); typedef struct el_prompt_t { el_pfunc_t p_func; /* Function to return the prompt */ coord_t p_pos; /* position in the line after prompt */ } el_prompt_t; -protected void prompt_print __P((EditLine *)); -protected int prompt_set __P((EditLine *, el_pfunc_t)); -protected int prompt_init __P((EditLine *)); -protected void prompt_end __P((EditLine *)); +protected void prompt_print(EditLine *); +protected int prompt_set(EditLine *, el_pfunc_t); +protected int prompt_init(EditLine *); +protected void prompt_end(EditLine *); #endif /* _h_el_prompt */ diff --git a/lib/libedit/read.c b/lib/libedit/read.c index 0f99fdd1035..f45aaa52257 100644 --- a/lib/libedit/read.c +++ b/lib/libedit/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.6 1997/08/20 03:30:13 millert Exp $ */ +/* $OpenBSD: read.c,v 1.7 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: read.c,v 1.4 1997/04/11 17:52:47 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: read.c,v 1.6 1997/08/20 03:30:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: read.c,v 1.7 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -58,9 +58,9 @@ extern int errno; #define OKCMD -1 -private int read__fixio __P((int, int)); -private int read_preread __P((EditLine *)); -private int read_getcmd __P((EditLine *, el_action_t *, char *)); +private int read__fixio(int, int); +private int read_preread(EditLine *); +private int read_getcmd(EditLine *, el_action_t *, char *); #ifdef DEBUG_EDIT private void diff --git a/lib/libedit/refresh.c b/lib/libedit/refresh.c index 08bff2fcc94..df6fe26fe90 100644 --- a/lib/libedit/refresh.c +++ b/lib/libedit/refresh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp $ */ +/* $OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: refresh.c,v 1.2 1997/01/11 06:48:07 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: refresh.c,v 1.5 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -56,16 +56,16 @@ static char rcsid[] = "$OpenBSD: refresh.c,v 1.4 1997/04/09 02:28:31 deraadt Exp #include "el.h" -private void re_addc __P((EditLine *, int)); -private void re_update_line __P((EditLine *, char *, char *, int)); +private void re_addc(EditLine *, int); +private void re_update_line(EditLine *, char *, char *, int); private void re_insert __P((EditLine *, char *, int, int, char *, int)); private void re_delete __P((EditLine *, char *, int, int, int)); -private void re_fastputc __P((EditLine *, int)); +private void re_fastputc(EditLine *, int); -private void re__strncopy __P((char *, char *, size_t)); -private void re__copy_and_pad __P((char *, char *, size_t)); +private void re__strncopy(char *, char *, size_t); +private void re__copy_and_pad(char *, char *, size_t); #ifdef DEBUG_REFRESH private void re_printstr __P((EditLine *, char *, char *, diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h index 9ffbde99d42..71d3919e574 100644 --- a/lib/libedit/refresh.h +++ b/lib/libedit/refresh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: refresh.h,v 1.3 1997/03/14 05:13:00 millert Exp $ */ +/* $OpenBSD: refresh.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: refresh.h,v 1.2 1997/01/11 06:48:08 lukem Exp $ */ /*- @@ -52,12 +52,12 @@ typedef struct { int r_oldcv, r_newcv; /* Vertical locations */ } el_refresh_t; -protected void re_putc __P((EditLine *, int)); -protected void re_clear_lines __P((EditLine *)); -protected void re_clear_display __P((EditLine *)); -protected void re_refresh __P((EditLine *)); -protected void re_refresh_cursor __P((EditLine *)); -protected void re_fastaddc __P((EditLine *)); -protected void re_goto_bottom __P((EditLine *)); +protected void re_putc(EditLine *, int); +protected void re_clear_lines(EditLine *); +protected void re_clear_display(EditLine *); +protected void re_refresh(EditLine *); +protected void re_refresh_cursor(EditLine *); +protected void re_fastaddc(EditLine *); +protected void re_goto_bottom(EditLine *); #endif /* _h_el_refresh */ diff --git a/lib/libedit/search.c b/lib/libedit/search.c index 06976ae33fe..c157c19cc88 100644 --- a/lib/libedit/search.c +++ b/lib/libedit/search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: search.c,v 1.4 1997/06/29 23:40:51 millert Exp $ */ +/* $OpenBSD: search.c,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: search.c,v 1.4 1997/01/23 14:02:47 mrg Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)search.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: search.c,v 1.4 1997/06/29 23:40:51 millert Exp $"; +static char rcsid[] = "$OpenBSD: search.c,v 1.5 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -118,8 +118,8 @@ el_match(str, pat) regexp *rp; int rv; #else - extern char *re_comp __P((const char *)); - extern int re_exec __P((const char *)); + extern char *re_comp(const char *); + extern int re_exec(const char *); #endif if (strstr(str, pat) != NULL) diff --git a/lib/libedit/search.h b/lib/libedit/search.h index 6cf20ed58c7..68e56d8525a 100644 --- a/lib/libedit/search.h +++ b/lib/libedit/search.h @@ -1,4 +1,4 @@ -/* $OpenBSD: search.h,v 1.3 1997/03/14 05:13:02 millert Exp $ */ +/* $OpenBSD: search.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: search.h,v 1.2 1997/01/11 06:48:09 lukem Exp $ */ /*- @@ -56,16 +56,16 @@ typedef struct el_search_t { } el_search_t; -protected int el_match __P((const char *, const char *)); -protected int search_init __P((EditLine *)); -protected void search_end __P((EditLine *)); -protected int c_hmatch __P((EditLine *, const char *)); -protected void c_setpat __P((EditLine *)); -protected el_action_t ce_inc_search __P((EditLine *, int)); -protected el_action_t cv_search __P((EditLine *, int)); -protected el_action_t ce_search_line __P((EditLine *, char *, int)); -protected el_action_t cv_repeat_srch __P((EditLine *, int)); -protected el_action_t cv_csearch_back __P((EditLine *, int, int, int)); -protected el_action_t cv_csearch_fwd __P((EditLine *, int, int, int)); +protected int el_match(const char *, const char *); +protected int search_init(EditLine *); +protected void search_end(EditLine *); +protected int c_hmatch(EditLine *, const char *); +protected void c_setpat(EditLine *); +protected el_action_t ce_inc_search(EditLine *, int); +protected el_action_t cv_search(EditLine *, int); +protected el_action_t ce_search_line(EditLine *, char *, int); +protected el_action_t cv_repeat_srch(EditLine *, int); +protected el_action_t cv_csearch_back(EditLine *, int, int, int); +protected el_action_t cv_csearch_fwd(EditLine *, int, int, int); #endif /* _h_el_search */ diff --git a/lib/libedit/sig.c b/lib/libedit/sig.c index b85de1a01b2..e720a46502f 100644 --- a/lib/libedit/sig.c +++ b/lib/libedit/sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig.c,v 1.6 2001/12/06 04:26:00 deraadt Exp $ */ +/* $OpenBSD: sig.c,v 1.7 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: sig.c,v 1.3 1997/04/11 17:52:48 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)sig.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: sig.c,v 1.6 2001/12/06 04:26:00 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sig.c,v 1.7 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -63,7 +63,7 @@ private int sighdl[] = { -1 }; -private void sig_handler __P((int)); +private void sig_handler(int); /* sig_handler(): * This is the handler called for all signals diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h index e70bbb611bf..9e7424142b5 100644 --- a/lib/libedit/sig.h +++ b/lib/libedit/sig.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sig.h,v 1.3 1997/03/14 05:13:03 millert Exp $ */ +/* $OpenBSD: sig.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: sig.h,v 1.2 1997/01/11 06:48:11 lukem Exp $ */ /*- @@ -65,9 +65,9 @@ typedef sig_t *el_signal_t; -protected void sig_end __P((EditLine*)); -protected int sig_init __P((EditLine*)); -protected void sig_set __P((EditLine*)); -protected void sig_clr __P((EditLine*)); +protected void sig_end(EditLine*); +protected int sig_init(EditLine*); +protected void sig_set(EditLine*); +protected void sig_clr(EditLine*); #endif /* _h_el_sig */ diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h index cfe5a2019a9..975dec2d7ba 100644 --- a/lib/libedit/sys.h +++ b/lib/libedit/sys.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sys.h,v 1.4 1997/07/25 20:30:16 mickey Exp $ */ +/* $OpenBSD: sys.h,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: sys.h,v 1.3 1997/01/11 06:48:12 lukem Exp $ */ /*- @@ -87,33 +87,33 @@ typedef char* ioctl_t; # undef REGEX # undef REGEXP # include <malloc.h> -typedef void (*sig_t)__P((int)); +typedef void (*sig_t)(int); # ifdef __GNUC__ /* * Broken hdrs. */ -extern char *getenv __P((const char *)); -extern int fprintf __P((FILE *, const char *, ...)); -extern int sigsetmask __P((int)); -extern int sigblock __P((int)); -extern int ioctl __P((int, int, void *)); -extern int fputc __P((int, FILE *)); -extern int fgetc __P((FILE *)); -extern int fflush __P((FILE *)); -extern int tolower __P((int)); -extern int toupper __P((int)); +extern char *getenv(const char *); +extern int fprintf(FILE *, const char *, ...); +extern int sigsetmask(int); +extern int sigblock(int); +extern int ioctl(int, int, void *); +extern int fputc(int, FILE *); +extern int fgetc(FILE *); +extern int fflush(FILE *); +extern int tolower(int); +extern int toupper(int); extern int errno, sys_nerr; extern char *sys_errlist[]; -extern void perror __P((const char *)); -extern int read __P((int, const char*, int)); +extern void perror(const char *); +extern int read(int, const char*, int); # include <string.h> # define strerror(e) sys_errlist[e] # endif # ifdef SABER -extern ptr_t memcpy __P((ptr_t, const ptr_t, size_t)); -extern ptr_t memset __P((ptr_t, int, size_t)); +extern ptr_t memcpy(ptr_t, const ptr_t, size_t); +extern ptr_t memset(ptr_t, int, size_t); # endif -extern char *fgetline __P((FILE *, int *)); +extern char *fgetline(FILE *, int *); #endif #endif /* _h_sys */ diff --git a/lib/libedit/term.c b/lib/libedit/term.c index 61e5089160d..2ecbc08bb41 100644 --- a/lib/libedit/term.c +++ b/lib/libedit/term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: term.c,v 1.4 1997/07/03 14:25:29 niklas Exp $ */ +/* $OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: term.c,v 1.8 1997/01/23 14:02:49 mrg Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)term.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: term.c,v 1.4 1997/07/03 14:25:29 niklas Exp $"; +static char rcsid[] = "$OpenBSD: term.c,v 1.5 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -251,13 +251,13 @@ private struct termcapval { /* do two or more of the attributes use me */ -private void term_rebuffer_display __P((EditLine *)); -private void term_free_display __P((EditLine *)); -private void term_alloc_display __P((EditLine *)); +private void term_rebuffer_display(EditLine *); +private void term_free_display(EditLine *); +private void term_alloc_display(EditLine *); private void term_alloc __P((EditLine *, struct termcapstr *, char *)); -private void term_init_arrow __P((EditLine *)); -private void term_reset_arrow __P((EditLine *)); +private void term_init_arrow(EditLine *); +private void term_reset_arrow(EditLine *); private FILE *term_outfile = NULL; /* XXX: How do we fix that? */ diff --git a/lib/libedit/term.h b/lib/libedit/term.h index 451d85291c9..5c251653d94 100644 --- a/lib/libedit/term.h +++ b/lib/libedit/term.h @@ -1,4 +1,4 @@ -/* $OpenBSD: term.h,v 1.3 1997/03/14 05:13:06 millert Exp $ */ +/* $OpenBSD: term.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: term.h,v 1.4 1997/01/11 06:48:14 lukem Exp $ */ /*- @@ -81,30 +81,30 @@ typedef struct { #define A_K_RT 3 #define A_K_NKEYS 4 -protected void term_move_to_line __P((EditLine *, int)); -protected void term_move_to_char __P((EditLine *, int)); -protected void term_clear_EOL __P((EditLine *, int)); -protected void term_overwrite __P((EditLine *, char *, int)); -protected void term_insertwrite __P((EditLine *, char *, int)); -protected void term_deletechars __P((EditLine *, int)); -protected void term_clear_screen __P((EditLine *)); -protected void term_beep __P((EditLine *)); -protected void term_change_size __P((EditLine *, int, int)); -protected int term_get_size __P((EditLine *, int *, int *)); -protected int term_init __P((EditLine *)); -protected void term_bind_arrow __P((EditLine *)); -protected void term_print_arrow __P((EditLine *, char *)); -protected int term_clear_arrow __P((EditLine *, char *)); +protected void term_move_to_line(EditLine *, int); +protected void term_move_to_char(EditLine *, int); +protected void term_clear_EOL(EditLine *, int); +protected void term_overwrite(EditLine *, char *, int); +protected void term_insertwrite(EditLine *, char *, int); +protected void term_deletechars(EditLine *, int); +protected void term_clear_screen(EditLine *); +protected void term_beep(EditLine *); +protected void term_change_size(EditLine *, int, int); +protected int term_get_size(EditLine *, int *, int *); +protected int term_init(EditLine *); +protected void term_bind_arrow(EditLine *); +protected void term_print_arrow(EditLine *, char *); +protected int term_clear_arrow(EditLine *, char *); protected int term_set_arrow __P((EditLine *, char *, key_value_t *, int)); -protected void term_end __P((EditLine *)); -protected int term_set __P((EditLine *, char *)); -protected int term_settc __P((EditLine *, int, char **)); -protected int term_telltc __P((EditLine *, int, char **)); -protected int term_echotc __P((EditLine *, int, char **)); +protected void term_end(EditLine *); +protected int term_set(EditLine *, char *); +protected int term_settc(EditLine *, int, char **); +protected int term_telltc(EditLine *, int, char **); +protected int term_echotc(EditLine *, int, char **); -protected void term__putc __P((int)); -protected void term__flush __P((void)); +protected void term__putc(int); +protected void term__flush(void); /* * Easy access macros diff --git a/lib/libedit/termcap.h b/lib/libedit/termcap.h index 507bdbf6796..f7190a6d865 100644 --- a/lib/libedit/termcap.h +++ b/lib/libedit/termcap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: termcap.h,v 1.3 1997/03/14 05:13:06 millert Exp $ */ +/* $OpenBSD: termcap.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: termcap.h,v 1.2 1997/01/11 06:48:14 lukem Exp $ */ /*- @@ -45,11 +45,11 @@ #ifndef _h_termcap #define _h_termcap -int tgetent __P((char *, char *)); -char *tgetstr __P((char *, char **)); -int tgetflag __P((char *)); -int tgetnum __P((char *)); -char *tgoto __P((char *, int, int)); +int tgetent(char *, char *); +char *tgetstr(char *, char **); +int tgetflag(char *); +int tgetnum(char *); +char *tgoto(char *, int, int); char *tputs __P((char *, int, void (*)(int))); #endif /* _h_termcap */ diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c index 22f25145060..9beca22371a 100644 --- a/lib/libedit/tokenizer.c +++ b/lib/libedit/tokenizer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tokenizer.c,v 1.4 1998/08/16 20:24:54 millert Exp $ */ +/* $OpenBSD: tokenizer.c,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: tokenizer.c,v 1.2 1997/01/11 06:48:15 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)tokenizer.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: tokenizer.c,v 1.4 1998/08/16 20:24:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: tokenizer.c,v 1.5 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -80,7 +80,7 @@ struct tokenizer { }; -private void tok_finish __P((Tokenizer *)); +private void tok_finish(Tokenizer *); /* tok_finish(): diff --git a/lib/libedit/tokenizer.h b/lib/libedit/tokenizer.h index 33cc9753bff..2a5c4d2deb3 100644 --- a/lib/libedit/tokenizer.h +++ b/lib/libedit/tokenizer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tokenizer.h,v 1.3 1997/03/14 05:13:08 millert Exp $ */ +/* $OpenBSD: tokenizer.h,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: tokenizer.h,v 1.2 1997/01/11 06:48:16 lukem Exp $ */ /*- @@ -47,9 +47,9 @@ typedef struct tokenizer Tokenizer; -Tokenizer *tok_init __P((const char *)); -void tok_reset __P((Tokenizer *)); -void tok_end __P((Tokenizer *)); +Tokenizer *tok_init(const char *); +void tok_reset(Tokenizer *); +void tok_end(Tokenizer *); int tok_line __P((Tokenizer *, const char *, int *, char ***)); diff --git a/lib/libedit/tty.c b/lib/libedit/tty.c index 8ea40de82bd..cade741c99f 100644 --- a/lib/libedit/tty.c +++ b/lib/libedit/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.5 2001/04/13 20:21:19 deraadt Exp $ */ +/* $OpenBSD: tty.c,v 1.6 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: tty.c,v 1.3 1997/04/11 17:52:49 christos Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: tty.c,v 1.5 2001/04/13 20:21:19 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: tty.c,v 1.6 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -453,10 +453,10 @@ private ttymodes_t ttymodes[] = { #define tty__geteightbit(td) (((td)->c_cflag & CSIZE) == CS8) #define tty__cooked_mode(td) ((td)->c_lflag & ICANON) -private void tty__getchar __P((struct termios *, unsigned char *)); -private void tty__setchar __P((struct termios *, unsigned char *)); -private speed_t tty__getspeed __P((struct termios *)); -private int tty_setup __P((EditLine *)); +private void tty__getchar(struct termios *, unsigned char *); +private void tty__setchar(struct termios *, unsigned char *); +private speed_t tty__getspeed(struct termios *); +private int tty_setup(EditLine *); #define t_qu t_ts diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h index 26ff4854013..58fa6e2fbe4 100644 --- a/lib/libedit/tty.h +++ b/lib/libedit/tty.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.h,v 1.4 1997/06/29 23:40:53 millert Exp $ */ +/* $OpenBSD: tty.h,v 1.5 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: tty.h,v 1.4 1997/04/11 21:38:02 christos Exp $ */ /*- @@ -460,14 +460,14 @@ typedef struct { typedef unsigned char ttychar_t[NN_IO][C_NCC]; -protected int tty_init __P((EditLine *)); -protected void tty_end __P((EditLine *)); -protected int tty_stty __P((EditLine *, int, char**)); -protected int tty_rawmode __P((EditLine *)); -protected int tty_cookedmode __P((EditLine *)); -protected int tty_quotemode __P((EditLine *)); -protected int tty_noquotemode __P((EditLine *)); -protected void tty_bind_char __P((EditLine *, int)); +protected int tty_init(EditLine *); +protected void tty_end(EditLine *); +protected int tty_stty(EditLine *, int, char**); +protected int tty_rawmode(EditLine *); +protected int tty_cookedmode(EditLine *); +protected int tty_quotemode(EditLine *); +protected int tty_noquotemode(EditLine *); +protected void tty_bind_char(EditLine *, int); typedef struct { ttyperm_t t_t; diff --git a/lib/libedit/vi.c b/lib/libedit/vi.c index 8226fab7a13..f1abb964efb 100644 --- a/lib/libedit/vi.c +++ b/lib/libedit/vi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $ */ +/* $OpenBSD: vi.c,v 1.4 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: vi.c,v 1.2 1997/01/11 06:48:19 lukem Exp $ */ /*- @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)vi.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $"; +static char rcsid[] = "$OpenBSD: vi.c,v 1.4 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* not lint && not SCCSID */ @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: vi.c,v 1.3 1997/03/14 05:13:11 millert Exp $"; #include "sys.h" #include "el.h" -private el_action_t cv_action __P((EditLine *, int)); +private el_action_t cv_action(EditLine *, int); /* cv_action(): * Handle vi actions. diff --git a/lib/libkeynote/base64.c b/lib/libkeynote/base64.c index cd0ef31ad93..37b32d26f83 100644 --- a/lib/libkeynote/base64.c +++ b/lib/libkeynote/base64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: base64.c,v 1.8 2000/10/03 01:33:55 angelos Exp $ */ +/* $OpenBSD: base64.c,v 1.9 2002/02/16 21:27:26 millert Exp $ */ /* * Copyright (c) 1996 by Internet Software Consortium. * @@ -61,8 +61,8 @@ #include "keynote.h" #if defined(HAVE___B64_NTOP) -int __b64_ntop __P((unsigned char const *, size_t, char *, size_t)); -int __b64_pton __P((char const *, unsigned char *, size_t)); +int __b64_ntop(unsigned char const *, size_t, char *, size_t); +int __b64_pton(char const *, unsigned char *, size_t); int kn_encode_base64(src, srclength, target, targsize) diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c index de636e7c136..73865047e5f 100644 --- a/lib/libkvm/kvm.c +++ b/lib/libkvm/kvm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $ */ +/* $OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $ */ /*- @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; #else -static char *rcsid = "$OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $"; +static char *rcsid = "$OpenBSD: kvm.c,v 1.27 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -72,11 +72,11 @@ static char *rcsid = "$OpenBSD: kvm.c,v 1.26 2001/11/21 20:16:16 drahn Exp $"; #include "kvm_private.h" -static int kvm_dbopen __P((kvm_t *, const char *)); -static int _kvm_get_header __P((kvm_t *)); +static int kvm_dbopen(kvm_t *, const char *); +static int _kvm_get_header(kvm_t *); static kvm_t *_kvm_open __P((kvm_t *, const char *, const char *, const char *, int, char *)); -static int clear_gap __P((kvm_t *, FILE *, int)); +static int clear_gap(kvm_t *, FILE *, int); char * kvm_geterr(kd) diff --git a/lib/libkvm/kvm_private.h b/lib/libkvm/kvm_private.h index 5f0808a546b..2b88a2e8977 100644 --- a/lib/libkvm/kvm_private.h +++ b/lib/libkvm/kvm_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_private.h,v 1.5 2001/05/18 09:08:38 art Exp $ */ +/* $OpenBSD: kvm_private.h,v 1.6 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: kvm_private.h,v 1.7 1996/05/05 04:32:15 gwr Exp $ */ /*- @@ -90,18 +90,18 @@ struct __kvm { /* * Functions used internally by kvm, but across kvm modules. */ -void _kvm_err __P((kvm_t *kd, const char *program, const char *fmt, ...)); -int _kvm_dump_mkheader __P((kvm_t *kd_live, kvm_t *kd_dump)); -void _kvm_freeprocs __P((kvm_t *kd)); -void _kvm_freevtop __P((kvm_t *)); -int _kvm_initvtop __P((kvm_t *)); -int _kvm_kvatop __P((kvm_t *, u_long, u_long *)); -void *_kvm_malloc __P((kvm_t *kd, size_t)); -off_t _kvm_pa2off __P((kvm_t *, u_long)); -void *_kvm_realloc __P((kvm_t *kd, void *, size_t)); +void _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...); +int _kvm_dump_mkheader(kvm_t *kd_live, kvm_t *kd_dump); +void _kvm_freeprocs(kvm_t *kd); +void _kvm_freevtop(kvm_t *); +int _kvm_initvtop(kvm_t *); +int _kvm_kvatop(kvm_t *, u_long, u_long *); +void *_kvm_malloc(kvm_t *kd, size_t); +off_t _kvm_pa2off(kvm_t *, u_long); +void *_kvm_realloc(kvm_t *kd, void *, size_t); void _kvm_syserr - __P((kvm_t *kd, const char *program, const char *fmt, ...)); +(kvm_t *kd, const char *program, const char *fmt, ...); ssize_t _kvm_pread - __P((kvm_t *, int, void *, size_t, off_t)); +(kvm_t *, int, void *, size_t, off_t); ssize_t _kvm_pwrite - __P((kvm_t *, int, void *, size_t, off_t)); +(kvm_t *, int, void *, size_t, off_t); diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index 6b6bbc7a9cc..40f055fd658 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_proc.c,v 1.12 2001/12/13 08:16:00 hugh Exp $ */ +/* $OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ #if 0 static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; #else -static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.12 2001/12/13 08:16:00 hugh Exp $"; +static char *rcsid = "$OpenBSD: kvm_proc.c,v 1.13 2002/02/16 21:27:26 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -122,14 +122,14 @@ ssize_t kvm_uread __P((kvm_t *, const struct proc *, u_long, char *, static char **kvm_argv __P((kvm_t *, const struct proc *, u_long, int, int)); -static int kvm_deadprocs __P((kvm_t *, int, int, u_long, u_long, int)); +static int kvm_deadprocs(kvm_t *, int, int, u_long, u_long, int); static char **kvm_doargv __P((kvm_t *, const struct kinfo_proc *, int, void (*)(struct ps_strings *, u_long *, int *))); static int kvm_proclist __P((kvm_t *, int, int, struct proc *, struct kinfo_proc *, int)); -static int proc_verify __P((kvm_t *, u_long, const struct proc *)); -static void ps_str_a __P((struct ps_strings *, u_long *, int *)); -static void ps_str_e __P((struct ps_strings *, u_long *, int *)); +static int proc_verify(kvm_t *, u_long, const struct proc *); +static void ps_str_a(struct ps_strings *, u_long *, int *); +static void ps_str_e(struct ps_strings *, u_long *, int *); char * _kvm_uread(kd, p, va, cnt) diff --git a/lib/libkvm/kvm_sparc64.c b/lib/libkvm/kvm_sparc64.c index b844204ad53..85a061575d4 100644 --- a/lib/libkvm/kvm_sparc64.c +++ b/lib/libkvm/kvm_sparc64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_sparc64.c,v 1.2 2001/12/05 02:23:11 art Exp $ */ +/* $OpenBSD: kvm_sparc64.c,v 1.3 2002/02/16 21:27:26 millert Exp $ */ /* $NetBSD: kvm_sparc64.c,v 1.7 2001/08/05 03:33:15 matt Exp $ */ /*- @@ -67,7 +67,7 @@ #include "kvm_private.h" -int _kvm_kvatop __P((kvm_t *, u_long, u_long *)); +int _kvm_kvatop(kvm_t *, u_long, u_long *); void _kvm_freevtop(kd) diff --git a/lib/libm/noieee_src/mathimpl.h b/lib/libm/noieee_src/mathimpl.h index e4ed3fd91b2..ac4dc6a438c 100644 --- a/lib/libm/noieee_src/mathimpl.h +++ b/lib/libm/noieee_src/mathimpl.h @@ -95,5 +95,5 @@ extern double __exp__E(); extern double __log__L(); struct Double {double a, b;}; -double __exp__D __P((double, double)); -struct Double __log__D __P((double)); +double __exp__D(double, double); +struct Double __log__D(double); diff --git a/lib/libm/noieee_src/n_gamma.c b/lib/libm/noieee_src/n_gamma.c index b719cdd978c..a30a5a58a22 100644 --- a/lib/libm/noieee_src/n_gamma.c +++ b/lib/libm/noieee_src/n_gamma.c @@ -77,11 +77,11 @@ static char sccsid[] = "@(#)gamma.c 8.1 (Berkeley) 6/4/93"; * Maximum observed error < 4ulp in 1,000,000 trials. */ -static double neg_gam __P((double)); -static double small_gam __P((double)); -static double smaller_gam __P((double)); -static struct Double large_gam __P((double)); -static struct Double ratfun_gam __P((double, double)); +static double neg_gam(double); +static double small_gam(double); +static double smaller_gam(double); +static struct Double large_gam(double); +static struct Double ratfun_gam(double, double); /* * Rational approximation, A0 + x*x*P(x)/Q(x), on the interval diff --git a/lib/libm/noieee_src/n_j0.c b/lib/libm/noieee_src/n_j0.c index 0654adb4cbd..9856ec2a2b8 100644 --- a/lib/libm/noieee_src/n_j0.c +++ b/lib/libm/noieee_src/n_j0.c @@ -122,7 +122,7 @@ static char sccsid[] = "@(#)j0.c 8.2 (Berkeley) 11/30/93"; #define infnan(x) (0.0) #endif -static double pzero __P((double)), qzero __P((double)); +static double pzero(double), qzero(double); static double huge = 1e300, diff --git a/lib/libm/noieee_src/n_pow.c b/lib/libm/noieee_src/n_pow.c index 6d7198fb258..c2e15d6eb4c 100644 --- a/lib/libm/noieee_src/n_pow.c +++ b/lib/libm/noieee_src/n_pow.c @@ -122,7 +122,7 @@ static char sccsid[] = "@(#)pow.c 8.1 (Berkeley) 6/4/93"; const static double zero=0.0, one=1.0, two=2.0, negone= -1.0; -static double pow_P __P((double, double)); +static double pow_P(double, double); double pow(x,y) double x,y; diff --git a/lib/libm/src/math_private.h b/lib/libm/src/math_private.h index 942d4a782df..df2c618ed93 100644 --- a/lib/libm/src/math_private.h +++ b/lib/libm/src/math_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: math_private.h,v 1.5 2000/03/02 00:29:50 todd Exp $ */ +/* $OpenBSD: math_private.h,v 1.6 2002/02/16 21:27:27 millert Exp $ */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -152,75 +152,75 @@ do { \ } while (0) /* ieee style elementary functions */ -extern double __ieee754_sqrt __P((double)); -extern double __ieee754_acos __P((double)); -extern double __ieee754_acosh __P((double)); -extern double __ieee754_log __P((double)); -extern double __ieee754_atanh __P((double)); -extern double __ieee754_asin __P((double)); -extern double __ieee754_atan2 __P((double,double)); -extern double __ieee754_exp __P((double)); -extern double __ieee754_cosh __P((double)); -extern double __ieee754_fmod __P((double,double)); -extern double __ieee754_pow __P((double,double)); -extern double __ieee754_lgamma_r __P((double,int *)); -extern double __ieee754_gamma_r __P((double,int *)); -extern double __ieee754_lgamma __P((double)); -extern double __ieee754_gamma __P((double)); -extern double __ieee754_log10 __P((double)); -extern double __ieee754_sinh __P((double)); -extern double __ieee754_hypot __P((double,double)); -extern double __ieee754_j0 __P((double)); -extern double __ieee754_j1 __P((double)); -extern double __ieee754_y0 __P((double)); -extern double __ieee754_y1 __P((double)); -extern double __ieee754_jn __P((int,double)); -extern double __ieee754_yn __P((int,double)); -extern double __ieee754_remainder __P((double,double)); -extern int __ieee754_rem_pio2 __P((double,double*)); -extern double __ieee754_scalb __P((double,double)); +extern double __ieee754_sqrt(double); +extern double __ieee754_acos(double); +extern double __ieee754_acosh(double); +extern double __ieee754_log(double); +extern double __ieee754_atanh(double); +extern double __ieee754_asin(double); +extern double __ieee754_atan2(double,double); +extern double __ieee754_exp(double); +extern double __ieee754_cosh(double); +extern double __ieee754_fmod(double,double); +extern double __ieee754_pow(double,double); +extern double __ieee754_lgamma_r(double,int *); +extern double __ieee754_gamma_r(double,int *); +extern double __ieee754_lgamma(double); +extern double __ieee754_gamma(double); +extern double __ieee754_log10(double); +extern double __ieee754_sinh(double); +extern double __ieee754_hypot(double,double); +extern double __ieee754_j0(double); +extern double __ieee754_j1(double); +extern double __ieee754_y0(double); +extern double __ieee754_y1(double); +extern double __ieee754_jn(int,double); +extern double __ieee754_yn(int,double); +extern double __ieee754_remainder(double,double); +extern int __ieee754_rem_pio2(double,double*); +extern double __ieee754_scalb(double,double); /* fdlibm kernel function */ -extern double __kernel_standard __P((double,double,int)); -extern double __kernel_sin __P((double,double,int)); -extern double __kernel_cos __P((double,double)); -extern double __kernel_tan __P((double,double,int)); -extern int __kernel_rem_pio2 __P((double*,double*,int,int,int,const int*)); +extern double __kernel_standard(double,double,int); +extern double __kernel_sin(double,double,int); +extern double __kernel_cos(double,double); +extern double __kernel_tan(double,double,int); +extern int __kernel_rem_pio2(double*,double*,int,int,int,const int*); /* ieee style elementary float functions */ -extern float __ieee754_sqrtf __P((float)); -extern float __ieee754_acosf __P((float)); -extern float __ieee754_acoshf __P((float)); -extern float __ieee754_logf __P((float)); -extern float __ieee754_atanhf __P((float)); -extern float __ieee754_asinf __P((float)); -extern float __ieee754_atan2f __P((float,float)); -extern float __ieee754_expf __P((float)); -extern float __ieee754_coshf __P((float)); -extern float __ieee754_fmodf __P((float,float)); -extern float __ieee754_powf __P((float,float)); -extern float __ieee754_lgammaf_r __P((float,int *)); -extern float __ieee754_gammaf_r __P((float,int *)); -extern float __ieee754_lgammaf __P((float)); -extern float __ieee754_gammaf __P((float)); -extern float __ieee754_log10f __P((float)); -extern float __ieee754_sinhf __P((float)); -extern float __ieee754_hypotf __P((float,float)); -extern float __ieee754_j0f __P((float)); -extern float __ieee754_j1f __P((float)); -extern float __ieee754_y0f __P((float)); -extern float __ieee754_y1f __P((float)); -extern float __ieee754_jnf __P((int,float)); -extern float __ieee754_ynf __P((int,float)); -extern float __ieee754_remainderf __P((float,float)); -extern int __ieee754_rem_pio2f __P((float,float*)); -extern float __ieee754_scalbf __P((float,float)); +extern float __ieee754_sqrtf(float); +extern float __ieee754_acosf(float); +extern float __ieee754_acoshf(float); +extern float __ieee754_logf(float); +extern float __ieee754_atanhf(float); +extern float __ieee754_asinf(float); +extern float __ieee754_atan2f(float,float); +extern float __ieee754_expf(float); +extern float __ieee754_coshf(float); +extern float __ieee754_fmodf(float,float); +extern float __ieee754_powf(float,float); +extern float __ieee754_lgammaf_r(float,int *); +extern float __ieee754_gammaf_r(float,int *); +extern float __ieee754_lgammaf(float); +extern float __ieee754_gammaf(float); +extern float __ieee754_log10f(float); +extern float __ieee754_sinhf(float); +extern float __ieee754_hypotf(float,float); +extern float __ieee754_j0f(float); +extern float __ieee754_j1f(float); +extern float __ieee754_y0f(float); +extern float __ieee754_y1f(float); +extern float __ieee754_jnf(int,float); +extern float __ieee754_ynf(int,float); +extern float __ieee754_remainderf(float,float); +extern int __ieee754_rem_pio2f(float,float*); +extern float __ieee754_scalbf(float,float); /* float versions of fdlibm kernel functions */ -extern float __kernel_sinf __P((float,float,int)); -extern float __kernel_cosf __P((float,float)); -extern float __kernel_tanf __P((float,float,int)); -extern int __kernel_rem_pio2f __P((float*,float*,int,int,int,const int*)); +extern float __kernel_sinf(float,float,int); +extern float __kernel_cosf(float,float); +extern float __kernel_tanf(float,float,int); +extern int __kernel_rem_pio2f(float*,float*,int,int,int,const int*); #endif /* _MATH_PRIVATE_H_ */ diff --git a/lib/libocurses/cr_put.c b/lib/libocurses/cr_put.c index d98e66b50e0..e11b69167e4 100644 --- a/lib/libocurses/cr_put.c +++ b/lib/libocurses/cr_put.c @@ -55,10 +55,10 @@ mvcur(ly, lx, y, x) return (__mvcur(ly, lx, y, x, 0)); } -static void fgoto __P((int)); -static int plod __P((int, int)); -static void plodput __P((int)); -static int tabcol __P((int, int)); +static void fgoto(int); +static int plod(int, int); +static void plodput(int); +static int tabcol(int, int); static int outcol, outline, destcol, destline; diff --git a/lib/libocurses/curses.h b/lib/libocurses/curses.h index 3b80a82a691..3914699e45c 100644 --- a/lib/libocurses/curses.h +++ b/lib/libocurses/curses.h @@ -233,87 +233,87 @@ extern char *ttytype; /* Full name of current terminal. */ /* Public function prototypes. */ __BEGIN_DECLS -int box __P((WINDOW *, int, int)); -int cbreak __P((void)); -int delwin __P((WINDOW *)); -int echo __P((void)); -int endwin __P((void)); -char *fullname __P((char *, char *)); -char *getcap __P((char *)); -int gettmode __P((void)); -void idlok __P((WINDOW *, int)); -WINDOW *initscr __P((void)); -char *longname __P((char *, char *)); -int mvcur __P((int, int, int, int)); -int mvprintw __P((int, int, const char *, ...)); -int mvscanw __P((int, int, const char *, ...)); -int mvwin __P((WINDOW *, int, int)); -int mvwprintw __P((WINDOW *, int, int, const char *, ...)); -int mvwscanw __P((WINDOW *, int, int, const char *, ...)); -WINDOW *newwin __P((int, int, int, int)); -int nl __P((void)); -int nocbreak __P((void)); -int noecho __P((void)); -int nonl __P((void)); -int noraw __P((void)); -int overlay __P((WINDOW *, WINDOW *)); -int overwrite __P((WINDOW *, WINDOW *)); -int printw __P((const char *, ...)); -int raw __P((void)); -int resetty __P((void)); -int savetty __P((void)); -int scanw __P((const char *, ...)); -int scroll __P((WINDOW *)); -int setterm __P((char *)); -int sscans __P((WINDOW *, const char *, ...)); -WINDOW *subwin __P((WINDOW *, int, int, int, int)); -int suspendwin __P((void)); -int touchline __P((WINDOW *, int, int, int)); -int touchoverlap __P((WINDOW *, WINDOW *)); -int touchwin __P((WINDOW *)); -int vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_)); -int vwscanw __P((WINDOW *, const char *, _BSD_VA_LIST_)); -int waddch __P((WINDOW *, int)); -int waddnstr __P((WINDOW *, const char *, int)); -int wclear __P((WINDOW *)); -int wclrtobot __P((WINDOW *)); -int wclrtoeol __P((WINDOW *)); -int wdelch __P((WINDOW *)); -int wdeleteln __P((WINDOW *)); -int werase __P((WINDOW *)); -int wgetch __P((WINDOW *)); -int wgetstr __P((WINDOW *, char *)); -int winsch __P((WINDOW *, int)); -int winsertln __P((WINDOW *)); -int wmove __P((WINDOW *, int, int)); -int wprintw __P((WINDOW *, const char *, ...)); -int wrefresh __P((WINDOW *)); -int wscanw __P((WINDOW *, const char *, ...)); -int wstandend __P((WINDOW *)); -int wstandout __P((WINDOW *)); -int vwprintw __P((WINDOW *, const char *, _BSD_VA_LIST_)); +int box(WINDOW *, int, int); +int cbreak(void); +int delwin(WINDOW *); +int echo(void); +int endwin(void); +char *fullname(char *, char *); +char *getcap(char *); +int gettmode(void); +void idlok(WINDOW *, int); +WINDOW *initscr(void); +char *longname(char *, char *); +int mvcur(int, int, int, int); +int mvprintw(int, int, const char *, ...); +int mvscanw(int, int, const char *, ...); +int mvwin(WINDOW *, int, int); +int mvwprintw(WINDOW *, int, int, const char *, ...); +int mvwscanw(WINDOW *, int, int, const char *, ...); +WINDOW *newwin(int, int, int, int); +int nl(void); +int nocbreak(void); +int noecho(void); +int nonl(void); +int noraw(void); +int overlay(WINDOW *, WINDOW *); +int overwrite(WINDOW *, WINDOW *); +int printw(const char *, ...); +int raw(void); +int resetty(void); +int savetty(void); +int scanw(const char *, ...); +int scroll(WINDOW *); +int setterm(char *); +int sscans(WINDOW *, const char *, ...); +WINDOW *subwin(WINDOW *, int, int, int, int); +int suspendwin(void); +int touchline(WINDOW *, int, int, int); +int touchoverlap(WINDOW *, WINDOW *); +int touchwin(WINDOW *); +int vwprintw(WINDOW *, const char *, _BSD_VA_LIST_); +int vwscanw(WINDOW *, const char *, _BSD_VA_LIST_); +int waddch(WINDOW *, int); +int waddnstr(WINDOW *, const char *, int); +int wclear(WINDOW *); +int wclrtobot(WINDOW *); +int wclrtoeol(WINDOW *); +int wdelch(WINDOW *); +int wdeleteln(WINDOW *); +int werase(WINDOW *); +int wgetch(WINDOW *); +int wgetstr(WINDOW *, char *); +int winsch(WINDOW *, int); +int winsertln(WINDOW *); +int wmove(WINDOW *, int, int); +int wprintw(WINDOW *, const char *, ...); +int wrefresh(WINDOW *); +int wscanw(WINDOW *, const char *, ...); +int wstandend(WINDOW *); +int wstandout(WINDOW *); +int vwprintw(WINDOW *, const char *, _BSD_VA_LIST_); /* Private functions that are needed for user programs prototypes. */ -void __cputchar __P((int)); -int __waddbytes __P((WINDOW *, const char *, int, int)); +void __cputchar(int); +int __waddbytes(WINDOW *, const char *, int, int); __END_DECLS /* Private functions. */ #ifdef _CURSES_PRIVATE -void __CTRACE __P((const char *, ...)); -unsigned int __hash __P((char *, int)); -void __id_subwins __P((WINDOW *)); -int __mvcur __P((int, int, int, int, int)); -void __restore_stophandler __P((void)); -void __set_stophandler __P((void)); -void __set_subwin __P((WINDOW *, WINDOW *)); -void __startwin __P((void)); -void __stop_signal_handler __P((int)); -void __swflags __P((WINDOW *)); -int __touchline __P((WINDOW *, int, int, int, int)); -int __touchwin __P((WINDOW *)); -char *__tscroll __P((const char *, int, int)); -int __waddch __P((WINDOW *, __LDATA *)); +void __CTRACE(const char *, ...); +unsigned int __hash(char *, int); +void __id_subwins(WINDOW *); +int __mvcur(int, int, int, int, int); +void __restore_stophandler(void); +void __set_stophandler(void); +void __set_subwin(WINDOW *, WINDOW *); +void __startwin(void); +void __stop_signal_handler(int); +void __swflags(WINDOW *); +int __touchline(WINDOW *, int, int, int, int); +int __touchwin(WINDOW *); +char *__tscroll(const char *, int, int); +int __waddch(WINDOW *, __LDATA *); /* Private #defines. */ #define min(a,b) (a < b ? a : b) @@ -329,11 +329,11 @@ extern int __noqch; /* Termcap functions. */ __BEGIN_DECLS -int tgetent __P((char *, char *)); -int tgetnum __P((char *)); -int tgetflag __P((char *)); -char *tgetstr __P((char *, char **)); -char *tgoto __P((char *, int, int)); +int tgetent(char *, char *); +int tgetnum(char *); +int tgetflag(char *); +char *tgetstr(char *, char **); +char *tgoto(char *, int, int); void tputs __P((char *, int, void (*)(int))); __END_DECLS diff --git a/lib/libocurses/newwin.c b/lib/libocurses/newwin.c index 8f09cbf7966..3ddcc662494 100644 --- a/lib/libocurses/newwin.c +++ b/lib/libocurses/newwin.c @@ -41,9 +41,9 @@ static char sccsid[] = "@(#)newwin.c 8.3 (Berkeley) 7/27/94"; #undef nl /* Don't need it here, and it interferes. */ -static WINDOW *__makenew __P((int, int, int, int, int)); +static WINDOW *__makenew(int, int, int, int, int); -void __set_subwin __P((WINDOW *, WINDOW *)); +void __set_subwin(WINDOW *, WINDOW *); /* * newwin -- diff --git a/lib/libocurses/printw.c b/lib/libocurses/printw.c index ae6ea49dabf..2a397c1dffb 100644 --- a/lib/libocurses/printw.c +++ b/lib/libocurses/printw.c @@ -50,7 +50,7 @@ static char sccsid[] = "@(#)printw.c 8.3 (Berkeley) 5/4/94"; * is not in effect. */ -static int __winwrite __P((void *, const char *, int)); +static int __winwrite(void *, const char *, int); /* * printw -- diff --git a/lib/libocurses/refresh.c b/lib/libocurses/refresh.c index b89c685f677..0158eb2b77c 100644 --- a/lib/libocurses/refresh.c +++ b/lib/libocurses/refresh.c @@ -42,10 +42,10 @@ static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94"; static int curwin; static short ly, lx; -static void domvcur __P((int, int, int, int)); -static int makech __P((WINDOW *, int)); -static void quickch __P((WINDOW *)); -static void scrolln __P((WINDOW *, int, int, int, int, int)); +static void domvcur(int, int, int, int); +static int makech(WINDOW *, int); +static void quickch(WINDOW *); +static void scrolln(WINDOW *, int, int, int, int, int); /* * wrefresh -- diff --git a/lib/libocurses/setterm.c b/lib/libocurses/setterm.c index 4652edfc596..73f57edb7a8 100644 --- a/lib/libocurses/setterm.c +++ b/lib/libocurses/setterm.c @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)setterm.c 8.7 (Berkeley) 7/27/94"; #include "curses.h" -static void zap __P((void)); +static void zap(void); static char *sflags[] = { /* am bs da eo hc in mi ms */ diff --git a/lib/libocurses/tputs.c b/lib/libocurses/tputs.c index fd8e7cfaff7..a2441cb68f2 100644 --- a/lib/libocurses/tputs.c +++ b/lib/libocurses/tputs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tputs.c,v 1.1 1998/07/23 21:10:28 millert Exp $ */ +/* $OpenBSD: tputs.c,v 1.2 2002/02/16 21:27:27 millert Exp $ */ /* $NetBSD: tputs.c,v 1.5 1995/06/06 08:14:37 pk Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tputs.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: tputs.c,v 1.1 1998/07/23 21:10:28 millert Exp $"; +static char rcsid[] = "$OpenBSD: tputs.c,v 1.2 2002/02/16 21:27:27 millert Exp $"; #endif #endif /* not lint */ @@ -69,7 +69,7 @@ void tputs(cp, affcnt, outc) register char *cp; int affcnt; - void (*outc) __P((int)); + void (*outc)(int); { register int i = 0; register int mspc10; diff --git a/lib/libossaudio/soundcard.h b/lib/libossaudio/soundcard.h index c88823d7897..755d7b04f54 100644 --- a/lib/libossaudio/soundcard.h +++ b/lib/libossaudio/soundcard.h @@ -1,4 +1,4 @@ -/* $OpenBSD: soundcard.h,v 1.6 2001/08/18 19:33:30 brad Exp $ */ +/* $OpenBSD: soundcard.h,v 1.7 2002/02/16 21:27:27 millert Exp $ */ /* $NetBSD: soundcard.h,v 1.11 2001/05/09 21:49:58 augustss Exp $ */ /*- @@ -314,7 +314,7 @@ typedef struct buffmem_desc { #include <sys/cdefs.h> __BEGIN_DECLS -int _oss_ioctl __P((int fd, unsigned long com, void *argp)); +int _oss_ioctl(int fd, unsigned long com, void *argp); __END_DECLS #endif /* !_SOUNDCARD_H_ */ diff --git a/lib/libpthread/include/pthread.h b/lib/libpthread/include/pthread.h index 16224681331..c81cf953901 100644 --- a/lib/libpthread/include/pthread.h +++ b/lib/libpthread/include/pthread.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread.h,v 1.14 2002/01/10 00:45:30 fgsch Exp $ */ +/* $OpenBSD: pthread.h,v 1.15 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu @@ -143,7 +143,7 @@ typedef struct pthread_rwlockattr *pthread_rwlockattr_t; * use in header symbols. */ typedef void *pthread_addr_t; -typedef void *(*pthread_startroutine_t) __P((void *)); +typedef void *(*pthread_startroutine_t)(void *); /* * Once definitions. @@ -204,20 +204,20 @@ enum pthread_mutextype { * Thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_destroy __P((pthread_attr_t *)); -int pthread_attr_getstacksize __P((pthread_attr_t *, size_t *)); -int pthread_attr_getstackaddr __P((pthread_attr_t *, void **)); +int pthread_attr_destroy(pthread_attr_t *); +int pthread_attr_getstacksize(pthread_attr_t *, size_t *); +int pthread_attr_getstackaddr(pthread_attr_t *, void **); int pthread_attr_getdetachstate __P((const pthread_attr_t *, int *)); -int pthread_attr_init __P((pthread_attr_t *)); -int pthread_attr_setstacksize __P((pthread_attr_t *, size_t)); -int pthread_attr_setstackaddr __P((pthread_attr_t *, void *)); -int pthread_attr_setdetachstate __P((pthread_attr_t *, int)); -void pthread_cleanup_pop __P((int execute)); +int pthread_attr_init(pthread_attr_t *); +int pthread_attr_setstacksize(pthread_attr_t *, size_t); +int pthread_attr_setstackaddr(pthread_attr_t *, void *); +int pthread_attr_setdetachstate(pthread_attr_t *, int); +void pthread_cleanup_pop(int execute); void pthread_cleanup_push __P((void (*routine) (void *), void *routine_arg)); -int pthread_condattr_destroy __P((pthread_condattr_t *attr)); -int pthread_condattr_init __P((pthread_condattr_t *attr)); +int pthread_condattr_destroy(pthread_condattr_t *attr); +int pthread_condattr_init(pthread_condattr_t *attr); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_condattr_getpshared __P((const pthread_condattr_t *attr, @@ -226,63 +226,63 @@ int pthread_condattr_setpshared __P((pthread_condattr_t *attr, int pshared)); #endif -int pthread_cond_broadcast __P((pthread_cond_t *)); -int pthread_cond_destroy __P((pthread_cond_t *)); +int pthread_cond_broadcast(pthread_cond_t *); +int pthread_cond_destroy(pthread_cond_t *); int pthread_cond_init __P((pthread_cond_t *, const pthread_condattr_t *)); -int pthread_cond_signal __P((pthread_cond_t *)); +int pthread_cond_signal(pthread_cond_t *); int pthread_cond_timedwait __P((pthread_cond_t *, pthread_mutex_t *, const struct timespec * abstime)); -int pthread_cond_wait __P((pthread_cond_t *, pthread_mutex_t *)); +int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *); int pthread_create __P((pthread_t *, const pthread_attr_t *, void *(*start_routine) (void *), void *)); -int pthread_detach __P((pthread_t)); -int pthread_equal __P((pthread_t, pthread_t)); -__dead void pthread_exit __P((void *)) __attribute__((__noreturn__)); -void *pthread_getspecific __P((pthread_key_t)); -int pthread_join __P((pthread_t, void **)); +int pthread_detach(pthread_t); +int pthread_equal(pthread_t, pthread_t); +__dead void pthread_exit(void *) __attribute__((__noreturn__)); +void *pthread_getspecific(pthread_key_t); +int pthread_join(pthread_t, void **); int pthread_key_create __P((pthread_key_t *, void (*routine) (void *))); -int pthread_key_delete __P((pthread_key_t)); -int pthread_kill __P((struct pthread *, int)); -int pthread_mutexattr_init __P((pthread_mutexattr_t *)); -int pthread_mutexattr_destroy __P((pthread_mutexattr_t *)); -int pthread_mutexattr_gettype __P((pthread_mutexattr_t *, int *)); -int pthread_mutexattr_settype __P((pthread_mutexattr_t *, int)); -int pthread_mutex_destroy __P((pthread_mutex_t *)); +int pthread_key_delete(pthread_key_t); +int pthread_kill(struct pthread *, int); +int pthread_mutexattr_init(pthread_mutexattr_t *); +int pthread_mutexattr_destroy(pthread_mutexattr_t *); +int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *); +int pthread_mutexattr_settype(pthread_mutexattr_t *, int); +int pthread_mutex_destroy(pthread_mutex_t *); int pthread_mutex_init __P((pthread_mutex_t *, const pthread_mutexattr_t *)); -int pthread_mutex_lock __P((pthread_mutex_t *)); -int pthread_mutex_trylock __P((pthread_mutex_t *)); -int pthread_mutex_unlock __P((pthread_mutex_t *)); +int pthread_mutex_lock(pthread_mutex_t *); +int pthread_mutex_trylock(pthread_mutex_t *); +int pthread_mutex_unlock(pthread_mutex_t *); int pthread_once __P((pthread_once_t *, void (*) (void))); -int pthread_rwlock_destroy __P((pthread_rwlock_t *)); +int pthread_rwlock_destroy(pthread_rwlock_t *); int pthread_rwlock_init __P((pthread_rwlock_t *, const pthread_rwlockattr_t *)); -int pthread_rwlock_rdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_tryrdlock __P((pthread_rwlock_t *)); -int pthread_rwlock_trywrlock __P((pthread_rwlock_t *)); -int pthread_rwlock_unlock __P((pthread_rwlock_t *)); -int pthread_rwlock_wrlock __P((pthread_rwlock_t *)); -int pthread_rwlockattr_init __P((pthread_rwlockattr_t *)); +int pthread_rwlock_rdlock(pthread_rwlock_t *); +int pthread_rwlock_tryrdlock(pthread_rwlock_t *); +int pthread_rwlock_trywrlock(pthread_rwlock_t *); +int pthread_rwlock_unlock(pthread_rwlock_t *); +int pthread_rwlock_wrlock(pthread_rwlock_t *); +int pthread_rwlockattr_init(pthread_rwlockattr_t *); int pthread_rwlockattr_getpshared __P((const pthread_rwlockattr_t *, int *)); int pthread_rwlockattr_setpshared __P((pthread_rwlockattr_t *, int)); -int pthread_rwlockattr_destroy __P((pthread_rwlockattr_t *)); -pthread_t pthread_self __P((void)); -int pthread_setspecific __P((pthread_key_t, const void *)); -int pthread_sigmask __P((int, const sigset_t *, sigset_t *)); +int pthread_rwlockattr_destroy(pthread_rwlockattr_t *); +pthread_t pthread_self(void); +int pthread_setspecific(pthread_key_t, const void *); +int pthread_sigmask(int, const sigset_t *, sigset_t *); -int pthread_cancel __P((pthread_t)); -int pthread_setcancelstate __P((int, int *)); -int pthread_setcanceltype __P((int, int *)); -void pthread_testcancel __P((void)); +int pthread_cancel(pthread_t); +int pthread_setcancelstate(int, int *); +int pthread_setcanceltype(int, int *); +void pthread_testcancel(void); -int pthread_getprio __P((pthread_t)); -int pthread_setprio __P((pthread_t, int)); -void pthread_yield __P((void)); +int pthread_getprio(pthread_t); +int pthread_setprio(pthread_t, int); +void pthread_yield(void); #if defined(_POSIX_THREAD_PROCESS_SHARED) int pthread_mutexattr_getpshared __P((pthread_mutexattr_t *, @@ -296,7 +296,7 @@ int pthread_mutexattr_getprioceiling __P((pthread_mutexattr_t *, int *prioceiling)); int pthread_mutexattr_setprioceiling __P((pthread_mutexattr_t *, int prioceiling)); -int pthread_mutex_getprioceiling __P((pthread_mutex_t *, int *)); +int pthread_mutex_getprioceiling(pthread_mutex_t *, int *); int pthread_mutex_setprioceiling __P((pthread_mutex_t *, int, int *)); #endif @@ -314,20 +314,20 @@ int pthread_setschedparam __P((pthread_t pthread, int policy, const struct sched_param * param)); #if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) -int pthread_attr_getinheritsched __P((const pthread_attr_t *, int *)); +int pthread_attr_getinheritsched(const pthread_attr_t *, int *); int pthread_attr_getschedparam __P((const pthread_attr_t *, struct sched_param *)); -int pthread_attr_getschedpolicy __P((const pthread_attr_t *, int *)); -int pthread_attr_getscope __P((const pthread_attr_t *, int *)); -int pthread_attr_setinheritsched __P((pthread_attr_t *, int)); +int pthread_attr_getschedpolicy(const pthread_attr_t *, int *); +int pthread_attr_getscope(const pthread_attr_t *, int *); +int pthread_attr_setinheritsched(pthread_attr_t *, int); int pthread_attr_setschedparam __P((pthread_attr_t *, const struct sched_param *)); -int pthread_attr_setschedpolicy __P((pthread_attr_t *, int)); -int pthread_attr_setscope __P((pthread_attr_t *, int)); +int pthread_attr_setschedpolicy(pthread_attr_t *, int); +int pthread_attr_setscope(pthread_attr_t *, int); #endif -int pthread_attr_setfloatstate __P((pthread_attr_t *, int)); -int pthread_attr_getfloatstate __P((pthread_attr_t *, int *)); +int pthread_attr_setfloatstate(pthread_attr_t *, int); +int pthread_attr_getfloatstate(pthread_attr_t *, int *); int pthread_attr_setcleanup __P((pthread_attr_t *, void (*routine) (void *), void *)); @@ -343,8 +343,8 @@ int pthread_attr_getguardsize __P((const pthread_attr_t *, size_t *)); int pthread_attr_setguardsize __P((const pthread_attr_t *, size_t)); -int pthread_getconcurrency __P((void)); -int pthread_setconcurrency __P((int)); +int pthread_getconcurrency(void); +int pthread_setconcurrency(int); #endif /* susv2 */ __END_DECLS diff --git a/lib/libpthread/include/pthread_np.h b/lib/libpthread/include/pthread_np.h index 014b0f7c67b..a7eded4b025 100644 --- a/lib/libpthread/include/pthread_np.h +++ b/lib/libpthread/include/pthread_np.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pthread_np.h,v 1.4 2001/08/17 22:44:15 pvalchev Exp $ */ +/* $OpenBSD: pthread_np.h,v 1.5 2002/02/16 21:27:25 millert Exp $ */ /* * Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -37,23 +37,23 @@ /* * Non-POSIX type definitions: */ -typedef void (*pthread_switch_routine_t) __P((pthread_t, pthread_t)); +typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t); /* * Non-POSIX thread function prototype definitions: */ __BEGIN_DECLS -int pthread_attr_setcreatesuspend_np __P((pthread_attr_t *)); -int pthread_multi_np __P((void)); -int pthread_resume_np __P((pthread_t)); -int pthread_single_np __P((void)); -int pthread_suspend_np __P((pthread_t)); -int pthread_mutexattr_getkind_np __P((pthread_mutexattr_t)); -int pthread_mutexattr_setkind_np __P((pthread_mutexattr_t *, int)); -void pthread_set_name_np __P((pthread_t, char *)); -int pthread_switch_add_np __P((pthread_switch_routine_t)); -int pthread_switch_delete_np __P((pthread_switch_routine_t)); -int pthread_main_np __P((void)); +int pthread_attr_setcreatesuspend_np(pthread_attr_t *); +int pthread_multi_np(void); +int pthread_resume_np(pthread_t); +int pthread_single_np(void); +int pthread_suspend_np(pthread_t); +int pthread_mutexattr_getkind_np(pthread_mutexattr_t); +int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); +void pthread_set_name_np(pthread_t, char *); +int pthread_switch_add_np(pthread_switch_routine_t); +int pthread_switch_delete_np(pthread_switch_routine_t); +int pthread_main_np(void); __END_DECLS #endif diff --git a/lib/libpthread/include/sched.h b/lib/libpthread/include/sched.h index 898d4ae6b16..81b91b2a682 100644 --- a/lib/libpthread/include/sched.h +++ b/lib/libpthread/include/sched.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sched.h,v 1.5 2002/01/18 00:38:12 fgsch Exp $ */ +/* $OpenBSD: sched.h,v 1.6 2002/02/16 21:27:25 millert Exp $ */ /* sched.h: POSIX 1003.1b Process Scheduling header */ @@ -60,17 +60,17 @@ struct sched_param #include <sys/cdefs.h> __BEGIN_DECLS -int sched_setparam __P((pid_t, const struct sched_param *)); -int sched_getparam __P((pid_t, struct sched_param *)); +int sched_setparam(pid_t, const struct sched_param *); +int sched_getparam(pid_t, struct sched_param *); -int sched_setscheduler __P((pid_t, int, const struct sched_param *)); -int sched_getscheduler __P((pid_t)); +int sched_setscheduler(pid_t, int, const struct sched_param *); +int sched_getscheduler(pid_t); -int sched_yield __P((void)); -int sched_get_priority_max __P((int)); -int sched_get_priority_min __P((int)); +int sched_yield(void); +int sched_get_priority_max(int); +int sched_get_priority_min(int); struct timespec; -int sched_rr_get_interval __P((pid_t, struct timespec *)); +int sched_rr_get_interval(pid_t, struct timespec *); __END_DECLS #endif /* KERNEL */ diff --git a/lib/libpthread/include/semaphore.h b/lib/libpthread/include/semaphore.h index eab8e356121..4735f9c29f9 100644 --- a/lib/libpthread/include/semaphore.h +++ b/lib/libpthread/include/semaphore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: semaphore.h,v 1.2 2002/01/18 20:36:25 fgsch Exp $ */ +/* $OpenBSD: semaphore.h,v 1.3 2002/02/16 21:27:25 millert Exp $ */ /* semaphore.h: POSIX 1003.1b semaphores */ @@ -52,15 +52,15 @@ typedef struct sem *sem_t; #include <sys/cdefs.h> __BEGIN_DECLS -int sem_init __P((sem_t *, int, unsigned int)); -int sem_destroy __P((sem_t *)); -sem_t *sem_open __P((const char *, int, ...)); -int sem_close __P((sem_t *)); -int sem_unlink __P((const char *)); -int sem_wait __P((sem_t *)); -int sem_trywait __P((sem_t *)); -int sem_post __P((sem_t *)); -int sem_getvalue __P((sem_t *, int *)); +int sem_init(sem_t *, int, unsigned int); +int sem_destroy(sem_t *); +sem_t *sem_open(const char *, int, ...); +int sem_close(sem_t *); +int sem_unlink(const char *); +int sem_wait(sem_t *); +int sem_trywait(sem_t *); +int sem_post(sem_t *); +int sem_getvalue(sem_t *, int *); __END_DECLS #endif /* _KERNEL */ diff --git a/lib/libpthread/include/spinlock.h b/lib/libpthread/include/spinlock.h index 51dc5fba4de..8c87e963de1 100644 --- a/lib/libpthread/include/spinlock.h +++ b/lib/libpthread/include/spinlock.h @@ -29,8 +29,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ - * $OpenBSD: spinlock.h,v 1.6 2001/09/04 22:17:45 fgsch Exp $ + * $Id: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ + * $OpenBSD: spinlock.h,v 1.7 2002/02/16 21:27:25 millert Exp $ * * Lock definitions used in both libc and libpthread. * @@ -67,13 +67,13 @@ typedef volatile struct { * Thread function prototype definitions: */ __BEGIN_DECLS -void _spinlock __P((spinlock_t *)); -void _spinlock_debug __P((spinlock_t *, char *, int)); +void _spinlock(spinlock_t *); +void _spinlock_debug(spinlock_t *, char *, int); /* lock() functions return 0 if lock was acquired. */ /* is_locked functions() return 1 if lock is locked. */ -int _atomic_lock __P((volatile _spinlock_lock_t *)); -int _atomic_is_locked __P((volatile _spinlock_lock_t *)); +int _atomic_lock(volatile _spinlock_lock_t *); +int _atomic_is_locked(volatile _spinlock_lock_t *); __END_DECLS #endif /* _SPINLOCK_H_ */ diff --git a/lib/libpthread/thread/thread_storage.c b/lib/libpthread/thread/thread_storage.c index 7dedd52f2f2..fa8357c85ec 100644 --- a/lib/libpthread/thread/thread_storage.c +++ b/lib/libpthread/thread/thread_storage.c @@ -30,7 +30,7 @@ _libc_private_storage(volkey, init, initsz, error) void * error; { void *result; - void (*cleanfn) __P((void *)); + void (*cleanfn)(void *); struct _thread_private_key_struct * key; /* Use static storage while not threaded: */ diff --git a/lib/libpthread/uthread/uthread_autoinit.c b/lib/libpthread/uthread/uthread_autoinit.c index 43f50a2778e..5753d434c7f 100644 --- a/lib/libpthread/uthread/uthread_autoinit.c +++ b/lib/libpthread/uthread/uthread_autoinit.c @@ -1,7 +1,7 @@ /* * David Leonard, 1998. Public Domain. <david.leonard@csee.uq.edu.au> * - * $OpenBSD: uthread_autoinit.c,v 1.9 2002/01/24 18:39:46 pefo Exp $ + * $OpenBSD: uthread_autoinit.c,v 1.10 2002/02/16 21:27:25 millert Exp $ */ #include <stdio.h> @@ -9,7 +9,7 @@ #include "pthread_private.h" __BEGIN_DECLS -extern void _thread_init __P((void)); +extern void _thread_init(void); __END_DECLS #ifdef DEBUG @@ -36,7 +36,7 @@ Init _thread_initialiser; * The a.out ld.so dynamic linker calls the function * at symbol ".init" if it exists, just after linkage. */ -extern void _thread_dot_init __P((void)) asm(".init"); +extern void _thread_dot_init(void) asm(".init"); void _thread_dot_init() { @@ -53,7 +53,7 @@ _thread_dot_init() * to call it. */ #if defined(__GNUC__) /* && defined(notyet) */ /* internal compiler error??? */ -void _thread_init_constructor __P((void)) __attribute__((constructor)); +void _thread_init_constructor(void) __attribute__((constructor)); void _thread_init_constructor() { diff --git a/lib/libskey/put.c b/lib/libskey/put.c index a2a2b06767f..9b95a6be39c 100644 --- a/lib/libskey/put.c +++ b/lib/libskey/put.c @@ -8,7 +8,7 @@ * * Dictionary lookup and extraction. * - * $OpenBSD: put.c,v 1.10 2001/06/20 22:17:21 millert Exp $ + * $OpenBSD: put.c,v 1.11 2002/02/16 21:27:27 millert Exp $ */ #include <stdio.h> @@ -19,10 +19,10 @@ #include "skey.h" -static unsigned int extract __P((char *, int, int)); -static void standard __P((char *)); -static void insert __P((char *, int, int, int)); -static int wsrch __P((char *, int, int)); +static unsigned int extract(char *, int, int); +static void standard(char *); +static void insert(char *, int, int, int); +static int wsrch(char *, int, int); /* Standard dictionary for integer-word translations */ static const char * const Wp[2048] = { diff --git a/lib/libskey/skey.h b/lib/libskey/skey.h index 38dc6fadbdc..37d9bd269fe 100644 --- a/lib/libskey/skey.h +++ b/lib/libskey/skey.h @@ -10,7 +10,7 @@ * * Main client header * - * $OpenBSD: skey.h,v 1.16 2001/06/23 22:28:23 millert Exp $ + * $OpenBSD: skey.h,v 1.17 2002/02/16 21:27:28 millert Exp $ */ #ifndef _SKEY_H_ @@ -62,32 +62,32 @@ struct mc { #define _SKEY_RAND_FILE_PATH_ "/var/db/host.random" __BEGIN_DECLS -void f __P((char *)); -int keycrunch __P((char *, char *, char *)); -char *btoe __P((char *, char *)); -char *put8 __P((char *, char *)); -int etob __P((char *, char *)); -void rip __P((char *)); -int skeychallenge __P((struct skey *, char *, char *)); -int skeylookup __P((struct skey *, char *)); -int skeyverify __P((struct skey *, char *)); -int skeyzero __P((struct skey *)); -void sevenbit __P((char *)); -void backspace __P((char *)); -char *skipspace __P((char *)); -char *readpass __P((char *, int)); -char *readskey __P((char *, int)); -int skey_authenticate __P((char *)); -int skey_passcheck __P((char *, char *)); -char *skey_keyinfo __P((char *)); -int skey_haskey __P((char *)); -int atob8 __P((char *, char *)); -int btoa8 __P((char *, char *)); -int htoi __P((int)); -const char *skey_get_algorithm __P((void)); -char *skey_set_algorithm __P((char *)); -int skeygetnext __P((struct skey *)); -int skey_unlock __P((struct skey *)); +void f(char *); +int keycrunch(char *, char *, char *); +char *btoe(char *, char *); +char *put8(char *, char *); +int etob(char *, char *); +void rip(char *); +int skeychallenge(struct skey *, char *, char *); +int skeylookup(struct skey *, char *); +int skeyverify(struct skey *, char *); +int skeyzero(struct skey *); +void sevenbit(char *); +void backspace(char *); +char *skipspace(char *); +char *readpass(char *, int); +char *readskey(char *, int); +int skey_authenticate(char *); +int skey_passcheck(char *, char *); +char *skey_keyinfo(char *); +int skey_haskey(char *); +int atob8(char *, char *); +int btoa8(char *, char *); +int htoi(int); +const char *skey_get_algorithm(void); +char *skey_set_algorithm(char *); +int skeygetnext(struct skey *); +int skey_unlock(struct skey *); __END_DECLS #endif /* _SKEY_H_ */ diff --git a/lib/libskey/skeylogin.c b/lib/libskey/skeylogin.c index e7de30d66ea..0cd761b75ed 100644 --- a/lib/libskey/skeylogin.c +++ b/lib/libskey/skeylogin.c @@ -10,7 +10,7 @@ * * S/Key verification check, lookups, and authentication. * - * $OpenBSD: skeylogin.c,v 1.40 2001/12/07 05:09:33 millert Exp $ + * $OpenBSD: skeylogin.c,v 1.41 2002/02/16 21:27:28 millert Exp $ */ #include <sys/param.h> @@ -36,8 +36,8 @@ #include "skey.h" -static void skey_fakeprompt __P((char *, char *)); -static char *tgetline __P((int, char *, size_t, int)); +static void skey_fakeprompt(char *, char *); +static char *tgetline(int, char *, size_t, int); /* * Return an skey challenge string for user 'name'. If successful, diff --git a/lib/libskey/skeysubr.c b/lib/libskey/skeysubr.c index a79117e5269..97b3f43e9e5 100644 --- a/lib/libskey/skeysubr.c +++ b/lib/libskey/skeysubr.c @@ -9,7 +9,7 @@ * * S/Key misc routines. * - * $OpenBSD: skeysubr.c,v 1.22 2002/01/24 23:01:19 millert Exp $ + * $OpenBSD: skeysubr.c,v 1.23 2002/02/16 21:27:28 millert Exp $ */ #include <stdio.h> @@ -31,13 +31,13 @@ #define SKEY_HASH_DEFAULT 1 #endif -static int keycrunch_md4 __P((char *, char *, char *)); -static int keycrunch_md5 __P((char *, char *, char *)); -static int keycrunch_sha1 __P((char *, char *, char *)); -static int keycrunch_rmd160 __P((char *, char *, char *)); -static void lowcase __P((char *)); -static void skey_echo __P((int)); -static void trapped __P((int)); +static int keycrunch_md4(char *, char *, char *); +static int keycrunch_md5(char *, char *, char *); +static int keycrunch_sha1(char *, char *, char *); +static int keycrunch_rmd160(char *, char *, char *); +static void lowcase(char *); +static void skey_echo(int); +static void trapped(int); /* Current hash type (index into skey_hash_types array) */ static int skey_hash_type = SKEY_HASH_DEFAULT; @@ -49,7 +49,7 @@ static int skey_hash_type = SKEY_HASH_DEFAULT; #define SKEY_ALGORITH_LAST 4 struct skey_algorithm_table { const char *name; - int (*keycrunch) __P((char *, char *, char *)); + int (*keycrunch)(char *, char *, char *); }; static struct skey_algorithm_table skey_algorithm_table[] = { { "md4", keycrunch_md4 }, @@ -293,7 +293,7 @@ readpass(buf, n) char *buf; int n; { - void (*old_handler) __P(()); + void (*old_handler)(); /* Turn off echoing */ skey_echo(0); diff --git a/lib/libtelnet/getent.c b/lib/libtelnet/getent.c index 7cf05b9a5a8..1048789dac7 100644 --- a/lib/libtelnet/getent.c +++ b/lib/libtelnet/getent.c @@ -34,7 +34,7 @@ #ifndef lint /* from: static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93"; */ /* from: static char *rcsid = "$NetBSD: getent.c,v 1.5 1996/02/24 01:15:22 jtk Exp $"; */ -static char *rcsid = "$OpenBSD: getent.c,v 1.3 1998/07/28 20:11:15 marc Exp $"; +static char *rcsid = "$OpenBSD: getent.c,v 1.4 2002/02/16 21:27:29 millert Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -42,8 +42,8 @@ static char *rcsid = "$OpenBSD: getent.c,v 1.3 1998/07/28 20:11:15 marc Exp $"; static char *area; -int gtgetent __P((char *, char *)); -char *gtgetstr __P((char *, char **)); +int gtgetent(char *, char *); +char *gtgetstr(char *, char **); /*ARGSUSED*/ int diff --git a/lib/libutil/check_expire.c b/lib/libutil/check_expire.c index f5689c8b2b9..4f63c09ccfb 100644 --- a/lib/libutil/check_expire.c +++ b/lib/libutil/check_expire.c @@ -1,4 +1,4 @@ -/* $OpenBSD: check_expire.c,v 1.3 2001/08/16 18:39:20 millert Exp $ */ +/* $OpenBSD: check_expire.c,v 1.4 2002/02/16 21:27:29 millert Exp $ */ /* * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. @@ -51,7 +51,7 @@ #include "util.h" -static char *pwd_update __P((struct passwd *)); +static char *pwd_update(struct passwd *); int login_check_expire(back, pwd, class, lastchance) diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index 2c236160ca6..63c4e85121b 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $ +/* $OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $ /* $NetBSD: fparseln.c,v 1.7 1999/07/02 15:49:12 simonb Exp $ */ /* @@ -31,7 +31,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Exp $"; +static char rcsid[] = "$OpenBSD: fparseln.c,v 1.3 2002/02/16 21:27:29 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> @@ -42,7 +42,7 @@ static char rcsid[] = "$OpenBSD: fparseln.c,v 1.2 2001/08/16 18:34:40 millert Ex #include "util.h" -static int isescaped __P((const char *, const char *, int)); +static int isescaped(const char *, const char *, int); /* isescaped(): * Return true if the character in *p that belongs to a string @@ -192,7 +192,7 @@ fparseln(fp, size, lineno, str, flags) #ifdef TEST -int main __P((int, char **)); +int main(int, char **); int main(argc, argv) diff --git a/lib/libutil/login_fbtab.c b/lib/libutil/login_fbtab.c index 1b9bb526cd4..d32cc0d9c4d 100644 --- a/lib/libutil/login_fbtab.c +++ b/lib/libutil/login_fbtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_fbtab.c,v 1.7 2001/06/03 15:32:57 deraadt Exp $ */ +/* $OpenBSD: login_fbtab.c,v 1.8 2002/02/16 21:27:29 millert Exp $ */ /************************************************************************ * Copyright 1995 by Wietse Venema. All rights reserved. Some individual @@ -75,7 +75,7 @@ #define _PATH_FBTAB "/etc/fbtab" -static void login_protect __P((char *, char *, int, uid_t, gid_t)); +static void login_protect(char *, char *, int, uid_t, gid_t); #define WSPACE " \t\n" diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c index 698407f4873..ceada7f4d91 100644 --- a/lib/libutil/passwd.c +++ b/lib/libutil/passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp $ */ +/* $OpenBSD: passwd.c,v 1.31 2002/02/16 21:27:29 millert Exp $ */ /* * Copyright (c) 1987, 1993, 1994, 1995 @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp $"; +static char rcsid[] = "$OpenBSD: passwd.c,v 1.31 2002/02/16 21:27:29 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: passwd.c,v 1.30 2002/01/16 01:28:54 millert Exp #define NUM_OPTIONS 2 /* Number of hardcoded defaults */ -static void pw_cont __P((int sig)); +static void pw_cont(int sig); static const char options[NUM_OPTIONS][2][80] = { diff --git a/lib/libutil/scsi.h b/lib/libutil/scsi.h index 46ac8cbf73d..08b8a9b9b48 100644 --- a/lib/libutil/scsi.h +++ b/lib/libutil/scsi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.h,v 1.1 1996/06/12 11:21:37 deraadt Exp $ */ +/* $OpenBSD: scsi.h,v 1.2 2002/02/16 21:27:29 millert Exp $ */ /* Copyright (c) 1994 HD Associates (hd@world.std.com) * All rights reserved. @@ -50,18 +50,18 @@ || SR->error /* copy of errno */ \ ) -scsireq_t *scsireq_reset __P((scsireq_t *)); -scsireq_t *scsireq_new __P((void)); +scsireq_t *scsireq_reset(scsireq_t *); +scsireq_t *scsireq_new(void); -int scsireq_buff_decode __P((u_char *, size_t, char *, ...)); +int scsireq_buff_decode(u_char *, size_t, char *, ...); int scsireq_buff_decode_visit __P((u_char *, size_t, char *, void (*a)(void *, int, void *, int, char *), void *)); -int scsireq_decode __P((scsireq_t *, char *, ...)); +int scsireq_decode(scsireq_t *, char *, ...); int scsireq_decode_visit __P((scsireq_t *, char *, void (*) (void *, int, void *, int, char *), void *)); -int scsireq_encode __P((scsireq_t *, char *, ...)); +int scsireq_encode(scsireq_t *, char *, ...); int scsireq_encode_visit __P((scsireq_t *, char *, int (*)(void *, char *), void *)); int scsireq_buff_encode_visit __P((u_char *, size_t, char *, @@ -75,12 +75,12 @@ scsireq_t *scsireq_build_visit __P((scsireq_t *, u_long, caddr_t, u_long, char *, int (*)(void *, char *), void *)); -int scsireq_enter __P((int, scsireq_t *)); +int scsireq_enter(int, scsireq_t *); -void scsi_dump __P((FILE *, char *, u_char *, int, int, int )); +void scsi_dump(FILE *, char *, u_char *, int, int, int ); -int scsi_debug __P((FILE *, int, scsireq_t *)); -FILE *scsi_debug_output __P((char *)); -int scsi_open __P((const char *, int )); +int scsi_debug(FILE *, int, scsireq_t *); +FILE *scsi_debug_output(char *); +int scsi_open(const char *, int ); #endif /* _SCSI_H_ */ diff --git a/lib/libutil/util.h b/lib/libutil/util.h index bff64ce0367..33bf13560a9 100644 --- a/lib/libutil/util.h +++ b/lib/libutil/util.h @@ -1,4 +1,4 @@ -/* $OpenBSD: util.h,v 1.18 2001/09/29 17:45:36 jakob Exp $ */ +/* $OpenBSD: util.h,v 1.19 2002/02/16 21:27:29 millert Exp $ */ /* $NetBSD: util.h,v 1.2 1996/05/16 07:00:22 thorpej Exp $ */ /*- @@ -81,39 +81,39 @@ struct utmp; struct winsize; __BEGIN_DECLS -char *fparseln __P((struct __sFILE *, size_t *, size_t *, const char[3], int)); -void login __P((struct utmp *)); -int login_tty __P((int)); -int logout __P((const char *)); -void logwtmp __P((const char *, const char *, const char *)); -int opendev __P((char *, int, int, char **)); -int pidfile __P((const char *)); -void pw_setdir __P((const char *)); -char *pw_file __P((const char *)); -int pw_lock __P((int retries)); -int pw_mkdb __P((char *, int)); -int pw_abort __P((void)); -void pw_init __P((void)); -void pw_edit __P((int, const char *)); -void pw_prompt __P((void)); -void pw_copy __P((int, int, struct passwd *)); -void pw_getconf __P((char *, size_t, const char *, const char *)); -int pw_scan __P((char *, struct passwd *, int *)); -void pw_error __P((const char *, int, int)); +char *fparseln(struct __sFILE *, size_t *, size_t *, const char[3], int); +void login(struct utmp *); +int login_tty(int); +int logout(const char *); +void logwtmp(const char *, const char *, const char *); +int opendev(char *, int, int, char **); +int pidfile(const char *); +void pw_setdir(const char *); +char *pw_file(const char *); +int pw_lock(int retries); +int pw_mkdb(char *, int); +int pw_abort(void); +void pw_init(void); +void pw_edit(int, const char *); +void pw_prompt(void); +void pw_copy(int, int, struct passwd *); +void pw_getconf(char *, size_t, const char *, const char *); +int pw_scan(char *, struct passwd *, int *); +void pw_error(const char *, int, int); int openpty __P((int *, int *, char *, struct termios *, struct winsize *)); int opendisk __P((const char *path, int flags, char *buf, size_t buflen, int iscooked)); -pid_t forkpty __P((int *, char *, struct termios *, struct winsize *)); -int getmaxpartitions __P((void)); -int getrawpartition __P((void)); -void login_fbtab __P((char *, uid_t, gid_t)); -int login_check_expire __P((struct __sFILE *, struct passwd *, char *, int)); -char *readlabelfs __P((char *, int)); -const char *uu_lockerr __P((int _uu_lockresult)); -int uu_lock __P((const char *_ttyname)); -int uu_lock_txfr __P((const char *_ttyname, pid_t _pid)); -int uu_unlock __P((const char *_ttyname)); +pid_t forkpty(int *, char *, struct termios *, struct winsize *); +int getmaxpartitions(void); +int getrawpartition(void); +void login_fbtab(char *, uid_t, gid_t); +int login_check_expire(struct __sFILE *, struct passwd *, char *, int); +char *readlabelfs(char *, int); +const char *uu_lockerr(int _uu_lockresult); +int uu_lock(const char *_ttyname); +int uu_lock_txfr(const char *_ttyname, pid_t _pid); +int uu_unlock(const char *_ttyname); __END_DECLS #endif /* !_UTIL_H_ */ diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c index 9c81177e217..0d4c0bba18d 100644 --- a/lib/libutil/uucplock.c +++ b/lib/libutil/uucplock.c @@ -1,4 +1,4 @@ -/* * $OpenBSD: uucplock.c,v 1.7 1999/09/21 04:52:46 csapuntz Exp $*/ +/* * $OpenBSD: uucplock.c,v 1.8 2002/02/16 21:27:29 millert Exp $*/ /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. @@ -59,8 +59,8 @@ static const char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93"; goto __CONCAT(ret, level); } /* Forward declarations */ -static int put_pid __P((int fd, pid_t pid)); -static pid_t get_pid __P((int fd,int *err)); +static int put_pid(int fd, pid_t pid); +static pid_t get_pid(int fd,int *err); /* * uucp style locking routines diff --git a/lib/libwrap/tcpd.h b/lib/libwrap/tcpd.h index f110c759011..a49c71f44e1 100644 --- a/lib/libwrap/tcpd.h +++ b/lib/libwrap/tcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcpd.h,v 1.11 2001/11/07 18:49:10 deraadt Exp $ */ +/* $OpenBSD: tcpd.h,v 1.12 2002/02/16 21:27:29 millert Exp $ */ /* * Copyright (c) 1997, Jason Downs. All rights reserved. @@ -106,21 +106,21 @@ extern "C" { #define fromhost sock_host /* no TLI support needed */ __BEGIN_DECLS -extern int hosts_access __P((struct request_info *)); -extern int hosts_ctl __P((char *, char *, char *, char *)); -extern void shell_cmd __P((char *)); -extern char *percent_m __P((char *, char *)); -extern char *percent_x __P((char *, int, char *, struct request_info *)); -extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); -extern int rfc1413 __P((struct sockaddr *, struct sockaddr *, char *, size_t, int)); -extern void clean_exit __P((struct request_info *)); -extern void refuse __P((struct request_info *)); +extern int hosts_access(struct request_info *); +extern int hosts_ctl(char *, char *, char *, char *); +extern void shell_cmd(char *); +extern char *percent_m(char *, char *); +extern char *percent_x(char *, int, char *, struct request_info *); +extern void rfc931(struct sockaddr *, struct sockaddr *, char *); +extern int rfc1413(struct sockaddr *, struct sockaddr *, char *, size_t, int); +extern void clean_exit(struct request_info *); +extern void refuse(struct request_info *); #ifdef _STDIO_H_ -extern char *xgets __P((char *, int, FILE *)); +extern char *xgets(char *, int, FILE *); #endif /* _STDIO_H_ */ -extern char *split_at __P((char *, int)); -extern int dot_quad_addr_new __P((char *, in_addr_t *)); -extern in_addr_t dot_quad_addr __P((char *)); +extern char *split_at(char *, int); +extern int dot_quad_addr_new(char *, in_addr_t *); +extern in_addr_t dot_quad_addr(char *); #ifdef __cplusplus } @@ -141,8 +141,8 @@ extern int resident; /* > 0 if resident process */ * attributes. Each attribute has its own key. */ -extern struct request_info *request_init __P((struct request_info *, ...)); -extern struct request_info *request_set __P((struct request_info *, ...)); +extern struct request_info *request_init(struct request_info *, ...); +extern struct request_info *request_set(struct request_info *, ...); #define RQ_FILE 1 /* file descriptor */ #define RQ_DAEMON 2 /* server process (argv[0]) */ @@ -162,20 +162,20 @@ extern struct request_info *request_set __P((struct request_info *, ...)); * host_info structures serve as caches for the lookup results. */ -extern char *eval_user __P((struct request_info *)); -extern char *eval_hostname __P((struct host_info *)); -extern char *eval_hostaddr __P((struct host_info *)); -extern char *eval_hostinfo __P((struct host_info *)); -extern char *eval_client __P((struct request_info *)); -extern char *eval_server __P((struct request_info *)); +extern char *eval_user(struct request_info *); +extern char *eval_hostname(struct host_info *); +extern char *eval_hostaddr(struct host_info *); +extern char *eval_hostinfo(struct host_info *); +extern char *eval_client(struct request_info *); +extern char *eval_server(struct request_info *); #define eval_daemon(r) ((r)->daemon) /* daemon process name */ #define eval_pid(r) ((r)->pid) /* process id */ /* Socket-specific methods, including DNS hostname lookups. */ -extern void sock_host __P((struct request_info *)); -extern void sock_hostname __P((struct host_info *)); -extern void sock_hostaddr __P((struct host_info *)); +extern void sock_host(struct request_info *); +extern void sock_hostname(struct host_info *); +extern void sock_hostaddr(struct host_info *); #define sock_methods(r) \ { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } @@ -185,8 +185,8 @@ extern void sock_hostaddr __P((struct host_info *)); * everyone would have to include <setjmp.h>. */ -extern void tcpd_warn __P((char *, ...)); -extern void tcpd_jump __P((char *, ...)); +extern void tcpd_warn(char *, ...); +extern void tcpd_jump(char *, ...); __END_DECLS struct tcpd_context { @@ -215,7 +215,7 @@ extern struct tcpd_context tcpd_context; * behavior. */ -extern void process_options __P((char *, struct request_info *)); +extern void process_options(char *, struct request_info *); extern int dry_run; /* verification flag */ __END_DECLS diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 6ed841cdefa..fa89abbf840 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comsat.c,v 1.20 2001/12/07 18:45:32 mpech Exp $ */ +/* $OpenBSD: comsat.c,v 1.21 2002/02/16 21:27:29 millert Exp $ */ /* * Copyright (c) 1980, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: comsat.c,v 1.20 2001/12/07 18:45:32 mpech Exp $"; +static char rcsid[] = "$OpenBSD: comsat.c,v 1.21 2002/02/16 21:27:29 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -77,12 +77,12 @@ struct utmp *utmp = NULL; time_t lastmsgtime; int nutmp, uf; -void jkfprintf __P((FILE *, char[], off_t)); -void mailfor __P((char *)); -void notify __P((struct utmp *, off_t)); -void readutmp __P((int)); -void doreadutmp __P((void)); -void reapchildren __P((int)); +void jkfprintf(FILE *, char[], off_t); +void mailfor(char *); +void notify(struct utmp *, off_t); +void readutmp(int); +void doreadutmp(void); +void reapchildren(int); volatile sig_atomic_t wantreadutmp; diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index 39f0c0f0fe6..ebff51bd573 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp $ */ +/* $OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "from: @(#)fingerd.c 8.1 (Berkeley) 6/4/93"; #else -static char rcsid[] = "$OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp $"; +static char rcsid[] = "$OpenBSD: fingerd.c,v 1.25 2002/02/16 21:27:29 millert Exp $"; #endif #endif /* not lint */ @@ -61,8 +61,8 @@ static char rcsid[] = "$OpenBSD: fingerd.c,v 1.24 2001/12/07 18:45:32 mpech Exp #include <string.h> #include "pathnames.h" -void err __P((const char *, ...)); -void usage __P((void)); +void err(const char *, ...); +void usage(void); void usage() diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h index 73b43bcf4d6..edf358102fb 100644 --- a/libexec/ftpd/extern.h +++ b/libexec/ftpd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.6 2001/01/28 19:34:27 niklas Exp $ */ +/* $OpenBSD: extern.h,v 1.7 2002/02/16 21:27:29 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/04/11 02:44:49 cgd Exp $ */ /* @@ -65,46 +65,46 @@ * @(#)extern.h 8.2 (Berkeley) 4/4/94 */ -void blkfree __P((char **)); -char **copyblk __P((char **)); -void cwd __P((char *)); -void delete __P((char *)); -void dologout __P((int)); -void fatal __P((char *)); -int ftpd_pclose __P((FILE *)); -FILE *ftpd_popen __P((char *, char *)); -char *getline __P((char *, int, FILE *)); -void ftpdlogwtmp __P((char *, char *, char *)); -void lreply __P((int, const char *, ...)); -void makedir __P((char *)); -void nack __P((char *)); -void pass __P((char *)); -void passive __P((void)); -int lpsvproto2af __P((int)); -int af2lpsvproto __P((int)); -int epsvproto2af __P((int)); -int af2epsvproto __P((int)); -void long_passive __P((char *, int)); -int extended_port __P((const char *)); -void epsv_protounsupp __P((const char *)); -void perror_reply __P((int, char *)); -void pwd __P((void)); -void removedir __P((char *)); -void renamecmd __P((char *, char *)); -char *renamefrom __P((char *)); -void reply __P((int, const char *, ...)); -void retrieve __P((char *, char *)); -void send_file_list __P((char *)); -void setproctitle __P((const char *, ...)); -void statcmd __P((void)); -void statfilecmd __P((char *)); -void store __P((char *, char *, int)); -void upper __P((char *)); -void user __P((char *)); -void yyerror __P((char *)); -void toolong __P((int)); +void blkfree(char **); +char **copyblk(char **); +void cwd(char *); +void delete(char *); +void dologout(int); +void fatal(char *); +int ftpd_pclose(FILE *); +FILE *ftpd_popen(char *, char *); +char *getline(char *, int, FILE *); +void ftpdlogwtmp(char *, char *, char *); +void lreply(int, const char *, ...); +void makedir(char *); +void nack(char *); +void pass(char *); +void passive(void); +int lpsvproto2af(int); +int af2lpsvproto(int); +int epsvproto2af(int); +int af2epsvproto(int); +void long_passive(char *, int); +int extended_port(const char *); +void epsv_protounsupp(const char *); +void perror_reply(int, char *); +void pwd(void); +void removedir(char *); +void renamecmd(char *, char *); +char *renamefrom(char *); +void reply(int, const char *, ...); +void retrieve(char *, char *); +void send_file_list(char *); +void setproctitle(const char *, ...); +void statcmd(void); +void statfilecmd(char *); +void store(char *, char *, int); +void upper(char *); +void user(char *); +void yyerror(char *); +void toolong(int); -int yyparse __P((void)); +int yyparse(void); union sockunion { struct sockinet { diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y index 58f862029e3..11388f6d78e 100644 --- a/libexec/ftpd/ftpcmd.y +++ b/libexec/ftpd/ftpcmd.y @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $ */ +/* $OpenBSD: ftpcmd.y,v 1.38 2002/02/16 21:27:29 millert Exp $ */ /* $NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $ */ /* @@ -47,7 +47,7 @@ #if 0 static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #else -static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.37 2002/01/30 18:01:46 mpech Exp $"; +static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.38 2002/02/16 21:27:29 millert Exp $"; #endif #endif /* not lint */ @@ -1058,11 +1058,11 @@ struct tab sitetab[] = { { NULL, 0, 0, 0, 0 } }; -static void help __P((struct tab *, char *)); +static void help(struct tab *, char *); static struct tab * - lookup __P((struct tab *, char *)); -static void sizecmd __P((char *)); -static int yylex __P((void)); + lookup(struct tab *, char *); +static void sizecmd(char *); +static int yylex(void); extern int epsvall; diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index ba6c182d120..9317e544a6a 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.119 2002/02/01 05:02:49 itojun Exp $ */ +/* $OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -73,7 +73,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #else -static char rcsid[] = "$OpenBSD: ftpd.c,v 1.119 2002/02/01 05:02:49 itojun Exp $"; +static char rcsid[] = "$OpenBSD: ftpd.c,v 1.120 2002/02/16 21:27:29 millert Exp $"; #endif #endif /* not lint */ @@ -235,29 +235,29 @@ char proctitle[BUFSIZ]; /* initial part of title */ cmd, (*(file) == '/') ? "" : curdir(), file, cnt); \ } -static void ack __P((char *)); -static void sigurg __P((int)); -static void myoob __P((void)); -static int checkuser __P((char *, char *)); -static FILE *dataconn __P((char *, off_t, char *)); -static void dolog __P((struct sockaddr *)); -static char *copy_dir __P((char *, struct passwd *)); -static char *curdir __P((void)); -static void end_login __P((void)); -static FILE *getdatasock __P((char *)); -static int guniquefd __P((char *, char **)); -static void lostconn __P((int)); -static void sigquit __P((int)); -static int receive_data __P((FILE *, FILE *)); -static void replydirname __P((const char *, const char *)); -static int send_data __P((FILE *, FILE *, off_t, off_t, int)); +static void ack(char *); +static void sigurg(int); +static void myoob(void); +static int checkuser(char *, char *); +static FILE *dataconn(char *, off_t, char *); +static void dolog(struct sockaddr *); +static char *copy_dir(char *, struct passwd *); +static char *curdir(void); +static void end_login(void); +static FILE *getdatasock(char *); +static int guniquefd(char *, char **); +static void lostconn(int); +static void sigquit(int); +static int receive_data(FILE *, FILE *); +static void replydirname(const char *, const char *); +static int send_data(FILE *, FILE *, off_t, off_t, int); static struct passwd * - sgetpwnam __P((char *)); -static void reapchild __P((int)); -static int check_host __P((struct sockaddr *)); -static void usage __P((void)); + sgetpwnam(char *); +static void reapchild(int); +static int check_host(struct sockaddr *); +static void usage(void); -void logxfer __P((char *, off_t, time_t)); +void logxfer(char *, off_t, time_t); static char * curdir() @@ -1125,7 +1125,7 @@ retrieve(cmd, name) { FILE *fin, *dout; struct stat st; - int (*closefunc) __P((FILE *)); + int (*closefunc)(FILE *); time_t start; if (cmd == 0) { @@ -1199,7 +1199,7 @@ store(name, mode, unique) int unique; { FILE *fout, *din; - int (*closefunc) __P((FILE *)); + int (*closefunc)(FILE *); struct stat st; int fd; diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c index adf2d00c58d..0de367f51b7 100644 --- a/libexec/getNAME/getNAME.c +++ b/libexec/getNAME/getNAME.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getNAME.c,v 1.7 2001/12/07 18:45:32 mpech Exp $ */ +/* $OpenBSD: getNAME.c,v 1.8 2002/02/16 21:27:29 millert Exp $ */ /* $NetBSD: getNAME.c,v 1.7.2.1 1997/11/10 19:54:46 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)getNAME.c 8.1 (Berkeley) 6/30/93"; #else -static char rcsid[] = "$OpenBSD: getNAME.c,v 1.7 2001/12/07 18:45:32 mpech Exp $"; +static char rcsid[] = "$OpenBSD: getNAME.c,v 1.8 2002/02/16 21:27:29 millert Exp $"; #endif #endif /* not lint */ @@ -64,13 +64,13 @@ int tocrc; int intro; int typeflag; -void doname __P((char *)); -void dorefname __P((char *)); -void getfrom __P((char *)); -void split __P((char *, char *)); -void trimln __P((char *)); -void usage __P((void)); -int main __P((int, char *[])); +void doname(char *); +void dorefname(char *); +void getfrom(char *); +void split(char *, char *); +void trimln(char *); +void usage(void); +int main(int, char *[]); int main(argc, argv) diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h index 9bf59caa4dc..9ed1e4a6554 100644 --- a/libexec/getty/extern.h +++ b/libexec/getty/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 2001/01/28 19:34:28 niklas Exp $*/ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:30 millert Exp $*/ /* * Copyright (c) 1993 @@ -37,20 +37,20 @@ struct delayval; -int adelay __P((int, struct delayval *)); -char *autobaud __P((void)); -int delaybits __P((void)); -void edithost __P((char *)); -void gendefaults __P((void)); -int getent __P((char *, char *)); -int getflag __P((char *)); -long getnum __P((char *)); -char *getstr __P((char *, char **)); -void gettable __P((char *, char *)); -void makeenv __P((char *[])); -char *portselector __P((void)); -void set_ttydefaults __P((int)); -void setchars __P((void)); -void setdefaults __P((void)); -void setflags __P((int)); -int speed __P((int)); +int adelay(int, struct delayval *); +char *autobaud(void); +int delaybits(void); +void edithost(char *); +void gendefaults(void); +int getent(char *, char *); +int getflag(char *); +long getnum(char *); +char *getstr(char *, char **); +void gettable(char *, char *); +void makeenv(char *[]); +char *portselector(void); +void set_ttydefaults(int); +void setchars(void); +void setdefaults(void); +void setflags(int); +int speed(int); diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h index aeab6128486..faee8e2a714 100644 --- a/libexec/getty/gettytab.h +++ b/libexec/getty/gettytab.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gettytab.h,v 1.4 2001/01/28 19:34:28 niklas Exp $*/ +/* $OpenBSD: gettytab.h,v 1.5 2002/02/16 21:27:30 millert Exp $*/ /* * Copyright (c) 1983, 1993, 1994 @@ -162,10 +162,10 @@ struct gettyflags { #define NP gettyflags[21].value #define MB gettyflags[22].value -int getent __P((char *, char *)); -long getnum __P((char *)); -int getflag __P((char *)); -char *getstr __P((char *, char **)); +int getent(char *, char *); +long getnum(char *); +int getflag(char *); +char *getstr(char *, char **); extern struct gettyflags gettyflags[]; extern struct gettynums gettynums[]; diff --git a/libexec/getty/main.c b/libexec/getty/main.c index 71f9ffa63fe..577b62a2b3e 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.20 2001/11/19 22:35:04 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.21 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)main.c 8.1 (Berkeley) 6/20/93";*/ -static char rcsid[] = "$OpenBSD: main.c,v 1.20 2001/11/19 22:35:04 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.21 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -160,13 +160,13 @@ timeoverrun(signo) _exit(1); } -static int getname __P((void)); -static void oflush __P((void)); -static void prompt __P((void)); -static void putchr __P((int)); -static void putf __P((char *)); -static void putpad __P((char *)); -static void xputs __P((char *)); +static int getname(void); +static void oflush(void); +static void prompt(void); +static void putchr(int); +static void putf(char *); +static void putpad(char *); +static void xputs(char *); int main(argc, argv) diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index d57cc2f6e23..d906d6b5f78 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $ */ +/* $OpenBSD: subr.c,v 1.15 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)subr.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: subr.c,v 1.15 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ /* @@ -54,7 +54,7 @@ static char rcsid[] = "$OpenBSD: subr.c,v 1.14 2001/11/19 01:08:14 deraadt Exp $ extern struct termios tmode, omode; -static void compatflags __P((long)); +static void compatflags(long); /* * Get a table entry. diff --git a/libexec/identd/identd.h b/libexec/identd/identd.h index 45093c544df..73f2c5e20b6 100644 --- a/libexec/identd/identd.h +++ b/libexec/identd/identd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: identd.h,v 1.9 2001/08/08 07:02:42 deraadt Exp $*/ +/* $OpenBSD: identd.h,v 1.10 2002/02/16 21:27:30 millert Exp $*/ /* ** @@ -39,12 +39,12 @@ extern char *indirect_password; extern int lport; extern int fport; -int parse __P((int, struct in_addr *, struct in_addr *)); -int parse6 __P((int, struct sockaddr_in6 *, struct sockaddr_in6 *)); -char *gethost4 __P((struct sockaddr_in *)); -char *gethost4_addr __P((struct in_addr *)); -char *gethost6 __P((struct sockaddr_in6 *)); -int k_getuid __P((struct in_addr *, int, struct in_addr *, int, uid_t *)); +int parse(int, struct in_addr *, struct in_addr *); +int parse6(int, struct sockaddr_in6 *, struct sockaddr_in6 *); +char *gethost4(struct sockaddr_in *); +char *gethost4_addr(struct in_addr *); +char *gethost6(struct sockaddr_in6 *); +int k_getuid(struct in_addr *, int, struct in_addr *, int, uid_t *); int k_getuid6 __P((struct sockaddr_in6 *, int, struct sockaddr_in6 *, int, uid_t *)); diff --git a/libexec/identd/parse.c b/libexec/identd/parse.c index 7be252081fa..c43bb4f06fa 100644 --- a/libexec/identd/parse.c +++ b/libexec/identd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.28 2002/01/07 08:13:31 mpech Exp $ */ +/* $OpenBSD: parse.c,v 1.29 2002/02/16 21:27:30 millert Exp $ */ /* * This program is in the public domain and may be used freely by anyone @@ -30,10 +30,10 @@ #define IO_TIMEOUT 30 /* Timeout I/O operations after N seconds */ -int check_noident __P((char *)); -ssize_t timed_read __P((int, void *, size_t, time_t)); -ssize_t timed_write __P((int, const void *, size_t, time_t)); -void gentoken __P((char *, int)); +int check_noident(char *); +ssize_t timed_read(int, void *, size_t, time_t); +ssize_t timed_write(int, const void *, size_t, time_t); +void gentoken(char *, int); /* * A small routine to check for the existence of the ".noident" diff --git a/libexec/ld.so/alpha/archdep.h b/libexec/ld.so/alpha/archdep.h index 96a2f3f2163..c599ab776b6 100644 --- a/libexec/ld.so/alpha/archdep.h +++ b/libexec/ld.so/alpha/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.3 2001/06/08 06:52:32 art Exp $ */ +/* $OpenBSD: archdep.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -45,7 +45,7 @@ #include <elf_abi.h> #include <machine/reloc.h> -int _dl_write __P((int, const char *, int)); +int _dl_write(int, const char *, int); /* * The following functions are declared inline so they can diff --git a/libexec/ld.so/alpha/syscall.h b/libexec/ld.so/alpha/syscall.h index 02ddf74ff33..367579f6bec 100644 --- a/libexec/ld.so/alpha/syscall.h +++ b/libexec/ld.so/alpha/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.1 2001/05/14 22:18:22 niklas Exp $ */ +/* $OpenBSD: syscall.h,v 1.2 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -42,23 +42,23 @@ #define _dl_check_error(__res) \ ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO) -int _dl_close __P((int)); -int _dl_exit __P((int)); -int _dl_getegid __P((void)); -int _dl_geteuid __P((void)); -int _dl_getgid __P((void)); -int _dl_getuid __P((void)); +int _dl_close(int); +int _dl_exit(int); +int _dl_getegid(void); +int _dl_geteuid(void); +int _dl_getgid(void); +int _dl_getuid(void); long _dl_mmap __P((void *, unsigned int, unsigned int, unsigned int, int, off_t)); -int _dl_mprotect __P((const void *, int, int)); -int _dl_munmap __P((const void*, unsigned int)); -int _dl_open __P((const char*, unsigned int)); -void _dl_printf __P((const char *, ...)); -int _dl_read __P((int, const char*, int)); +int _dl_mprotect(const void *, int, int); +int _dl_munmap(const void*, unsigned int); +int _dl_open(const char*, unsigned int); +void _dl_printf(const char *, ...); +int _dl_read(int, const char*, int); #ifdef USE_CACHE -int _dl_stat __P((const char *, struct stat *)); +int _dl_stat(const char *, struct stat *); #endif -int _dl_write __P((int, const char*, int)); +int _dl_write(int, const char*, int); /* * Not an actual syscall, but we need something in assembly to say diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c index 1e0f3fa6531..db3e38d479b 100644 --- a/libexec/ld.so/dl_printf.c +++ b/libexec/ld.so/dl_printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl_printf.c,v 1.2 2001/06/06 12:38:44 art Exp $ */ +/* $OpenBSD: dl_printf.c,v 1.3 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1993 @@ -70,8 +70,8 @@ static void kprintn __P((void (*)(int), u_long, int)); static void kdoprnt __P((void (*)(int), const char *, va_list)); -static void putchar __P((int)); -static void sputchar __P((int)); +static void putchar(int); +static void sputchar(int); static char *sbuf; static void diff --git a/libexec/ld.so/ldconfig/ld.h b/libexec/ld.so/ldconfig/ld.h index cb00ad572fa..d9b9be014d8 100644 --- a/libexec/ld.so/ldconfig/ld.h +++ b/libexec/ld.so/ldconfig/ld.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ld.h,v 1.3 2001/01/30 02:39:04 brad Exp $ */ +/* $OpenBSD: ld.h,v 1.4 2002/02/16 21:27:30 millert Exp $ */ /* * Header file to make code compatible with ELF version * ldconfig was taken from the a.out ld. @@ -7,9 +7,9 @@ extern int n_search_dirs; extern char **search_dirs; -char *xstrdup __P((char *)); -void *xmalloc __P((size_t)); -void *xrealloc __P((void *, size_t)); -char *concat __P((const char *, const char *, const char *)); +char *xstrdup(char *); +void *xmalloc(size_t); +void *xrealloc(void *, size_t); +char *concat(const char *, const char *, const char *); #define PAGSIZ __LDPGSZ diff --git a/libexec/ld.so/ldconfig/ldconfig.c b/libexec/ld.so/ldconfig/ldconfig.c index 70cd9906a2e..2442752b2fe 100644 --- a/libexec/ld.so/ldconfig/ldconfig.c +++ b/libexec/ld.so/ldconfig/ldconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldconfig.c,v 1.6 2001/12/07 18:45:32 mpech Exp $ */ +/* $OpenBSD: ldconfig.c,v 1.7 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1993,1995 Paul Kranenburg @@ -79,11 +79,11 @@ struct shlib_list { static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; static char *dir_list; -static void enter __P((char *, char *, char *, int *, int)); -static int dodir __P((char *, int)); -static int buildhints __P((void)); -static int readhints __P((void)); -static void listhints __P((void)); +static void enter(char *, char *, char *, int *, int); +static int dodir(char *, int); +static int buildhints(void); +static int readhints(void); +static void listhints(void); int main(argc, argv) diff --git a/libexec/ld.so/sparc64/archdep.h b/libexec/ld.so/sparc64/archdep.h index 3ddd8b3c92c..cd2ea9b3abe 100644 --- a/libexec/ld.so/sparc64/archdep.h +++ b/libexec/ld.so/sparc64/archdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: archdep.h,v 1.4 2001/09/25 06:57:03 art Exp $ */ +/* $OpenBSD: archdep.h,v 1.5 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -47,7 +47,7 @@ #include <machine/reloc.h> #include <sys/syscall.h> -int _dl_write __P((int, const char *, int)); +int _dl_write(int, const char *, int); /* * The following functions are declared inline so they can diff --git a/libexec/ld.so/sparc64/syscall.h b/libexec/ld.so/sparc64/syscall.h index 52d6f7a85b3..9233615d393 100644 --- a/libexec/ld.so/sparc64/syscall.h +++ b/libexec/ld.so/sparc64/syscall.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.h,v 1.2 2001/09/25 06:57:03 art Exp $ */ +/* $OpenBSD: syscall.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 2001 Niklas Hallqvist @@ -42,22 +42,22 @@ #define _dl_check_error(__res) \ ((int) __res < 0 && (int) __res >= -_dl_MAX_ERRNO) -int _dl_close __P((int)); -int _dl_exit __P((int)); -int _dl_getegid __P((void)); -int _dl_geteuid __P((void)); -int _dl_getgid __P((void)); -int _dl_getuid __P((void)); +int _dl_close(int); +int _dl_exit(int); +int _dl_getegid(void); +int _dl_geteuid(void); +int _dl_getgid(void); +int _dl_getuid(void); long _dl___syscall(quad_t, ...); -int _dl_mprotect __P((const void *, int, int)); -int _dl_munmap __P((const void*, unsigned int)); -int _dl_open __P((const char*, unsigned int)); -void _dl_printf __P((const char *, ...)); -int _dl_read __P((int, const char*, int)); +int _dl_mprotect(const void *, int, int); +int _dl_munmap(const void*, unsigned int); +int _dl_open(const char*, unsigned int); +void _dl_printf(const char *, ...); +int _dl_read(int, const char*, int); #ifdef USE_CACHE -int _dl_stat __P((const char *, struct stat *)); +int _dl_stat(const char *, struct stat *); #endif -int _dl_write __P((int, const char*, int)); +int _dl_write(int, const char*, int); /* * Not an actual syscall, but we need something in assembly to say diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h index 272fb91059c..492c56c8f8f 100644 --- a/libexec/lfs_cleanerd/clean.h +++ b/libexec/lfs_cleanerd/clean.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clean.h,v 1.2 1996/07/01 11:04:55 downsj Exp $ */ +/* $OpenBSD: clean.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -106,15 +106,15 @@ typedef struct fs_info { (i) % (fs)->lfs_sepb) __BEGIN_DECLS -int dump_summary __P((struct lfs *, SEGSUM *, u_long, daddr_t **)); -void err __P((const int, const char *, ...)); -int fs_getmntinfo __P((struct statfs **, char *, const char *)); -int get __P((int, off_t, void *, size_t)); -FS_INFO *get_fs_info __P((struct statfs *, int)); -int lfs_segmapv __P((FS_INFO *, int, caddr_t, BLOCK_INFO **, int *)); -int mmap_segment __P((FS_INFO *, int, caddr_t *, int)); -void munmap_segment __P((FS_INFO *, caddr_t, int)); -void reread_fs_info __P((FS_INFO *, int)); +int dump_summary(struct lfs *, SEGSUM *, u_long, daddr_t **); +void err(const int, const char *, ...); +int fs_getmntinfo(struct statfs **, char *, const char *); +int get(int, off_t, void *, size_t); +FS_INFO *get_fs_info(struct statfs *, int); +int lfs_segmapv(FS_INFO *, int, caddr_t, BLOCK_INFO **, int *); +int mmap_segment(FS_INFO *, int, caddr_t *, int); +void munmap_segment(FS_INFO *, caddr_t, int); +void reread_fs_info(FS_INFO *, int); void toss __P((void *, int *, size_t, int (*)(const void *, const void *, const void *), void *)); @@ -155,10 +155,10 @@ void toss __P((void *, int *, size_t, fflush(stdout); \ } -void dump_super __P((struct lfs *)); -void dump_cleaner_info __P((void *)); -void print_SEGSUM __P(( struct lfs *, SEGSUM *)); -void print_CLEANERINFO __P((CLEANERINFO *)); +void dump_super(struct lfs *); +void dump_cleaner_info(void *); +void print_SEGSUM( struct lfs *, SEGSUM *); +void print_CLEANERINFO(CLEANERINFO *); #else #define PRINT_FINFO(fp, ip) #define PRINT_INODE(b, bip) diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c index 8b0db6d4e3f..47314cad476 100644 --- a/libexec/lfs_cleanerd/cleanerd.c +++ b/libexec/lfs_cleanerd/cleanerd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cleanerd.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)cleanerd.c 8.5 (Berkeley) 6/10/95";*/ -static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: cleanerd.c,v 1.7 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -86,21 +86,21 @@ struct tossstruct { #define CLEAN_BYTES 0x1 /* function prototypes for system calls; not sure where they should go */ -int lfs_segwait __P((fsid_t *, struct timeval *)); -int lfs_segclean __P((fsid_t *, u_long)); -int lfs_bmapv __P((fsid_t *, BLOCK_INFO *, int)); -int lfs_markv __P((fsid_t *, BLOCK_INFO *, int)); +int lfs_segwait(fsid_t *, struct timeval *); +int lfs_segclean(fsid_t *, u_long); +int lfs_bmapv(fsid_t *, BLOCK_INFO *, int); +int lfs_markv(fsid_t *, BLOCK_INFO *, int); /* function prototypes */ -int bi_tossold __P((const void *, const void *, const void *)); +int bi_tossold(const void *, const void *, const void *); int choose_segments __P((FS_INFO *, struct seglist *, int (*)(FS_INFO *, SEGUSE *))); void clean_fs __P((FS_INFO *, int (*)(FS_INFO *, SEGUSE *), int, long)); -int clean_loop __P((FS_INFO *, int, long)); -int clean_segment __P((FS_INFO *, int)); -int cost_benefit __P((FS_INFO *, SEGUSE *)); -int cost_compare __P((const void *, const void *)); -void sig_report __P((int)); +int clean_loop(FS_INFO *, int, long); +int clean_segment(FS_INFO *, int); +int cost_benefit(FS_INFO *, SEGUSE *); +int cost_compare(const void *, const void *); +void sig_report(int); /* * Cleaning Cost Functions: @@ -308,7 +308,7 @@ clean_loop(fsp, nsegs, options) void clean_fs(fsp, cost_func, nsegs, options) FS_INFO *fsp; /* file system information */ - int (*cost_func) __P((FS_INFO *, SEGUSE *)); + int (*cost_func)(FS_INFO *, SEGUSE *); int nsegs; long options; { @@ -380,7 +380,7 @@ int choose_segments(fsp, seglist, cost_func) FS_INFO *fsp; struct seglist *seglist; - int (*cost_func) __P((FS_INFO *, SEGUSE *)); + int (*cost_func)(FS_INFO *, SEGUSE *); { struct lfs *lfsp; struct seglist *sp; diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c index cdf0bfeaa1f..9a193d9e8c2 100644 --- a/libexec/lfs_cleanerd/library.c +++ b/libexec/lfs_cleanerd/library.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library.c,v 1.4 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "@(#)library.c 8.3 (Berkeley) 5/24/95";*/ -static char rcsid[] = "$OpenBSD: library.c,v 1.4 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: library.c,v 1.5 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -60,11 +60,11 @@ void add_blocks __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t, daddr_t, daddr_t)); void add_inodes __P((FS_INFO *, BLOCK_INFO *, int *, SEGSUM *, caddr_t, daddr_t)); -int bi_compare __P((const void *, const void *)); -int bi_toss __P((const void *, const void *, const void *)); -void get_ifile __P((FS_INFO *, int)); -int get_superblock __P((FS_INFO *, struct lfs *)); -int pseg_valid __P((FS_INFO *, SEGSUM *)); +int bi_compare(const void *, const void *); +int bi_toss(const void *, const void *, const void *); +void get_ifile(FS_INFO *, int); +int get_superblock(FS_INFO *, struct lfs *); +int pseg_valid(FS_INFO *, SEGSUM *); /* * This function will get information on a a filesystem which matches @@ -674,7 +674,7 @@ toss(p, nump, size, dotoss, client) void *p; int *nump; size_t size; - int (*dotoss) __P((const void *, const void *, const void *)); + int (*dotoss)(const void *, const void *, const void *); void *client; { int i; diff --git a/libexec/lockspool/lockspool.c b/libexec/lockspool/lockspool.c index dc0e0d162fd..7c18f4bc46a 100644 --- a/libexec/lockspool/lockspool.c +++ b/libexec/lockspool/lockspool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 millert Exp $ */ +/* $OpenBSD: lockspool.c,v 1.7 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1998 Theo de Raadt <deraadt@theos.com> @@ -29,7 +29,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 millert Exp $"; +static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.7 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ #include <sys/signal.h> @@ -40,8 +40,8 @@ static const char rcsid[] = "$OpenBSD: lockspool.c,v 1.6 2001/09/05 18:53:26 mil #include <stdio.h> #include "mail.local.h" -void unhold __P((int)); -void usage __P((void)); +void unhold(int); +void usage(void); extern char *__progname; diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c index ed31e2795ae..c05d9e036e8 100644 --- a/libexec/login_chpass/login_chpass.c +++ b/libexec/login_chpass/login_chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_chpass.c,v 1.5 2002/01/06 21:53:28 millert Exp $ */ +/* $OpenBSD: login_chpass.c,v 1.6 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -76,20 +76,20 @@ struct iovec iov[2] = { { BI_SILENT, sizeof(BI_SILENT) - 1 }, { "\n", 1 } }; #ifdef YP -int _yp_check __P((char **)); -char *ypgetnewpasswd __P((struct passwd *, char **)); -struct passwd *ypgetpwnam __P((char *)); -void kbintr __P((int)); +int _yp_check(char **); +char *ypgetnewpasswd(struct passwd *, char **); +struct passwd *ypgetpwnam(char *); +void kbintr(int); #endif #ifdef KERBEROS -int get_pw_new_pwd __P((char *, int, krb_principal *, int)); +int get_pw_new_pwd(char *, int, krb_principal *, int); char realm[REALM_SZ]; #endif -void local_chpass __P((char **)); -void krb_chpass __P((char *, char *, char **)); -void yp_chpass __P((char *)); +void local_chpass(char **); +void krb_chpass(char *, char *, char **); +void yp_chpass(char *); int main(argc, argv) diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c index 31921d489fb..86bddeef576 100644 --- a/libexec/login_lchpass/login_lchpass.c +++ b/libexec/login_lchpass/login_lchpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_lchpass.c,v 1.6 2002/01/06 21:53:28 millert Exp $ */ +/* $OpenBSD: login_lchpass.c,v 1.7 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -55,7 +55,7 @@ #define BACK_CHANNEL 3 -int local_passwd __P((char *, int)); +int local_passwd(char *, int); int main(argc, argv) diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c index 7645a70b702..0219d59c167 100644 --- a/libexec/login_skey/login_skey.c +++ b/libexec/login_skey/login_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_skey.c,v 1.6 2001/12/07 05:15:58 millert Exp $ */ +/* $OpenBSD: login_skey.c,v 1.7 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1995 Berkeley Software Design, Inc. All rights reserved. @@ -57,8 +57,8 @@ #include <sha1.h> #include <skey.h> -void quit __P((int)); -void suspend __P((int)); +void quit(int); +void suspend(int); volatile sig_atomic_t resumed; struct skey skey; diff --git a/libexec/mail.local/mail.local.h b/libexec/mail.local/mail.local.h index 4c1baab8092..1b24dfd5e95 100644 --- a/libexec/mail.local/mail.local.h +++ b/libexec/mail.local/mail.local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mail.local.h,v 1.2 2001/08/18 21:37:38 deraadt Exp $ */ +/* $OpenBSD: mail.local.h,v 1.3 2002/02/16 21:27:30 millert Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -36,11 +36,11 @@ #define FATAL 1 #define NOTFATAL 0 -void baditem __P((char *)); -int deliver __P((int, char *, int)); -void merr __P((int, const char *, ...)); -int getlock __P((char *, struct passwd *)); -void notifybiff __P((char *)); -void rellock __P((void)); -int store __P((char *)); -void usage __P((void)); +void baditem(char *); +int deliver(int, char *, int); +void merr(int, const char *, ...); +int getlock(char *, struct passwd *); +void notifybiff(char *); +void rellock(void); +int store(char *); +void usage(void); diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c index aab2c1c2faf..0c50cf8a8b3 100644 --- a/libexec/rexecd/rexecd.c +++ b/libexec/rexecd/rexecd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp $ */ +/* $OpenBSD: rexecd.c,v 1.19 2002/02/16 21:27:30 millert Exp $ */ /* * Copyright (c) 1983 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rexecd.c 5.12 (Berkeley) 2/25/91";*/ -static char rcsid[] = "$OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rexecd.c,v 1.19 2002/02/16 21:27:30 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -68,7 +68,7 @@ static char rcsid[] = "$OpenBSD: rexecd.c,v 1.18 2001/07/09 07:04:44 deraadt Exp #include <bsd_auth.h> /*VARARGS1*/ -void error __P(()); +void error(); char *remote; char *envinit[1]; @@ -77,8 +77,8 @@ login_cap_t *lc; struct sockaddr_in asin = { AF_INET }; -void doit __P((int, struct sockaddr_in *)); -void getstr __P((char *buf, int cnt, char *err)); +void doit(int, struct sockaddr_in *); +void getstr(char *buf, int cnt, char *err); /* * remote execute server: diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index e4e50159725..7a5e77950a8 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $ */ +/* $OpenBSD: rlogind.c,v 1.34 2002/02/16 21:27:31 millert Exp $ */ /*- * Copyright (c) 1983, 1988, 1989, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rlogind.c 8.1 (Berkeley) 6/4/93"; */ -static char *rcsid = "$OpenBSD: rlogind.c,v 1.33 2002/02/16 19:34:45 millert Exp $"; +static char *rcsid = "$OpenBSD: rlogind.c,v 1.34 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ /* @@ -109,18 +109,18 @@ int check_all = 1; struct passwd *pwd; -void doit __P((int, struct sockaddr *)); -int control __P((int, char *, int)); -void protocol __P((int, int)); -void cleanup __P((int)); -void fatal __P((int, char *, int)); -int do_rlogin __P((struct sockaddr *)); -void getstr __P((char *, int, char *)); -void setup_term __P((int)); -int do_krb_login __P((struct sockaddr_in *)); -void usage __P((void)); -int local_domain __P((char *)); -char *topdomain __P((char *)); +void doit(int, struct sockaddr *); +int control(int, char *, int); +void protocol(int, int); +void cleanup(int); +void fatal(int, char *, int); +int do_rlogin(struct sockaddr *); +void getstr(char *, int, char *); +void setup_term(int); +int do_krb_login(struct sockaddr_in *); +void usage(void); +int local_domain(char *); +char *topdomain(char *); int main(argc, argv) diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index b40080848e4..581d9bc5b9b 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rquotad.c,v 1.10 2001/06/11 15:18:51 mickey Exp $ */ +/* $OpenBSD: rquotad.c,v 1.11 2002/02/16 21:27:31 millert Exp $ */ /* * by Manuel Bouyer (bouyer@ensta.fr) * @@ -29,12 +29,12 @@ #include <rpcsvc/rquota.h> #include <arpa/inet.h> -void rquota_service __P((struct svc_req *request, SVCXPRT *transp)); -void sendquota __P((struct svc_req *request, SVCXPRT *transp)); -void printerr_reply __P((SVCXPRT *transp)); -void initfs __P((void)); -int getfsquota __P((long id, char *path, struct dqblk *dqblk)); -int hasquota __P((struct fstab *fs, char **qfnamep)); +void rquota_service(struct svc_req *request, SVCXPRT *transp); +void sendquota(struct svc_req *request, SVCXPRT *transp); +void printerr_reply(SVCXPRT *transp); +void initfs(void); +int getfsquota(long id, char *path, struct dqblk *dqblk); +int hasquota(struct fstab *fs, char **qfnamep); /* * structure containing informations about ufs filesystems diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c index 5d0d933230d..0ae365812eb 100644 --- a/libexec/rpc.rstatd/rstat_proc.c +++ b/libexec/rpc.rstatd/rstat_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rstat_proc.c,v 1.20 2001/11/18 23:45:39 deraadt Exp $ */ +/* $OpenBSD: rstat_proc.c,v 1.21 2002/02/16 21:27:31 millert Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for @@ -31,7 +31,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/ /*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/ -static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.20 2001/11/18 23:45:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rstat_proc.c,v 1.21 2002/02/16 21:27:31 millert Exp $"; #endif /* @@ -298,7 +298,7 @@ rstat_service(rqstp, transp) } argument; char *result; xdrproc_t xdr_argument, xdr_result; - char *(*local) __P((void *, struct svc_req *)); + char *(*local)(void *, struct svc_req *); switch (rqstp->rq_proc) { case NULLPROC: @@ -310,15 +310,15 @@ rstat_service(rqstp, transp) xdr_result = (xdrproc_t)xdr_statstime; switch (rqstp->rq_vers) { case RSTATVERS_ORIG: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_stats_1_svc; break; case RSTATVERS_SWTCH: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_stats_2_svc; break; case RSTATVERS_TIME: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_stats_3_svc; break; default: @@ -332,15 +332,15 @@ rstat_service(rqstp, transp) xdr_result = (xdrproc_t)xdr_u_int; switch (rqstp->rq_vers) { case RSTATVERS_ORIG: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_havedisk_1_svc; break; case RSTATVERS_SWTCH: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_havedisk_2_svc; break; case RSTATVERS_TIME: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rstatproc_havedisk_3_svc; break; default: diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index 98d50c61e65..56de7d78dae 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp $ */ +/* $OpenBSD: rstatd.c,v 1.8 2002/02/16 21:27:31 millert Exp $ */ /*- * Copyright (c) 1993, John Brezak @@ -34,7 +34,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rstatd.c,v 1.8 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: rstatd.c,v 1.7 2001/11/18 23:45:39 deraadt Exp extern int __svc_fdsetsize; extern fd_set *__svc_fdset; -extern void svc_getreqset2 __P((fd_set *, int)); +extern void svc_getreqset2(fd_set *, int); extern void rstat_service(struct svc_req *, SVCXPRT *); void my_svc_run(void); diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c index 2198ef970fd..c2b66d6eb50 100644 --- a/libexec/rpc.rusersd/rusers_proc.c +++ b/libexec/rpc.rusersd/rusers_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rusers_proc.c,v 1.12 2001/11/18 23:39:18 deraadt Exp $ */ +/* $OpenBSD: rusers_proc.c,v 1.13 2002/02/16 21:27:31 millert Exp $ */ /*- * Copyright (c) 1993 John Brezak @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.12 2001/11/18 23:39:18 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rusers_proc.c,v 1.13 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -357,7 +357,7 @@ rusers_service(rqstp, transp) } argument; char *result; xdrproc_t xdr_argument, xdr_result; - char *(*local) __P((void *, struct svc_req *)); + char *(*local)(void *, struct svc_req *); switch (rqstp->rq_proc) { case NULLPROC: @@ -371,7 +371,7 @@ rusers_service(rqstp, transp) case RUSERSVERS_3: case RUSERSVERS_IDLE: case RUSERSVERS_ORIG: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusers_num_svc; break; default: @@ -386,19 +386,19 @@ rusers_service(rqstp, transp) xdr_result = (xdrproc_t)xdr_utmp_array; switch (rqstp->rq_vers) { case RUSERSVERS_3: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_names_3_svc; break; case RUSERSVERS_IDLE: xdr_result = (xdrproc_t)xdr_utmpidlearr; - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_names_2_svc; break; case RUSERSVERS_ORIG: xdr_result = (xdrproc_t)xdr_utmpidlearr; - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_names_1_svc; break; @@ -414,19 +414,19 @@ rusers_service(rqstp, transp) xdr_result = (xdrproc_t)xdr_utmp_array; switch (rqstp->rq_vers) { case RUSERSVERS_3: - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_allnames_3_svc; break; case RUSERSVERS_IDLE: xdr_result = (xdrproc_t)xdr_utmpidlearr; - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_allnames_2_svc; break; case RUSERSVERS_ORIG: xdr_result = (xdrproc_t)xdr_utmpidlearr; - local = (char *(*) __P((void *, struct svc_req *))) + local = (char *(*)(void *, struct svc_req *)) rusersproc_allnames_1_svc; break; diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index b43dfc79136..6d145b8a717 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rwalld.c,v 1.5 2001/07/08 21:18:11 deraadt Exp $ */ +/* $OpenBSD: rwalld.c,v 1.6 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -30,7 +30,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: rwalld.c,v 1.5 2001/07/08 21:18:11 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rwalld.c,v 1.6 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -151,7 +151,7 @@ wallprog_1(rqstp, transp) } argument; char *result; xdrproc_t xdr_argument, xdr_result; - char *(*local) __P((char **, struct svc_req *)); + char *(*local)(char **, struct svc_req *); switch (rqstp->rq_proc) { case NULLPROC: @@ -161,7 +161,7 @@ wallprog_1(rqstp, transp) case WALLPROC_WALL: xdr_argument = (xdrproc_t)xdr_wrapstring; xdr_result = (xdrproc_t)xdr_void; - local = (char *(*) __P((char **, struct svc_req *))) + local = (char *(*)(char **, struct svc_req *)) wallproc_wall_1_svc; break; diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 8b31a8c97cf..83d5d545d58 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp $*/ +/* $OpenBSD: sprayd.c,v 1.5 2002/02/16 21:27:31 millert Exp $*/ /* * Copyright (c) 1994 Christos Zoulas @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: sprayd.c,v 1.5 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -46,7 +46,7 @@ static char rcsid[] = "$OpenBSD: sprayd.c,v 1.4 2001/07/08 21:18:11 deraadt Exp #include <rpc/rpc.h> #include <rpcsvc/spray.h> -static void spray_service __P((struct svc_req *, SVCXPRT *)); +static void spray_service(struct svc_req *, SVCXPRT *); static int from_inetd = 1; diff --git a/libexec/rpc.yppasswdd/yppasswdd_proc.c b/libexec/rpc.yppasswdd/yppasswdd_proc.c index bdac32bd040..702d9b13c0c 100644 --- a/libexec/rpc.yppasswdd/yppasswdd_proc.c +++ b/libexec/rpc.yppasswdd/yppasswdd_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod Exp $ */ +/* $OpenBSD: yppasswdd_proc.c,v 1.7 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod Exp $"; +static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.7 2002/02/16 21:27:31 millert Exp $"; #endif #include <sys/types.h> @@ -43,7 +43,7 @@ static char rcsid[] = "$OpenBSD: yppasswdd_proc.c,v 1.6 2001/12/09 14:58:30 miod #include "yppasswd.h" -int make_passwd __P((yppasswd *)); +int make_passwd(yppasswd *); int * yppasswdproc_update_1_svc(argp, rqstp, transp) diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index 697b7cc4452..300071025eb 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rshd.c,v 1.40 2001/09/05 22:32:36 deraadt Exp $ */ +/* $OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $ */ /*- * Copyright (c) 1988, 1989, 1992, 1993, 1994 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)rshd.c 8.2 (Berkeley) 4/6/94"; */ -static char *rcsid = "$OpenBSD: rshd.c,v 1.40 2001/09/05 22:32:36 deraadt Exp $"; +static char *rcsid = "$OpenBSD: rshd.c,v 1.41 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ /* @@ -84,12 +84,12 @@ int log_success; /* If TRUE, log all successful accesses */ int sent_null; login_cap_t *lc; -void doit __P((struct sockaddr *)); -void error __P((const char *, ...)); -void getstr __P((char *, int, char *)); -int local_domain __P((char *)); -char *topdomain __P((char *)); -void usage __P((void)); +void doit(struct sockaddr *); +void error(const char *, ...); +void getstr(char *, int, char *); +int local_domain(char *); +char *topdomain(char *); +void usage(void); #ifdef KERBEROS #include <des.h> @@ -108,10 +108,10 @@ char tickbuf[sizeof(KTEXT_ST)]; int doencrypt, use_kerberos, vacuous; des_key_schedule schedule; #ifdef CRYPT -int des_read __P((int, char *, int)); -int des_write __P((int, char *, int)); -void desrw_clear_key __P(()); -void desrw_set_key __P((des_cblock *, des_key_schedule *)); +int des_read(int, char *, int); +int des_write(int, char *, int); +void desrw_clear_key(); +void desrw_set_key(des_cblock *, des_key_schedule *); #endif #else #define OPTIONS "alnL" diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c index 432d6a1ecfa..0c60261a74d 100644 --- a/libexec/talkd/announce.c +++ b/libexec/talkd/announce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $ */ +/* $OpenBSD: announce.c,v 1.12 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)announce.c 5.9 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $"; +static char rcsid[] = "$Id: announce.c,v 1.12 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -55,7 +55,7 @@ static char rcsid[] = "$Id: announce.c,v 1.11 2001/07/08 21:18:12 deraadt Exp $" #include <paths.h> #include "talkd.h" -static void print_mesg __P((FILE *,CTL_MSG *,char *)); +static void print_mesg(FILE *,CTL_MSG *,char *); /* * Announce an invitation to talk. If the user is diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c index 71c37df30fb..14925978567 100644 --- a/libexec/talkd/table.c +++ b/libexec/talkd/table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: table.c,v 1.7 2001/12/07 18:45:33 mpech Exp $ */ +/* $OpenBSD: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -35,7 +35,7 @@ #ifndef lint /*static char sccsid[] = "from: @(#)table.c 5.7 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$Id: table.c,v 1.7 2001/12/07 18:45:33 mpech Exp $"; +static char rcsid[] = "$Id: table.c,v 1.8 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ /* @@ -72,7 +72,7 @@ struct table_entry { }; TAILQ_HEAD(, table_entry) table; -static void delete __P((TABLE_ENTRY *)); +static void delete(TABLE_ENTRY *); /* * Init the table diff --git a/libexec/talkd/talkd.h b/libexec/talkd/talkd.h index 5ace0fbfbfb..bf25785b5c9 100644 --- a/libexec/talkd/talkd.h +++ b/libexec/talkd/talkd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: talkd.h,v 1.4 2001/12/07 18:45:33 mpech Exp $ */ +/* $OpenBSD: talkd.h,v 1.5 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -38,22 +38,22 @@ extern int debug; extern char hostname[]; /* table.c */ -void init_table __P((void)); -CTL_MSG *find_request __P((CTL_MSG *)); -CTL_MSG *find_match __P((CTL_MSG *)); -void insert_table __P((CTL_MSG *, CTL_RESPONSE *)); -int new_id __P((void)); -int delete_invite __P((int)); +void init_table(void); +CTL_MSG *find_request(CTL_MSG *); +CTL_MSG *find_match(CTL_MSG *); +void insert_table(CTL_MSG *, CTL_RESPONSE *); +int new_id(void); +int delete_invite(int); /* process.c */ -void process_request __P(( CTL_MSG *, CTL_RESPONSE *)); -void do_announce __P((CTL_MSG *, CTL_RESPONSE *)); -int find_user __P((char *name, char *tty)); +void process_request( CTL_MSG *, CTL_RESPONSE *); +void do_announce(CTL_MSG *, CTL_RESPONSE *); +int find_user(char *name, char *tty); /* announce.c */ -int announce __P((CTL_MSG *,char *)); +int announce(CTL_MSG *,char *); /* print.c */ -void print_request __P((char *,CTL_MSG *)); -void print_response __P((char *,CTL_RESPONSE *)); +void print_request(char *,CTL_MSG *); +void print_response(char *,CTL_RESPONSE *); diff --git a/libexec/tcpd/safe_finger/safe_finger.c b/libexec/tcpd/safe_finger/safe_finger.c index f05d11507b7..0b8692dded9 100644 --- a/libexec/tcpd/safe_finger/safe_finger.c +++ b/libexec/tcpd/safe_finger/safe_finger.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safe_finger.c,v 1.2 2001/01/17 19:24:28 deraadt Exp $ */ +/* $OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $ */ /* * safe_finger - finger client wrapper that protects against nasty stuff @@ -20,7 +20,7 @@ #if 0 static char sccsid[] = "@(#) safe_finger.c 1.4 94/12/28 17:42:41"; #else -static char rcsid[] = "$OpenBSD: safe_finger.c,v 1.2 2001/01/17 19:24:28 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: safe_finger.c,v 1.3 2002/02/16 21:27:31 millert Exp $"; #endif #endif @@ -50,7 +50,7 @@ char path[] = "PATH=/bin:/usr/bin:/usr/sbin:/sbin"; int finger_pid; -int pipe_stdin __P((char **)); +int pipe_stdin(char **); void cleanup(sig) int sig; diff --git a/libexec/tcpd/tcpdchk/inetcf.h b/libexec/tcpd/tcpdchk/inetcf.h index c07ef60ecac..05716c3509e 100644 --- a/libexec/tcpd/tcpdchk/inetcf.h +++ b/libexec/tcpd/tcpdchk/inetcf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: inetcf.h,v 1.1 1997/02/26 06:17:07 downsj Exp $ */ +/* $OpenBSD: inetcf.h,v 1.2 2002/02/16 21:27:31 millert Exp $ */ /* * @(#) inetcf.h 1.1 94/12/28 17:42:30 @@ -8,9 +8,9 @@ #include <sys/cdefs.h> -extern char *inet_cfg __P((char *)); -extern void inet_set __P((char *, int)); -extern int inet_get __P((char *)); +extern char *inet_cfg(char *); +extern void inet_set(char *, int); +extern int inet_get(char *); #define WR_UNKNOWN (-1) /* service unknown */ #define WR_NOT 1 /* may not be wrapped */ diff --git a/libexec/tcpd/tcpdchk/scaffold.h b/libexec/tcpd/tcpdchk/scaffold.h index ca845c11e44..2450d24ca10 100644 --- a/libexec/tcpd/tcpdchk/scaffold.h +++ b/libexec/tcpd/tcpdchk/scaffold.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scaffold.h,v 1.1 1997/02/26 06:17:08 downsj Exp $ */ +/* $OpenBSD: scaffold.h,v 1.2 2002/02/16 21:27:31 millert Exp $ */ /* * @(#) scaffold.h 1.3 94/12/31 18:19:19 @@ -9,7 +9,7 @@ #include <sys/cdefs.h> __BEGIN_DECLS -extern struct hostent *find_inet_addr __P((char *)); -extern int check_dns __P((char *)); -extern int check_path __P((char *, struct stat *)); +extern struct hostent *find_inet_addr(char *); +extern int check_dns(char *); +extern int check_path(char *, struct stat *); __END_DECLS diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c index 41ac4a62ab0..55935abda13 100644 --- a/libexec/uucpd/uucpd.c +++ b/libexec/uucpd/uucpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $ */ +/* $OpenBSD: uucpd.c,v 1.21 2002/02/16 21:27:31 millert Exp $ */ /* * Copyright (c) 1985 The Regents of the University of California. @@ -44,7 +44,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)uucpd.c 5.10 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $"; +static char rcsid[] = "$OpenBSD: uucpd.c,v 1.21 2002/02/16 21:27:31 millert Exp $"; #endif /* not lint */ /* @@ -73,10 +73,10 @@ static char rcsid[] = "$OpenBSD: uucpd.c,v 1.20 2001/12/07 18:45:33 mpech Exp $" #include <fcntl.h> #include "pathnames.h" -void doit __P((struct sockaddr_in *)); -int readline __P((char *, int n)); -void dologout __P((void)); -void dologin __P((struct passwd *, struct sockaddr_in *)); +void doit(struct sockaddr_in *); +int readline(char *, int n); +void dologout(void); +void dologin(struct passwd *, struct sockaddr_in *); struct sockaddr_in hisctladdr; int hisaddrlen = sizeof hisctladdr; diff --git a/lkm/union/union_lkm.c b/lkm/union/union_lkm.c index 88a849f7c8d..d1f6dbc900c 100644 --- a/lkm/union/union_lkm.c +++ b/lkm/union/union_lkm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: union_lkm.c,v 1.1 1997/01/20 09:15:32 mickey Exp $ */ +/* $OpenBSD: union_lkm.c,v 1.2 2002/02/16 21:27:31 millert Exp $ */ /* * union_lkm.c (was: kernfsmod.c) @@ -60,7 +60,7 @@ extern int (*union_check_p) __P((off_t, struct proc *, struct vnode *, struct file *, struct uio, int *)); extern int union_check __P((off_t, struct proc *, struct vnode *, struct file *, struct uio, int *)); -static int union_load __P((struct lkm_table *, int)); +static int union_load(struct lkm_table *, int); /* * declare the filesystem diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c index 63e80524ec5..9f4da588006 100644 --- a/regress/lib/libc/db/dbtest.c +++ b/regress/lib/libc/db/dbtest.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $ */ +/* $OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94"; #else -static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $"; +static char rcsid[] = "$OpenBSD: dbtest.c,v 1.7 2002/02/16 21:27:32 millert Exp $"; #endif #endif /* not lint */ @@ -64,22 +64,22 @@ static char rcsid[] = "$OpenBSD: dbtest.c,v 1.6 2001/01/29 02:05:40 niklas Exp $ enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA }; -void compare __P((DBT *, DBT *)); -DBTYPE dbtype __P((char *)); -void dump __P((DB *, int)); -void err __P((const char *, ...)); -void get __P((DB *, DBT *)); -void getdata __P((DB *, DBT *, DBT *)); -void put __P((DB *, DBT *, DBT *)); -void rem __P((DB *, DBT *)); -char *sflags __P((int)); -void synk __P((DB *)); -void *rfile __P((char *, size_t *)); -void seq __P((DB *, DBT *)); -u_int setflags __P((char *)); -void *setinfo __P((DBTYPE, char *)); -void usage __P((void)); -void *xmalloc __P((char *, size_t)); +void compare(DBT *, DBT *); +DBTYPE dbtype(char *); +void dump(DB *, int); +void err(const char *, ...); +void get(DB *, DBT *); +void getdata(DB *, DBT *, DBT *); +void put(DB *, DBT *, DBT *); +void rem(DB *, DBT *); +char *sflags(int); +void synk(DB *); +void *rfile(char *, size_t *); +void seq(DB *, DBT *); +u_int setflags(char *); +void *setinfo(DBTYPE, char *); +void usage(void); +void *xmalloc(char *, size_t); DBTYPE type; /* Database type. */ void *infop; /* Iflags. */ diff --git a/regress/lib/libc/regex/debug.ih b/regress/lib/libc/regex/debug.ih index 2aa04490389..9eb313af238 100644 --- a/regress/lib/libc/regex/debug.ih +++ b/regress/lib/libc/regex/debug.ih @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $ */ +/* $OpenBSD: debug.ih,v 1.3 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: debug.ih,v 1.2 1995/04/20 22:39:47 cgd Exp $ */ /* ========= begin header generated by ./mkh ========= */ @@ -7,9 +7,9 @@ extern "C" { #endif /* === debug.c === */ -void regprint __P((regex_t *r, FILE *d)); -static void s_print __P((register struct re_guts *g, FILE *d)); -static char *regchar __P((int ch)); +void regprint(regex_t *r, FILE *d); +static void s_print(register struct re_guts *g, FILE *d); +static char *regchar(int ch); #ifdef __cplusplus } diff --git a/regress/lib/libc/regex/main.ih b/regress/lib/libc/regex/main.ih index 9e3246889e6..0860e263331 100644 --- a/regress/lib/libc/regex/main.ih +++ b/regress/lib/libc/regex/main.ih @@ -1,4 +1,4 @@ -/* $OpenBSD: main.ih,v 1.2 2001/01/29 02:05:44 niklas Exp $ */ +/* $OpenBSD: main.ih,v 1.3 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: main.ih,v 1.2 1995/04/20 22:39:55 cgd Exp $ */ /* ========= begin header generated by ./mkh ========= */ @@ -7,14 +7,14 @@ extern "C" { #endif /* === main.c === */ -void regress __P((FILE *in)); -void try __P((char *f0, char *f1, char *f2, char *f3, char *f4, int opts)); -int options __P((int type, char *s)); -int opt __P((int c, char *s)); -void fixstr __P((register char *p)); -char *check __P((char *str, regmatch_t sub, char *should)); -static char *eprint __P((int err)); -static int efind __P((char *name)); +void regress(FILE *in); +void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts); +int options(int type, char *s); +int opt(int c, char *s); +void fixstr(register char *p); +char *check(char *str, regmatch_t sub, char *should); +static char *eprint(int err); +static int efind(char *name); #ifdef __cplusplus } diff --git a/regress/lib/libc_r/include/test.h b/regress/lib/libc_r/include/test.h index c66291c2166..32798c2d1df 100644 --- a/regress/lib/libc_r/include/test.h +++ b/regress/lib/libc_r/include/test.h @@ -1,4 +1,4 @@ -/* $OpenBSD: test.h,v 1.2 2001/09/20 15:33:17 todd Exp $ */ +/* $OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $ */ #ifndef _h_test_ #define _h_test_ @@ -9,8 +9,8 @@ #include <string.h> #include <stdarg.h> -int _thread_sys_write __P((int, const char*, size_t)); -__dead void _thread_sys__exit __P((int)) __attribute__((__noreturn__)); +int _thread_sys_write(int, const char*, size_t); +__dead void _thread_sys__exit(int) __attribute__((__noreturn__)); static __dead void __vpanic __P((const char *, const char *, const char *, int, const char *, va_list)) __attribute__((__noreturn__)); @@ -20,7 +20,7 @@ static __dead void __panic __P((const char *, const char *, const char *, #if defined(__OpenBSD__) || defined(__FreeBSD__) #include <pthread.h> #include <pthread_np.h> -void _thread_dump_info __P((void)); +void _thread_dump_info(void); #define SET_NAME(x) pthread_set_name_np(pthread_self(), x) #define DUMP_INFO() _thread_dump_info() #else diff --git a/regress/lib/libpthread/include/test.h b/regress/lib/libpthread/include/test.h index c66291c2166..32798c2d1df 100644 --- a/regress/lib/libpthread/include/test.h +++ b/regress/lib/libpthread/include/test.h @@ -1,4 +1,4 @@ -/* $OpenBSD: test.h,v 1.2 2001/09/20 15:33:17 todd Exp $ */ +/* $OpenBSD: test.h,v 1.3 2002/02/16 21:27:32 millert Exp $ */ #ifndef _h_test_ #define _h_test_ @@ -9,8 +9,8 @@ #include <string.h> #include <stdarg.h> -int _thread_sys_write __P((int, const char*, size_t)); -__dead void _thread_sys__exit __P((int)) __attribute__((__noreturn__)); +int _thread_sys_write(int, const char*, size_t); +__dead void _thread_sys__exit(int) __attribute__((__noreturn__)); static __dead void __vpanic __P((const char *, const char *, const char *, int, const char *, va_list)) __attribute__((__noreturn__)); @@ -20,7 +20,7 @@ static __dead void __panic __P((const char *, const char *, const char *, #if defined(__OpenBSD__) || defined(__FreeBSD__) #include <pthread.h> #include <pthread_np.h> -void _thread_dump_info __P((void)); +void _thread_dump_info(void); #define SET_NAME(x) pthread_set_name_np(pthread_self(), x) #define DUMP_INFO() _thread_dump_info() #else diff --git a/regress/sys/arch/m68k/emuspeed/emuspeed.c b/regress/sys/arch/m68k/emuspeed/emuspeed.c index a0d51725430..7fd19d98fa8 100644 --- a/regress/sys/arch/m68k/emuspeed/emuspeed.c +++ b/regress/sys/arch/m68k/emuspeed/emuspeed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuspeed.c,v 1.2 2001/01/29 02:05:53 niklas Exp $ */ +/* $OpenBSD: emuspeed.c,v 1.3 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: emuspeed.c,v 1.3 1998/06/15 14:43:25 is Exp $ */ #include <setjmp.h> @@ -14,7 +14,7 @@ const struct test { char *name; - void (*func)__P((int)); + void (*func)(int); char *comment; } testlist[] = { {"Illegal", illegal, "(test: unimplemented)"}, diff --git a/regress/sys/arch/m68k/emuspeed/speed.h b/regress/sys/arch/m68k/emuspeed/speed.h index e2dd75ef661..f2f7bbcccff 100644 --- a/regress/sys/arch/m68k/emuspeed/speed.h +++ b/regress/sys/arch/m68k/emuspeed/speed.h @@ -1,18 +1,18 @@ -/* $OpenBSD: speed.h,v 1.2 2001/01/29 02:05:54 niklas Exp $ */ +/* $OpenBSD: speed.h,v 1.3 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: speed.h,v 1.2 1998/01/09 08:03:57 perry Exp $ */ #include <sys/cdefs.h> -void illegal __P((int)); -void mul32smem __P((int)); -void mul32sreg __P((int)); +void illegal(int); +void mul32smem(int); +void mul32sreg(int); -void mul64sreg __P((int)); -void mul64ureg __P((int)); -void mul64smem __P((int)); -void mul64umem __P((int)); +void mul64sreg(int); +void mul64ureg(int); +void mul64smem(int); +void mul64umem(int); -void div64umem __P((int)); -void div64smem __P((int)); -void div64ureg __P((int)); -void div64sreg __P((int)); +void div64umem(int); +void div64smem(int); +void div64ureg(int); +void div64sreg(int); diff --git a/regress/sys/kern/unfdpass/unfdpass.c b/regress/sys/kern/unfdpass/unfdpass.c index 589023e8426..1a9727c8d2f 100644 --- a/regress/sys/kern/unfdpass/unfdpass.c +++ b/regress/sys/kern/unfdpass/unfdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unfdpass.c,v 1.6 2002/02/11 05:31:25 art Exp $ */ +/* $OpenBSD: unfdpass.c,v 1.7 2002/02/16 21:27:32 millert Exp $ */ /* $NetBSD: unfdpass.c,v 1.3 1998/06/24 23:51:30 thorpej Exp $ */ /*- @@ -58,9 +58,9 @@ #define SOCK_NAME "test-sock" -int main __P((int, char *[])); -void child __P((void)); -void catch_sigchld __P((int)); +int main(int, char *[]); +void child(void); +void catch_sigchld(int); /* ARGSUSED */ int diff --git a/sbin/ancontrol/ancontrol.c b/sbin/ancontrol/ancontrol.c index a4403c4313c..c78f1462bd3 100644 --- a/sbin/ancontrol/ancontrol.c +++ b/sbin/ancontrol/ancontrol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ancontrol.c,v 1.18 2001/09/29 21:57:15 mickey Exp $ */ +/* $OpenBSD: ancontrol.c,v 1.19 2002/02/16 21:27:32 millert Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -62,30 +62,30 @@ static const char rcsid[] = #define an_printbool(val) printf(val? "[ On ]" : "[ Off ]") -void an_getval __P((struct an_req *)); -void an_setval __P((struct an_req *)); -void an_printwords __P((u_int16_t *, int)); -void an_printspeeds __P((u_int8_t*, int)); -void an_printhex __P((char *, int)); -void an_printstr __P((char *, int)); -void an_dumpstatus __P((void)); -void an_dumpstats __P((void)); -void an_dumpconfig __P((void)); -void an_dumpcaps __P((void)); -void an_dumpssid __P((void)); -void an_dumpap __P((void)); -void an_setconfig __P((int, void *)); -void an_setssid __P((int, void *)); -void an_setap __P((int, void *)); -void an_setspeed __P((void *)); -void an_readkeyinfo __P((void)); +void an_getval(struct an_req *); +void an_setval(struct an_req *); +void an_printwords(u_int16_t *, int); +void an_printspeeds(u_int8_t*, int); +void an_printhex(char *, int); +void an_printstr(char *, int); +void an_dumpstatus(void); +void an_dumpstats(void); +void an_dumpconfig(void); +void an_dumpcaps(void); +void an_dumpssid(void); +void an_dumpap(void); +void an_setconfig(int, void *); +void an_setssid(int, void *); +void an_setap(int, void *); +void an_setspeed(void *); +void an_readkeyinfo(void); #ifdef ANCACHE -void an_zerocache __P((void)); -void an_readcache __P((void)); +void an_zerocache(void); +void an_readcache(void); #endif -void getsock __P((void)); -static void usage __P((void)); -int main __P((int, char **)); +void getsock(void); +static void usage(void); +int main(int, char **); /* flags to trigger dumping information about configs */ #define STAT_DUMPAP 0x01 diff --git a/sbin/atactl/atactl.c b/sbin/atactl/atactl.c index bfa9a278bbf..c491927ac31 100644 --- a/sbin/atactl/atactl.c +++ b/sbin/atactl/atactl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atactl.c,v 1.9 2002/01/30 00:46:36 csapuntz Exp $ */ +/* $OpenBSD: atactl.c,v 1.10 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: atactl.c,v 1.4 1999/02/24 18:49:14 jwise Exp $ */ /*- @@ -58,7 +58,7 @@ struct command { const char *cmd_name; - void (*cmd_func) __P((int, char *[])); + void (*cmd_func)(int, char *[]); }; struct bitinfo { @@ -66,10 +66,10 @@ struct bitinfo { const char *string; }; -int main __P((int, char *[])); -void usage __P((void)); -void ata_command __P((struct atareq *)); -void print_bitinfo __P((const char *, u_int, struct bitinfo *)); +int main(int, char *[]); +void usage(void); +void ata_command(struct atareq *); +void print_bitinfo(const char *, u_int, struct bitinfo *); int fd; /* file descriptor for device */ const char *dvname; /* device name */ @@ -79,14 +79,14 @@ const char *cmdname; /* command user issued */ extern const char *__progname; /* from crt0.o */ void device_dump(int, char*[]); -void device_identify __P((int, char *[])); -void device_setidle __P((int, char *[])); -void device_idle __P((int, char *[])); -void device_checkpower __P((int, char *[])); -void device_acoustic __P((int, char *[])); -void device_apm __P((int, char *[])); -void device_feature __P((int, char *[])); -void device_smart __P((int, char *[])); +void device_identify(int, char *[]); +void device_setidle(int, char *[]); +void device_idle(int, char *[]); +void device_checkpower(int, char *[]); +void device_acoustic(int, char *[]); +void device_apm(int, char *[]); +void device_feature(int, char *[]); +void device_smart(int, char *[]); struct command commands[] = { { "dump", device_dump }, diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index 8449b77d9dd..337c361ff9d 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: badsect.c,v 1.7 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: badsect.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: badsect.c,v 1.7 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -89,8 +89,8 @@ long dev_bsize = 1; char buf[MAXBSIZE]; -void rdfs __P((daddr_t, int, char *)); -int chkuse __P((daddr_t, int)); +void rdfs(daddr_t, int, char *); +int chkuse(daddr_t, int); int main(argc, argv) diff --git a/sbin/brconfig/brconfig.c b/sbin/brconfig/brconfig.c index 7fb0e1e26c7..97868096f02 100644 --- a/sbin/brconfig/brconfig.c +++ b/sbin/brconfig/brconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brconfig.c,v 1.16 2001/12/15 09:03:23 jason Exp $ */ +/* $OpenBSD: brconfig.c,v 1.17 2002/02/16 21:27:33 millert Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -50,40 +50,40 @@ #include <stdlib.h> #include <limits.h> -void usage __P((void)); -int main __P((int, char **)); -int bridge_setflag __P((int, char *, short)); -int bridge_clrflag __P((int, char *, short)); -int bridge_ifsetflag __P((int, char *, char *, u_int32_t)); -int bridge_ifclrflag __P((int, char *, char *, u_int32_t)); -int bridge_list __P((int, char *, char *)); -int bridge_cfg __P((int, char *, char *)); -int bridge_addrs __P((int, char *, char *)); -int bridge_addaddr __P((int, char *, char *, char *)); -int bridge_deladdr __P((int, char *, char *)); -int bridge_maxaddr __P((int, char *, char *)); -int bridge_maxage __P((int, char *, char *)); -int bridge_priority __P((int, char *, char *)); -int bridge_fwddelay __P((int, char *, char *)); -int bridge_hellotime __P((int, char *, char *)); -int bridge_ifprio __P((int, char *, char *, char *)); -int bridge_timeout __P((int, char *, char *)); -int bridge_flush __P((int, char *)); -int bridge_flushall __P((int, char *)); -int bridge_add __P((int, char *, char *)); -int bridge_delete __P((int, char *, char *)); -int bridge_addspan __P((int, char *, char *)); -int bridge_delspan __P((int, char *, char *)); -int bridge_status __P((int, char *)); -int is_bridge __P((int, char *)); -int bridge_show_all __P((int)); -void printb __P((char *, unsigned short, char *)); -int bridge_rule __P((int, char *, int, char **, int)); -int bridge_rules __P((int, char *, char *, char *)); -int bridge_flushrule __P((int, char *, char *)); -void bridge_badrule __P((int, char **, int)); -void bridge_showrule __P((struct ifbrlreq *, char *)); -int bridge_rulefile __P((int, char *, char *)); +void usage(void); +int main(int, char **); +int bridge_setflag(int, char *, short); +int bridge_clrflag(int, char *, short); +int bridge_ifsetflag(int, char *, char *, u_int32_t); +int bridge_ifclrflag(int, char *, char *, u_int32_t); +int bridge_list(int, char *, char *); +int bridge_cfg(int, char *, char *); +int bridge_addrs(int, char *, char *); +int bridge_addaddr(int, char *, char *, char *); +int bridge_deladdr(int, char *, char *); +int bridge_maxaddr(int, char *, char *); +int bridge_maxage(int, char *, char *); +int bridge_priority(int, char *, char *); +int bridge_fwddelay(int, char *, char *); +int bridge_hellotime(int, char *, char *); +int bridge_ifprio(int, char *, char *, char *); +int bridge_timeout(int, char *, char *); +int bridge_flush(int, char *); +int bridge_flushall(int, char *); +int bridge_add(int, char *, char *); +int bridge_delete(int, char *, char *); +int bridge_addspan(int, char *, char *); +int bridge_delspan(int, char *, char *); +int bridge_status(int, char *); +int is_bridge(int, char *); +int bridge_show_all(int); +void printb(char *, unsigned short, char *); +int bridge_rule(int, char *, int, char **, int); +int bridge_rules(int, char *, char *, char *); +int bridge_flushrule(int, char *, char *); +void bridge_badrule(int, char **, int); +void bridge_showrule(struct ifbrlreq *, char *); +int bridge_rulefile(int, char *, char *); /* if_flags bits: borrowed from ifconfig.c */ #define IFFBITS \ diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index b6cb1d79a71..45bfb805c9b 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccdconfig.c,v 1.16 2001/07/07 18:26:10 deraadt Exp $ */ +/* $OpenBSD: ccdconfig.c,v 1.17 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ /*- @@ -95,15 +95,15 @@ static struct nlist nl[] = { #define CCD_UNCONFIGALL 3 /* unconfigure all devices */ #define CCD_DUMP 4 /* dump a ccd's configuration */ -static int checkdev __P((char *)); -static int do_io __P((char *, u_long, struct ccd_ioctl *)); -static int do_single __P((int, char **, int)); -static int do_all __P((int)); -static int dump_ccd __P((int, char **)); -static int flags_to_val __P((char *)); -static void print_ccd_info __P((struct ccd_softc *, kvm_t *)); -static char *resolve_ccdname __P((char *)); -static void usage __P((void)); +static int checkdev(char *); +static int do_io(char *, u_long, struct ccd_ioctl *); +static int do_single(int, char **, int); +static int do_all(int); +static int dump_ccd(int, char **); +static int flags_to_val(char *); +static void print_ccd_info(struct ccd_softc *, kvm_t *); +static char *resolve_ccdname(char *); +static void usage(void); int main(argc, argv) diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 875a1b99eab..bfaa8811cda 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.71 2001/09/03 16:14:27 millert Exp $ */ +/* $OpenBSD: disklabel.c,v 1.72 2002/02/16 21:27:33 millert Exp $ */ /* * Copyright (c) 1987, 1993 @@ -43,7 +43,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.71 2001/09/03 16:14:27 millert Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.72 2002/02/16 21:27:33 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -116,29 +116,29 @@ int donothing; #ifdef DOSLABEL struct dos_partition *dosdp; /* DOS partition, if found */ -struct dos_partition *readmbr __P((int)); +struct dos_partition *readmbr(int); #endif -void makedisktab __P((FILE *, struct disklabel *)); -void makelabel __P((char *, char *, struct disklabel *)); -int writelabel __P((int, char *, struct disklabel *)); -void l_perror __P((char *)); -struct disklabel *readlabel __P((int)); -struct disklabel *makebootarea __P((char *, struct disklabel *, int)); -void display __P((FILE *, struct disklabel *)); -void display_partition __P((FILE *, struct disklabel *, char **, int, char, int)); -int width_partition __P((struct disklabel *, int)); -int editor __P((struct disklabel *, int, char *, char *)); -int edit __P((struct disklabel *, int)); -int editit __P((void)); -char *skip __P((char *)); -char *word __P((char *)); -int getasciilabel __P((FILE *, struct disklabel *)); -int checklabel __P((struct disklabel *)); -int cmplabel __P((struct disklabel *, struct disklabel *)); -void setbootflag __P((struct disklabel *)); -void usage __P((void)); -u_short dkcksum __P((struct disklabel *)); +void makedisktab(FILE *, struct disklabel *); +void makelabel(char *, char *, struct disklabel *); +int writelabel(int, char *, struct disklabel *); +void l_perror(char *); +struct disklabel *readlabel(int); +struct disklabel *makebootarea(char *, struct disklabel *, int); +void display(FILE *, struct disklabel *); +void display_partition(FILE *, struct disklabel *, char **, int, char, int); +int width_partition(struct disklabel *, int); +int editor(struct disklabel *, int, char *, char *); +int edit(struct disklabel *, int); +int editit(void); +char *skip(char *); +char *word(char *); +int getasciilabel(FILE *, struct disklabel *); +int checklabel(struct disklabel *); +int cmplabel(struct disklabel *, struct disklabel *); +void setbootflag(struct disklabel *); +void usage(void); +u_short dkcksum(struct disklabel *); int main(argc, argv) diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 23c8547cf17..7d4f1ed8177 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.78 2002/01/24 23:01:19 millert Exp $ */ +/* $OpenBSD: editor.c,v 1.79 2002/02/16 21:27:33 millert Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.78 2002/01/24 23:01:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.79 2002/02/16 21:27:33 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -77,55 +77,55 @@ struct mountinfo { int partno; }; -void edit_parms __P((struct disklabel *, u_int32_t *)); -int editor __P((struct disklabel *, int, char *, char *)); -void editor_add __P((struct disklabel *, char **, u_int32_t *, char *)); -void editor_change __P((struct disklabel *, u_int32_t *, char *)); -void editor_countfree __P((struct disklabel *, u_int32_t *)); -void editor_delete __P((struct disklabel *, char **, u_int32_t *, char *)); -void editor_display __P((struct disklabel *, char **, u_int32_t *, char)); -void editor_help __P((char *)); -void editor_modify __P((struct disklabel *, char **, u_int32_t *, char *)); -void editor_name __P((struct disklabel *, char **, char *)); -char *getstring __P((char *, char *, char *)); -u_int32_t getuint __P((struct disklabel *, int, char *, char *, u_int32_t, u_int32_t, u_int32_t, int)); -int has_overlap __P((struct disklabel *, u_int32_t *, int)); -void make_contiguous __P((struct disklabel *)); -u_int32_t next_offset __P((struct disklabel *, u_int32_t *)); -int partition_cmp __P((const void *, const void *)); -struct partition **sort_partitions __P((struct disklabel *, u_int16_t *)); -void getdisktype __P((struct disklabel *, char *, char *)); -void find_bounds __P((struct disklabel *, struct disklabel *)); -void set_bounds __P((struct disklabel *, u_int32_t *)); -struct diskchunk *free_chunks __P((struct disklabel *)); -char ** mpcopy __P((char **, char **)); -int micmp __P((const void *, const void *)); -int mpequal __P((char **, char **)); -int mpsave __P((struct disklabel *, char **, char *, char *)); -int get_bsize __P((struct disklabel *, int)); -int get_cpg __P((struct disklabel *, int)); -int get_fsize __P((struct disklabel *, int)); -int get_fstype __P((struct disklabel *, int)); -int get_mp __P((struct disklabel *, char **, int)); -int get_offset __P((struct disklabel *, int)); -int get_size __P((struct disklabel *, int, u_int32_t *, int)); -void get_geometry __P((int, struct disklabel **, struct disklabel **)); -void set_geometry __P((struct disklabel *, struct disklabel *, struct disklabel *, struct disklabel *, char *)); -void zero_partitions __P((struct disklabel *, u_int32_t *)); +void edit_parms(struct disklabel *, u_int32_t *); +int editor(struct disklabel *, int, char *, char *); +void editor_add(struct disklabel *, char **, u_int32_t *, char *); +void editor_change(struct disklabel *, u_int32_t *, char *); +void editor_countfree(struct disklabel *, u_int32_t *); +void editor_delete(struct disklabel *, char **, u_int32_t *, char *); +void editor_display(struct disklabel *, char **, u_int32_t *, char); +void editor_help(char *); +void editor_modify(struct disklabel *, char **, u_int32_t *, char *); +void editor_name(struct disklabel *, char **, char *); +char *getstring(char *, char *, char *); +u_int32_t getuint(struct disklabel *, int, char *, char *, u_int32_t, u_int32_t, u_int32_t, int); +int has_overlap(struct disklabel *, u_int32_t *, int); +void make_contiguous(struct disklabel *); +u_int32_t next_offset(struct disklabel *, u_int32_t *); +int partition_cmp(const void *, const void *); +struct partition **sort_partitions(struct disklabel *, u_int16_t *); +void getdisktype(struct disklabel *, char *, char *); +void find_bounds(struct disklabel *, struct disklabel *); +void set_bounds(struct disklabel *, u_int32_t *); +struct diskchunk *free_chunks(struct disklabel *); +char ** mpcopy(char **, char **); +int micmp(const void *, const void *); +int mpequal(char **, char **); +int mpsave(struct disklabel *, char **, char *, char *); +int get_bsize(struct disklabel *, int); +int get_cpg(struct disklabel *, int); +int get_fsize(struct disklabel *, int); +int get_fstype(struct disklabel *, int); +int get_mp(struct disklabel *, char **, int); +int get_offset(struct disklabel *, int); +int get_size(struct disklabel *, int, u_int32_t *, int); +void get_geometry(int, struct disklabel **, struct disklabel **); +void set_geometry(struct disklabel *, struct disklabel *, struct disklabel *, struct disklabel *, char *); +void zero_partitions(struct disklabel *, u_int32_t *); static u_int32_t starting_sector; static u_int32_t ending_sector; static int expert; /* from disklabel.c */ -int checklabel __P((struct disklabel *)); -void display __P((FILE *, struct disklabel *)); -void display_partition __P((FILE *, struct disklabel *, char **, int, char, int)); -int width_partition __P((struct disklabel *, int)); - -struct disklabel *readlabel __P((int)); -struct disklabel *makebootarea __P((char *, struct disklabel *, int)); -int writelabel __P((int, char *, struct disklabel *)); +int checklabel(struct disklabel *); +void display(FILE *, struct disklabel *); +void display_partition(FILE *, struct disklabel *, char **, int, char, int); +int width_partition(struct disklabel *, int); + +struct disklabel *readlabel(int); +struct disklabel *makebootarea(char *, struct disklabel *, int); +int writelabel(int, char *, struct disklabel *); extern char *bootarea, *specname; extern int donothing; #ifdef DOSLABEL diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c index 84e2523be14..9e61428bc50 100644 --- a/sbin/dmesg/dmesg.c +++ b/sbin/dmesg/dmesg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: dmesg.c,v 1.15 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: dmesg.c,v 1.8 1995/03/18 14:54:49 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dmesg.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dmesg.c,v 1.14 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: dmesg.c,v 1.15 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ struct nlist nl[] = { { NULL }, }; -void usage __P((void)); +void usage(void); #define KREAD(addr, var) \ kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index e7d80f3dd68..6cd1552c6dc 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.h,v 1.8 1998/11/24 01:25:46 deraadt Exp $ */ +/* $OpenBSD: dump.h,v 1.9 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: dump.h,v 1.11 1997/06/05 11:13:20 lukem Exp $ */ /*- @@ -95,55 +95,55 @@ int tp_bshift; /* log2(TP_BSIZE) */ #endif /* operator interface functions */ -void broadcast __P((char *message)); -time_t do_stats __P((void)); -void lastdump __P((int arg)); /* int should be char */ -void msg __P((const char *fmt, ...)); -void msgtail __P((const char *fmt, ...)); -int query __P((char *question)); -void quit __P((const char *fmt, ...)); -void statussig __P((int)); -void timeest __P((void)); +void broadcast(char *message); +time_t do_stats(void); +void lastdump(int arg); /* int should be char */ +void msg(const char *fmt, ...); +void msgtail(const char *fmt, ...); +int query(char *question); +void quit(const char *fmt, ...); +void statussig(int); +void timeest(void); /* mapping routines */ struct dinode; -long blockest __P((struct dinode *dp)); -void mapfileino __P((ino_t, u_int64_t *, int *)); +long blockest(struct dinode *dp); +void mapfileino(ino_t, u_int64_t *, int *); int mapfiles __P((ino_t maxino, u_int64_t *tapesize, char *disk, char * const *dirv)); -int mapdirs __P((ino_t maxino, u_int64_t *tapesize)); +int mapdirs(ino_t maxino, u_int64_t *tapesize); /* file dumping routines */ -void blksout __P((daddr_t *blkp, int frags, ino_t ino)); -void bread __P((daddr_t blkno, char *buf, int size)); -void dumpino __P((struct dinode *dp, ino_t ino)); -void dumpmap __P((char *map, int type, ino_t ino)); -void writeheader __P((ino_t ino)); +void blksout(daddr_t *blkp, int frags, ino_t ino); +void bread(daddr_t blkno, char *buf, int size); +void dumpino(struct dinode *dp, ino_t ino); +void dumpmap(char *map, int type, ino_t ino); +void writeheader(ino_t ino); /* tape writing routines */ -int alloctape __P((void)); -void close_rewind __P((void)); -void dumpblock __P((daddr_t blkno, int size)); -void startnewtape __P((int top)); -void trewind __P((void)); -void writerec __P((char *dp, int isspcl)); +int alloctape(void); +void close_rewind(void); +void dumpblock(daddr_t blkno, int size); +void startnewtape(int top); +void trewind(void); +void writerec(char *dp, int isspcl); -__dead void Exit __P((int status)); -void dumpabort __P((int signo)); -void getfstab __P((void)); +__dead void Exit(int status); +void dumpabort(int signo); +void getfstab(void); -char *rawname __P((char *cp)); -struct dinode *getino __P((ino_t inum)); +char *rawname(char *cp); +struct dinode *getino(ino_t inum); /* rdump routines */ #ifdef RDUMP -void rmtclose __P((void)); -int rmthost __P((char *host)); -int rmtopen __P((char *tape, int mode)); -int rmtwrite __P((char *buf, int count)); +void rmtclose(void); +int rmthost(char *host); +int rmtopen(char *tape, int mode); +int rmtwrite(char *buf, int count); #endif /* RDUMP */ -void interrupt __P((int signo)); /* in case operator bangs on console */ +void interrupt(int signo); /* in case operator bangs on console */ /* * Exit status codes @@ -155,7 +155,7 @@ void interrupt __P((int signo)); /* in case operator bangs on console */ #define OPGRENT "operator" /* group entry to notify */ -struct fstab *fstabsearch __P((char *key)); /* search fs_file and fs_spec */ +struct fstab *fstabsearch(char *key); /* search fs_file and fs_spec */ #ifndef NAME_MAX #define NAME_MAX 255 @@ -178,13 +178,13 @@ struct dumptime *dthead; /* head of the list version */ int nddates; /* number of records (might be zero) */ int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ -void initdumptimes __P((void)); -void getdumptime __P((void)); -void putdumptime __P((void)); +void initdumptimes(void); +void getdumptime(void); +void putdumptime(void); #define ITITERATE(i, ddp) \ for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) -void sig __P((int signo)); +void sig(int signo); /* * Compatibility with old systems. diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c index 60440087148..dc0e1a854c1 100644 --- a/sbin/dump/dumprmt.c +++ b/sbin/dump/dumprmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumprmt.c,v 1.15 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: dumprmt.c,v 1.16 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $ */ /*- @@ -83,13 +83,13 @@ static int rmtstate = TS_CLOSED; static int rmtape; static char *rmtpeer; -static int okname __P((char *)); -static int rmtcall __P((char *, char *)); -static void rmtconnaborted __P((/* int, int */)); -static int rmtgetb __P((void)); -static void rmtgetconn __P((void)); -static void rmtgets __P((char *, int)); -static int rmtreply __P((char *)); +static int okname(char *); +static int rmtcall(char *, char *); +static void rmtconnaborted(/* int, int */); +static int rmtgetb(void); +static void rmtgetconn(void); +static void rmtgets(char *, int); +static int rmtreply(char *); extern int ntrec; /* blocking factor on tape */ diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index 8a279c52ddc..8662b4a3265 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -1,4 +1,4 @@ -/* $OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: itime.c,v 1.4 1997/04/15 01:09:50 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: itime.c,v 1.6 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: itime.c,v 1.7 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -73,10 +73,10 @@ int nddates = 0; int ddates_in = 0; struct dumptime *dthead = 0; -static void dumprecout __P((FILE *, struct dumpdates *)); -static int getrecord __P((FILE *, struct dumpdates *)); -static int makedumpdate __P((struct dumpdates *, char *)); -static void readdumptimes __P((FILE *)); +static void dumprecout(FILE *, struct dumpdates *); +static int getrecord(FILE *, struct dumpdates *); +static int makedumpdate(struct dumpdates *, char *); +static void readdumptimes(FILE *); void initdumptimes() diff --git a/sbin/dump/main.c b/sbin/dump/main.c index 900ab39fe01..6f8d389b3b3 100644 --- a/sbin/dump/main.c +++ b/sbin/dump/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.30 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.31 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: main.c,v 1.14 1997/06/05 11:13:24 lukem Exp $ */ /*- @@ -95,9 +95,9 @@ long blocksperfile; /* output blocks per file */ char *host = NULL; /* remote host (if any) */ int maxbsize = 64*1024; /* XXX MAXBSIZE from sys/param.h */ -static long numarg __P((char *, long, long)); -static void obsolete __P((int *, char **[])); -static void usage __P((void)); +static long numarg(char *, long, long); +static void obsolete(int *, char **[]); +static void usage(void); int main(argc, argv) diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c index 66ccb918356..54c242dfa90 100644 --- a/sbin/dump/optr.c +++ b/sbin/dump/optr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: optr.c,v 1.11 1997/05/27 08:34:36 mrg Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)optr.c 8.2 (Berkeley) 1/6/94"; #else -static char rcsid[] = "$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: optr.c,v 1.20 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -68,8 +68,8 @@ static char rcsid[] = "$OpenBSD: optr.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; #include "dump.h" #include "pathnames.h" -void alarmcatch __P((/* int, int */)); -int datesort __P((const void *, const void *)); +void alarmcatch(/* int, int */); +int datesort(const void *, const void *); /* * Query the operator; This previously-fascist piece of code diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c index 309c02c54ae..929cc65d5c1 100644 --- a/sbin/dump/tape.c +++ b/sbin/dump/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: tape.c,v 1.11 1997/06/05 11:13:26 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)tape.c 8.2 (Berkeley) 3/17/94"; #else -static char rcsid[] = "$OpenBSD: tape.c,v 1.12 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: tape.c,v 1.13 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -86,11 +86,11 @@ extern char *host; char *nexttape; static ssize_t atomic __P((ssize_t (*)(), int, char *, int)); -static void doslave __P((int, int)); -static void enslave __P((void)); -static void flushtape __P((void)); -static void killall __P((void)); -static void rollforward __P((void)); +static void doslave(int, int); +static void enslave(void); +static void flushtape(void); +static void killall(void); +static void rollforward(void); /* * Concurrent dump mods (Caltech) - disk block reading and tape writing diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c index 409495aaee2..7f6274d7231 100644 --- a/sbin/dump/traverse.c +++ b/sbin/dump/traverse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)traverse.c 8.2 (Berkeley) 9/23/93"; #else -static char rcsid[] = "$OpenBSD: traverse.c,v 1.7 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: traverse.c,v 1.8 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -79,9 +79,9 @@ typedef quad_t fsizeT; typedef int32_t fsizeT; #endif -static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size)); -static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size)); -static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); +static int dirindir(ino_t ino, daddr_t blkno, int level, long *size); +static void dmpindir(ino_t ino, daddr_t blk, int level, fsizeT *size); +static int searchdir(ino_t ino, daddr_t blkno, long size, long filesize); /* * This is an estimation of the number of TP_BSIZE blocks in the file. diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index 72871516e9a..71e789c6462 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumpfs.c,v 1.13 2001/12/01 19:13:21 deraadt Exp $ */ +/* $OpenBSD: dumpfs.c,v 1.14 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: dumpfs.c,v 1.12 1997/04/26 05:41:33 lukem Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dumpfs.c 8.2 (Berkeley) 2/2/94"; #else -static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.13 2001/12/01 19:13:21 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dumpfs.c,v 1.14 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -77,10 +77,10 @@ union { long dev_bsize = 1; -int dumpfs __P((char *)); -int dumpcg __P((char *, int, int)); -void pbits __P((void *, int)); -void usage __P((void)); +int dumpfs(char *); +int dumpcg(char *, int, int); +void pbits(void *, int); +void usage(void); int main(argc, argv) diff --git a/sbin/dumplfs/dumplfs.c b/sbin/dumplfs/dumplfs.c index 2bddb5387ca..4770963d186 100644 --- a/sbin/dumplfs/dumplfs.c +++ b/sbin/dumplfs/dumplfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp $ */ +/* $OpenBSD: dumplfs.c,v 1.6 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: dumplfs.c,v 1.7 1995/12/14 22:36:34 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)dumplfs.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp $"; +static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.6 2002/02/16 21:27:33 millert Exp $"; #endif #endif /* not lint */ @@ -66,16 +66,16 @@ static char rcsid[] = "$OpenBSD: dumplfs.c,v 1.5 2001/06/04 14:59:48 mickey Exp #include <unistd.h> #include "extern.h" -static void addseg __P((char *)); -static void dump_cleaner_info __P((struct lfs *, void *)); -static void dump_dinode __P((struct dinode *)); -static void dump_ifile __P((int, struct lfs *, int)); -static int dump_ipage_ifile __P((int, IFILE *, int)); -static int dump_ipage_segusage __P((struct lfs *, int, IFILE *, int)); -static void dump_segment __P((int, int, daddr_t, struct lfs *, int)); -static int dump_sum __P((int, struct lfs *, SEGSUM *, int, daddr_t)); -static void dump_super __P((struct lfs *)); -static void usage __P((void)); +static void addseg(char *); +static void dump_cleaner_info(struct lfs *, void *); +static void dump_dinode(struct dinode *); +static void dump_ifile(int, struct lfs *, int); +static int dump_ipage_ifile(int, IFILE *, int); +static int dump_ipage_segusage(struct lfs *, int, IFILE *, int); +static void dump_segment(int, int, daddr_t, struct lfs *, int); +static int dump_sum(int, struct lfs *, SEGSUM *, int, daddr_t); +static void dump_super(struct lfs *); +static void usage(void); typedef struct seglist SEGLIST; struct seglist { diff --git a/sbin/dumplfs/extern.h b/sbin/dumplfs/extern.h index b1941363838..f31b51bac61 100644 --- a/sbin/dumplfs/extern.h +++ b/sbin/dumplfs/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1996/06/23 14:30:19 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:33 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/18 14:55:22 cgd Exp $ */ /*- @@ -36,6 +36,6 @@ * @(#)extern.h 8.1 (Berkeley) 6/5/93 */ -void get __P((int, off_t, void *, size_t)); +void get(int, off_t, void *, size_t); extern char *special; diff --git a/sbin/fdisk/cmd.h b/sbin/fdisk/cmd.h index 0b15f9ed44a..48dd0e64b27 100644 --- a/sbin/fdisk/cmd.h +++ b/sbin/fdisk/cmd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.h,v 1.6 2001/08/12 12:03:01 heko Exp $ */ +/* $OpenBSD: cmd.h,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -62,20 +62,20 @@ typedef struct _cmd_table_t { /* Prototypes */ -int Xreinit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xdisk __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xmanual __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xedit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xsetpid __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xselect __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xprint __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xwrite __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xexit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xquit __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xabort __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xhelp __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xflag __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); -int Xupdate __P((cmd_t *, disk_t *, mbr_t *, mbr_t *, int)); +int Xreinit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xdisk(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xmanual(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xedit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xsetpid(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xselect(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xprint(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xwrite(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xexit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xquit(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xabort(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xhelp(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xflag(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); +int Xupdate(cmd_t *, disk_t *, mbr_t *, mbr_t *, int); #endif /* _CMD_H */ diff --git a/sbin/fdisk/disk.h b/sbin/fdisk/disk.h index 2889997a9d8..161fd8075cb 100644 --- a/sbin/fdisk/disk.h +++ b/sbin/fdisk/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.5 2002/01/18 08:38:26 kjell Exp $ */ +/* $OpenBSD: disk.h,v 1.6 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -49,10 +49,10 @@ typedef struct _disk_t { } disk_t; /* Prototypes */ -int DISK_open __P((char *, int)); -int DISK_close __P((int)); -int DISK_getmetrics __P((disk_t *, DISK_metrics *)); -int DISK_printmetrics __P((disk_t *, char *)); +int DISK_open(char *, int); +int DISK_close(int); +int DISK_getmetrics(disk_t *, DISK_metrics *); +int DISK_printmetrics(disk_t *, char *); #endif /* _DISK_H */ diff --git a/sbin/fdisk/mbr.h b/sbin/fdisk/mbr.h index 306b0be6a36..1ba4f243cd3 100644 --- a/sbin/fdisk/mbr.h +++ b/sbin/fdisk/mbr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.h,v 1.9 2002/01/18 08:38:26 kjell Exp $ */ +/* $OpenBSD: mbr.h,v 1.10 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -52,14 +52,14 @@ typedef struct _mbr_t { } mbr_t; /* Prototypes */ -void MBR_print_disk __P((char *)); -void MBR_print __P((mbr_t *, char *)); -void MBR_parse __P((disk_t *, char *, off_t, off_t, mbr_t *)); -void MBR_make __P((mbr_t *, char *)); -void MBR_init __P((disk_t *, mbr_t *)); -int MBR_read __P((int, off_t, char *)); -int MBR_write __P((int, off_t, char *)); -void MBR_pcopy __P((disk_t *, mbr_t *)); +void MBR_print_disk(char *); +void MBR_print(mbr_t *, char *); +void MBR_parse(disk_t *, char *, off_t, off_t, mbr_t *); +void MBR_make(mbr_t *, char *); +void MBR_init(disk_t *, mbr_t *); +int MBR_read(int, off_t, char *); +int MBR_write(int, off_t, char *); +void MBR_pcopy(disk_t *, mbr_t *); /* Sanity check */ #include <machine/param.h> diff --git a/sbin/fdisk/misc.c b/sbin/fdisk/misc.c index e511cf36a8c..09064917970 100644 --- a/sbin/fdisk/misc.c +++ b/sbin/fdisk/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.9 2002/01/23 22:04:01 mickey Exp $ */ +/* $OpenBSD: misc.c,v 1.10 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -90,7 +90,7 @@ ask_num(str, flags, dflt, low, high, help) int dflt; int low; int high; - void (*help) __P((void)); + void (*help)(void); { char lbuf[100], *cp; int num; diff --git a/sbin/fdisk/misc.h b/sbin/fdisk/misc.h index 3a17487321e..248afc00cd6 100644 --- a/sbin/fdisk/misc.h +++ b/sbin/fdisk/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.6 2002/01/18 08:38:26 kjell Exp $ */ +/* $OpenBSD: misc.h,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -60,15 +60,15 @@ static const struct unit_type { #define DO_ROUNDING 0x00000002 /* Prototypes */ -int unit_lookup __P((char *)); -int ask_cmd __P((cmd_t *)); -int ask_num __P((const char *, int, int, int, int, void (*help) __P((void)))); -int ask_yn __P((const char *)); -u_int16_t getshort __P((void *)); -u_int32_t getlong __P((void *)); -void putshort __P((void *, u_int16_t)); -void putlong __P((void *, u_int32_t)); -u_int32_t getuint __P((disk_t *, char *, char *, u_int32_t, u_int32_t, u_int32_t, int)); +int unit_lookup(char *); +int ask_cmd(cmd_t *); +int ask_num __P((const char *, int, int, int, int, void (*help)(void))); +int ask_yn(const char *); +u_int16_t getshort(void *); +u_int32_t getlong(void *); +void putshort(void *, u_int16_t); +void putlong(void *, u_int32_t); +u_int32_t getuint(disk_t *, char *, char *, u_int32_t, u_int32_t, u_int32_t, int); #endif /* _MISC_H */ diff --git a/sbin/fdisk/part.h b/sbin/fdisk/part.h index 965a6d6d2ce..d9a56b2c69d 100644 --- a/sbin/fdisk/part.h +++ b/sbin/fdisk/part.h @@ -1,4 +1,4 @@ -/* $OpenBSD: part.h,v 1.9 2002/01/18 08:38:26 kjell Exp $ */ +/* $OpenBSD: part.h,v 1.10 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -44,17 +44,17 @@ typedef struct _prt_t { } prt_t; /* Prototypes */ -void PRT_printall __P((void)); -const char *PRT_ascii_id __P((int)); -void PRT_parse __P((disk_t *, void *, off_t, off_t, prt_t *, int)); -void PRT_make __P((prt_t *, off_t, off_t, void *)); -void PRT_print __P((int, prt_t *, char *)); +void PRT_printall(void); +const char *PRT_ascii_id(int); +void PRT_parse(disk_t *, void *, off_t, off_t, prt_t *, int); +void PRT_make(prt_t *, off_t, off_t, void *); +void PRT_print(int, prt_t *, char *); /* This does CHS -> bs/ns */ -void PRT_fix_BN __P((disk_t *, prt_t *, int)); +void PRT_fix_BN(disk_t *, prt_t *, int); /* This does bs/ns -> CHS */ -void PRT_fix_CHS __P((disk_t *, prt_t *, int)); +void PRT_fix_CHS(disk_t *, prt_t *, int); #endif /* _PART_H */ diff --git a/sbin/fdisk/user.h b/sbin/fdisk/user.h index 65f8667dde0..96c624ded05 100644 --- a/sbin/fdisk/user.h +++ b/sbin/fdisk/user.h @@ -1,4 +1,4 @@ -/* $OpenBSD: user.h,v 1.5 2001/12/15 02:12:26 kjell Exp $ */ +/* $OpenBSD: user.h,v 1.6 2002/02/16 21:27:34 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -37,9 +37,9 @@ #include "mbr.h" /* Prototypes */ -int USER_init __P((disk_t *, mbr_t *, int)); -int USER_modify __P((disk_t *, mbr_t *, off_t, off_t)); -int USER_print_disk __P((disk_t *)); +int USER_init(disk_t *, mbr_t *, int); +int USER_modify(disk_t *, mbr_t *, off_t, off_t); +int USER_print_disk(disk_t *); #endif /* _USER_H */ diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c index 61fbe4e4ad0..06db7f96338 100644 --- a/sbin/fsck/fsck.c +++ b/sbin/fsck/fsck.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.c,v 1.7 2001/07/07 18:26:11 deraadt Exp $ */ +/* $OpenBSD: fsck.c,v 1.8 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $ */ /* @@ -74,19 +74,19 @@ static int maxrun = 0; static char *options = NULL; static int flags = 0; -int main __P((int, char *[])); +int main(int, char *[]); static int checkfs __P((const char *, const char *, const char *, void *, pid_t *)); -static int selected __P((const char *)); -static void addoption __P((char *)); -static const char *getoptions __P((const char *)); -static void addentry __P((struct fstypelist *, const char *, const char *)); -static void maketypelist __P((char *)); -static char *catopt __P((char *, const char *, int)); -static void mangle __P((char *, int *, const char ***, int *)); -static void usage __P((void)); -static void *isok __P((struct fstab *)); +static int selected(const char *); +static void addoption(char *); +static const char *getoptions(const char *); +static void addentry(struct fstypelist *, const char *, const char *); +static void maketypelist(char *); +static char *catopt(char *, const char *, int); +static void mangle(char *, int *, const char ***, int *); +static void usage(void); +static void *isok(struct fstab *); int diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c index ecdc076ab31..accf55a4672 100644 --- a/sbin/fsck/fsutil.c +++ b/sbin/fsck/fsutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsutil.c,v 1.4 2001/07/03 13:03:44 ian Exp $ */ +/* $OpenBSD: fsutil.c,v 1.5 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsutil.c,v 1.2 1996/10/03 20:06:31 christos Exp $ */ /* @@ -60,7 +60,7 @@ static int preen = 0; extern char *__progname; -static void vmsg __P((int, const char *, va_list)); +static void vmsg(int, const char *, va_list); void setcdevname(cd, pr) diff --git a/sbin/fsck/fsutil.h b/sbin/fsck/fsutil.h index e185fc7e901..038223c42ba 100644 --- a/sbin/fsck/fsutil.h +++ b/sbin/fsck/fsutil.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsutil.h,v 1.1 1996/10/20 08:36:25 tholo Exp $ */ +/* $OpenBSD: fsutil.h,v 1.2 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsutil.h,v 1.3 1996/10/03 20:06:31 christos Exp $ */ /* @@ -30,24 +30,24 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -void perror __P((const char *)); -void errexit __P((const char *, ...)) +void perror(const char *); +void errexit(const char *, ...) __attribute__((__noreturn__,__format__(__printf__,1,2))); -void pfatal __P((const char *, ...)) +void pfatal(const char *, ...) __attribute__((__format__(__printf__,1,2))); -void pwarn __P((const char *, ...)) +void pwarn(const char *, ...) __attribute__((__format__(__printf__,1,2))); -void panic __P((const char *, ...)) +void panic(const char *, ...) __attribute__((__noreturn__,__format__(__printf__,1,2))); -char *rawname __P((char *)); -char *unrawname __P((char *)); -char *blockcheck __P((char *)); -const char *cdevname __P((void)); -void setcdevname __P((const char *, int)); -int hotroot __P((void)); -void *emalloc __P((size_t)); -void *erealloc __P((void *, size_t)); -char *estrdup __P((const char *)); +char *rawname(char *); +char *unrawname(char *); +char *blockcheck(char *); +const char *cdevname(void); +void setcdevname(const char *, int); +int hotroot(void); +void *emalloc(size_t); +void *erealloc(void *, size_t); +char *estrdup(const char *); #define CHECK_PREEN 1 #define CHECK_VERBOSE 2 diff --git a/sbin/fsck/preen.c b/sbin/fsck/preen.c index 8d792407310..137730c5c1e 100644 --- a/sbin/fsck/preen.c +++ b/sbin/fsck/preen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: preen.c,v 1.6 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: preen.c,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: preen.c,v 1.15 1996/09/28 19:21:42 christos Exp $ */ /* @@ -78,16 +78,16 @@ TAILQ_HEAD(disk, diskentry) diskh; static int nrun = 0, ndisks = 0; -static struct diskentry *finddisk __P((const char *)); -static void addpart __P((const char *, const char *, const char *, void *)); +static struct diskentry *finddisk(const char *); +static void addpart(const char *, const char *, const char *, void *); static int startdisk __P((struct diskentry *, int (*)(const char *, const char *, const char *, void *, pid_t *))); -static void printpart __P((void)); +static void printpart(void); int checkfstab(flags, maxrun, docheck, checkit) int flags, maxrun; - void *(*docheck) __P((struct fstab *)); + void *(*docheck)(struct fstab *); int (*checkit) __P((const char *, const char *, const char *, void *, pid_t *)); { diff --git a/sbin/fsck_ext2fs/dir.c b/sbin/fsck_ext2fs/dir.c index 610dc1d3c64..21159556a7e 100644 --- a/sbin/fsck_ext2fs/dir.c +++ b/sbin/fsck_ext2fs/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.6 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: dir.c,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: dir.c,v 1.5 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -61,13 +61,13 @@ struct ext2fs_dirtemplate dirhead = { }; #undef DIRBLKSIZ -static int expanddir __P((struct ext2fs_dinode *, char *)); -static void freedir __P((ino_t, ino_t)); -static struct ext2fs_direct *fsck_readdir __P((struct inodesc *)); -static struct bufarea *getdirblk __P((daddr_t, long)); -static int lftempname __P((char *, ino_t)); -static int mkentry __P((struct inodesc *)); -static int chgino __P((struct inodesc *)); +static int expanddir(struct ext2fs_dinode *, char *); +static void freedir(ino_t, ino_t); +static struct ext2fs_direct *fsck_readdir(struct inodesc *); +static struct bufarea *getdirblk(daddr_t, long); +static int lftempname(char *, ino_t); +static int mkentry(struct inodesc *); +static int chgino(struct inodesc *); /* * Propagate connected state through the tree. diff --git a/sbin/fsck_ext2fs/extern.h b/sbin/fsck_ext2fs/extern.h index 46c5bee9945..782d63f269b 100644 --- a/sbin/fsck_ext2fs/extern.h +++ b/sbin/fsck_ext2fs/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1997/06/14 04:16:51 downsj Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: extern.h,v 1.1 1997/06/11 11:21:46 bouyer Exp $ */ /* @@ -26,51 +26,51 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -void adjust __P((struct inodesc *, short)); -int allocblk __P((void)); -int allocdir __P((ino_t, ino_t, int)); -void blkerror __P((ino_t, char *, daddr_t)); -int bread __P((int, char *, daddr_t, long)); -void bufinit __P((void)); -void bwrite __P((int, char *, daddr_t, long)); -void cacheino __P((struct ext2fs_dinode *, ino_t)); -int changeino __P((ino_t, char *, ino_t)); +void adjust(struct inodesc *, short); +int allocblk(void); +int allocdir(ino_t, ino_t, int); +void blkerror(ino_t, char *, daddr_t); +int bread(int, char *, daddr_t, long); +void bufinit(void); +void bwrite(int, char *, daddr_t, long); +void cacheino(struct ext2fs_dinode *, ino_t); +int changeino(ino_t, char *, ino_t); struct fstab; -int chkrange __P((daddr_t, int)); -void ckfini __P((int)); -int ckinode __P((struct ext2fs_dinode *, struct inodesc *)); -void clri __P((struct inodesc *, char *, int)); -int dircheck __P((struct inodesc *, struct ext2fs_direct *)); -void direrror __P((ino_t, char *)); -int dirscan __P((struct inodesc *)); -int dofix __P((struct inodesc *, char *)); -void fileerror __P((ino_t, ino_t, char *)); -int findino __P((struct inodesc *)); -int findname __P((struct inodesc *)); -void flush __P((int, struct bufarea *)); -void freeblk __P((daddr_t)); -void freeino __P((ino_t)); -void freeinodebuf __P((void)); -int ftypeok __P((struct ext2fs_dinode *)); -void getpathname __P((char *, ino_t, ino_t)); -void inocleanup __P((void)); -void inodirty __P((void)); -int linkup __P((ino_t, ino_t)); -int makeentry __P((ino_t, ino_t, char *)); -void pass1 __P((void)); -void pass1b __P((void)); -void pass2 __P((void)); -void pass3 __P((void)); -void pass4 __P((void)); -int pass1check __P((struct inodesc *)); -int pass4check __P((struct inodesc *)); -void pass5 __P((void)); -void pinode __P((ino_t)); -void propagate __P((void)); -int reply __P((char *)); -void resetinodebuf __P((void)); -int setup __P((char *)); -struct ext2fs_dinode * getnextinode __P((ino_t)); -void catch __P((int)); -void catchquit __P((int)); -void voidquit __P((int)); +int chkrange(daddr_t, int); +void ckfini(int); +int ckinode(struct ext2fs_dinode *, struct inodesc *); +void clri(struct inodesc *, char *, int); +int dircheck(struct inodesc *, struct ext2fs_direct *); +void direrror(ino_t, char *); +int dirscan(struct inodesc *); +int dofix(struct inodesc *, char *); +void fileerror(ino_t, ino_t, char *); +int findino(struct inodesc *); +int findname(struct inodesc *); +void flush(int, struct bufarea *); +void freeblk(daddr_t); +void freeino(ino_t); +void freeinodebuf(void); +int ftypeok(struct ext2fs_dinode *); +void getpathname(char *, ino_t, ino_t); +void inocleanup(void); +void inodirty(void); +int linkup(ino_t, ino_t); +int makeentry(ino_t, ino_t, char *); +void pass1(void); +void pass1b(void); +void pass2(void); +void pass3(void); +void pass4(void); +int pass1check(struct inodesc *); +int pass4check(struct inodesc *); +void pass5(void); +void pinode(ino_t); +void propagate(void); +int reply(char *); +void resetinodebuf(void); +int setup(char *); +struct ext2fs_dinode * getnextinode(ino_t); +void catch(int); +void catchquit(int); +void voidquit(int); diff --git a/sbin/fsck_ext2fs/fsck.h b/sbin/fsck_ext2fs/fsck.h index 63a3b45a683..5b2275adcb0 100644 --- a/sbin/fsck_ext2fs/fsck.h +++ b/sbin/fsck_ext2fs/fsck.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.h,v 1.4 2000/04/26 23:26:05 jasoni Exp $ */ +/* $OpenBSD: fsck.h,v 1.5 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsck.h,v 1.1 1997/06/11 11:21:47 bouyer Exp $ */ /* @@ -81,7 +81,7 @@ struct bufarea sblk; /* file system superblock */ struct bufarea asblk; /* first alternate superblock */ struct bufarea *pdirbp; /* current directory contents */ struct bufarea *pbp; /* current inode block */ -struct bufarea *getdatablk __P((daddr_t, long)); +struct bufarea *getdatablk(daddr_t, long); struct m_ext2fs sblock; #define dirty(bp) (bp)->b_dirty = 1 @@ -97,7 +97,7 @@ enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE}; struct inodesc { enum fixstate id_fix; /* policy on fixing errors */ int (*id_func) /* function to be applied to blocks of inode */ - __P((struct inodesc *)); +(struct inodesc *); ino_t id_number; /* inode number described */ ino_t id_parent; /* for DATA nodes, their parent */ daddr_t id_blkno; /* current block number being examined */ @@ -207,9 +207,9 @@ struct ext2fs_dinode zino; #define ALTERED 0x08 #define FOUND 0x10 -struct ext2fs_dinode *ginode __P((ino_t)); -struct inoinfo *getinoinfo __P((ino_t)); -void getblk __P((struct bufarea *, daddr_t, long)); -ino_t allocino __P((ino_t, int)); -void copyback_sb __P((struct bufarea*)); -daddr_t cgoverhead __P((int)); /* overhead per cg */ +struct ext2fs_dinode *ginode(ino_t); +struct inoinfo *getinoinfo(ino_t); +void getblk(struct bufarea *, daddr_t, long); +ino_t allocino(ino_t, int); +void copyback_sb(struct bufarea*); +daddr_t cgoverhead(int); /* overhead per cg */ diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c index 387c5ea2514..c6e97e2ca5c 100644 --- a/sbin/fsck_ext2fs/inode.c +++ b/sbin/fsck_ext2fs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.8 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: inode.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -65,7 +65,7 @@ static ino_t startinum; -static int iblock __P((struct inodesc *, long, u_int64_t)); +static int iblock(struct inodesc *, long, u_int64_t); int ckinode(dp, idesc) @@ -162,7 +162,7 @@ iblock(idesc, ilevel, isize) daddr_t *ap; daddr_t *aplim; struct bufarea *bp; - int i, n, (*func) __P((struct inodesc *)), nif; + int i, n, (*func)(struct inodesc *), nif; u_int64_t sizepb; char buf[BUFSIZ]; char pathbuf[MAXPATHLEN + 1]; diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c index 5806a97dd3d..cecfe2ff6b2 100644 --- a/sbin/fsck_ext2fs/main.c +++ b/sbin/fsck_ext2fs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $ */ +/* $OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $ */ /* @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94"; #if 0 static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.8 2002/02/16 21:27:34 millert Exp $"; #endif #endif #endif /* not lint */ @@ -72,11 +72,11 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.7 2000/04/26 23:26:06 jasoni Exp $"; int returntosingle; -int main __P((int, char *[])); +int main(int, char *[]); -static int argtoi __P((int, char *, char *, int)); -static int checkfilesys __P((char *, char *, long, int)); -static void usage __P((void)); +static int argtoi(int, char *, char *, int); +static int checkfilesys(char *, char *, long, int); +static void usage(void); int diff --git a/sbin/fsck_ext2fs/pass1.c b/sbin/fsck_ext2fs/pass1.c index b9dd16644e4..bd99eabaf0b 100644 --- a/sbin/fsck_ext2fs/pass1.c +++ b/sbin/fsck_ext2fs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.6 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: pass1.c,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass1.c,v 1.9 2000/01/31 11:40:12 bouyer Exp $ */ /* @@ -54,7 +54,7 @@ static daddr_t badblk; static daddr_t dupblk; -static void checkinode __P((ino_t, struct inodesc *)); +static void checkinode(ino_t, struct inodesc *); void pass1() diff --git a/sbin/fsck_ext2fs/pass1b.c b/sbin/fsck_ext2fs/pass1b.c index f10f36acbf1..4051694d756 100644 --- a/sbin/fsck_ext2fs/pass1b.c +++ b/sbin/fsck_ext2fs/pass1b.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1b.c,v 1.4 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: pass1b.c,v 1.5 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass1b.c,v 1.2 1997/09/14 14:27:26 lukem Exp $ */ /* @@ -44,7 +44,7 @@ #include "fsck.h" #include "extern.h" -static int pass1bcheck __P((struct inodesc *)); +static int pass1bcheck(struct inodesc *); static struct dups *duphead; void diff --git a/sbin/fsck_ext2fs/pass2.c b/sbin/fsck_ext2fs/pass2.c index 47657dfbc2c..a2da0883e51 100644 --- a/sbin/fsck_ext2fs/pass2.c +++ b/sbin/fsck_ext2fs/pass2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass2.c,v 1.5 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: pass2.c,v 1.6 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass2.c,v 1.6 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -53,8 +53,8 @@ #define MINDIRSIZE (sizeof (struct ext2fs_dirtemplate)) -static int pass2check __P((struct inodesc *)); -static int blksort __P((const void *, const void *)); +static int pass2check(struct inodesc *); +static int blksort(const void *, const void *); void pass2() diff --git a/sbin/fsck_ext2fs/pass5.c b/sbin/fsck_ext2fs/pass5.c index 060c3237d32..f1793dc7331 100644 --- a/sbin/fsck_ext2fs/pass5.c +++ b/sbin/fsck_ext2fs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.8 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: pass5.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass5.c,v 1.7 2000/01/28 16:01:46 bouyer Exp $ */ /* @@ -50,7 +50,7 @@ #include "extern.h" -void print_bmap __P((u_char *,u_int32_t)); +void print_bmap(u_char *,u_int32_t); void pass5() diff --git a/sbin/fsck_ext2fs/preen.c b/sbin/fsck_ext2fs/preen.c index 2ea22ddb1e9..e6a3ee7e6be 100644 --- a/sbin/fsck_ext2fs/preen.c +++ b/sbin/fsck_ext2fs/preen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: preen.c,v 1.4 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: preen.c,v 1.5 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: preen.c,v 1.2 1997/09/14 14:27:30 lukem Exp $ */ /* @@ -63,7 +63,7 @@ int nrun, ndisks; char hotroot; char *rawname(), *unrawname(), *blockcheck(); -void addpart __P((char *, char *, long)); +void addpart(char *, char *, long); int startdisk __P((struct disk *, int (*)() )); int diff --git a/sbin/fsck_ext2fs/setup.c b/sbin/fsck_ext2fs/setup.c index 13f82b16d1e..b42913f448a 100644 --- a/sbin/fsck_ext2fs/setup.c +++ b/sbin/fsck_ext2fs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.7 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: setup.c,v 1.8 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: setup.c,v 1.1 1997/06/11 11:22:01 bouyer Exp $ */ /* @@ -58,10 +58,10 @@ #define POWEROF2(num) (((num) & ((num) - 1)) == 0) -void badsb __P((int, char *)); -int calcsb __P((char *, int, struct m_ext2fs *)); -static struct disklabel *getdisklabel __P((char *, int)); -static int readsb __P((int)); +void badsb(int, char *); +int calcsb(char *, int, struct m_ext2fs *); +static struct disklabel *getdisklabel(char *, int); +static int readsb(int); int setup(dev) diff --git a/sbin/fsck_ext2fs/utilities.c b/sbin/fsck_ext2fs/utilities.c index c0eca929756..b06c4a5452c 100644 --- a/sbin/fsck_ext2fs/utilities.c +++ b/sbin/fsck_ext2fs/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.9 2001/09/18 17:43:15 art Exp $ */ +/* $OpenBSD: utilities.c,v 1.10 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: utilities.c,v 1.6 2001/02/04 21:19:34 christos Exp $ */ /* @@ -53,7 +53,7 @@ long diskreads, totalreads; /* Disk cache statistics */ -static void rwerror __P((char *, daddr_t)); +static void rwerror(char *, daddr_t); extern int returntosingle; diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 622b11d032d..30910fe2db6 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: dir.c,v 1.11 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: dir.c,v 1.20 1996/09/27 22:45:11 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)dir.c 8.5 (Berkeley) 12/8/94"; #else -static char rcsid[] = "$OpenBSD: dir.c,v 1.10 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.11 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -68,13 +68,13 @@ struct odirtemplate odirhead = { 0, DIRBLKSIZ - 12, 2, ".." }; -static int expanddir __P((struct dinode *, char *)); -static void freedir __P((ino_t, ino_t)); -static struct direct *fsck_readdir __P((struct inodesc *)); -static struct bufarea *getdirblk __P((daddr_t, long)); -static int lftempname __P((char *, ino_t)); -static int mkentry __P((struct inodesc *)); -static int chgino __P((struct inodesc *)); +static int expanddir(struct dinode *, char *); +static void freedir(ino_t, ino_t); +static struct direct *fsck_readdir(struct inodesc *); +static struct bufarea *getdirblk(daddr_t, long); +static int lftempname(char *, ino_t); +static int mkentry(struct inodesc *); +static int chgino(struct inodesc *); /* * Propagate connected state through the tree. diff --git a/sbin/fsck_ffs/extern.h b/sbin/fsck_ffs/extern.h index 45e9c080e15..5ac4e5c2672 100644 --- a/sbin/fsck_ffs/extern.h +++ b/sbin/fsck_ffs/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.5 2001/05/28 21:22:47 gluk Exp $ */ +/* $OpenBSD: extern.h,v 1.6 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: extern.h,v 1.6 1996/09/27 22:45:12 christos Exp $ */ /* @@ -25,52 +25,52 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -void adjust __P((struct inodesc *, short)); -int allocblk __P((long)); -int allocdir __P((ino_t, ino_t, int)); -void blkerror __P((ino_t, char *, daddr_t)); -int bread __P((int, char *, daddr_t, long)); -void bufinit __P((void)); -void bwrite __P((int, char *, daddr_t, long)); -void cacheino __P((struct dinode *, ino_t)); -int changeino __P((ino_t, char *, ino_t)); +void adjust(struct inodesc *, short); +int allocblk(long); +int allocdir(ino_t, ino_t, int); +void blkerror(ino_t, char *, daddr_t); +int bread(int, char *, daddr_t, long); +void bufinit(void); +void bwrite(int, char *, daddr_t, long); +void cacheino(struct dinode *, ino_t); +int changeino(ino_t, char *, ino_t); struct fstab; -int chkrange __P((daddr_t, int)); -void ckfini __P((int)); -int ckinode __P((struct dinode *, struct inodesc *)); -void clri __P((struct inodesc *, char *, int)); -int dircheck __P((struct inodesc *, struct direct *)); -void direrror __P((ino_t, char *)); -int dirscan __P((struct inodesc *)); -int dofix __P((struct inodesc *, char *)); -void fileerror __P((ino_t, ino_t, char *)); -int findino __P((struct inodesc *)); -int findname __P((struct inodesc *)); -void flush __P((int, struct bufarea *)); -void freeblk __P((daddr_t, long)); -void freeino __P((ino_t)); -void freeinodebuf __P((void)); -int ftypeok __P((struct dinode *)); -void getpathname __P((char *, ino_t, ino_t)); -void inocleanup __P((void)); -void inodirty __P((void)); -int linkup __P((ino_t, ino_t)); -int makeentry __P((ino_t, ino_t, char *)); -void pass1 __P((void)); -void pass1b __P((void)); -void pass2 __P((void)); -void pass3 __P((void)); -void pass4 __P((void)); -int pass1check __P((struct inodesc *)); -int pass4check __P((struct inodesc *)); -void pass5 __P((void)); -void pinode __P((ino_t)); -void propagate __P((ino_t)); -int reply __P((char *)); -void resetinodebuf __P((void)); -int setup __P((char *)); -struct dinode * getnextinode __P((ino_t)); -void catch __P((int)); -void catchquit __P((int)); -void voidquit __P((int)); -void catchinfo __P((int)); +int chkrange(daddr_t, int); +void ckfini(int); +int ckinode(struct dinode *, struct inodesc *); +void clri(struct inodesc *, char *, int); +int dircheck(struct inodesc *, struct direct *); +void direrror(ino_t, char *); +int dirscan(struct inodesc *); +int dofix(struct inodesc *, char *); +void fileerror(ino_t, ino_t, char *); +int findino(struct inodesc *); +int findname(struct inodesc *); +void flush(int, struct bufarea *); +void freeblk(daddr_t, long); +void freeino(ino_t); +void freeinodebuf(void); +int ftypeok(struct dinode *); +void getpathname(char *, ino_t, ino_t); +void inocleanup(void); +void inodirty(void); +int linkup(ino_t, ino_t); +int makeentry(ino_t, ino_t, char *); +void pass1(void); +void pass1b(void); +void pass2(void); +void pass3(void); +void pass4(void); +int pass1check(struct inodesc *); +int pass4check(struct inodesc *); +void pass5(void); +void pinode(ino_t); +void propagate(ino_t); +int reply(char *); +void resetinodebuf(void); +int setup(char *); +struct dinode * getnextinode(ino_t); +void catch(int); +void catchquit(int); +void voidquit(int); +void catchinfo(int); diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 9f1146b6a79..b169c5ed7b9 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsck.h,v 1.8 2001/03/02 08:33:55 art Exp $ */ +/* $OpenBSD: fsck.h,v 1.9 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsck.h,v 1.13 1996/10/11 20:15:46 thorpej Exp $ */ /* @@ -80,7 +80,7 @@ struct bufarea sblk; /* file system superblock */ struct bufarea cgblk; /* cylinder group blocks */ struct bufarea *pdirbp; /* current directory contents */ struct bufarea *pbp; /* current inode block */ -struct bufarea *getdatablk __P((daddr_t, long)); +struct bufarea *getdatablk(daddr_t, long); #define dirty(bp) (bp)->b_dirty = 1 #define initbarea(bp) \ @@ -98,7 +98,7 @@ enum fixstate {DONTKNOW, NOFIX, FIX, IGNORE}; struct inodesc { enum fixstate id_fix; /* policy on fixing errors */ int (*id_func) /* function to be applied to blocks of inode */ - __P((struct inodesc *)); +(struct inodesc *); ino_t id_number; /* inode number described */ ino_t id_parent; /* for DATA nodes, their parent */ daddr_t id_blkno; /* current block number being examined */ @@ -214,10 +214,10 @@ struct dinode zino; #define ALTERED 0x08 #define FOUND 0x10 -struct dinode *ginode __P((ino_t)); -struct inoinfo *getinoinfo __P((ino_t)); -void getblk __P((struct bufarea *, daddr_t, long)); -ino_t allocino __P((ino_t, int)); +struct dinode *ginode(ino_t); +struct inoinfo *getinoinfo(ino_t); +void getblk(struct bufarea *, daddr_t, long); +ino_t allocino(ino_t, int); int (*info_fn)(char *, int); char *info_filesys; diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 6b59bd22baf..0a51822c76c 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: inode.c,v 1.19 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95"; #else -static char rcsid[] = "$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: inode.c,v 1.19 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: inode.c,v 1.18 2001/11/05 07:39:16 mpech Exp $" static ino_t startinum; -static int iblock __P((struct inodesc *, long, u_int64_t)); +static int iblock(struct inodesc *, long, u_int64_t); int ckinode(dp, idesc) @@ -161,7 +161,7 @@ iblock(idesc, ilevel, isize) daddr_t *ap; daddr_t *aplim; struct bufarea *bp; - int i, n, (*func) __P((struct inodesc *)), nif; + int i, n, (*func)(struct inodesc *), nif; u_int64_t sizepb; char buf[BUFSIZ]; char pathbuf[MAXPATHLEN + 1]; diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 7896b100683..01b6279742e 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/23/94"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.20 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -65,10 +65,10 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.19 2001/11/05 07:39:16 mpech Exp $"; #include "fsutil.h" int returntosingle; -int argtoi __P((int, char *, char *, int)); -int checkfilesys __P((char *, char *, long, int)); -int docheck __P((struct fstab *)); -int main __P((int, char *[])); +int argtoi(int, char *, char *, int); +int checkfilesys(char *, char *, long, int); +int docheck(struct fstab *); +int main(int, char *[]); extern char *__progname; diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 5c94218a15d..0f8802abeed 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: pass1.c,v 1.11 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass1.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: pass1.c,v 1.11 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: pass1.c,v 1.10 2001/11/05 07:39:16 mpech Exp $" static daddr_t badblk; static daddr_t dupblk; -static void checkinode __P((ino_t, struct inodesc *)); +static void checkinode(ino_t, struct inodesc *); static ino_t info_inumber; diff --git a/sbin/fsck_ffs/pass1b.c b/sbin/fsck_ffs/pass1b.c index b2aea2d4778..5586c60dca5 100644 --- a/sbin/fsck_ffs/pass1b.c +++ b/sbin/fsck_ffs/pass1b.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: pass1b.c,v 1.6 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass1b.c,v 1.10 1996/09/23 16:18:37 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass1b.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: pass1b.c,v 1.6 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -52,7 +52,7 @@ static char rcsid[] = "$OpenBSD: pass1b.c,v 1.5 2001/11/05 07:39:16 mpech Exp $" #include "fsck.h" #include "extern.h" -static int pass1bcheck __P((struct inodesc *)); +static int pass1bcheck(struct inodesc *); static struct dups *duphead; static ino_t info_inumber; diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index e23d518db0d..c501666ebdd 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: pass2.c,v 1.12 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)pass2.c 8.6 (Berkeley) 10/27/94"; #else -static char rcsid[] = "$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: pass2.c,v 1.12 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -58,8 +58,8 @@ static char rcsid[] = "$OpenBSD: pass2.c,v 1.11 2001/11/05 07:39:16 mpech Exp $" #define MINDIRSIZE (sizeof (struct dirtemplate)) -static int pass2check __P((struct inodesc *)); -static int blksort __P((const void *, const void *)); +static int pass2check(struct inodesc *); +static int blksort(const void *, const void *); static int info_max; static int info_pos; diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c index a11facb44d7..2e73760b81c 100644 --- a/sbin/fsck_ffs/setup.c +++ b/sbin/fsck_ffs/setup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: setup.c,v 1.15 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)setup.c 8.5 (Berkeley) 11/23/94"; #else -static char rcsid[] = "$OpenBSD: setup.c,v 1.14 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: setup.c,v 1.15 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -66,10 +66,10 @@ struct bufarea asblk; #define altsblock (*asblk.b_un.b_fs) #define POWEROF2(num) (((num) & ((num) - 1)) == 0) -void badsb __P((int, char *)); -int calcsb __P((char *, int, struct fs *)); -static struct disklabel *getdisklabel __P((char *, int)); -static int readsb __P((int)); +void badsb(int, char *); +int calcsb(char *, int, struct fs *); +static struct disklabel *getdisklabel(char *, int); +static int readsb(int); int setup(dev) diff --git a/sbin/fsck_ffs/utilities.c b/sbin/fsck_ffs/utilities.c index 86d69e65199..bfcbc0a3b9a 100644 --- a/sbin/fsck_ffs/utilities.c +++ b/sbin/fsck_ffs/utilities.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: utilities.c,v 1.14 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: utilities.c,v 1.18 1996/09/27 22:45:20 christos Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)utilities.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: utilities.c,v 1.14 2002/02/16 21:27:34 millert Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ static char rcsid[] = "$OpenBSD: utilities.c,v 1.13 2001/11/05 07:39:16 mpech Ex long diskreads, totalreads; /* Disk cache statistics */ -static void rwerror __P((char *, daddr_t)); +static void rwerror(char *, daddr_t); int ftypeok(dp) diff --git a/sbin/fsck_msdos/dir.c b/sbin/fsck_msdos/dir.c index 607f8001bd4..97002f579c3 100644 --- a/sbin/fsck_msdos/dir.c +++ b/sbin/fsck_msdos/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: dir.c,v 1.11 1997/10/17 11:19:35 ws Exp $ */ /* @@ -37,7 +37,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: dir.c,v 1.14 2002/02/16 21:27:34 millert Exp $"; #endif /* not lint */ #include <stdio.h> @@ -91,12 +91,12 @@ static char rcsid[] = "$OpenBSD: dir.c,v 1.13 2001/07/07 18:26:12 deraadt Exp $" #define DD_YEAR_SHIFT 9 /* dir.c */ -static struct dosDirEntry *newDosDirEntry __P((void)); -static void freeDosDirEntry __P((struct dosDirEntry *)); -static struct dirTodoNode *newDirTodo __P((void)); -static void freeDirTodo __P((struct dirTodoNode *)); -static char *fullpath __P((struct dosDirEntry *)); -static u_char calcShortSum __P((u_char *)); +static struct dosDirEntry *newDosDirEntry(void); +static void freeDosDirEntry(struct dosDirEntry *); +static struct dirTodoNode *newDirTodo(void); +static void freeDirTodo(struct dirTodoNode *); +static char *fullpath(struct dosDirEntry *); +static u_char calcShortSum(u_char *); static int delete __P((int, struct bootblock *, struct fatEntry *, cl_t, int, cl_t, int, int)); static int removede __P((int, struct bootblock *, struct fatEntry *, u_char *, diff --git a/sbin/fsck_msdos/ext.h b/sbin/fsck_msdos/ext.h index 5df7e5ecc70..98022d201af 100644 --- a/sbin/fsck_msdos/ext.h +++ b/sbin/fsck_msdos/ext.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ext.h,v 1.6 2001/09/19 10:58:07 mpech Exp $ */ +/* $OpenBSD: ext.h,v 1.7 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: ext.h,v 1.5 1997/10/17 11:19:48 ws Exp $ */ /* @@ -58,12 +58,12 @@ extern struct dosDirEntry *rootDir; /* * function declarations */ -int ask __P((int, const char *, ...)); +int ask(int, const char *, ...); /* * Check filesystem given as arg */ -int checkfilesys __P((const char *)); +int checkfilesys(const char *); /* * Return values of various functions @@ -79,41 +79,41 @@ int checkfilesys __P((const char *)); * read a boot block in a machine independend fashion and translate * it into our struct bootblock. */ -int readboot __P((int, struct bootblock *)); +int readboot(int, struct bootblock *); /* * Correct the FSInfo block. */ -int writefsinfo __P((int, struct bootblock *)); +int writefsinfo(int, struct bootblock *); /* * Read one of the FAT copies and return a pointer to the new * allocated array holding our description of it. */ -int readfat __P((int, struct bootblock *, int, struct fatEntry **)); +int readfat(int, struct bootblock *, int, struct fatEntry **); /* * Check two FAT copies for consistency and merge changes into the * first if neccessary. */ -int comparefat __P((struct bootblock *, struct fatEntry *, struct fatEntry *, int)); +int comparefat(struct bootblock *, struct fatEntry *, struct fatEntry *, int); /* * Check a FAT */ -int checkfat __P((struct bootblock *, struct fatEntry *)); +int checkfat(struct bootblock *, struct fatEntry *); /* * Write back FAT entries */ -int writefat __P((int, struct bootblock *, struct fatEntry *)); +int writefat(int, struct bootblock *, struct fatEntry *); /* * Read a directory */ -int resetDosDirSection __P((struct bootblock *, struct fatEntry *)); -void finishDosDirSection __P((void)); -int handleDirTree __P((int, struct bootblock *, struct fatEntry *)); +int resetDosDirSection(struct bootblock *, struct fatEntry *); +void finishDosDirSection(void); +int handleDirTree(int, struct bootblock *, struct fatEntry *); /* * Cross-check routines run after everything is completely in memory @@ -121,12 +121,12 @@ int handleDirTree __P((int, struct bootblock *, struct fatEntry *)); /* * Check for lost cluster chains */ -int checklost __P((int, struct bootblock *, struct fatEntry *)); +int checklost(int, struct bootblock *, struct fatEntry *); /* * Try to reconnect a lost cluster chain */ -int reconnect __P((int, struct bootblock *, struct fatEntry *, cl_t)); -void finishlf __P((void)); +int reconnect(int, struct bootblock *, struct fatEntry *, cl_t); +void finishlf(void); /* * Small helper functions @@ -134,11 +134,11 @@ void finishlf __P((void)); /* * Return the type of a reserved cluster as text */ -char *rsrvdcltype __P((cl_t)); +char *rsrvdcltype(cl_t); /* * Clear a cluster chain in a FAT */ -void clearchain __P((struct bootblock *, struct fatEntry *, cl_t)); +void clearchain(struct bootblock *, struct fatEntry *, cl_t); #endif diff --git a/sbin/fsck_msdos/fat.c b/sbin/fsck_msdos/fat.c index 9ed3137ad52..f46c3ca5121 100644 --- a/sbin/fsck_msdos/fat.c +++ b/sbin/fsck_msdos/fat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $ */ +/* $OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fat.c,v 1.8 1997/10/17 11:19:53 ws Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $"; +static char rcsid[] = "$OpenBSD: fat.c,v 1.10 2002/02/16 21:27:34 millert Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -46,9 +46,9 @@ static char rcsid[] = "$OpenBSD: fat.c,v 1.9 2000/06/28 17:42:06 mickey Exp $"; #include "ext.h" -static int checkclnum __P((struct bootblock *, int, cl_t, cl_t *)); -static int clustdiffer __P((cl_t, cl_t *, cl_t *, int)); -static int tryclear __P((struct bootblock *, struct fatEntry *, cl_t, cl_t *)); +static int checkclnum(struct bootblock *, int, cl_t, cl_t *); +static int clustdiffer(cl_t, cl_t *, cl_t *, int); +static int tryclear(struct bootblock *, struct fatEntry *, cl_t, cl_t *); /* * Check a cluster number for valid value diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c index aec6ae0acad..e623113d4d0 100644 --- a/sbin/fsck_msdos/main.c +++ b/sbin/fsck_msdos/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.10 2001/09/05 22:32:37 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: main.c,v 1.8 1996/10/17 20:29:53 cgd Exp $ */ /* @@ -35,7 +35,7 @@ #ifndef lint -static char rcsid[] = "$OpenBSD: main.c,v 1.10 2001/09/05 22:32:37 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.11 2002/02/16 21:27:34 millert Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -57,8 +57,8 @@ int alwaysyes; /* assume "yes" for all questions */ int preen; /* set when preening */ int rdonly; /* device is opened read only (supersedes above) */ -static void usage __P((void)); -int main __P((int, char **)); +static void usage(void); +int main(int, char **); static void usage() diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index d163b75e6bb..12d55d3f7eb 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsdb.c,v 1.8 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: fsdb.c,v 1.9 2002/02/16 21:27:34 millert Exp $ */ /* $NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $ */ /*- @@ -68,16 +68,16 @@ static char rcsid[] = "$NetBSD: fsdb.c,v 1.4 1996/03/21 17:56:15 jtc Exp $"; extern char *__progname; /* from crt0.o */ -int main __P((int, char *[])); -static void usage __P((void)); -static int cmdloop __P((void)); -static int helpfn __P((int, char *[])); -static char *prompt __P((EditLine *)); -static int scannames __P((struct inodesc *)); -static int dolookup __P((char *)); -static int chinumfunc __P((struct inodesc *)); -static int chnamefunc __P((struct inodesc *)); -static int dotime __P((char *, int32_t *, int32_t *)); +int main(int, char *[]); +static void usage(void); +static int cmdloop(void); +static int helpfn(int, char *[]); +static char *prompt(EditLine *); +static int scannames(struct inodesc *); +static int dolookup(char *); +static int chinumfunc(struct inodesc *); +static int chnamefunc(struct inodesc *); +static int dotime(char *, int32_t *, int32_t *); int returntosingle = 0; struct dinode *curinode; @@ -132,7 +132,7 @@ main(argc, argv) exit(rval); } -#define CMDFUNC(func) static int func __P((int argc, char *argv[])) +#define CMDFUNC(func) static int func(int argc, char *argv[]) #define CMDFUNCSTART(func) static int func(argc, argv) \ int argc; \ char *argv[]; diff --git a/sbin/fsdb/fsdb.h b/sbin/fsdb/fsdb.h index 63a2e2f0db7..cfed3d503ed 100644 --- a/sbin/fsdb/fsdb.h +++ b/sbin/fsdb/fsdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsdb.h,v 1.3 1997/01/16 04:04:20 millert Exp $ */ +/* $OpenBSD: fsdb.h,v 1.4 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: fsdb.h,v 1.4 1996/09/28 19:30:36 christos Exp $ */ /*- @@ -37,10 +37,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -extern int bread __P((int fd, char *buf, daddr_t blk, long size)); -extern void bwrite __P((int fd, char *buf, daddr_t blk, long size)); -extern void rwerror __P((char *mesg, daddr_t blk)); -extern int reply __P((char *question)); +extern int bread(int fd, char *buf, daddr_t blk, long size); +extern void bwrite(int fd, char *buf, daddr_t blk, long size); +extern void rwerror(char *mesg, daddr_t blk); +extern int reply(char *question); extern long dev_bsize; extern long secsize; @@ -52,14 +52,14 @@ struct cmdtable { const char *helptxt; unsigned int minargc; unsigned int maxargc; - int (*handler) __P((int argc, char *argv[])); + int (*handler)(int argc, char *argv[]); }; extern struct dinode *curinode; extern ino_t curinum; -char **crack __P((char *, int *)); -int argcount __P((struct cmdtable *, int, char *[])); -void printstat __P((const char *, ino_t, struct dinode *)); -int checkactive __P((void)); -int checkactivedir __P((void)); -int printactive __P((void)); +char **crack(char *, int *); +int argcount(struct cmdtable *, int, char *[]); +void printstat(const char *, ino_t, struct dinode *); +int checkactive(void); +int checkactivedir(void); +int printactive(void); diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c index dbb67b431b6..a76defcc476 100644 --- a/sbin/fsirand/fsirand.c +++ b/sbin/fsirand/fsirand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Exp $ */ +/* $OpenBSD: fsirand.c,v 1.14 2002/02/16 21:27:35 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Exp $"; +static char rcsid[] = "$OpenBSD: fsirand.c,v 1.14 2002/02/16 21:27:35 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -50,8 +50,8 @@ static char rcsid[] = "$OpenBSD: fsirand.c,v 1.13 1998/06/21 22:13:55 millert Ex #include <unistd.h> #include <util.h> -void usage __P((int)); -int fsirand __P((char *)); +void usage(int); +int fsirand(char *); extern char *__progname; diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 4c72df2e55a..39f6d6f786c 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.55 2001/11/13 18:08:21 mickey Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -81,7 +81,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #else -static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.55 2001/11/13 18:08:21 mickey Exp $"; +static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.56 2002/02/16 21:27:35 millert Exp $"; #endif #endif /* not lint */ @@ -159,43 +159,43 @@ int explicit_prefix = 0; int Lflag = 1; #endif -void notealias __P((char *, int)); -void notrailers __P((char *, int)); -void setifaddr __P((char *, int)); -void setifdstaddr __P((char *, int)); -void setifflags __P((char *, int)); -void setifbroadaddr __P((char *)); -void setifipdst __P((char *)); -void setifmetric __P((char *)); -void setifmtu __P((char *, int)); -void setifnwid __P((char *, int)); -void setifnetmask __P((char *)); -void setifprefixlen __P((char *, int)); -void setnsellength __P((char *)); -void setsnpaoffset __P((char *)); -void setipxframetype __P((char *, int)); -void setatrange __P((char *, int)); -void setatphase __P((char *, int)); -void settunnel __P((char *, char *)); -void deletetunnel __P((void)); +void notealias(char *, int); +void notrailers(char *, int); +void setifaddr(char *, int); +void setifdstaddr(char *, int); +void setifflags(char *, int); +void setifbroadaddr(char *); +void setifipdst(char *); +void setifmetric(char *); +void setifmtu(char *, int); +void setifnwid(char *, int); +void setifnetmask(char *); +void setifprefixlen(char *, int); +void setnsellength(char *); +void setsnpaoffset(char *); +void setipxframetype(char *, int); +void setatrange(char *, int); +void setatphase(char *, int); +void settunnel(char *, char *); +void deletetunnel(void); #ifdef INET6 -void setia6flags __P((char *, int)); -void setia6pltime __P((char *, int)); -void setia6vltime __P((char *, int)); -void setia6lifetime __P((char *, char *)); +void setia6flags(char *, int); +void setia6pltime(char *, int); +void setia6vltime(char *, int); +void setia6lifetime(char *, char *); #endif -void checkatrange __P ((struct sockaddr_at *)); -void setmedia __P((char *, int)); -void setmediaopt __P((char *, int)); -void unsetmediaopt __P((char *, int)); -void setmediainst __P((char *, int)); -void setvlantag __P((char *, int)); -void setvlandev __P((char *, int)); -void unsetvlandev __P((char *, int)); +void checkatrange(struct sockaddr_at *); +void setmedia(char *, int); +void setmediaopt(char *, int); +void unsetmediaopt(char *, int); +void setmediainst(char *, int); +void setvlantag(char *, int); +void setvlandev(char *, int); +void unsetvlandev(char *, int); void vlan_status (); -void fixnsel __P((struct sockaddr_iso *)); -int main __P((int, char *[])); -int prefix __P((void *val, int)); +void fixnsel(struct sockaddr_iso *); +int main(int, char *[]); +int prefix(void *val, int); /* * Media stuff. Whenever a media command is first performed, the @@ -291,47 +291,47 @@ const struct cmd { }; void adjust_nsellength(); -int getinfo __P((struct ifreq *)); -void getsock __P((int)); -void printif __P((struct ifreq *, int)); -void printb __P((char *, unsigned short, char *)); -void status __P((int)); +int getinfo(struct ifreq *); +void getsock(int); +void printif(struct ifreq *, int); +void printb(char *, unsigned short, char *); +void status(int); void usage(); -char *sec2str __P((time_t)); +char *sec2str(time_t); -const char *get_media_type_string __P((int)); -const char *get_media_subtype_string __P((int)); -int get_media_subtype __P((int, const char *)); -int get_media_options __P((int, const char *)); +const char *get_media_type_string(int); +const char *get_media_subtype_string(int); +int get_media_subtype(int, const char *); +int get_media_options(int, const char *); int lookup_media_word __P((const struct ifmedia_description *, int, const char *)); -void print_media_word __P((int, int, int)); -void process_media_commands __P((void)); -void init_current_media __P((void)); +void print_media_word(int, int, int); +void process_media_commands(void); +void init_current_media(void); /* * XNS support liberally adapted from code written at the University of * Maryland principally by James O'Toole and Chris Torek. */ -void in_status __P((int)); -void in_getaddr __P((char *, int)); -void in_getprefix __P((char *, int)); +void in_status(int); +void in_getaddr(char *, int); +void in_getprefix(char *, int); #ifdef INET6 -void in6_fillscopeid __P((struct sockaddr_in6 *sin6)); -void in6_alias __P((struct in6_ifreq *)); -void in6_status __P((int)); -void in6_getaddr __P((char *, int)); -void in6_getprefix __P((char *, int)); +void in6_fillscopeid(struct sockaddr_in6 *sin6); +void in6_alias(struct in6_ifreq *); +void in6_status(int); +void in6_getaddr(char *, int); +void in6_getprefix(char *, int); #endif -void at_status __P((int)); -void at_getaddr __P((char *, int)); -void xns_status __P((int)); -void xns_getaddr __P((char *, int)); -void ipx_status __P((int)); -void ipx_getaddr __P((char *, int)); -void iso_status __P((int)); -void iso_getaddr __P((char *, int)); -void ieee80211_status __P((void)); +void at_status(int); +void at_getaddr(char *, int); +void xns_status(int); +void xns_getaddr(char *, int); +void ipx_status(int); +void ipx_getaddr(char *, int); +void iso_status(int); +void iso_getaddr(char *, int); +void ieee80211_status(void); /* Known address families */ const struct afswtch { diff --git a/sbin/init/init.c b/sbin/init/init.c index 30a62c17039..9cabc9c0409 100644 --- a/sbin/init/init.c +++ b/sbin/init/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $ */ +/* $OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)init.c 8.2 (Berkeley) 4/28/95"; #else -static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $"; +static char rcsid[] = "$OpenBSD: init.c,v 1.24 2002/02/16 21:27:35 millert Exp $"; #endif #endif /* not lint */ @@ -105,38 +105,38 @@ static char rcsid[] = "$OpenBSD: init.c,v 1.23 2001/11/05 07:39:16 mpech Exp $"; #define DEFAULT_STATE runcom #endif -void handle __P((sig_t, ...)); -void delset __P((sigset_t *, ...)); +void handle(sig_t, ...); +void delset(sigset_t *, ...); -void stall __P((char *, ...)); -void warning __P((char *, ...)); -void emergency __P((char *, ...)); -void disaster __P((int)); -void badsys __P((int)); +void stall(char *, ...); +void warning(char *, ...); +void emergency(char *, ...); +void disaster(int); +void badsys(int); /* * We really need a recursive typedef... * The following at least guarantees that the return type of (*state_t)() * is sufficiently wide to hold a function pointer. */ -typedef long (*state_func_t) __P((void)); -typedef state_func_t (*state_t) __P((void)); - -state_func_t single_user __P((void)); -state_func_t runcom __P((void)); -state_func_t read_ttys __P((void)); -state_func_t multi_user __P((void)); -state_func_t clean_ttys __P((void)); -state_func_t catatonia __P((void)); -state_func_t death __P((void)); -state_func_t nice_death __P((void)); +typedef long (*state_func_t)(void); +typedef state_func_t (*state_t)(void); + +state_func_t single_user(void); +state_func_t runcom(void); +state_func_t read_ttys(void); +state_func_t multi_user(void); +state_func_t clean_ttys(void); +state_func_t catatonia(void); +state_func_t death(void); +state_func_t nice_death(void); enum { AUTOBOOT, FASTBOOT } runcom_mode = AUTOBOOT; -void transition __P((state_t)); +void transition(state_t); state_t requested_transition = DEFAULT_STATE; -void setctty __P((char *)); +void setctty(char *); typedef struct init_session { int se_index; /* index of entry in ttys file */ @@ -155,33 +155,33 @@ typedef struct init_session { struct init_session *se_next; } session_t; -void free_session __P((session_t *)); -session_t *new_session __P((session_t *, int, struct ttyent *)); +void free_session(session_t *); +session_t *new_session(session_t *, int, struct ttyent *); session_t *sessions; -char **construct_argv __P((char *)); -void start_window_system __P((session_t *)); -void collect_child __P((pid_t)); -pid_t start_getty __P((session_t *)); -void transition_handler __P((int)); -void alrm_handler __P((int)); -void setsecuritylevel __P((int)); -int getsecuritylevel __P((void)); -int setupargv __P((session_t *, struct ttyent *)); +char **construct_argv(char *); +void start_window_system(session_t *); +void collect_child(pid_t); +pid_t start_getty(session_t *); +void transition_handler(int); +void alrm_handler(int); +void setsecuritylevel(int); +int getsecuritylevel(void); +int setupargv(session_t *, struct ttyent *); int clang; #ifdef LOGIN_CAP -void setprocresources __P((char *)); +void setprocresources(char *); #else #define setprocresources(p) #endif -void clear_session_logs __P((session_t *)); +void clear_session_logs(session_t *); -int start_session_db __P((void)); -void add_session __P((session_t *)); -void del_session __P((session_t *)); -session_t *find_session __P((pid_t)); +int start_session_db(void); +void add_session(session_t *); +void del_session(session_t *); +session_t *find_session(pid_t); DB *session_db; /* diff --git a/sbin/isakmpd/sysdep/common/blf.h b/sbin/isakmpd/sysdep/common/blf.h index 042668138bc..6c5cd97a37c 100644 --- a/sbin/isakmpd/sysdep/common/blf.h +++ b/sbin/isakmpd/sysdep/common/blf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: blf.h,v 1.1 2001/01/26 11:33:59 niklas Exp $ */ +/* $OpenBSD: blf.h,v 1.2 2002/02/16 21:27:35 millert Exp $ */ /* * Blowfish - a fast block cipher designed by Bruce Schneier * @@ -60,20 +60,20 @@ typedef struct BlowfishContext { * Blowfish_expand0state( state, key, keylen ) */ -void Blowfish_encipher __P((blf_ctx *, u_int32_t *, u_int32_t *)); -void Blowfish_decipher __P((blf_ctx *, u_int32_t *, u_int32_t *)); -void Blowfish_initstate __P((blf_ctx *)); -void Blowfish_expand0state __P((blf_ctx *, const u_int8_t *, u_int16_t)); +void Blowfish_encipher(blf_ctx *, u_int32_t *, u_int32_t *); +void Blowfish_decipher(blf_ctx *, u_int32_t *, u_int32_t *); +void Blowfish_initstate(blf_ctx *); +void Blowfish_expand0state(blf_ctx *, const u_int8_t *, u_int16_t); void Blowfish_expandstate - __P((blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t)); +(blf_ctx *, const u_int8_t *, u_int16_t, const u_int8_t *, u_int16_t); /* Standard Blowfish */ -void blf_key __P((blf_ctx *, const u_int8_t *, u_int16_t)); -void blf_enc __P((blf_ctx *, u_int32_t *, u_int16_t)); -void blf_dec __P((blf_ctx *, u_int32_t *, u_int16_t)); +void blf_key(blf_ctx *, const u_int8_t *, u_int16_t); +void blf_enc(blf_ctx *, u_int32_t *, u_int16_t); +void blf_dec(blf_ctx *, u_int32_t *, u_int16_t); /* Converts u_int8_t to u_int32_t */ -u_int32_t Blowfish_stream2word __P((const u_int8_t *, u_int16_t , u_int16_t *)); +u_int32_t Blowfish_stream2word(const u_int8_t *, u_int16_t , u_int16_t *); #endif diff --git a/sbin/isakmpd/sysdep/linux/sysdep-os.h b/sbin/isakmpd/sysdep/linux/sysdep-os.h index 74e051c4f33..bdf9e25a979 100644 --- a/sbin/isakmpd/sysdep/linux/sysdep-os.h +++ b/sbin/isakmpd/sysdep/linux/sysdep-os.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep-os.h,v 1.4 2001/01/28 22:38:49 niklas Exp $ */ +/* $OpenBSD: sysdep-os.h,v 1.5 2002/02/16 21:27:35 millert Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -43,7 +43,7 @@ typedef u_int32_t in_addr_t; /* * Why -D__USE_GNU does not work in order to get this from stdio.h beats me. */ -extern int asprintf __P((char **, const char *, ...)); +extern int asprintf(char **, const char *, ...); #endif #define DL_LAZY RTLD_LAZY diff --git a/sbin/kbd/main.c b/sbin/kbd/main.c index b159d7b3e95..85a0f946fcf 100644 --- a/sbin/kbd/main.c +++ b/sbin/kbd/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.3 1997/09/14 10:37:58 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.4 2002/02/16 21:27:35 millert Exp $ */ /* * Copyright (c) 1996 Juergen Hannken-Illjes @@ -35,8 +35,8 @@ #include <unistd.h> #include <stdio.h> -extern void kbd_list __P((void)); -extern void kbd_set __P((char *, int)); +extern void kbd_list(void); +extern void kbd_set(char *, int); extern char *__progname; diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c index 58a1da1127f..d4da3e0e8fa 100644 --- a/sbin/mknod/mknod.c +++ b/sbin/mknod/mknod.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $ */ +/* $OpenBSD: mknod.c,v 1.10 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: mknod.c,v 1.8 1995/08/11 00:08:18 jtc Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mknod.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mknod.c,v 1.10 2002/02/16 21:27:35 millert Exp $"; #endif #endif /* not lint */ @@ -62,9 +62,9 @@ static char rcsid[] = "$OpenBSD: mknod.c,v 1.9 2001/07/07 18:26:14 deraadt Exp $ extern char *__progname; -int domknod __P((int, char **, mode_t)); -int domkfifo __P((int, char **, mode_t)); -void usage __P((int)); +int domknod(int, char **, mode_t); +int domkfifo(int, char **, mode_t); +void usage(int); int main(argc, argv) diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c index abce30d4959..0fb8c972aa7 100644 --- a/sbin/modload/modload.c +++ b/sbin/modload/modload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modload.c,v 1.32 2002/01/09 00:02:52 ericj Exp $ */ +/* $OpenBSD: modload.c,v 1.33 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: modload.c,v 1.30 2001/11/08 15:33:15 christos Exp $ */ /* @@ -67,7 +67,7 @@ char *out = NULL; int symtab = 1; int Sflag; -static void cleanup __P((void)); +static void cleanup(void); /* prelink the module */ static int diff --git a/sbin/modload/modload.h b/sbin/modload/modload.h index 80ba2f315be..2cb62243b73 100644 --- a/sbin/modload/modload.h +++ b/sbin/modload/modload.h @@ -1,4 +1,4 @@ -/* $OpenBSD: modload.h,v 1.1 2002/01/08 21:28:38 ericj Exp $ */ +/* $OpenBSD: modload.h,v 1.2 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: modload.h,v 1.2 2001/11/08 15:33:15 christos Exp $ */ /* @@ -38,17 +38,17 @@ int elf_mod_sizes __P((int, size_t *, int *, struct lmc_resrv *, struct stat *)); -void *elf_mod_load __P((int)); +void *elf_mod_load(int); void elf_linkcmd __P((char*, size_t, const char*, const char*, const char*, const void*, const char*)); -void elf_mod_symload __P((int)); +void elf_mod_symload(int); int a_out_mod_sizes __P((int, size_t *, int *, struct lmc_resrv *, struct stat *)); -void *a_out_mod_load __P((int)); +void *a_out_mod_load(int); void a_out_linkcmd __P((char*, size_t, const char*, const char*, const char*, const void*, const char*)); -void a_out_mod_symload __P((int)); +void a_out_mod_symload(int); #ifndef USE_AOUT #define mod_sizes elf_mod_sizes diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h index 890fde93e0a..eebb6115df1 100644 --- a/sbin/mount/mntopts.h +++ b/sbin/mount/mntopts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mntopts.h,v 1.7 2001/04/04 20:19:00 gluk Exp $ */ +/* $OpenBSD: mntopts.h,v 1.8 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: mntopts.h,v 1.3 1995/03/18 14:56:59 cgd Exp $ */ /*- @@ -86,4 +86,4 @@ struct mntopt { MOPT_RDONLY, \ MOPT_UNION -void getmntopts __P((const char *, const struct mntopt *, int *)); +void getmntopts(const char *, const struct mntopt *, int *); diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index dc543569320..36f9bc80214 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $ */ +/* $OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $ */ /* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount.c 8.19 (Berkeley) 4/19/94"; #else -static char rcsid[] = "$OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $"; +static char rcsid[] = "$OpenBSD: mount.c,v 1.25 2002/02/16 21:27:35 millert Exp $"; #endif #endif /* not lint */ @@ -75,18 +75,18 @@ static char rcsid[] = "$OpenBSD: mount.c,v 1.24 2002/01/18 01:37:27 mickey Exp $ int debug, verbose; char **typelist = NULL; -int selected __P((const char *)); -char *catopt __P((char *, const char *)); +int selected(const char *); +char *catopt(char *, const char *); struct statfs - *getmntpt __P((const char *)); -int hasopt __P((const char *, const char *)); -void maketypelist __P((char *)); -void mangle __P((char *, int *, const char **)); + *getmntpt(const char *); +int hasopt(const char *, const char *); +void maketypelist(char *); +void mangle(char *, int *, const char **); int mountfs __P((const char *, const char *, const char *, int, const char *, const char *, int)); -void prmount __P((struct statfs *)); -int disklabelcheck __P((struct fstab *)); -void usage __P((void)); +void prmount(struct statfs *); +int disklabelcheck(struct fstab *); +void usage(void); /* Map from mount options to printable formats. */ static struct opt { diff --git a/sbin/mount_ados/mount_ados.c b/sbin/mount_ados/mount_ados.c index 46feeae01b6..61ebe19cbf1 100644 --- a/sbin/mount_ados/mount_ados.c +++ b/sbin/mount_ados/mount_ados.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $ */ +/* $OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_ados.c,v 1.5 1996/04/13 01:30:59 jtc Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.7 1997/08/24 08:07:05 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount_ados.c,v 1.8 2002/02/16 21:27:36 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -56,10 +56,10 @@ const struct mntopt mopts[] = { { NULL } }; -gid_t a_gid __P((char *)); -uid_t a_uid __P((char *)); -mode_t a_mask __P((char *)); -void usage __P((void)); +gid_t a_gid(char *); +uid_t a_uid(char *); +mode_t a_mask(char *); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 517b11cd2f2..4a35f1f5b74 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_cd9660.c,v 1.11 2000/07/31 01:57:06 pjanzen Exp $ */ +/* $OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_cd9660.c,v 1.3 1996/04/13 01:31:08 jtc Exp $ */ /* @@ -49,7 +49,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_cd9660.c 8.4 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.11 2000/07/31 01:57:06 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: mount_cd9660.c,v 1.12 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -72,7 +72,7 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c index 41c6a133853..a7bdf9cc990 100644 --- a/sbin/mount_ext2fs/mount_ext2fs.c +++ b/sbin/mount_ext2fs/mount_ext2fs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $ */ +/* $OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.8 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraad #include "mntopts.h" -void ext2fs_usage __P((void)); +void ext2fs_usage(void); static const struct mntopt mopts[] = { MOPT_STDOPTS, diff --git a/sbin/mount_fdesc/mount_fdesc.c b/sbin/mount_fdesc/mount_fdesc.c index be6b4aece8d..44c1b8b2c15 100644 --- a/sbin/mount_fdesc/mount_fdesc.c +++ b/sbin/mount_fdesc/mount_fdesc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $ */ +/* $OpenBSD: mount_fdesc.c,v 1.7 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_fdesc.c,v 1.7 1996/04/13 01:31:15 jtc Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_fdesc.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.6 1997/08/24 08:07:11 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount_fdesc.c,v 1.7 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -69,7 +69,7 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c index 7e4d88dd532..29e2f343467 100644 --- a/sbin/mount_ffs/mount_ffs.c +++ b/sbin/mount_ffs/mount_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp $ */ +/* $OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_ufs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp $"; +static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.12 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -60,7 +60,7 @@ static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.11 2001/04/04 20:19:01 gluk Exp #include "mntopts.h" -void ffs_usage __P((void)); +void ffs_usage(void); static const struct mntopt mopts[] = { MOPT_STDOPTS, diff --git a/sbin/mount_kernfs/mount_kernfs.c b/sbin/mount_kernfs/mount_kernfs.c index 3ef864409f6..24e785cd8ac 100644 --- a/sbin/mount_kernfs/mount_kernfs.c +++ b/sbin/mount_kernfs/mount_kernfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_kernfs.c,v 1.7 1998/12/21 16:14:40 mickey Exp $ */ +/* $OpenBSD: mount_kernfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_kernfs.c,v 1.8 1996/04/13 05:35:39 cgd Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_kernfs.c 8.2 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.7 1998/12/21 16:14:40 mickey Exp $"; +static char rcsid[] = "$OpenBSD: mount_kernfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -69,7 +69,7 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c index 3e4c35ef43b..eb1bec192c5 100644 --- a/sbin/mount_lfs/mount_lfs.c +++ b/sbin/mount_lfs/mount_lfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $ */ +/* $OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_lfs.c,v 1.4 1996/04/13 05:35:44 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mount_lfs.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.5 1997/01/15 23:41:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: mount_lfs.c,v 1.6 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -68,8 +68,8 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); -void invoke_cleaner __P((char *)); +void usage(void); +void invoke_cleaner(char *); int short_rds, cleaner_debug; diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 5eade9a29d2..5f642b02c7e 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.12 1999/04/20 23:06:47 millert Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.12 1999/04/20 23:06:47 millert Exp $"; +static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.13 2002/02/16 21:27:36 millert Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -57,10 +57,10 @@ const struct mntopt mopts[] = { { NULL } }; -gid_t a_gid __P((char *)); -uid_t a_uid __P((char *)); -mode_t a_mask __P((char *)); -void usage __P((void)); +gid_t a_gid(char *); +uid_t a_uid(char *); +mode_t a_mask(char *); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_nfs/mntopts.h b/sbin/mount_nfs/mntopts.h index 8b98770c42a..2e85b063150 100644 --- a/sbin/mount_nfs/mntopts.h +++ b/sbin/mount_nfs/mntopts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mntopts.h,v 1.1 1996/03/21 00:16:00 niklas Exp $ */ +/* $OpenBSD: mntopts.h,v 1.2 2002/02/16 21:27:36 millert Exp $ */ /*- * Copyright (c) 1994 @@ -78,5 +78,5 @@ struct mntopt { MOPT_RDONLY, \ MOPT_UNION -void getmntopts __P((const char *, const struct mntopt *, int *, int *)); +void getmntopts(const char *, const struct mntopt *, int *, int *); extern int getmnt_silent; diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index eb044a04a33..b0a79acb195 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_nfs.c,v 1.26 2001/12/01 19:13:48 deraadt Exp $ */ +/* $OpenBSD: mount_nfs.c,v 1.27 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_nfs.c,v 1.12.4.1 1996/05/25 22:48:05 fvdl Exp $ */ /* @@ -168,14 +168,14 @@ u_short port_no = 0; int force2 = 0; int force3 = 0; -int getnfsargs __P((char *, struct nfs_args *)); +int getnfsargs(char *, struct nfs_args *); #ifdef ISO -struct iso_addr *iso_addr __P((const char *)); +struct iso_addr *iso_addr(const char *); #endif -void set_rpc_maxgrouplist __P((int)); -__dead void usage __P((void)); -int xdr_dir __P((XDR *, char *)); -int xdr_fh __P((XDR *, struct nfhret *)); +void set_rpc_maxgrouplist(int); +__dead void usage(void); +int xdr_dir(XDR *, char *); +int xdr_fh(XDR *, struct nfhret *); int main(argc, argv) diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c index 4e01fc03154..308fc09e7b9 100644 --- a/sbin/mount_null/mount_null.c +++ b/sbin/mount_null/mount_null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $ */ +/* $OpenBSD: mount_null.c,v 1.7 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_null.c,v 1.3 1996/04/13 01:31:49 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_null.c 8.5 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_null.c,v 1.6 1997/08/24 08:07:14 downsj Exp $"; +static char rcsid[] = "$OpenBSD: mount_null.c,v 1.7 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -69,8 +69,8 @@ const struct mntopt mopts[] = { { NULL } }; -int subdir __P((const char *, const char *)); -void usage __P((void)); +int subdir(const char *, const char *); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c index ae095ca118b..f996fe81cbb 100644 --- a/sbin/mount_portal/mount_portal.c +++ b/sbin/mount_portal/mount_portal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_portal.c,v 1.17 2001/12/08 23:42:57 miod Exp $ */ +/* $OpenBSD: mount_portal.c,v 1.18 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_portal.c,v 1.8 1996/04/13 01:31:54 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_portal.c 8.6 (Berkeley) 4/26/95"; #else -static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.17 2001/12/08 23:42:57 miod Exp $"; +static char rcsid[] = "$OpenBSD: mount_portal.c,v 1.18 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ extern char *__progname; /* from crt0.o */ static char *mountpt; /* made available to signal handler */ -static void usage __P((void)); +static void usage(void); static volatile sig_atomic_t readcf; /* Set when SIGHUP received */ diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h index 273fdb8f3a4..e9003655d8e 100644 --- a/sbin/mount_portal/portald.h +++ b/sbin/mount_portal/portald.h @@ -1,4 +1,4 @@ -/* $OpenBSD: portald.h,v 1.3 1997/03/23 03:52:15 millert Exp $ */ +/* $OpenBSD: portald.h,v 1.4 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: portald.h,v 1.4 1995/04/23 10:33:23 cgd Exp $ */ /* @@ -79,6 +79,6 @@ extern int portal_tcp __P((struct portal_cred *, /* * Global functions */ -extern void activate __P((qelem *q, int so)); -extern char **conf_match __P((qelem *q, char *key)); -extern void conf_read __P((qelem *q, char *conf)); +extern void activate(qelem *q, int so); +extern char **conf_match(qelem *q, char *key); +extern void conf_read(qelem *q, char *conf); diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c index dce84a64bbc..ec0f7252df6 100644 --- a/sbin/mount_procfs/mount_procfs.c +++ b/sbin/mount_procfs/mount_procfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_procfs.c,v 1.7 2001/04/09 07:14:20 tholo Exp $ */ +/* $OpenBSD: mount_procfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $ */ /* @@ -48,7 +48,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_procfs.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.7 2001/04/09 07:14:20 tholo Exp $"; +static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.8 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -72,7 +72,7 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_tcfs/mount_tcfs.c b/sbin/mount_tcfs/mount_tcfs.c index 370519d48ef..de3df97ad60 100644 --- a/sbin/mount_tcfs/mount_tcfs.c +++ b/sbin/mount_tcfs/mount_tcfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_tcfs.c,v 1.4 2000/06/21 05:28:25 fgsch Exp $ */ +/* $OpenBSD: mount_tcfs.c,v 1.5 2002/02/16 21:27:36 millert Exp $ */ /* * Copyright (c) 1992, 1993, 1994 @@ -59,8 +59,8 @@ const struct mntopt mopts[] = { { NULL } }; -int subdir __P((const char *, const char *)); -void tcfs_usage __P((void)); +int subdir(const char *, const char *); +void tcfs_usage(void); int main(argc, argv) diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c index 3112292a646..6b68b63a801 100644 --- a/sbin/mount_umap/mount_umap.c +++ b/sbin/mount_umap/mount_umap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_umap.c,v 1.8 2001/01/31 22:32:30 deraadt Exp $ */ +/* $OpenBSD: mount_umap.c,v 1.9 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_umap.c,v 1.5 1996/04/13 01:32:05 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_umap.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.8 2001/01/31 22:32:30 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_umap.c,v 1.9 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -89,7 +89,7 @@ const struct mntopt mopts[] = { { NULL } }; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/sbin/mount_union/mount_union.c b/sbin/mount_union/mount_union.c index f9a4a2a7429..93cc15f2551 100644 --- a/sbin/mount_union/mount_union.c +++ b/sbin/mount_union/mount_union.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_union.c,v 1.6 1997/08/24 06:52:01 deraadt Exp $ */ +/* $OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mount_union.c,v 1.3 1996/04/13 01:32:11 jtc Exp $ */ /* @@ -47,7 +47,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_union.c,v 1.6 1997/08/24 06:52:01 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mount_union.c,v 1.7 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -70,8 +70,8 @@ const struct mntopt mopts[] = { { NULL } }; -int subdir __P((const char *, const char *)); -void usage __P((void)); +int subdir(const char *, const char *); +void usage(void); int main(argc, argv) diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index d38e4f3244c..249f2677c64 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mountd.c,v 1.41 2001/12/02 02:05:59 deraadt Exp $ */ +/* $OpenBSD: mountd.c,v 1.42 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: mountd.c,v 1.31 1996/02/18 11:57:53 fvdl Exp $ */ /* @@ -149,50 +149,50 @@ struct fhreturn { }; /* Global defs */ -char *add_expdir __P((struct dirlist **, char *, int)); +char *add_expdir(struct dirlist **, char *, int); void add_dlist __P((struct dirlist **, struct dirlist *, struct grouplist *, int)); -void add_mlist __P((char *, char *)); -int check_dirpath __P((char *)); -int check_options __P((struct dirlist *)); -int chk_host __P((struct dirlist *, in_addr_t, int *, int *)); -void del_mlist __P((char *, char *)); -struct dirlist *dirp_search __P((struct dirlist *, char *)); +void add_mlist(char *, char *); +int check_dirpath(char *); +int check_options(struct dirlist *); +int chk_host(struct dirlist *, in_addr_t, int *, int *); +void del_mlist(char *, char *); +struct dirlist *dirp_search(struct dirlist *, char *); int do_mount __P((struct exportlist *, struct grouplist *, int, struct ucred *, char *, int, struct statfs *)); int do_opt __P((char **, char **, struct exportlist *, struct grouplist *, int *, int *, struct ucred *)); -struct exportlist *ex_search __P((fsid_t *)); -struct exportlist *get_exp __P((void)); -void free_dir __P((struct dirlist *)); -void free_exp __P((struct exportlist *)); -void free_grp __P((struct grouplist *)); -void free_host __P((struct hostlist *)); -void new_exportlist __P((void)); -void get_exportlist __P((void)); -int get_host __P((char *, struct grouplist *, struct grouplist *)); -int get_num __P((char *)); -struct hostlist *get_ht __P((void)); -int get_line __P((void)); -void get_mountlist __P((void)); -int get_net __P((char *, struct netmsk *, int)); -void getexp_err __P((struct exportlist *, struct grouplist *)); -struct grouplist *get_grp __P((void)); +struct exportlist *ex_search(fsid_t *); +struct exportlist *get_exp(void); +void free_dir(struct dirlist *); +void free_exp(struct exportlist *); +void free_grp(struct grouplist *); +void free_host(struct hostlist *); +void new_exportlist(void); +void get_exportlist(void); +int get_host(char *, struct grouplist *, struct grouplist *); +int get_num(char *); +struct hostlist *get_ht(void); +int get_line(void); +void get_mountlist(void); +int get_net(char *, struct netmsk *, int); +void getexp_err(struct exportlist *, struct grouplist *); +struct grouplist *get_grp(void); void hang_dirp __P((struct dirlist *, struct grouplist *, struct exportlist *, int)); -void mntsrv __P((struct svc_req *, SVCXPRT *)); -void nextfield __P((char **, char **)); -void out_of_mem __P((void)); -void parsecred __P((char *, struct ucred *)); -int put_exlist __P((struct dirlist *, XDR *, struct dirlist *, int *)); -int scan_tree __P((struct dirlist *, in_addr_t)); -void send_umntall __P((void)); -int umntall_each __P((caddr_t, struct sockaddr_in *)); -int xdr_dir __P((XDR *, char *)); -int xdr_explist __P((XDR *, caddr_t)); -int xdr_fhs __P((XDR *, caddr_t)); -int xdr_mlist __P((XDR *, caddr_t)); -void mountd_svc_run __P((void)); +void mntsrv(struct svc_req *, SVCXPRT *); +void nextfield(char **, char **); +void out_of_mem(void); +void parsecred(char *, struct ucred *); +int put_exlist(struct dirlist *, XDR *, struct dirlist *, int *); +int scan_tree(struct dirlist *, in_addr_t); +void send_umntall(void); +int umntall_each(caddr_t, struct sockaddr_in *); +int xdr_dir(XDR *, char *); +int xdr_explist(XDR *, caddr_t); +int xdr_fhs(XDR *, caddr_t); +int xdr_mlist(XDR *, caddr_t); +void mountd_svc_run(void); struct exportlist *exphead; struct mountlist *mlhead; @@ -289,8 +289,8 @@ main(argc, argv) fprintf(pidfile, "%d\n", getpid()); fclose(pidfile); - signal(SIGHUP, (void (*) __P((int))) new_exportlist); - signal(SIGTERM, (void (*) __P((int))) send_umntall); + signal(SIGHUP, (void (*)(int)) new_exportlist); + signal(SIGTERM, (void (*)(int)) send_umntall); signal(SIGSYS, SIG_IGN); if ((udptransp = svcudp_create(RPC_ANYSOCK)) == NULL || (tcptransp = svctcp_create(RPC_ANYSOCK, 0, 0)) == NULL) { diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 07fc32194ca..3d1bf1fef86 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.c +++ b/sbin/ncheck_ffs/ncheck_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncheck_ffs.c,v 1.8 2001/12/01 19:05:39 deraadt Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.8 2001/12/01 19:05:39 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.9 2002/02/16 21:27:36 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -72,20 +72,20 @@ struct icache_s { } *icache; int nicache; -void addinode __P((ino_t inum)); -struct dinode *getino __P((ino_t inum)); -void findinodes __P((ino_t)); -void bread __P((daddr_t, char *, int)); -void usage __P((void)); -void scanonedir __P((ino_t, const char *)); -void dirindir __P((ino_t, daddr_t, int, long *, const char *)); -void searchdir __P((ino_t, daddr_t, long, long, const char *)); -int matchino __P((const void *, const void *)); -int matchcache __P((const void *, const void *)); -void cacheino __P((ino_t, struct dinode *)); -struct dinode *cached __P((ino_t)); -int main __P((int, char *[])); -char *rawname __P((char *)); +void addinode(ino_t inum); +struct dinode *getino(ino_t inum); +void findinodes(ino_t); +void bread(daddr_t, char *, int); +void usage(void); +void scanonedir(ino_t, const char *); +void dirindir(ino_t, daddr_t, int, long *, const char *); +void searchdir(ino_t, daddr_t, long, long, const char *); +int matchino(const void *, const void *); +int matchcache(const void *, const void *); +void cacheino(ino_t, struct dinode *); +struct dinode *cached(ino_t); +int main(int, char *[]); +char *rawname(char *); /* * Check to see if the indicated inodes are the same diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 0698875c461..a7a00760424 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: newfs.c,v 1.30 2002/02/16 21:27:36 millert Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.29 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.30 2002/02/16 21:27:36 millert Exp $"; #endif #endif /* not lint */ @@ -89,11 +89,11 @@ struct mntopt mopts[] = { { NULL }, }; -void fatal __P((const char *fmt, ...)); -void usage __P((void)); -void mkfs __P((struct partition *, char *, int, int)); -void rewritelabel __P((char *, int, struct disklabel *)); -u_short dkcksum __P((struct disklabel *)); +void fatal(const char *fmt, ...); +void usage(void); +void mkfs(struct partition *, char *, int, int); +void rewritelabel(char *, int, struct disklabel *); +u_short dkcksum(struct disklabel *); #define COMPAT /* allow non-labeled disks */ diff --git a/sbin/newlfs/extern.h b/sbin/newlfs/extern.h index 65ec0cbc77f..b0f100b080b 100644 --- a/sbin/newlfs/extern.h +++ b/sbin/newlfs/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1996/07/01 11:02:54 downsj Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: extern.h,v 1.2 1995/03/18 14:58:48 cgd Exp $ */ /*- @@ -36,13 +36,13 @@ * @(#)extern.h 8.2 (Berkeley) 5/24/95 */ -u_long cksum __P((void *, size_t)); -u_short dkcksum __P((struct disklabel *)); -void fatal __P((const char *fmt, ...)); -u_int log2 __P((u_int)); +u_long cksum(void *, size_t); +u_short dkcksum(struct disklabel *); +void fatal(const char *fmt, ...); +u_int log2(u_int); int make_lfs __P((int, struct disklabel *, struct partition *, int, int, int, int)); -int mkfs __P((struct partition *, char *, int, int)); +int mkfs(struct partition *, char *, int, int); extern char *progname; extern char *special; diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c index 7220287491c..42c7f9abd40 100644 --- a/sbin/newlfs/lfs.c +++ b/sbin/newlfs/lfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: lfs.c,v 1.4 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: lfs.c,v 1.5 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -168,9 +168,9 @@ struct direct lfs_lf_dir[] = { }; static daddr_t make_dinode - __P((ino_t, struct dinode *, int, daddr_t, struct lfs *)); -static void make_dir __P(( void *, struct direct *, int)); -static void put __P((int, off_t, void *, size_t)); +(ino_t, struct dinode *, int, daddr_t, struct lfs *); +static void make_dir( void *, struct direct *, int); +static void put(int, off_t, void *, size_t); int make_lfs(fd, lp, partp, minfree, block_size, frag_size, seg_size) diff --git a/sbin/newlfs/newfs.c b/sbin/newlfs/newfs.c index f41d4101ca5..db9881658fa 100644 --- a/sbin/newlfs/newfs.c +++ b/sbin/newlfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $ */ +/* $OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: newfs.c,v 1.5 1996/05/16 07:17:50 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.5 (Berkeley) 5/24/95"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.8 1999/08/17 09:13:14 millert Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.9 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -118,10 +118,10 @@ int unlabeled; char device[MAXPATHLEN]; char *progname, *special; -static struct disklabel *getdisklabel __P((char *, int)); -static struct disklabel *debug_readlabel __P((int)); -static void rewritelabel __P((char *, int, struct disklabel *)); -static void usage __P((void)); +static struct disklabel *getdisklabel(char *, int); +static struct disklabel *debug_readlabel(int); +static void rewritelabel(char *, int, struct disklabel *); +static void usage(void); int main(argc, argv) diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c index 863d527636b..db151202a95 100644 --- a/sbin/nfsd/nfsd.c +++ b/sbin/nfsd/nfsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsd.c,v 1.15 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: nfsd.c,v 1.16 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $ */ /* @@ -111,9 +111,9 @@ struct timeval ktv; NFSKERBKEYSCHED_T kerb_keysched; #endif -void nonfs __P((int)); -void reapchild __P((int)); -void usage __P((void)); +void nonfs(int); +void reapchild(int); +void usage(void); /* * Nfs server daemon mostly just a user context for nfssvc() diff --git a/sbin/pdisk/file_media.c b/sbin/pdisk/file_media.c index 043bb0596bc..9e518958f3f 100644 --- a/sbin/pdisk/file_media.c +++ b/sbin/pdisk/file_media.c @@ -58,7 +58,7 @@ */ #ifdef __linux__ #define LOFF_MAX 9223372036854775807LL -extern __loff_t llseek __P ((int __fd, __loff_t __offset, int __whence)); +extern __loff_t llseek(int __fd, __loff_t __offset, int __whence); #else #define loff_t long #define llseek lseek diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 98e627e25e7..ccf24ad1ec8 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping.c,v 1.48 2002/01/28 08:08:20 hugh Exp $ */ +/* $OpenBSD: ping.c,v 1.49 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: ping.c,v 1.48 2002/01/28 08:08:20 hugh Exp $"; +static char rcsid[] = "$OpenBSD: ping.c,v 1.49 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -172,16 +172,16 @@ int reset_kerninfo; int bufspace = IP_MAXPACKET; -void fill __P((char *, char *)); +void fill(char *, char *); void catcher(), prtsig(), finish(), summary(int); -int in_cksum __P((u_short *, int)); +int in_cksum(u_short *, int); void pinger(); -char *pr_addr __P((in_addr_t)); -int check_icmph __P((struct ip *)); -void pr_icmph __P((struct icmp *)); -void pr_pack __P((char *, int, struct sockaddr_in *)); -void pr_retip __P((struct ip *)); -quad_t qsqrt __P((quad_t)); +char *pr_addr(in_addr_t); +int check_icmph(struct ip *); +void pr_icmph(struct icmp *); +void pr_pack(char *, int, struct sockaddr_in *); +void pr_retip(struct ip *); +quad_t qsqrt(quad_t); void usage(); int diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c index 0d66fb5ed79..955b261adde 100644 --- a/sbin/ping6/ping6.c +++ b/sbin/ping6/ping6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ping6.c,v 1.40 2001/11/17 22:26:50 deraadt Exp $ */ +/* $OpenBSD: ping6.c,v 1.41 2002/02/16 21:27:37 millert Exp $ */ /* $KAME: ping6.c,v 1.129 2001/06/22 13:16:02 itojun Exp $ */ /* @@ -253,36 +253,36 @@ volatile sig_atomic_t seenint; volatile sig_atomic_t seeninfo; #endif -int main __P((int, char *[])); -void fill __P((char *, char *)); -int get_hoplim __P((struct msghdr *)); -int get_pathmtu __P((struct msghdr *)); -struct in6_pktinfo *get_rcvpktinfo __P((struct msghdr *)); -void onsignal __P((int)); -void retransmit __P((void)); -void onint __P((int)); -size_t pingerlen __P((void)); -int pinger __P((void)); -const char *pr_addr __P((struct sockaddr *, int)); -void pr_icmph __P((struct icmp6_hdr *, u_char *)); -void pr_iph __P((struct ip6_hdr *)); -void pr_suptypes __P((struct icmp6_nodeinfo *, size_t)); -void pr_nodeaddr __P((struct icmp6_nodeinfo *, int)); -int myechoreply __P((const struct icmp6_hdr *)); -int mynireply __P((const struct icmp6_nodeinfo *)); +int main(int, char *[]); +void fill(char *, char *); +int get_hoplim(struct msghdr *); +int get_pathmtu(struct msghdr *); +struct in6_pktinfo *get_rcvpktinfo(struct msghdr *); +void onsignal(int); +void retransmit(void); +void onint(int); +size_t pingerlen(void); +int pinger(void); +const char *pr_addr(struct sockaddr *, int); +void pr_icmph(struct icmp6_hdr *, u_char *); +void pr_iph(struct ip6_hdr *); +void pr_suptypes(struct icmp6_nodeinfo *, size_t); +void pr_nodeaddr(struct icmp6_nodeinfo *, int); +int myechoreply(const struct icmp6_hdr *); +int mynireply(const struct icmp6_nodeinfo *); char *dnsdecode __P((const u_char **, const u_char *, const u_char *, u_char *, size_t)); -void pr_pack __P((u_char *, int, struct msghdr *)); -void pr_exthdrs __P((struct msghdr *)); -void pr_ip6opt __P((void *)); -void pr_rthdr __P((void *)); -int pr_bitrange __P((u_int32_t, int, int)); -void pr_retip __P((struct ip6_hdr *, u_char *)); -void summary __P((void)); -void tvsub __P((struct timeval *, struct timeval *)); -int setpolicy __P((int, char *)); -char *nigroup __P((char *)); -void usage __P((void)); +void pr_pack(u_char *, int, struct msghdr *); +void pr_exthdrs(struct msghdr *); +void pr_ip6opt(void *); +void pr_rthdr(void *); +int pr_bitrange(u_int32_t, int, int); +void pr_retip(struct ip6_hdr *, u_char *); +void summary(void); +void tvsub(struct timeval *, struct timeval *); +int setpolicy(int, char *); +char *nigroup(char *); +void usage(void); int main(argc, argv) diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c index 5e17e285216..b49a0e0fc06 100644 --- a/sbin/quotacheck/quotacheck.c +++ b/sbin/quotacheck/quotacheck.c @@ -1,4 +1,4 @@ -/* $OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: quotacheck.c,v 1.12 1996/03/30 22:34:25 mark Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)quotacheck.c 8.3 (Berkeley) 1/29/94"; #else -static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.11 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: quotacheck.c,v 1.12 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -112,23 +112,23 @@ int fi; /* open disk file descriptor */ u_long highid[MAXQUOTAS]; /* highest addid()'ed identifier per type */ struct fileusage * - addid __P((u_long, int, char *)); -char *blockcheck __P((char *)); -void bread __P((daddr_t, char *, long)); + addid(u_long, int, char *); +char *blockcheck(char *); +void bread(daddr_t, char *, long); int chkquota __P((const char *, const char *, const char *, void *, pid_t *)); -void freeinodebuf __P((void)); +void freeinodebuf(void); struct dinode * - getnextinode __P((ino_t)); -int getquotagid __P((void)); -int hasquota __P((struct fstab *, int, char **)); + getnextinode(ino_t); +int getquotagid(void); +int hasquota(struct fstab *, int, char **); struct fileusage * - lookup __P((u_long, int)); -void *needchk __P((struct fstab *)); -int oneof __P((char *, char*[], int)); -void resetinodebuf __P((void)); -int update __P((const char *, const char *, int)); -void usage __P((void)); + lookup(u_long, int); +void *needchk(struct fstab *); +int oneof(char *, char*[], int); +void resetinodebuf(void); +int update(const char *, const char *, int); +void usage(void); int main(argc, argv) diff --git a/sbin/raidctl/raidctl.c b/sbin/raidctl/raidctl.c index b61a8586094..5a769713b12 100644 --- a/sbin/raidctl/raidctl.c +++ b/sbin/raidctl/raidctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raidctl.c,v 1.8 2001/12/29 21:54:57 tdeval Exp $ */ +/* $OpenBSD: raidctl.c,v 1.9 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: raidctl.c,v 1.27 2001/07/10 01:30:52 lukem Exp $ */ /*- @@ -67,27 +67,27 @@ extern char *__progname; -int main __P((int, char *[])); -void do_ioctl __P((int, u_long, void *, const char *)); -static void rf_configure __P((int, char*, int)); -static const char *device_status __P((RF_DiskStatus_t)); -static void rf_get_device_status __P((int)); -static void rf_output_configuration __P((int, const char *)); -static void get_component_number __P((int, char *, int *, int *)); -static void rf_fail_disk __P((int, char *, int)); -static void usage __P((void)); -static void get_component_label __P((int, char *)); -static void set_component_label __P((int, char *)); -static void init_component_labels __P((int, int)); -static void set_autoconfig __P((int, int, char *)); -static void add_hot_spare __P((int, char *)); -static void remove_hot_spare __P((int, char *)); -static void rebuild_in_place __P((int, char *)); -static void check_status __P((int,int)); -static void check_parity __P((int,int,char *)); -static void do_meter __P((int, u_long)); -static void get_bar __P((char *, double, int)); -static void get_time_string __P((char *, int)); +int main(int, char *[]); +void do_ioctl(int, u_long, void *, const char *); +static void rf_configure(int, char*, int); +static const char *device_status(RF_DiskStatus_t); +static void rf_get_device_status(int); +static void rf_output_configuration(int, const char *); +static void get_component_number(int, char *, int *, int *); +static void rf_fail_disk(int, char *, int); +static void usage(void); +static void get_component_label(int, char *); +static void set_component_label(int, char *); +static void init_component_labels(int, int); +static void set_autoconfig(int, int, char *); +static void add_hot_spare(int, char *); +static void remove_hot_spare(int, char *); +static void rebuild_in_place(int, char *); +static void check_status(int,int); +static void check_parity(int,int,char *); +static void do_meter(int, u_long); +static void get_bar(char *, double, int); +static void get_time_string(char *, int); int verbose; diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 841eaebcabf..5ef0cbc3c73 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: reboot.c,v 1.23 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: reboot.c,v 1.8 1995/10/05 05:36:22 mycroft Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #else -static char rcsid[] = "$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: reboot.c,v 1.23 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -66,7 +66,7 @@ static char rcsid[] = "$OpenBSD: reboot.c,v 1.22 2001/11/05 07:39:17 mpech Exp $ #include <paths.h> #include <util.h> -void usage __P((void)); +void usage(void); extern char *__progname; #define _PATH_RC "/etc/rc" diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c index 1f9223afd3e..a562c9a2058 100644 --- a/sbin/restore/dirs.c +++ b/sbin/restore/dirs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: dirs.c,v 1.19 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: dirs.c,v 1.26 1997/07/01 05:37:49 lukem Exp $ */ /* @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = "@(#)dirs.c 8.5 (Berkeley) 8/31/94"; #else -static char rcsid[] = "$OpenBSD: dirs.c,v 1.18 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: dirs.c,v 1.19 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -125,16 +125,16 @@ struct odirect { char d_name[ODIRSIZ]; }; -static struct inotab *allocinotab __P((ino_t, struct dinode *, long)); -static void dcvt __P((struct odirect *, struct direct *)); -static void flushent __P((void)); -static struct inotab *inotablookup __P((ino_t)); -static RST_DIR *opendirfile __P((const char *)); -static void putdir __P((char *, long)); -static void putent __P((struct direct *)); -static void rst_seekdir __P((RST_DIR *, long, long)); -static long rst_telldir __P((RST_DIR *)); -static struct direct *searchdir __P((ino_t, char *)); +static struct inotab *allocinotab(ino_t, struct dinode *, long); +static void dcvt(struct odirect *, struct direct *); +static void flushent(void); +static struct inotab *inotablookup(ino_t); +static RST_DIR *opendirfile(const char *); +static void putdir(char *, long); +static void putent(struct direct *); +static void rst_seekdir(RST_DIR *, long, long); +static long rst_telldir(RST_DIR *); +static struct direct *searchdir(ino_t, char *); /* * Extract directory contents, building up a directory structure @@ -231,7 +231,7 @@ void treescan(pname, ino, todo) char *pname; ino_t ino; - long (*todo) __P((char *, ino_t, int)); + long (*todo)(char *, ino_t, int); { struct inotab *itp; struct direct *dp; diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h index 134906612e3..8582ba184dc 100644 --- a/sbin/restore/extern.h +++ b/sbin/restore/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1997/07/05 20:51:21 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: extern.h,v 1.4 1995/03/18 14:59:43 cgd Exp $ */ /*- @@ -36,78 +36,78 @@ * @(#)extern.h 8.2 (Berkeley) 1/7/94 */ -struct entry *addentry __P((char *, ino_t, int)); -long addfile __P((char *, ino_t, int)); -int addwhiteout __P((char *)); -void badentry __P((struct entry *, char *)); -void canon __P((char *, char *)); -void checkrestore __P((void)); -void cleanup __P((void)); -void closemt __P((void)); -void createfiles __P((void)); -void createleaves __P((char *)); -void createlinks __P((void)); -long deletefile __P((char *, ino_t, int)); -void deleteino __P((ino_t)); -void delwhiteout __P((struct entry *)); -ino_t dirlookup __P((const char *)); -void dumpsymtable __P((char *, long)); -void extractdirs __P((int)); -int extractfile __P((char *)); -void findunreflinks __P((void)); -char *flagvalues __P((struct entry *)); -void freeentry __P((struct entry *)); -void freename __P((char *)); -int genliteraldir __P((char *, ino_t)); -char *gentempname __P((struct entry *)); +struct entry *addentry(char *, ino_t, int); +long addfile(char *, ino_t, int); +int addwhiteout(char *); +void badentry(struct entry *, char *); +void canon(char *, char *); +void checkrestore(void); +void cleanup(void); +void closemt(void); +void createfiles(void); +void createleaves(char *); +void createlinks(void); +long deletefile(char *, ino_t, int); +void deleteino(ino_t); +void delwhiteout(struct entry *); +ino_t dirlookup(const char *); +void dumpsymtable(char *, long); +void extractdirs(int); +int extractfile(char *); +void findunreflinks(void); +char *flagvalues(struct entry *); +void freeentry(struct entry *); +void freename(char *); +int genliteraldir(char *, ino_t); +char *gentempname(struct entry *); void getfile __P((void (*)(char *, long), void (*)(char *, long))); -void getvol __P((long)); -void initsymtable __P((char *)); -int inodetype __P((ino_t)); -int linkit __P((char *, char *, int)); -struct entry *lookupino __P((ino_t)); -struct entry *lookupname __P((char *)); -long listfile __P((char *, ino_t, int)); -ino_t lowerbnd __P((ino_t)); -void mktempname __P((struct entry *)); -void moveentry __P((struct entry *, char *)); -void msg __P((const char *, ...)); -char *myname __P((struct entry *)); -void newnode __P((struct entry *)); -void newtapebuf __P((long)); -long nodeupdates __P((char *, ino_t, int)); -void onintr __P((int)); -void panic __P((const char *, ...)); -void pathcheck __P((char *)); -struct direct *pathsearch __P((const char *)); -void printdumpinfo __P((void)); -void removeleaf __P((struct entry *)); -void removenode __P((struct entry *)); -void removeoldleaves __P((void)); -void removeoldnodes __P((void)); -void renameit __P((char *, char *)); -int reply __P((char *)); -RST_DIR *rst_opendir __P((const char *)); -struct direct *rst_readdir __P((RST_DIR *)); -void rst_closedir __P((RST_DIR *dirp)); -void runcmdshell __P((void)); -char *savename __P((char *)); -void setdirmodes __P((int)); -void setinput __P((char *)); -void setup __P((void)); -void skipdirs __P((void)); -void skipfile __P((void)); -void skipmaps __P((void)); -void swabst __P((u_char *, u_char *)); +void getvol(long); +void initsymtable(char *); +int inodetype(ino_t); +int linkit(char *, char *, int); +struct entry *lookupino(ino_t); +struct entry *lookupname(char *); +long listfile(char *, ino_t, int); +ino_t lowerbnd(ino_t); +void mktempname(struct entry *); +void moveentry(struct entry *, char *); +void msg(const char *, ...); +char *myname(struct entry *); +void newnode(struct entry *); +void newtapebuf(long); +long nodeupdates(char *, ino_t, int); +void onintr(int); +void panic(const char *, ...); +void pathcheck(char *); +struct direct *pathsearch(const char *); +void printdumpinfo(void); +void removeleaf(struct entry *); +void removenode(struct entry *); +void removeoldleaves(void); +void removeoldnodes(void); +void renameit(char *, char *); +int reply(char *); +RST_DIR *rst_opendir(const char *); +struct direct *rst_readdir(RST_DIR *); +void rst_closedir(RST_DIR *dirp); +void runcmdshell(void); +char *savename(char *); +void setdirmodes(int); +void setinput(char *); +void setup(void); +void skipdirs(void); +void skipfile(void); +void skipmaps(void); +void swabst(u_char *, u_char *); void treescan __P((char *, ino_t, long (*)(char *, ino_t, int))); -ino_t upperbnd __P((ino_t)); -long verifyfile __P((char *, ino_t, int)); -void xtrnull __P((char *, long)); +ino_t upperbnd(ino_t); +long verifyfile(char *, ino_t, int); +void xtrnull(char *, long); /* From ../dump/dumprmt.c */ -void rmtclose __P((void)); -int rmthost __P((char *)); -int rmtioctl __P((int, int)); -int rmtopen __P((char *, int)); -int rmtread __P((char *, int)); -int rmtseek __P((int, int)); +void rmtclose(void); +int rmthost(char *); +int rmtioctl(int, int); +int rmtopen(char *, int); +int rmtread(char *, int); +int rmtseek(int, int); diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c index 3a7d101157b..8d6a8ac3965 100644 --- a/sbin/restore/interactive.c +++ b/sbin/restore/interactive.c @@ -1,4 +1,4 @@ -/* $OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: interactive.c,v 1.14 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: interactive.c,v 1.10 1997/03/19 08:42:52 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)interactive.c 8.3 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: interactive.c,v 1.13 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: interactive.c,v 1.14 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -87,14 +87,14 @@ struct arglist { char *cmd; /* the current command */ }; -static char *copynext __P((char *, char *)); -static int fcmp __P((const void *, const void *)); -static void formatf __P((struct afile *, int)); -static void getcmd __P((char *, char *, char *, struct arglist *)); -struct dirent *glob_readdir __P((RST_DIR *dirp)); -static int glob_stat __P((const char *, struct stat *)); -static void mkentry __P((char *, struct direct *, struct afile *)); -static void printlist __P((char *, char *)); +static char *copynext(char *, char *); +static int fcmp(const void *, const void *); +static void formatf(struct afile *, int); +static void getcmd(char *, char *, char *, struct arglist *); +struct dirent *glob_readdir(RST_DIR *dirp); +static int glob_stat(const char *, struct stat *); +static void mkentry(char *, struct direct *, struct afile *); +static void printlist(char *, char *); /* * Read and execute commands from the terminal. diff --git a/sbin/restore/main.c b/sbin/restore/main.c index 3c945871d92..706f7ff729d 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.10 2001/06/04 14:59:49 mickey Exp $ */ +/* $OpenBSD: main.c,v 1.11 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $ */ /* @@ -80,8 +80,8 @@ time_t dumpdate; FILE *terminal; char *tmpdir; -static void obsolete __P((int *, char **[])); -static void usage __P((void)); +static void obsolete(int *, char **[]); +static void usage(void); int main(argc, argv) diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c index 6087f286de5..a05abf8404d 100644 --- a/sbin/restore/restore.c +++ b/sbin/restore/restore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: restore.c,v 1.7 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: restore.c,v 1.9 1997/06/18 07:10:16 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)restore.c 8.3 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: restore.c,v 1.7 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -53,7 +53,7 @@ static char rcsid[] = "$OpenBSD: restore.c,v 1.6 2001/11/05 07:39:17 mpech Exp $ #include "restore.h" #include "extern.h" -static char *keyval __P((int)); +static char *keyval(int); /* * This implements the 't' option. diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c index 9c8427afb14..d7fb03747cf 100644 --- a/sbin/restore/symtab.c +++ b/sbin/restore/symtab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: symtab.c,v 1.7 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: symtab.c,v 1.10 1997/03/19 08:42:54 lukem Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)symtab.c 8.2 (Berkeley) 9/13/94"; #else -static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: symtab.c,v 1.7 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -77,9 +77,9 @@ static char rcsid[] = "$OpenBSD: symtab.c,v 1.6 2001/11/05 07:39:17 mpech Exp $" static struct entry **entry; static long entrytblsize; -static void addino __P((ino_t, struct entry *)); -static struct entry *lookupparent __P((char *)); -static void removeentry __P((struct entry *)); +static void addino(ino_t, struct entry *); +static struct entry *lookupparent(char *); +static void removeentry(struct entry *); /* * Look up an entry by inode number diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c index 10256e459cc..35bb32e7c05 100644 --- a/sbin/restore/tape.c +++ b/sbin/restore/tape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tape.c,v 1.19 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: tape.c,v 1.20 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: tape.c,v 1.26 1997/04/15 07:12:25 lukem Exp $ */ /* @@ -93,23 +93,23 @@ static int Qcvt; /* Swap quads (for sun) */ #define FLUSHTAPEBUF() blkcnt = ntrec + 1 -static void accthdr __P((struct s_spcl *)); -static int checksum __P((int *)); -static void findinode __P((struct s_spcl *)); -static void findtapeblksize __P((void)); -static int gethead __P((struct s_spcl *)); -static void readtape __P((char *)); -static void setdumpnum __P((void)); -static u_long swabl __P((u_long)); -static u_char *swablong __P((u_char *, int)); -static u_char *swabshort __P((u_char *, int)); -static void terminateinput __P((void)); -static void xtrfile __P((char *, long)); -static void xtrlnkfile __P((char *, long)); -static void xtrlnkskip __P((char *, long)); -static void xtrmap __P((char *, long)); -static void xtrmapskip __P((char *, long)); -static void xtrskip __P((char *, long)); +static void accthdr(struct s_spcl *); +static int checksum(int *); +static void findinode(struct s_spcl *); +static void findtapeblksize(void); +static int gethead(struct s_spcl *); +static void readtape(char *); +static void setdumpnum(void); +static u_long swabl(u_long); +static u_char *swablong(u_char *, int); +static u_char *swabshort(u_char *, int); +static void terminateinput(void); +static void xtrfile(char *, long); +static void xtrlnkfile(char *, long); +static void xtrlnkskip(char *, long); +static void xtrmap(char *, long); +static void xtrmapskip(char *, long); +static void xtrskip(char *, long); /* * Set up an input source @@ -642,8 +642,8 @@ skipfile() */ void getfile(fill, skip) - void (*fill) __P((char *, long)); - void (*skip) __P((char *, long)); + void (*fill)(char *, long); + void (*skip)(char *, long); { int i; volatile int curblk = 0; diff --git a/sbin/route/ccitt_addr.c b/sbin/route/ccitt_addr.c index 5f4a1d4db98..b75fc51fe7c 100644 --- a/sbin/route/ccitt_addr.c +++ b/sbin/route/ccitt_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccitt_addr.c,v 1.5 2000/09/24 01:02:23 millert Exp $ */ +/* $OpenBSD: ccitt_addr.c,v 1.6 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: ccitt_addr.c,v 1.8 1995/04/23 10:33:41 cgd Exp $ */ /* @@ -59,7 +59,7 @@ #include <sys/socket.h> #include <netccitt/x25.h> -static char *copychar __P((char *, char *)); +static char *copychar(char *, char *); int ccitt_addr (addr, xp) diff --git a/sbin/route/route.c b/sbin/route/route.c index 76a7bfbdbf4..f4d79899389 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.43 2001/07/07 18:26:20 deraadt Exp $ */ +/* $OpenBSD: route.c,v 1.44 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94"; #else -static char rcsid[] = "$OpenBSD: route.c,v 1.43 2001/07/07 18:26:20 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: route.c,v 1.44 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -99,27 +99,27 @@ struct rt_metrics rt_metrics; u_long rtm_inits; uid_t uid; -char *routename __P((struct sockaddr *)); -char *netname __P((struct sockaddr *)); -void flushroutes __P((int, char **)); -int newroute __P((int, char **)); -void monitor __P((void)); +char *routename(struct sockaddr *); +char *netname(struct sockaddr *); +void flushroutes(int, char **); +int newroute(int, char **); +void monitor(void); #ifdef INET6 -static int prefixlen __P((char *)); +static int prefixlen(char *); #endif -void sockaddr __P((char *, struct sockaddr *)); -void sodump __P((sup, char *)); -void print_getmsg __P((struct rt_msghdr *, int)); -void print_rtmsg __P((struct rt_msghdr *, int)); -void pmsg_common __P((struct rt_msghdr *)); -void pmsg_addrs __P((char *, int)); -void bprintf __P((FILE *, int, u_char *)); -void mask_addr __P((void)); -int getaddr __P((int, char *, struct hostent **)); -int rtmsg __P((int, int)); -int x25_makemask __P((void)); - -extern void show __P((int, char **)); /* XXX - from show.c */ +void sockaddr(char *, struct sockaddr *); +void sodump(sup, char *); +void print_getmsg(struct rt_msghdr *, int); +void print_rtmsg(struct rt_msghdr *, int); +void pmsg_common(struct rt_msghdr *); +void pmsg_addrs(char *, int); +void bprintf(FILE *, int, u_char *); +void mask_addr(void); +int getaddr(int, char *, struct hostent **); +int rtmsg(int, int); +int x25_makemask(void); + +extern void show(int, char **); /* XXX - from show.c */ __dead void usage(cp) diff --git a/sbin/route/show.c b/sbin/route/show.c index ee4efc6c331..43dd527fad4 100644 --- a/sbin/route/show.c +++ b/sbin/route/show.c @@ -1,4 +1,4 @@ -/* $OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $ */ +/* $OpenBSD: show.c,v 1.21 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94"; #else -static char *rcsid = "$OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $"; +static char *rcsid = "$OpenBSD: show.c,v 1.21 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -67,9 +67,9 @@ static char *rcsid = "$OpenBSD: show.c,v 1.20 2001/07/07 18:26:20 deraadt Exp $" #include <unistd.h> /* XXX: things from route.c */ -extern char *routename __P((struct sockaddr *)); -extern char *netname __P((struct sockaddr *)); -extern char *ns_print __P((struct sockaddr_ns *)); +extern char *routename(struct sockaddr *); +extern char *netname(struct sockaddr *); +extern char *ns_print(struct sockaddr_ns *); extern int nflag; #define ROUNDUP(a) \ @@ -102,11 +102,11 @@ static const struct bits bits[] = { { 0 } }; -static void p_rtentry __P((struct rt_msghdr *)); -static void p_sockaddr __P((struct sockaddr *, int, int)); -static void p_flags __P((int, char *)); -static void pr_rthdr __P((void)); -static void pr_family __P((int)); +static void p_rtentry(struct rt_msghdr *); +static void p_sockaddr(struct sockaddr *, int, int); +static void p_flags(int, char *); +static void pr_rthdr(void); +static void pr_family(int); int keyword(char *); void usage(char *); diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c index 58ffca3daa2..b6014ab69d6 100644 --- a/sbin/savecore/savecore.c +++ b/sbin/savecore/savecore.c @@ -1,4 +1,4 @@ -/* $OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: savecore.c,v 1.28 2002/02/16 21:27:37 millert Exp $ */ /* $NetBSD: savecore.c,v 1.26 1996/03/18 21:16:05 leo Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)savecore.c 8.3 (Berkeley) 1/2/94"; #else -static char rcsid[] = "$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: savecore.c,v 1.28 2002/02/16 21:27:37 millert Exp $"; #endif #endif /* not lint */ @@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: savecore.c,v 1.27 2001/11/05 07:39:17 mpech Exp #include <kvm.h> #include <vis.h> -extern FILE *zopen __P((const char *fname, const char *mode, int bits)); +extern FILE *zopen(const char *fname, const char *mode, int bits); #define KREAD(kd, addr, p)\ (kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p))) @@ -124,21 +124,21 @@ char vers[1024]; int clear, compress, force, verbose; /* flags */ -void check_kmem __P((void)); -int check_space __P((void)); -void clear_dump __P((void)); -int Create __P((char *, int)); -int dump_exists __P((void)); -char *find_dev __P((dev_t, int)); -int get_crashtime __P((void)); -void kmem_setup __P((void)); -void log __P((int, char *, ...)); -void Lseek __P((int, off_t, int)); -int Open __P((char *, int rw)); -char *rawname __P((char *s)); -void save_core __P((void)); -void usage __P((void)); -void Write __P((int, void *, int)); +void check_kmem(void); +int check_space(void); +void clear_dump(void); +int Create(char *, int); +int dump_exists(void); +char *find_dev(dev_t, int); +int get_crashtime(void); +void kmem_setup(void); +void log(int, char *, ...); +void Lseek(int, off_t, int); +int Open(char *, int rw); +char *rawname(char *s); +void save_core(void); +void usage(void); +void Write(int, void *, int); int main(argc, argv) diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c index f128feb6ffb..bd8770f1fa4 100644 --- a/sbin/shutdown/shutdown.c +++ b/sbin/shutdown/shutdown.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $ */ +/* $OpenBSD: shutdown.c,v 1.24 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)shutdown.c 8.2 (Berkeley) 2/16/94"; #else -static char rcsid[] = "$OpenBSD: shutdown.c,v 1.23 2001/11/05 07:39:17 mpech Exp $"; +static char rcsid[] = "$OpenBSD: shutdown.c,v 1.24 2002/02/16 21:27:38 millert Exp $"; #endif #endif /* not lint */ @@ -106,16 +106,16 @@ static time_t offset, shuttime; static int dofast, dohalt, doreboot, dopower, dodump, killflg, mbuflen, nosync; static char *whom, mbuf[BUFSIZ]; -void badtime __P((void)); -void __attribute ((noreturn)) die_you_gravy_sucking_pig_dog __P((void)); -void doitfast __P((void)); -void __attribute ((noreturn)) finish __P((int)); -void getoffset __P((char *)); -void __attribute ((noreturn)) loop __P((void)); -void nolog __P((void)); -void timeout __P((int)); -void timewarn __P((int)); -void usage __P((void)); +void badtime(void); +void __attribute ((noreturn)) die_you_gravy_sucking_pig_dog(void); +void doitfast(void); +void __attribute ((noreturn)) finish(int); +void getoffset(char *); +void __attribute ((noreturn)) loop(void); +void nolog(void); +void timeout(int); +void timewarn(int); +void usage(void); int main(argc, argv) diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index a4ce1fc9ed6..0a8bd7280fb 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slattach.c,v 1.11 2001/11/17 19:56:36 deraadt Exp $ */ +/* $OpenBSD: slattach.c,v 1.12 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: slattach.c,v 1.17 1996/05/19 21:57:39 jonathan Exp $ */ /* @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)slattach.c 8.2 (Berkeley) 1/7/94"; #else -static char rcsid[] = "$OpenBSD: slattach.c,v 1.11 2001/11/17 19:56:36 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: slattach.c,v 1.12 2002/02/16 21:27:38 millert Exp $"; #endif #endif /* not lint */ @@ -81,11 +81,11 @@ static char pidfilename[MAXPATHLEN]; /* name of pid file */ static pid_t pid; /* Our pid */ static FILE *pidfile; -void usage __P((void)); +void usage(void); -int ttydisc __P((char *)); +int ttydisc(char *); -void handler __P((int)); +void handler(int); volatile sig_atomic_t dying; diff --git a/sbin/swapctl/swapctl.c b/sbin/swapctl/swapctl.c index 7f065d7b78e..4e7d69fd6c0 100644 --- a/sbin/swapctl/swapctl.c +++ b/sbin/swapctl/swapctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapctl.c,v 1.6 2001/06/04 14:59:50 mickey Exp $ */ +/* $OpenBSD: swapctl.c,v 1.7 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: swapctl.c,v 1.9 1998/07/26 20:23:15 mycroft Exp $ */ /* @@ -105,15 +105,15 @@ char *tflag; /* swap device type (blk or noblk) */ int pri; /* uses 0 as default pri */ -static void change_priority __P((char *)); -static void add_swap __P((char *)); -static void del_swap __P((char *)); - int main __P((int, char *[])); -static void do_fstab __P((void)); -static void usage __P((void)); -static int swapon_command __P((int, char **)); +static void change_priority(char *); +static void add_swap(char *); +static void del_swap(char *); + int main(int, char *[]); +static void do_fstab(void); +static void usage(void); +static int swapon_command(int, char **); #if 0 -static void swapoff_command __P((int, char **)); +static void swapoff_command(int, char **); #endif extern char *__progname; /* from crt0.o */ diff --git a/sbin/swapctl/swapctl.h b/sbin/swapctl/swapctl.h index 596d5989b60..2d294437e9b 100644 --- a/sbin/swapctl/swapctl.h +++ b/sbin/swapctl/swapctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: swapctl.h,v 1.2 2000/02/26 04:06:23 hugh Exp $ */ +/* $OpenBSD: swapctl.h,v 1.3 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: swapctl.h,v 1.2 1997/10/10 05:39:54 mrg Exp $ */ /* @@ -30,4 +30,4 @@ */ /* pri, kflag, pflag, tflag, dolong (1 for long, 0 for short) */ -void list_swap __P((int, int, int, int, int)); +void list_swap(int, int, int, int, int); diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index bda459b89ff..6fdbf600ae3 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.c,v 1.78 2001/12/04 14:57:27 art Exp $ */ +/* $OpenBSD: sysctl.c,v 1.79 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)sysctl.c 8.5 (Berkeley) 5/9/95"; #else -static char *rcsid = "$OpenBSD: sysctl.c,v 1.78 2001/12/04 14:57:27 art Exp $"; +static char *rcsid = "$OpenBSD: sysctl.c,v 1.79 2002/02/16 21:27:38 millert Exp $"; #endif #endif /* not lint */ @@ -179,27 +179,27 @@ int Aflag, aflag, nflag, wflag; #define KMEMSTATS 0x00001000 /* prototypes */ -void debuginit __P((void)); -void listall __P((char *, struct list *)); -void parse __P((char *, int)); -void parse_baddynamic __P((int *, size_t, char *, void **, size_t *, int, int)); -void usage __P((void)); -int findname __P((char *, char *, char **, struct list *)); -int sysctl_inet __P((char *, char **, int *, int, int *)); +void debuginit(void); +void listall(char *, struct list *); +void parse(char *, int); +void parse_baddynamic(int *, size_t, char *, void **, size_t *, int, int); +void usage(void); +int findname(char *, char *, char **, struct list *); +int sysctl_inet(char *, char **, int *, int, int *); #ifdef INET6 -int sysctl_inet6 __P((char *, char **, int *, int, int *)); +int sysctl_inet6(char *, char **, int *, int, int *); #endif -int sysctl_ipx __P((char *, char **, int *, int, int *)); -int sysctl_fs __P((char *, char **, int *, int, int *)); -static int sysctl_vfs __P((char *, char **, int[], int, int *)); -static int sysctl_vfsgen __P((char *, char **, int[], int, int *)); -int sysctl_bios __P((char *, char **, int *, int, int *)); -int sysctl_swpenc __P((char *, char **, int *, int, int *)); -int sysctl_forkstat __P((char *, char **, int *, int, int *)); -int sysctl_tty __P((char *, char **, int *, int, int *)); -int sysctl_nchstats __P((char *, char **, int *, int, int *)); -int sysctl_malloc __P((char *, char **, int *, int, int *)); -void vfsinit __P((void)); +int sysctl_ipx(char *, char **, int *, int, int *); +int sysctl_fs(char *, char **, int *, int, int *); +static int sysctl_vfs(char *, char **, int[], int, int *); +static int sysctl_vfsgen(char *, char **, int[], int, int *); +int sysctl_bios(char *, char **, int *, int, int *); +int sysctl_swpenc(char *, char **, int *, int, int *); +int sysctl_forkstat(char *, char **, int *, int, int *); +int sysctl_tty(char *, char **, int *, int, int *); +int sysctl_nchstats(char *, char **, int *, int, int *); +int sysctl_malloc(char *, char **, int *, int, int *); +void vfsinit(void); int main(argc, argv) diff --git a/sbin/ttyflags/ttyflags.c b/sbin/ttyflags/ttyflags.c index ade502488ee..138100472c4 100644 --- a/sbin/ttyflags/ttyflags.c +++ b/sbin/ttyflags/ttyflags.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp $ */ +/* $OpenBSD: ttyflags.c,v 1.8 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: ttyflags.c,v 1.8 1996/04/09 05:20:30 cgd Exp $ */ /* @@ -39,7 +39,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp $"; +static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.8 2002/02/16 21:27:38 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -57,10 +57,10 @@ static char rcsid[] = "$OpenBSD: ttyflags.c,v 1.7 1997/03/04 05:48:00 tholo Exp #include <ttyent.h> #include <unistd.h> -int all __P((int)); -int ttys __P((char **, int)); -int ttyflags __P((struct ttyent *, int)); -void usage __P((void)); +int all(int); +int ttys(char **, int); +int ttyflags(struct ttyent *, int); +void usage(void); int nflag, vflag; diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c index c8c140bff52..d0a372fb022 100644 --- a/sbin/tunefs/tunefs.c +++ b/sbin/tunefs/tunefs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tunefs.c,v 1.18 2002/02/12 22:28:02 fgsch Exp $ */ +/* $OpenBSD: tunefs.c,v 1.19 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: tunefs.c,v 1.10 1995/03/18 15:01:31 cgd Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = static char sccsid[] = "@(#)tunefs.c 8.2 (Berkeley) 4/19/94"; #else static const char rcsid[] = - "$OpenBSD: tunefs.c,v 1.18 2002/02/12 22:28:02 fgsch Exp $"; + "$OpenBSD: tunefs.c,v 1.19 2002/02/16 21:27:38 millert Exp $"; #endif #endif /* not lint */ @@ -81,8 +81,8 @@ long dev_bsize = 1; void bwrite(daddr_t, char *, int); int bread(daddr_t, char *, int); void getsb(struct fs *, char *, int); -void usage __P((void)); -void printfs __P((void)); +void usage(void); +void printfs(void); extern char *__progname; diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index ac06cbe20cf..f7406220f87 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umount.c,v 1.12 2001/05/18 08:07:51 mickey Exp $ */ +/* $OpenBSD: umount.c,v 1.13 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)umount.c 8.3 (Berkeley) 2/20/94"; #else -static char rcsid[] = "$OpenBSD: umount.c,v 1.12 2001/05/18 08:07:51 mickey Exp $"; +static char rcsid[] = "$OpenBSD: umount.c,v 1.13 2002/02/16 21:27:38 millert Exp $"; #endif #endif /* not lint */ @@ -74,14 +74,14 @@ int fake, fflag, verbose; char **typelist = NULL; char *nfshost; -char *getmntname __P((char *, mntwhat, char *)); -void maketypelist __P((char *)); -int selected __P((const char *)); -int namematch __P((struct hostent *)); -int umountall __P((void)); -int umountfs __P((char *)); -void usage __P((void)); -int xdr_dir __P((XDR *, char *)); +char *getmntname(char *, mntwhat, char *); +void maketypelist(char *); +int selected(const char *); +int namematch(struct hostent *); +int umountall(void); +int umountfs(char *); +void usage(void); +int xdr_dir(XDR *, char *); int main(argc, argv) diff --git a/sbin/wicontrol/wicontrol.c b/sbin/wicontrol/wicontrol.c index f9c613e77eb..10d87fe02dc 100644 --- a/sbin/wicontrol/wicontrol.c +++ b/sbin/wicontrol/wicontrol.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wicontrol.c,v 1.19 2001/08/17 00:40:11 millert Exp $ */ +/* $OpenBSD: wicontrol.c,v 1.20 2002/02/16 21:27:38 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -67,25 +67,25 @@ static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\ Bill Paul. All rights reserved."; static const char rcsid[] = - "@(#) $OpenBSD: wicontrol.c,v 1.19 2001/08/17 00:40:11 millert Exp $"; + "@(#) $OpenBSD: wicontrol.c,v 1.20 2002/02/16 21:27:38 millert Exp $"; #endif -static void wi_getval __P((char *, struct wi_req *)); -static void wi_setval __P((char *, struct wi_req *)); -static void wi_printstr __P((struct wi_req *)); -static void wi_setstr __P((char *, int, char *)); -static void wi_setbytes __P((char *, int, char *, int)); -static void wi_setword __P((char *, int, char *)); -static void wi_sethex __P((char *, int, char *)); -static void wi_printwords __P((struct wi_req *)); -static void wi_printbool __P((struct wi_req *)); -static void wi_printhex __P((struct wi_req *)); -static void wi_dumpinfo __P((char *)); -static void wi_setkeys __P((char *, int, char *)); -static void wi_printkeys __P((struct wi_req *)); -static void wi_printcardid __P((struct wi_req *, int)); -static void wi_dumpstats __P((char *)); -static void usage __P((void)); +static void wi_getval(char *, struct wi_req *); +static void wi_setval(char *, struct wi_req *); +static void wi_printstr(struct wi_req *); +static void wi_setstr(char *, int, char *); +static void wi_setbytes(char *, int, char *, int); +static void wi_setword(char *, int, char *); +static void wi_sethex(char *, int, char *); +static void wi_printwords(struct wi_req *); +static void wi_printbool(struct wi_req *); +static void wi_printhex(struct wi_req *); +static void wi_dumpinfo(char *); +static void wi_setkeys(char *, int, char *); +static void wi_printkeys(struct wi_req *); +static void wi_printcardid(struct wi_req *, int); +static void wi_dumpstats(char *); +static void usage(void); static void wi_getval(iface, wreq) diff --git a/sbin/wsconsctl/keysym.c b/sbin/wsconsctl/keysym.c index 36123d9d69a..c41c921c22d 100644 --- a/sbin/wsconsctl/keysym.c +++ b/sbin/wsconsctl/keysym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: keysym.c,v 1.1 2000/07/01 23:52:45 mickey Exp $ */ +/* $OpenBSD: keysym.c,v 1.2 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: keysym.c,v 1.3 1999/02/08 11:08:23 hannken Exp $ */ /*- @@ -87,12 +87,12 @@ static const u_char latin1_to_upper[256] = { 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00, /* f */ }; -static int qcmp_name __P((const void *, const void *)); -static int qcmp_ksym __P((const void *, const void *)); -static int bcmp_name __P((const void *, const void *)); -static int bcmp_ksym __P((const void *, const void *)); +static int qcmp_name(const void *, const void *); +static int qcmp_ksym(const void *, const void *); +static int bcmp_name(const void *, const void *); +static int bcmp_ksym(const void *, const void *); -static void sort_ksym_tab __P((void)); +static void sort_ksym_tab(void); static int qcmp_name(a, b) diff --git a/sbin/wsconsctl/map_parse.y b/sbin/wsconsctl/map_parse.y index e96b521be5d..4ac444fe488 100644 --- a/sbin/wsconsctl/map_parse.y +++ b/sbin/wsconsctl/map_parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: map_parse.y,v 1.2 2001/08/26 17:35:13 deraadt Exp $ */ +/* $OpenBSD: map_parse.y,v 1.3 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: map_parse.y,v 1.2 1999/02/08 11:08:23 hannken Exp $ */ /*- @@ -67,7 +67,7 @@ static struct wscons_keymap mapdata[KS_NUMKEYCODES]; struct wskbd_map_data newkbmap; /* used in util.c */ static struct wscons_keymap *cur_mp; -static int ksym_lookup __P((keysym_t)); +static int ksym_lookup(keysym_t); static int ksym_lookup(ksym) diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c index d645b5f8639..c555fa59426 100644 --- a/sbin/wsconsctl/util.c +++ b/sbin/wsconsctl/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.6 2001/07/06 21:52:34 mickey Exp $ */ +/* $OpenBSD: util.c,v 1.7 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */ /*- @@ -114,9 +114,9 @@ static const struct nameint kbdvar_tab[] = { KB_VARTAB }; -char *int2name __P((int, int, const struct nameint *, int)); -int name2int __P((char *, const struct nameint *, int)); -void print_kmap __P((struct wskbd_map_data *)); +char *int2name(int, int, const struct nameint *, int); +int name2int(char *, const struct nameint *, int); +void print_kmap(struct wskbd_map_data *); struct field * field_by_name(field_tab, name) diff --git a/sbin/wsconsctl/wsconsctl.c b/sbin/wsconsctl/wsconsctl.c index 063ef3dbd3e..6dcd6333105 100644 --- a/sbin/wsconsctl/wsconsctl.c +++ b/sbin/wsconsctl/wsconsctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsctl.c,v 1.9 2001/10/24 17:45:59 miod Exp $ */ +/* $OpenBSD: wsconsctl.c,v 1.10 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: wsconsctl.c,v 1.2 1998/12/29 22:40:20 hannken Exp $ */ /*- @@ -54,14 +54,14 @@ extern struct field keyboard_field_tab[]; extern struct field mouse_field_tab[]; extern struct field display_field_tab[]; -void usage __P((char *)); +void usage(char *); struct vartypesw { const char *name, *file; int fd; struct field *field_tab; - void (*getval) __P((const char *pre, int)); - void (*putval) __P((const char *pre, int)); + void (*getval)(const char *pre, int); + void (*putval)(const char *pre, int); } typesw[] = { { "keyboard", PATH_KEYBOARD, -1, keyboard_field_tab, keyboard_get_values, keyboard_put_values }, @@ -72,7 +72,7 @@ struct vartypesw { { NULL } }; -struct vartypesw *tab_by_name __P((const char *)); +struct vartypesw *tab_by_name(const char *); void usage(msg) diff --git a/sbin/wsconsctl/wsconsctl.h b/sbin/wsconsctl/wsconsctl.h index ab639cbc184..4fa15e90b1b 100644 --- a/sbin/wsconsctl/wsconsctl.h +++ b/sbin/wsconsctl/wsconsctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconsctl.h,v 1.3 2001/06/30 02:12:57 mickey Exp $ */ +/* $OpenBSD: wsconsctl.h,v 1.4 2002/02/16 21:27:38 millert Exp $ */ /* $NetBSD: wsconsctl.h 1.1 1998/12/28 14:01:17 hannken Exp $ */ /*- @@ -59,20 +59,20 @@ struct field { int flags; }; -struct field *field_by_name __P((struct field *, char *)); -struct field *field_by_value __P((struct field *, void *)); -void pr_field __P((const char *, struct field *, const char *)); -void rd_field __P((struct field *, char *, int)); -int name2ksym __P((char *)); -char *ksym2name __P((int)); -keysym_t ksym_upcase __P((keysym_t)); -void keyboard_get_values __P((const char *,int)); -void keyboard_put_values __P((const char *,int)); -void mouse_get_values __P((const char *,int)); -void mouse_put_values __P((const char *,int)); -void display_get_values __P((const char *,int)); -void display_put_values __P((const char *,int)); -int yyparse __P((void)); -void yyerror __P((char *)); -int yylex __P((void)); -void map_scan_setinput __P((char *)); +struct field *field_by_name(struct field *, char *); +struct field *field_by_value(struct field *, void *); +void pr_field(const char *, struct field *, const char *); +void rd_field(struct field *, char *, int); +int name2ksym(char *); +char *ksym2name(int); +keysym_t ksym_upcase(keysym_t); +void keyboard_get_values(const char *,int); +void keyboard_put_values(const char *,int); +void mouse_get_values(const char *,int); +void mouse_put_values(const char *,int); +void display_get_values(const char *,int); +void display_put_values(const char *,int); +int yyparse(void); +void yyerror(char *); +int yylex(void); +void map_scan_setinput(char *); diff --git a/share/man/man5/link.5 b/share/man/man5/link.5 index 3d52c44755e..36c1e5c3681 100644 --- a/share/man/man5/link.5 +++ b/share/man/man5/link.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: link.5,v 1.10 2001/11/13 13:54:26 mpech Exp $ +.\" $OpenBSD: link.5,v 1.11 2002/02/16 21:27:39 millert Exp $ .\" $NetBSD: link.5,v 1.5 1996/01/09 00:14:32 pk Exp $ .\" .\" Copyright (c) 1993 Paul Kranenburg @@ -482,7 +482,7 @@ struct ld_entry { int (*dlclose)(void *); void *(*dlsym)(void *, char *); int (*dlctl)(void *, int, void *); - void (*dlexit) __P((void)); + void (*dlexit)(void); }; .Ed .Pp diff --git a/share/man/man9/audio.9 b/share/man/man9/audio.9 index 501af1c04d6..93c4e353205 100644 --- a/share/man/man9/audio.9 +++ b/share/man/man9/audio.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audio.9,v 1.8 2001/12/29 17:27:26 mickey Exp $ +.\" $OpenBSD: audio.9,v 1.9 2002/02/16 21:27:39 millert Exp $ .\" $NetBSD: audio.9,v 1.14 2000/02/11 22:56:15 kleink Exp $ .\" .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -50,44 +50,44 @@ The interface between these is the structure. .Bd -literal struct audio_hw_if { - int (*open)__P((void *, int)); - void (*close)__P((void *)); - int (*drain)__P((void *)); + int (*open)(void *, int); + void (*close)(void *); + int (*drain)(void *); - int (*query_encoding)__P((void *, struct audio_encoding *)); + int (*query_encoding)(void *, struct audio_encoding *); int (*set_params)__P((void *, int, int, struct audio_params *, struct audio_params *)); - int (*round_blocksize)__P((void *, int)); + int (*round_blocksize)(void *, int); - int (*commit_settings)__P((void *)); + int (*commit_settings)(void *); - int (*init_output)__P((void *, void *, int)); - int (*init_input)__P((void *, void *, int)); + int (*init_output)(void *, void *, int); + int (*init_input)(void *, void *, int); int (*start_output)__P((void *, void *, int, void (*)(void *), void *)); int (*start_input)__P((void *, void *, int, void (*)(void *), void *)); - int (*halt_output)__P((void *)); - int (*halt_input)__P((void *)); + int (*halt_output)(void *); + int (*halt_input)(void *); - int (*speaker_ctl)__P((void *, int)); + int (*speaker_ctl)(void *, int); #define SPKR_ON 1 #define SPKR_OFF 0 - int (*getdev)__P((void *, struct audio_device *)); - int (*setfd)__P((void *, int)); + int (*getdev)(void *, struct audio_device *); + int (*setfd)(void *, int); - int (*set_port)__P((void *, mixer_ctrl_t *)); - int (*get_port)__P((void *, mixer_ctrl_t *)); + int (*set_port)(void *, mixer_ctrl_t *); + int (*get_port)(void *, mixer_ctrl_t *); - int (*query_devinfo)__P((void *, mixer_devinfo_t *)); + int (*query_devinfo)(void *, mixer_devinfo_t *); - void *(*allocm)__P((void *, int, size_t, int, int)); - void (*freem)__P((void *, void *, int)); - size_t (*round_buffersize)__P((void *, int, size_t)); - int (*mappage)__P((void *, void *, int, int)); + void *(*allocm)(void *, int, size_t, int, int); + void (*freem)(void *, void *, int); + size_t (*round_buffersize)(void *, int, size_t); + int (*mappage)(void *, void *, int, int); - int (*get_props)__P((void *)); + int (*get_props)(void *); int (*trigger_output)__P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); @@ -101,7 +101,7 @@ struct audio_params { u_int precision; /* bits/sample */ u_int channels; /* mono(1), stereo(2) */ /* Software en/decode functions, set if SW coding required by HW */ - void (*sw_code)__P((void *, u_char *, int)); + void (*sw_code)(void *, u_char *, int); int factor; /* coding space change */ }; .Ed diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9 index f2639973607..528e1c0f4f5 100644 --- a/share/man/man9/disk.9 +++ b/share/man/man9/disk.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: disk.9,v 1.17 2001/09/06 15:04:34 mpech Exp $ +.\" $OpenBSD: disk.9,v 1.18 2002/02/16 21:27:39 millert Exp $ .\" $NetBSD: disk.9,v 1.2 1996/04/08 20:41:25 jtc Exp $ .\" .\" Copyright (c) 1995, 1996 Jason R. Thorpe. @@ -237,7 +237,7 @@ This switch currently includes a pointer to the disk's routine. This switch needs to have global scope and should be initialized as follows: .Bd -literal -void foostrategy __P((struct buf *)); +void foostrategy(struct buf *); struct dkdriver foodkdriver = { foostrategy }; .Ed .Pp diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index 9ca4ce2f4b1..ae96859c97b 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mbuf.9,v 1.3 2001/12/06 10:08:47 jjbg Exp $ +.\" $OpenBSD: mbuf.9,v 1.4 2002/02/16 21:27:39 millert Exp $ .\" .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org> .\" All rights reserved. @@ -126,10 +126,10 @@ struct pkthdr { struct m_ext { caddr_t ext_buf; void (*ext_free) - __P((struct mbuf *)); +(struct mbuf *); u_int ext_size; void (*ext_ref) - __P((struct mbuf *)); +(struct mbuf *); void *ext_handle; }; diff --git a/share/misc/getopt b/share/misc/getopt index 08b7ddc2733..77b9f1a8a31 100644 --- a/share/misc/getopt +++ b/share/misc/getopt @@ -1,4 +1,4 @@ -/* $OpenBSD: getopt,v 1.5 2001/12/05 09:59:16 deraadt Exp $ */ +/* $OpenBSD: getopt,v 1.6 2002/02/16 21:27:40 millert Exp $ */ /* * Main/getopt(3) fragment. * @@ -8,7 +8,7 @@ #include <sys/types.h> #include <stdlib.h> -void usage __P((void)); +void usage(void); int main(argc, argv) 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 bd7368a81d0..c03e4e06f8d 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: /home/cvs/src/usr.bin/lex/libmain.c,v 1.4 1996/12/14 07:07:56 tholo Exp $ */ +/* $Header: /home/cvs/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 89a1c867df4..48f324fa36d 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: /home/cvs/src/usr.bin/lex/libyywrap.c,v 1.4 1996/12/10 22:22:03 millert Exp $ */ +/* $Header: /home/cvs/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) diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index d71b7327e36..398576a421f 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -14,7 +14,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ac.c,v 1.9 2001/05/24 03:02:32 pvalchev Exp $"; +static char rcsid[] = "$Id: ac.c,v 1.10 2002/02/16 21:28:00 millert Exp $"; #endif #include <sys/types.h> @@ -80,20 +80,20 @@ static struct tty_list *Ttys = NULL; static int Debug = 0; #endif -int main __P((int, char **)); -int ac __P((FILE *)); -struct tty_list *add_tty __P((char *)); -int do_tty __P((char *)); -FILE *file __P((char *)); -struct utmp_list *log_in __P((struct utmp_list *, struct utmp *)); -struct utmp_list *log_out __P((struct utmp_list *, struct utmp *)); -int on_console __P((struct utmp_list *)); -void show __P((char *, time_t)); +int main(int, char **); +int ac(FILE *); +struct tty_list *add_tty(char *); +int do_tty(char *); +FILE *file(char *); +struct utmp_list *log_in(struct utmp_list *, struct utmp *); +struct utmp_list *log_out(struct utmp_list *, struct utmp *); +int on_console(struct utmp_list *); +void show(char *, time_t); void show_today __P((struct user_list *, struct utmp_list *, time_t)); -void show_users __P((struct user_list *)); -struct user_list *update_user __P((struct user_list *, char *, time_t)); -void usage __P((void)); +void show_users(struct user_list *); +struct user_list *update_user(struct user_list *, char *, time_t); +void usage(void); /* * open wtmp or die diff --git a/usr.sbin/accton/accton.c b/usr.sbin/accton/accton.c index f269fa4dcee..57a00dc03ea 100644 --- a/usr.sbin/accton/accton.c +++ b/usr.sbin/accton/accton.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /* from: static char sccsid[] = "@(#)accton.c 4.3 (Berkeley) 6/1/90"; */ -static char *rcsid = "$Id: accton.c,v 1.4 1998/12/18 20:48:33 deraadt Exp $"; +static char *rcsid = "$Id: accton.c,v 1.5 2002/02/16 21:28:00 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -49,7 +49,7 @@ static char *rcsid = "$Id: accton.c,v 1.4 1998/12/18 20:48:33 deraadt Exp $"; #include <stdlib.h> #include <string.h> -static void usage __P((void)); +static void usage(void); void usage() diff --git a/usr.sbin/afs/src/lib/acl/acl.h b/usr.sbin/afs/src/lib/acl/acl.h index 20e28a42b00..4a90b8abae2 100644 --- a/usr.sbin/afs/src/lib/acl/acl.h +++ b/usr.sbin/afs/src/lib/acl/acl.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. */ -/* $Id: acl.h,v 1.1 2000/09/11 14:40:54 art Exp $ */ +/* $Id: acl.h,v 1.2 2002/02/16 21:28:00 millert Exp $ */ #ifndef __ACL_H #define __ACL_H @@ -50,11 +50,11 @@ #define __P(x) x #endif -void acl_canonicalize_principal __P((char *principal, char *canon)); -int acl_initialize __P((char *acl_file, int perm)); -int acl_exact_match __P((char *acl, char *principal)); -int acl_check __P((char *acl, char *principal)); -int acl_add __P((char *acl, char *principal)); -int acl_delete __P((char *acl, char *principal)); +void acl_canonicalize_principal(char *principal, char *canon); +int acl_initialize(char *acl_file, int perm); +int acl_exact_match(char *acl, char *principal); +int acl_check(char *acl, char *principal); +int acl_add(char *acl, char *principal); +int acl_delete(char *acl, char *principal); #endif /* __ACL_H */ diff --git a/usr.sbin/afs/src/rxkad/rxkad.h b/usr.sbin/afs/src/rxkad/rxkad.h index 2f18b9d4fff..3ab7a79a693 100644 --- a/usr.sbin/afs/src/rxkad/rxkad.h +++ b/usr.sbin/afs/src/rxkad/rxkad.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. */ -/* @(#)$Id: rxkad.h,v 1.2 2000/09/11 14:41:26 art Exp $ */ +/* @(#)$Id: rxkad.h,v 1.3 2002/02/16 21:28:00 millert Exp $ */ #ifndef __RXKAD_H #define __RXKAD_H @@ -137,11 +137,11 @@ struct ktc_principal { char cell[MAXKTCREALMLEN]; }; -u_int32 life_to_time __P((u_int32 start, int life_)); +u_int32 life_to_time(u_int32 start, int life_); -int time_to_life __P((u_int32 start, u_int32 end)); +int time_to_life(u_int32 start, u_int32 end); -int tkt_CheckTimes __P((int32 begin, int32 end, int32 now)); +int tkt_CheckTimes(int32 begin, int32 end, int32 now); int tkt_MakeTicket __P((char *ticket, diff --git a/usr.sbin/apmd/apm-proto.h b/usr.sbin/apmd/apm-proto.h index 5d65c51bd32..74e74b16106 100644 --- a/usr.sbin/apmd/apm-proto.h +++ b/usr.sbin/apmd/apm-proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: apm-proto.h,v 1.2 2001/03/23 01:00:41 mickey Exp $ */ +/* $OpenBSD: apm-proto.h,v 1.3 2002/02/16 21:28:00 millert Exp $ */ /* * Copyright (c) 1996 John T. Kohl @@ -55,5 +55,5 @@ struct apm_reply { #define APMD_VNO 1 -extern const char *battstate __P((int state)); -extern const char *ac_state __P((int state)); +extern const char *battstate(int state); +extern const char *ac_state(int state); diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 9d0af01f183..f8db75e98ad 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $ */ +/* $OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $ */ /* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)arp.c 8.2 (Berkeley) 1/2/94";*/ -static char *rcsid = "$OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $"; +static char *rcsid = "$OpenBSD: arp.c,v 1.19 2002/02/16 21:28:00 millert Exp $"; #endif /* not lint */ /* @@ -75,21 +75,21 @@ static char *rcsid = "$OpenBSD: arp.c,v 1.18 2001/06/10 17:46:20 dugsong Exp $"; #include <paths.h> #include <unistd.h> -int delete __P((const char *, const char *)); +int delete(const char *, const char *); void search(in_addr_t addr, void (*action)(struct sockaddr_dl *sdl, struct sockaddr_inarp *sin, struct rt_msghdr *rtm)); void print_entry(struct sockaddr_dl *sdl, struct sockaddr_inarp *sin, struct rt_msghdr *rtm); void nuke_entry(struct sockaddr_dl *sdl, struct sockaddr_inarp *sin, struct rt_msghdr *rtm); -void ether_print __P((const u_char *)); -int file __P((char *)); -int get __P((const char *)); -int getinetaddr __P((const char *, struct in_addr *)); -void getsocket __P((void)); -int rtmsg __P((int)); -int set __P((int, char **)); -void usage __P((void)); +void ether_print(const u_char *); +int file(char *); +int get(const char *); +int getinetaddr(const char *, struct in_addr *); +void getsocket(void); +int rtmsg(int); +int set(int, char **); +void usage(void); static int pid; static int nflag; /* no reverse dns lookups */ diff --git a/usr.sbin/bad144/bad144.c b/usr.sbin/bad144/bad144.c index 6b538779fdd..6cfb72c56fd 100644 --- a/usr.sbin/bad144/bad144.c +++ b/usr.sbin/bad144/bad144.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)bad144.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: bad144.c,v 1.9 2001/08/12 12:03:03 heko Exp $"; +static char *rcsid = "$Id: bad144.c,v 1.10 2002/02/16 21:28:01 millert Exp $"; #endif /* not lint */ /* @@ -83,14 +83,14 @@ daddr_t size; struct disklabel *dp; char name[BUFSIZ]; -void Perror __P((const char *)); -daddr_t badsn __P((const struct bt_bad *)); -int blkcopy __P((int, daddr_t, daddr_t)); -void blkzero __P((int, daddr_t)); -int checkold __P((void)); -int compare __P((const void *, const void *)); -daddr_t getold __P((int, struct dkbad *)); -void shift __P((int, int, int)); +void Perror(const char *); +daddr_t badsn(const struct bt_bad *); +int blkcopy(int, daddr_t, daddr_t); +void blkzero(int, daddr_t); +int checkold(void); +int compare(const void *, const void *); +daddr_t getold(int, struct dkbad *); +void shift(int, int, int); int main(argc, argv) diff --git a/usr.sbin/catman/catman.c b/usr.sbin/catman/catman.c index cddaba6e16f..6c97940b47c 100644 --- a/usr.sbin/catman/catman.c +++ b/usr.sbin/catman/catman.c @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: catman.c,v 1.2 1997/01/15 23:43:49 millert Exp $"; +static char rcsid[] = "$Id: catman.c,v 1.3 2002/02/16 21:28:01 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -58,10 +58,10 @@ int dowhatis; char *mp = _PATH_MAN; char *sp = _MAN_SECTIONS; -void usage __P((void)); -void catman __P((const char *, char *)); -void makewhatis __P((const char *)); -void dosystem __P((const char *)); +void usage(void); +void catman(const char *, char *); +void makewhatis(const char *); +void dosystem(const char *); int main(argc, argv) diff --git a/usr.sbin/config/cmd.h b/usr.sbin/config/cmd.h index 2f2d330e774..dc354b6e94c 100644 --- a/usr.sbin/config/cmd.h +++ b/usr.sbin/config/cmd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: cmd.h,v 1.4 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -59,19 +59,19 @@ extern cmd_table_t cmd_table[]; #endif /* Prototypes */ -int Xhelp __P((cmd_t *)); -int Xadd __P((cmd_t *)); -int Xbase __P((cmd_t *)); -int Xchange __P((cmd_t *)); -int Xdisable __P((cmd_t *)); -int Xenable __P((cmd_t *)); -int Xfind __P((cmd_t *)); -int Xlines __P((cmd_t *)); -int Xlist __P((cmd_t *)); -int Xshow __P((cmd_t *)); -int Xexit __P((cmd_t *)); -int Xquit __P((cmd_t *)); -int Xtimezone __P((cmd_t *)); +int Xhelp(cmd_t *); +int Xadd(cmd_t *); +int Xbase(cmd_t *); +int Xchange(cmd_t *); +int Xdisable(cmd_t *); +int Xenable(cmd_t *); +int Xfind(cmd_t *); +int Xlines(cmd_t *); +int Xlist(cmd_t *); +int Xshow(cmd_t *); +int Xexit(cmd_t *); +int Xquit(cmd_t *); +int Xtimezone(cmd_t *); #endif /* _CMD_H */ diff --git a/usr.sbin/config/config.h b/usr.sbin/config/config.h index 426b15447f6..5017fdda174 100644 --- a/usr.sbin/config/config.h +++ b/usr.sbin/config/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.15 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: config.h,v 1.16 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: config.h,v 1.30 1997/02/02 21:12:30 thorpej Exp $ */ /* @@ -328,65 +328,65 @@ struct { /* loc[] table for config */ } locators; /* files.c */ -void initfiles __P((void)); -void checkfiles __P((void)); -int fixfiles __P((void)); /* finalize */ -int fixobjects __P((void)); -void addfile __P((const char *, struct nvlist *, int, const char *)); -void addobject __P((const char *, struct nvlist *, int)); +void initfiles(void); +void checkfiles(void); +int fixfiles(void); /* finalize */ +int fixobjects(void); +void addfile(const char *, struct nvlist *, int, const char *); +void addobject(const char *, struct nvlist *, int); /* hash.c */ -struct hashtab *ht_new __P((void)); -int ht_insrep __P((struct hashtab *, const char *, void *, int)); -int ht_remove __P((struct hashtab *, const char *)); +struct hashtab *ht_new(void); +int ht_insrep(struct hashtab *, const char *, void *, int); +int ht_remove(struct hashtab *, const char *); #define ht_insert(ht, nam, val) ht_insrep(ht, nam, val, 0) #define ht_replace(ht, nam, val) ht_insrep(ht, nam, val, 1) -void *ht_lookup __P((struct hashtab *, const char *)); -void initintern __P((void)); -const char *intern __P((const char *)); +void *ht_lookup(struct hashtab *, const char *); +void initintern(void); +const char *intern(const char *); /* main.c */ -void addoption __P((const char *name, const char *value)); -void removeoption __P((const char *name)); -void addmkoption __P((const char *name, const char *value)); -void defoption __P((const char *name)); -int devbase_has_instances __P((struct devbase *, int)); -int deva_has_instances __P((struct deva *, int)); -void setupdirs __P((void)); +void addoption(const char *name, const char *value); +void removeoption(const char *name); +void addmkoption(const char *name, const char *value); +void defoption(const char *name); +int devbase_has_instances(struct devbase *, int); +int deva_has_instances(struct deva *, int); +void setupdirs(void); /* mkheaders.c */ -int mkheaders __P((void)); +int mkheaders(void); /* mkioconf.c */ -int mkioconf __P((void)); +int mkioconf(void); /* mkmakefile.c */ -int mkmakefile __P((void)); +int mkmakefile(void); /* mkswap.c */ -int mkswap __P((void)); +int mkswap(void); /* pack.c */ -void pack __P((void)); +void pack(void); /* scan.l */ -int currentline __P((void)); -int firstfile __P((const char *)); -int include __P((const char *, int)); +int currentline(void); +int firstfile(const char *); +int include(const char *, int); /* sem.c, other than for yacc actions */ -void initsem __P((void)); +void initsem(void); /* util.c */ -void *emalloc __P((size_t)); -void *erealloc __P((void *, size_t)); -char *sourcepath __P((const char *)); -void error __P((const char *, ...)); /* immediate errs */ -void xerror __P((const char *, int, const char *, ...)); /* delayed errs */ -__dead void panic __P((const char *, ...)); +void *emalloc(size_t); +void *erealloc(void *, size_t); +char *sourcepath(const char *); +void error(const char *, ...); /* immediate errs */ +void xerror(const char *, int, const char *, ...); /* delayed errs */ +__dead void panic(const char *, ...); struct nvlist *newnv __P((const char *, const char *, void *, int, struct nvlist *)); -void nvfree __P((struct nvlist *)); -void nvfreel __P((struct nvlist *)); +void nvfree(struct nvlist *); +void nvfreel(struct nvlist *); -int ukc __P((char *, char *, int, int)); +int ukc(char *, char *, int, int); diff --git a/usr.sbin/config/exec.c b/usr.sbin/config/exec.c index ece46bc69ab..5549c5d4b81 100644 --- a/usr.sbin/config/exec.c +++ b/usr.sbin/config/exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1999 Mats O Jansson. All rights reserved. @@ -34,31 +34,31 @@ #include <stdio.h> #ifndef LINT -static char rcsid[] = "$OpenBSD: exec.c,v 1.2 2001/12/05 10:11:23 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: exec.c,v 1.3 2002/02/16 21:28:01 millert Exp $"; #endif #ifdef AOUT_SUPPORT -int aout_check __P((char *)); -void aout_loadkernel __P((char *)); -void aout_savekernel __P((char *)); -caddr_t aout_adjust __P((caddr_t)); -caddr_t aout_readjust __P((caddr_t)); +int aout_check(char *); +void aout_loadkernel(char *); +void aout_savekernel(char *); +caddr_t aout_adjust(caddr_t); +caddr_t aout_readjust(caddr_t); #endif #ifdef ECOFF_SUPPORT -int ecoff_check __P((char *)); -void ecoff_loadkernel __P((char *)); -void ecoff_savekernel __P((char *)); -caddr_t ecoff_adjust __P((caddr_t)); -caddr_t ecoff_readjust __P((caddr_t)); +int ecoff_check(char *); +void ecoff_loadkernel(char *); +void ecoff_savekernel(char *); +caddr_t ecoff_adjust(caddr_t); +caddr_t ecoff_readjust(caddr_t); #endif #ifdef ELF_SUPPORT -int elf_check __P((char *)); -void elf_loadkernel __P((char *)); -void elf_savekernel __P((char *)); -caddr_t elf_adjust __P((caddr_t)); -caddr_t elf_readjust __P((caddr_t)); +int elf_check(char *); +void elf_loadkernel(char *); +void elf_savekernel(char *); +caddr_t elf_adjust(caddr_t); +caddr_t elf_readjust(caddr_t); #endif #define DO_AOUT 0 diff --git a/usr.sbin/config/exec.h b/usr.sbin/config/exec.h index 93420676721..9ced4ae761c 100644 --- a/usr.sbin/config/exec.h +++ b/usr.sbin/config/exec.h @@ -1,4 +1,4 @@ -/* $OpenBSD: exec.h,v 1.2 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: exec.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1999 Mats O Jansson. All rights reserved. @@ -32,10 +32,10 @@ #ifndef _EXEC_H #define _EXEC_H -void loadkernel __P((char *)); -void savekernel __P((char *)); -caddr_t adjust __P((caddr_t)); -caddr_t readjust __P((caddr_t)); +void loadkernel(char *); +void savekernel(char *); +caddr_t adjust(caddr_t); +caddr_t readjust(caddr_t); #endif /* _EXEC_H */ diff --git a/usr.sbin/config/files.c b/usr.sbin/config/files.c index 84eeadcec53..4245d2fe5b9 100644 --- a/usr.sbin/config/files.c +++ b/usr.sbin/config/files.c @@ -1,4 +1,4 @@ -/* $OpenBSD: files.c,v 1.8 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: files.c,v 1.9 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: files.c,v 1.6 1996/03/17 13:18:17 cgd Exp $ */ /* @@ -68,13 +68,13 @@ static struct files **unchecked; static struct objects **nextobject; -static int checkaux __P((const char *, void *)); -static int fixcount __P((const char *, void *)); -static int fixfsel __P((const char *, void *)); -static int fixsel __P((const char *, void *)); +static int checkaux(const char *, void *); +static int fixcount(const char *, void *); +static int fixfsel(const char *, void *); +static int fixsel(const char *, void *); static int expr_eval __P((struct nvlist *, int (*)(const char *, void *), void *)); -static void expr_free __P((struct nvlist *)); +static void expr_free(struct nvlist *); void initfiles() @@ -392,7 +392,7 @@ fixsel(name, context) static int expr_eval(expr, fn, context) register struct nvlist *expr; - register int (*fn) __P((const char *, void *)); + register int (*fn)(const char *, void *); register void *context; { int lhs, rhs; diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y index 1012d32d596..f616ff61936 100644 --- a/usr.sbin/config/gram.y +++ b/usr.sbin/config/gram.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: gram.y,v 1.11 2001/01/23 06:02:58 angelos Exp $ */ +/* $OpenBSD: gram.y,v 1.12 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: gram.y,v 1.14 1997/02/02 21:12:32 thorpej Exp $ */ /* @@ -60,9 +60,9 @@ #define stop(s) error(s), exit(1) -int include __P((const char *, int)); -void yyerror __P((const char *)); -int yylex __P((void)); +int include(const char *, int); +void yyerror(const char *); +int yylex(void); static struct config conf; /* at most one active at a time */ @@ -85,9 +85,9 @@ static int adepth; #define fx_and(e1, e2) new0(NULL, NULL, e1, FX_AND, e2) #define fx_or(e1, e2) new0(NULL, NULL, e1, FX_OR, e2) -static void cleanup __P((void)); -static void setmachine __P((const char *, const char *)); -static void check_maxpart __P((void)); +static void cleanup(void); +static void setmachine(const char *, const char *); +static void check_maxpart(void); %} diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index 947d8d1bb64..03a0e2acc22 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.22 2001/12/11 23:47:00 miod Exp $ */ +/* $OpenBSD: main.c,v 1.23 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: main.c,v 1.22 1997/02/02 21:12:33 thorpej Exp $ */ /* @@ -62,8 +62,8 @@ static char copyright[] = #include <unistd.h> #include "config.h" -int firstfile __P((const char *)); -int yyparse __P((void)); +int firstfile(const char *); +int yyparse(void); extern char *optarg; extern int optind; @@ -73,15 +73,15 @@ static struct nvlist **nextopt; static struct nvlist **nextdefopt; static struct nvlist **nextmkopt; -static __dead void stop __P((void)); +static __dead void stop(void); static int do_option __P((struct hashtab *, struct nvlist ***, const char *, const char *, const char *)); -static int crosscheck __P((void)); -static int badstar __P((void)); -static int mksymlinks __P((void)); -static int hasparent __P((struct devi *)); -static int cfcrosscheck __P((struct config *, const char *, struct nvlist *)); -static void optiondelta __P((void)); +static int crosscheck(void); +static int badstar(void); +static int mksymlinks(void); +static int hasparent(struct devi *); +static int cfcrosscheck(struct config *, const char *, struct nvlist *); +static void optiondelta(void); int madedir = 0; diff --git a/usr.sbin/config/misc.h b/usr.sbin/config/misc.h index 503d6126f19..a5f5939eb78 100644 --- a/usr.sbin/config/misc.h +++ b/usr.sbin/config/misc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.2 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: misc.h,v 1.3 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -37,8 +37,8 @@ #include "cmd.h" /* Prototypes */ -int ask_cmd __P((cmd_t *)); -int ask_yn __P((const char *)); +int ask_cmd(cmd_t *); +int ask_yn(const char *); #endif /* _MISC_H */ diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c index dc4ed3f9f38..4b383e4a03a 100644 --- a/usr.sbin/config/mkheaders.c +++ b/usr.sbin/config/mkheaders.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkheaders.c,v 1.10 1998/05/14 21:16:44 deraadt Exp $ */ +/* $OpenBSD: mkheaders.c,v 1.11 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: mkheaders.c,v 1.12 1997/02/02 21:12:34 thorpej Exp $ */ /* @@ -53,10 +53,10 @@ #include <string.h> #include "config.h" -static int emitcnt __P((struct nvlist *)); -static int emitopt __P((struct nvlist *)); -static int err __P((const char *, char *, FILE *)); -static char *cntname __P((const char *)); +static int emitcnt(struct nvlist *); +static int emitopt(struct nvlist *); +static int err(const char *, char *, FILE *); +static char *cntname(const char *); /* * Make headers containing counts, as needed. diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 890deac0333..ad08c5174e8 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkioconf.c,v 1.17 2001/11/10 20:46:07 maja Exp $ */ +/* $OpenBSD: mkioconf.c,v 1.18 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: mkioconf.c,v 1.41 1996/11/11 14:18:49 mycroft Exp $ */ /* @@ -55,15 +55,15 @@ /* * Make ioconf.c. */ -static int cforder __P((const void *, const void *)); -static int emitcfdata __P((FILE *)); -static int emitexterns __P((FILE *)); -static int emithdr __P((FILE *)); -static int emitloc __P((FILE *)); -static int emitlocnames __P((FILE *)); -static int emitpseudo __P((FILE *)); -static int emitpv __P((FILE *)); -static int emitroots __P((FILE *)); +static int cforder(const void *, const void *); +static int emitcfdata(FILE *); +static int emitexterns(FILE *); +static int emithdr(FILE *); +static int emitloc(FILE *); +static int emitlocnames(FILE *); +static int emitpseudo(FILE *); +static int emitpv(FILE *); +static int emitroots(FILE *); #define SEP(pos, max) (((u_int)(pos) % (max)) == 0 ? "\n\t" : " ") @@ -469,7 +469,7 @@ emitpseudo(fp) if (fputs("\n/* pseudo-devices */\n", fp) < 0) return (1); for (i = allpseudo; i != NULL; i = i->i_next) - if (fprintf(fp, "extern void %sattach __P((int));\n", + if (fprintf(fp, "extern void %sattach(int);\n", i->i_base->d_name) < 0) return (1); if (fputs("\nchar *pdevnames[] = {\n", fp) < 0) diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c index 962ea278548..1e6ea16bb0a 100644 --- a/usr.sbin/config/mkmakefile.c +++ b/usr.sbin/config/mkmakefile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkmakefile.c,v 1.9 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: mkmakefile.c,v 1.10 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $ */ /* @@ -58,23 +58,23 @@ * Make the Makefile. */ -static const char *srcpath __P((struct files *)); +static const char *srcpath(struct files *); -static int emitdefs __P((FILE *)); -static int emitfiles __P((FILE *, int)); +static int emitdefs(FILE *); +static int emitfiles(FILE *, int); -static int emitobjs __P((FILE *)); -static int emitcfiles __P((FILE *)); -static int emitsfiles __P((FILE *)); -static int emitrules __P((FILE *)); -static int emitload __P((FILE *)); +static int emitobjs(FILE *); +static int emitcfiles(FILE *); +static int emitsfiles(FILE *); +static int emitrules(FILE *); +static int emitload(FILE *); int mkmakefile() { register FILE *ifp, *ofp; register int lineno; - register int (*fn) __P((FILE *)); + register int (*fn)(FILE *); register char *ifname; char line[BUFSIZ], buf[200]; diff --git a/usr.sbin/config/mkswap.c b/usr.sbin/config/mkswap.c index 57d58a6b19b..7b7367858d4 100644 --- a/usr.sbin/config/mkswap.c +++ b/usr.sbin/config/mkswap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkswap.c,v 1.7 1996/11/12 08:37:58 niklas Exp $ */ +/* $OpenBSD: mkswap.c,v 1.8 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: mkswap.c,v 1.5 1996/08/31 20:58:27 mycroft Exp $ */ /* @@ -53,7 +53,7 @@ #include "config.h" #include "sem.h" -static int mkoneswap __P((struct config *)); +static int mkoneswap(struct config *); /* * Make the various swap*.c files. Nothing to do for generic swap. @@ -120,7 +120,7 @@ mkoneswap(cf) goto wrerror; mountroot = cf->cf_root->nv_str == s_nfs ? "nfs_mountroot" : "dk_mountroot"; - if (fprintf(fp, "int (*mountroot) __P((void)) = %s;\n", mountroot) < 0) + if (fprintf(fp, "int (*mountroot)(void) = %s;\n", mountroot) < 0) goto wrerror; if (fclose(fp)) { diff --git a/usr.sbin/config/pack.c b/usr.sbin/config/pack.c index 8cc8659ff5a..cf589f93143 100644 --- a/usr.sbin/config/pack.c +++ b/usr.sbin/config/pack.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pack.c,v 1.9 1999/01/19 01:11:25 niklas Exp $ */ +/* $OpenBSD: pack.c,v 1.10 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: pack.c,v 1.5 1996/08/31 21:15:11 mycroft Exp $ */ /* @@ -88,7 +88,7 @@ * (So it goes.) */ -typedef int (*vec_cmp_func) __P((const void *, int, int)); +typedef int (*vec_cmp_func)(const void *, int, int); #define TAILHSIZE 128 #define PVHASH(i) ((i) & (TAILHSIZE - 1)) @@ -103,21 +103,21 @@ static int locspace; static int pvecspace; static int longest_pvec; -static void packdevi __P((void)); -static void packlocs __P((void)); -static void packpvec __P((void)); - -static void addparents __P((struct devi *src, struct devi *dst)); -static int nparents __P((struct devi **, struct devbase *, int)); -static int sameas __P((struct devi *, struct devi *)); -static int findvec __P((const void *, int, int, vec_cmp_func, int)); -static int samelocs __P((const void *, int, int)); -static int addlocs __P((const char **, int)); -static int loclencmp __P((const void *, const void *)); -static int samepv __P((const void *, int, int)); -static int addpv __P((short *, int)); -static int pvlencmp __P((const void *, const void *)); -static void resettails __P((void)); +static void packdevi(void); +static void packlocs(void); +static void packpvec(void); + +static void addparents(struct devi *src, struct devi *dst); +static int nparents(struct devi **, struct devbase *, int); +static int sameas(struct devi *, struct devi *); +static int findvec(const void *, int, int, vec_cmp_func, int); +static int samelocs(const void *, int, int); +static int addlocs(const char **, int); +static int loclencmp(const void *, const void *); +static int samepv(const void *, int, int); +static int addpv(short *, int); +static int pvlencmp(const void *, const void *); +static void resettails(void); void pack() diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l index 739e8022cb0..7d55ef8c504 100644 --- a/usr.sbin/config/scan.l +++ b/usr.sbin/config/scan.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scan.l,v 1.14 2001/01/23 06:02:59 angelos Exp $ */ +/* $OpenBSD: scan.l,v 1.15 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: scan.l,v 1.13 1997/02/02 21:12:37 thorpej Exp $ */ /* @@ -70,7 +70,7 @@ struct incl { int in_ateof; /* token to insert at EOF */ }; static struct incl *incl; -static int endinclude __P((void)); +static int endinclude(void); #define yywrap() 1 diff --git a/usr.sbin/config/sem.c b/usr.sbin/config/sem.c index 8e23e9b0d58..2abf276e3b9 100644 --- a/usr.sbin/config/sem.c +++ b/usr.sbin/config/sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.c,v 1.22 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: sem.c,v 1.23 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: sem.c,v 1.10 1996/11/11 23:40:11 gwr Exp $ */ /* @@ -77,21 +77,21 @@ static struct config **nextcf; static struct devi **nextdevi; static struct devi **nextpseudo; -static int has_errobj __P((struct nvlist *, void *)); -static struct nvlist *addtoattr __P((struct nvlist *, struct devbase *)); -static int exclude __P((struct nvlist *, const char *, const char *)); +static int has_errobj(struct nvlist *, void *); +static struct nvlist *addtoattr(struct nvlist *, struct devbase *); +static int exclude(struct nvlist *, const char *, const char *); static int resolve __P((struct nvlist **, const char *, const char *, struct nvlist *, int)); static int lresolve __P((struct nvlist **, const char *, const char *, struct nvlist *, int)); -static struct devi *newdevi __P((const char *, int, struct devbase *d)); -static struct devi *getdevi __P((const char *)); -static const char *concat __P((const char *, int)); -static char *extend __P((char *, const char *)); -static int split __P((const char *, size_t, char *, size_t, int *)); -static void selectbase __P((struct devbase *, struct deva *)); -static int onlist __P((struct nvlist *, void *)); -static const char **fixloc __P((const char *, struct attr *, struct nvlist *)); +static struct devi *newdevi(const char *, int, struct devbase *d); +static struct devi *getdevi(const char *); +static const char *concat(const char *, int); +static char *extend(char *, const char *); +static int split(const char *, size_t, char *, size_t, int *); +static void selectbase(struct devbase *, struct deva *); +static int onlist(struct nvlist *, void *); +static const char **fixloc(const char *, struct attr *, struct nvlist *); void initsem() diff --git a/usr.sbin/config/sem.h b/usr.sbin/config/sem.h index 2e6ab44ee59..89dfa079738 100644 --- a/usr.sbin/config/sem.h +++ b/usr.sbin/config/sem.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sem.h,v 1.8 2001/01/23 17:43:21 deraadt Exp $ */ +/* $OpenBSD: sem.h,v 1.9 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: sem.h,v 1.6 1996/11/11 23:40:10 gwr Exp $ */ /* @@ -45,27 +45,27 @@ * from: @(#)sem.h 8.1 (Berkeley) 6/6/93 */ -void enddefs __P((void)); +void enddefs(void); -void setdefmaxusers __P((int, int, int)); -void setmaxusers __P((int)); -int defattr __P((const char *, struct nvlist *)); +void setdefmaxusers(int, int, int); +void setmaxusers(int); +int defattr(const char *, struct nvlist *); void defdev __P((struct devbase *, int, struct nvlist *, struct nvlist *)); void defdevattach __P((struct deva *, struct devbase *, struct nvlist *, struct nvlist *)); -struct devbase *getdevbase __P((const char *name)); -struct deva *getdevattach __P((const char *name)); -struct attr *getattr __P((const char *name)); -void setmajor __P((struct devbase *d, int n)); -void addconf __P((struct config *)); -void setconf __P((struct nvlist **, const char *, struct nvlist *)); -void adddev __P((const char *, const char *, struct nvlist *, int, int)); -void enabledev __P((const char *, const char *)); -void addpseudo __P((const char *name, int number)); -const char *ref __P((const char *name)); -const char *starref __P((const char *name)); -const char *wildref __P((const char *name)); +struct devbase *getdevbase(const char *name); +struct deva *getdevattach(const char *name); +struct attr *getattr(const char *name); +void setmajor(struct devbase *d, int n); +void addconf(struct config *); +void setconf(struct nvlist **, const char *, struct nvlist *); +void adddev(const char *, const char *, struct nvlist *, int, int); +void enabledev(const char *, const char *); +void addpseudo(const char *name, int number); +const char *ref(const char *name); +const char *starref(const char *name); +const char *wildref(const char *name); extern const char *s_generic; extern const char *s_nfs; diff --git a/usr.sbin/config/ukc.c b/usr.sbin/config/ukc.c index 8e70d42fe5e..8d0db1cdb97 100644 --- a/usr.sbin/config/ukc.c +++ b/usr.sbin/config/ukc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ukc.c,v 1.7 2002/02/16 21:28:01 millert Exp $"; #endif #include <sys/types.h> @@ -51,8 +51,8 @@ static char rcsid[] = "$OpenBSD: ukc.c,v 1.6 2001/12/05 10:11:23 deraadt Exp $"; #include "ukc.h" #include "exec.h" -void init __P((void)); -void usage __P((void)); +void init(void); +void usage(void); int ukc_mod_kernel = 0; diff --git a/usr.sbin/config/ukc.h b/usr.sbin/config/ukc.h index 7745e9fe742..ef82f1e5501 100644 --- a/usr.sbin/config/ukc.h +++ b/usr.sbin/config/ukc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ukc.h,v 1.6 2001/12/05 10:11:23 deraadt Exp $ */ +/* $OpenBSD: ukc.h,v 1.7 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1999-2001 Mats O Jansson. All rights reserved. @@ -117,34 +117,34 @@ extern int oldkernel; extern int nopdev; #endif -struct cfdata *get_cfdata __P((int)); -short *get_locnamp __P((int)); -caddr_t *get_locnames __P((int)); -int *get_extraloc __P((int)); -char *get_pdevnames __P((int)); -struct pdevinit *get_pdevinit __P((int)); +struct cfdata *get_cfdata(int); +short *get_locnamp(int); +caddr_t *get_locnames(int); +int *get_extraloc(int); +char *get_pdevnames(int); +struct pdevinit *get_pdevinit(int); -int more __P(()); -void pnum __P((int)); -void pdevnam __P((short)); -void pdev __P((short)); -int number __P((char *, int *)); -int device __P((char *, int *, short *, short *)); -int attr __P((char *, int *)); -void modify __P((char *, int *)); -void change __P((int)); -void disable __P((int)); -void enable __P((int)); -void show __P((void)); -void common_attr_val __P((short, int *, char)); -void show_attr __P((char *)); -void common_dev __P((char *, int, short, short, char)); -void common_attr __P((char *, int, char)); -void add_read __P((char *, char, char *, int, int *)); -void add __P((char *, int, short, short)); +int more(); +void pnum(int); +void pdevnam(short); +void pdev(short); +int number(char *, int *); +int device(char *, int *, short *, short *); +int attr(char *, int *); +void modify(char *, int *); +void change(int); +void disable(int); +void enable(int); +void show(void); +void common_attr_val(short, int *, char); +void show_attr(char *); +void common_dev(char *, int, short, short, char); +void common_attr(char *, int, char); +void add_read(char *, char, char *, int, int *); +void add(char *, int, short, short); -int config __P(()); -void process_history __P((int, char *)); +int config(); +void process_history(int, char *); #define UC_CHANGE 'c' #define UC_DISABLE 'd' diff --git a/usr.sbin/config/util.c b/usr.sbin/config/util.c index b470ac4c8dd..699ae2acfba 100644 --- a/usr.sbin/config/util.c +++ b/usr.sbin/config/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.6 1997/07/25 20:12:10 mickey Exp $ */ +/* $OpenBSD: util.c,v 1.7 2002/02/16 21:28:01 millert Exp $ */ /* $NetBSD: util.c,v 1.5 1996/08/31 20:58:29 mycroft Exp $ */ /* @@ -57,8 +57,8 @@ #include <sys/types.h> #include "config.h" -static void nomem __P((void)); -static void vxerror __P((const char *, int, const char *, va_list)); +static void nomem(void); +static void vxerror(const char *, int, const char *, va_list); /* * Malloc, with abort on error. diff --git a/usr.sbin/cron/cron.c b/usr.sbin/cron/cron.c index 07b1075bdaf..fb3f44cd202 100644 --- a/usr.sbin/cron/cron.c +++ b/usr.sbin/cron/cron.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $ */ +/* $OpenBSD: cron.c,v 1.19 2002/02/16 21:28:01 millert Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * All rights reserved */ @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $"; +static char rcsid[] = "$OpenBSD: cron.c,v 1.19 2002/02/16 21:28:01 millert Exp $"; #endif #define MAIN_PROGRAM @@ -30,9 +30,9 @@ static char rcsid[] = "$OpenBSD: cron.c,v 1.18 2001/12/20 23:27:47 millert Exp $ static void usage(void), run_reboot_jobs(cron_db *), - find_jobs __P((int, cron_db *, int, int)), - set_time __P((int)), - cron_sleep __P((int)), + find_jobs(int, cron_db *, int, int), + set_time(int), + cron_sleep(int), sigchld_handler(int), sighup_handler(int), sigusr1_handler(int), diff --git a/usr.sbin/cron/crontab.c b/usr.sbin/cron/crontab.c index 2fae5876d30..9ed216e139d 100644 --- a/usr.sbin/cron/crontab.c +++ b/usr.sbin/cron/crontab.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crontab.c,v 1.26 2001/12/20 23:27:47 millert Exp $ */ +/* $OpenBSD: crontab.c,v 1.27 2002/02/16 21:28:01 millert Exp $ */ /* Copyright 1988,1990,1993,1994 by Paul Vixie * All rights reserved */ @@ -21,7 +21,7 @@ */ #if !defined(lint) && !defined(LINT) -static char rcsid[] = "$OpenBSD: crontab.c,v 1.26 2001/12/20 23:27:47 millert Exp $"; +static char rcsid[] = "$OpenBSD: crontab.c,v 1.27 2002/02/16 21:28:01 millert Exp $"; #endif /* crontab - install and manage per-user crontab files @@ -58,7 +58,7 @@ static void list_cmd(void), check_error(const char *), parse_args(int c, char *v[]); static int replace_cmd(void); -static void clean_turds __P((int)); +static void clean_turds(int); static void usage(const char *msg) { diff --git a/usr.sbin/cron/funcs.h b/usr.sbin/cron/funcs.h index 96828b63461..680f1301ca6 100644 --- a/usr.sbin/cron/funcs.h +++ b/usr.sbin/cron/funcs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: funcs.h,v 1.3 2001/02/20 02:03:19 millert Exp $ */ +/* $OpenBSD: funcs.h,v 1.4 2002/02/16 21:28:01 millert Exp $ */ /* * Copyright (c) 1997,2000 by Internet Software Consortium, Inc. @@ -45,7 +45,7 @@ int job_runqueue(void), get_char(FILE *), get_string(char *, int, FILE *, char *), swap_uids(void), - swap_uids_back __P((void)), + swap_uids_back(void), load_env(char *, FILE *), cron_pclose(FILE *), glue_strings(char *, int, char *, char *, int), diff --git a/usr.sbin/dev_mkdb/dev_mkdb.c b/usr.sbin/dev_mkdb/dev_mkdb.c index 18469377ec9..09108830f65 100644 --- a/usr.sbin/dev_mkdb/dev_mkdb.c +++ b/usr.sbin/dev_mkdb/dev_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $ */ +/* $OpenBSD: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)dev_mkdb.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$Id: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $"; +static char rcsid[] = "$Id: dev_mkdb.c,v 1.6 2002/02/16 21:28:01 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -60,7 +60,7 @@ static char rcsid[] = "$Id: dev_mkdb.c,v 1.5 2000/10/03 18:07:51 mickey Exp $"; #include <string.h> #include <unistd.h> -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 64de9f771d3..98bbe23c108 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -42,7 +42,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: edquota.c,v 1.28 2001/09/04 23:35:59 millert Exp $"; +static char *rcsid = "$Id: edquota.c,v 1.29 2002/02/16 21:28:01 millert Exp $"; #endif /* not lint */ /* @@ -77,24 +77,24 @@ struct quotause { struct dqblk dqblk; char fsname[MAXPATHLEN]; char qfname[1]; /* actually longer */ -} *getprivs __P((u_int, int)); +} *getprivs(u_int, int); #define FOUND 0x01 -void usage __P((void)); -int getentry __P((char *, int, u_int *)); +void usage(void); +int getentry(char *, int, u_int *); struct quotause * - getprivs __P((u_int, int)); -void putprivs __P((long, int, struct quotause *)); -int editit __P((char *)); -int writeprivs __P((struct quotause *, int, char *, int)); -int readprivs __P((struct quotause *, int)); -int writetimes __P((struct quotause *, int, int)); -int readtimes __P((struct quotause *, int)); -char * cvtstoa __P((time_t)); -int cvtatos __P((time_t, char *, time_t *)); -void freeprivs __P((struct quotause *)); -int alldigits __P((char *s)); -int hasquota __P((struct fstab *, int, char **)); + getprivs(u_int, int); +void putprivs(long, int, struct quotause *); +int editit(char *); +int writeprivs(struct quotause *, int, char *, int); +int readprivs(struct quotause *, int); +int writetimes(struct quotause *, int, int); +int readtimes(struct quotause *, int); +char * cvtstoa(time_t); +int cvtatos(time_t, char *, time_t *); +void freeprivs(struct quotause *); +int alldigits(char *s); +int hasquota(struct fstab *, int, char **); void usage() diff --git a/usr.sbin/eeprom/defs.h b/usr.sbin/eeprom/defs.h index 35870dee007..f51f9217aad 100644 --- a/usr.sbin/eeprom/defs.h +++ b/usr.sbin/eeprom/defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: defs.h,v 1.2 1996/03/25 15:55:18 niklas Exp $ */ +/* $OpenBSD: defs.h,v 1.3 2002/02/16 21:28:02 millert Exp $ */ /* $NetBSD: defs.h,v 1.2 1996/02/28 01:13:20 thorpej Exp $ */ /*- @@ -62,7 +62,7 @@ struct keytabent { char *kt_keyword; /* keyword for this entry */ u_int kt_offset; /* offset into prom of value */ - void (*kt_handler) __P((struct keytabent *, char *)); + void (*kt_handler)(struct keytabent *, char *); /* handler function for this entry */ }; @@ -90,25 +90,25 @@ struct extabent { #endif /* __sparc__ */ /* Sun 3/4 EEPROM handlers. */ -void ee_hwupdate __P((struct keytabent *, char *)); -void ee_num8 __P((struct keytabent *, char *)); -void ee_num16 __P((struct keytabent *, char *)); -void ee_screensize __P((struct keytabent *, char *)); -void ee_truefalse __P((struct keytabent *, char *)); -void ee_bootdev __P((struct keytabent *, char *)); -void ee_kbdtype __P((struct keytabent *, char *)); -void ee_constype __P((struct keytabent *, char *)); -void ee_diagpath __P((struct keytabent *, char *)); -void ee_banner __P((struct keytabent *, char *)); -void ee_notsupp __P((struct keytabent *, char *)); +void ee_hwupdate(struct keytabent *, char *); +void ee_num8(struct keytabent *, char *); +void ee_num16(struct keytabent *, char *); +void ee_screensize(struct keytabent *, char *); +void ee_truefalse(struct keytabent *, char *); +void ee_bootdev(struct keytabent *, char *); +void ee_kbdtype(struct keytabent *, char *); +void ee_constype(struct keytabent *, char *); +void ee_diagpath(struct keytabent *, char *); +void ee_banner(struct keytabent *, char *); +void ee_notsupp(struct keytabent *, char *); /* Sun 3/4 EEPROM checksum routines. */ -u_char ee_checksum __P((u_char *, size_t)); -void ee_updatechecksums __P((void)); -void ee_verifychecksums __P((void)); +u_char ee_checksum(u_char *, size_t); +void ee_updatechecksums(void); +void ee_verifychecksums(void); #ifdef __sparc__ /* Sparc Openprom handlers. */ -char *op_handler __P((char *, char *)); -void op_dump __P((void)); +char *op_handler(char *, char *); +void op_dump(void); #endif /* __sparc__ */ diff --git a/usr.sbin/eeprom/eehandlers.c b/usr.sbin/eeprom/eehandlers.c index a404eba3d40..f8547e275ae 100644 --- a/usr.sbin/eeprom/eehandlers.c +++ b/usr.sbin/eeprom/eehandlers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eehandlers.c,v 1.7 2001/09/20 20:42:25 jason Exp $ */ +/* $OpenBSD: eehandlers.c,v 1.8 2002/02/16 21:28:02 millert Exp $ */ /* $NetBSD: eehandlers.c,v 1.2 1996/02/28 01:13:22 thorpej Exp $ */ /*- @@ -65,12 +65,12 @@ extern int cksumfail; extern u_short writecount; struct timeb; -extern time_t get_date __P((char *, struct timeb *)); +extern time_t get_date(char *, struct timeb *); static char err_str[BUFSIZE]; -static void badval __P((struct keytabent *, char *)); -static int doio __P((struct keytabent *, u_char *, ssize_t, int)); +static void badval(struct keytabent *, char *); +static int doio(struct keytabent *, u_char *, ssize_t, int); #define BARF(kt) { \ badval((kt), arg); \ diff --git a/usr.sbin/eeprom/main.c b/usr.sbin/eeprom/main.c index 4e0a1d01b1b..5d836aa3d8b 100644 --- a/usr.sbin/eeprom/main.c +++ b/usr.sbin/eeprom/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.7 2001/09/20 20:42:25 jason Exp $ */ +/* $OpenBSD: main.c,v 1.8 2002/02/16 21:28:02 millert Exp $ */ /* $NetBSD: main.c,v 1.3 1996/05/16 16:00:55 thorpej Exp $ */ /*- @@ -100,11 +100,11 @@ struct keytabent eekeytab[] = { { NULL, 0, ee_notsupp }, }; -static void action __P((char *)); -static void dump_prom __P((void)); -static void usage __P((void)); +static void action(char *); +static void dump_prom(void); +static void usage(void); #ifdef __sparc__ -static int getcputype __P((void)); +static int getcputype(void); #endif /* __sparc__ */ char *path_eeprom = "/dev/eeprom"; diff --git a/usr.sbin/eeprom/ophandlers.c b/usr.sbin/eeprom/ophandlers.c index 315d59c1c6e..4eaa259e757 100644 --- a/usr.sbin/eeprom/ophandlers.c +++ b/usr.sbin/eeprom/ophandlers.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ophandlers.c,v 1.4 1996/08/31 13:12:12 deraadt Exp $ */ +/* $OpenBSD: ophandlers.c,v 1.5 2002/02/16 21:28:02 millert Exp $ */ /* $NetBSD: ophandlers.c,v 1.2 1996/02/28 01:13:30 thorpej Exp $ */ /*- @@ -57,7 +57,7 @@ extern int verbose; static char err_str[BUFSIZE]; -static void op_notsupp __P((struct extabent *, struct opiocdesc *, char *)); +static void op_notsupp(struct extabent *, struct opiocdesc *, char *); /* * There are several known fields that I either don't know how to diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index c9eaab84c7e..2314f30c90a 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: faithd.c,v 1.17 2002/01/11 03:51:08 itojun Exp $ */ +/* $OpenBSD: faithd.c,v 1.18 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: faithd.c,v 1.40 2001/07/02 14:36:48 itojun Exp $ */ /* @@ -103,27 +103,27 @@ static int pflag = 0; static int inetd = 0; static char *configfile = NULL; -int main __P((int, char **)); +int main(int, char **); #if 0 -static int inetd_main __P((int, char **)); +static int inetd_main(int, char **); #endif -static int daemon_main __P((int, char **)); -static void play_service __P((int)); -static void play_child __P((int, struct sockaddr *)); -static int faith_prefix __P((struct sockaddr *)); -static int map6to4 __P((struct sockaddr_in6 *, struct sockaddr_in *)); +static int daemon_main(int, char **); +static void play_service(int); +static void play_child(int, struct sockaddr *); +static int faith_prefix(struct sockaddr *); +static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *); #ifdef FAITH4 -static int map4to6 __P((struct sockaddr_in *, struct sockaddr_in6 *)); +static int map4to6(struct sockaddr_in *, struct sockaddr_in6 *); #endif -static void sig_child __P((int)); -static void sig_terminate __P((int)); -static void start_daemon __P((void)); -static void exit_stderr __P((const char *, ...)) +static void sig_child(int); +static void sig_terminate(int); +static void start_daemon(void); +static void exit_stderr(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -static void grab_myaddrs __P((void)); -static void free_myaddrs __P((void)); -static void update_myaddrs __P((void)); -static void usage __P((void)); +static void grab_myaddrs(void); +static void free_myaddrs(void); +static void update_myaddrs(void); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/faithd/faithd.h b/usr.sbin/faithd/faithd.h index cf0521cdba5..82311b1e0ea 100644 --- a/usr.sbin/faithd/faithd.h +++ b/usr.sbin/faithd/faithd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: faithd.h,v 1.6 2001/09/05 01:31:33 itojun Exp $ */ +/* $OpenBSD: faithd.h,v 1.7 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: faithd.h,v 1.7 2001/07/02 14:36:48 itojun Exp $ */ /* @@ -33,15 +33,15 @@ extern char logname[]; extern int dflag; -extern void tcp_relay __P((int, int, const char *)); -extern void ftp_relay __P((int, int)); -extern int ftp_active __P((int, int, int *, int *)); -extern int ftp_passive __P((int, int, int *, int *)); -extern void rsh_relay __P((int, int)); -extern void rsh_dual_relay __P((int, int)); -extern void exit_success __P((const char *, ...)) +extern void tcp_relay(int, int, const char *); +extern void ftp_relay(int, int); +extern int ftp_active(int, int, int *, int *); +extern int ftp_passive(int, int, int *, int *); +extern void rsh_relay(int, int); +extern void rsh_dual_relay(int, int); +extern void exit_success(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -extern void exit_failure __P((const char *, ...)) +extern void exit_failure(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); #define DEFAULT_PORT_NAME "telnet" diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index b5b6b0ea341..8537a34120d 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp.c,v 1.5 2001/09/05 01:31:33 itojun Exp $ */ +/* $OpenBSD: ftp.c,v 1.6 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: ftp.c,v 1.13 2001/09/05 01:10:30 itojun Exp $ */ /* @@ -67,11 +67,11 @@ enum state { NONE, LPRT, EPRT, PORT, LPSV, EPSV, PASV }; enum state { NONE, LPRT, EPRT, LPSV, EPSV }; #endif -static int ftp_activeconn __P((void)); -static int ftp_passiveconn __P((void)); -static int ftp_copy __P((int, int)); -static int ftp_copyresult __P((int, int, enum state)); -static int ftp_copycommand __P((int, int, enum state *)); +static int ftp_activeconn(void); +static int ftp_passiveconn(void); +static int ftp_copy(int, int); +static int ftp_copyresult(int, int, enum state); +static int ftp_copycommand(int, int, enum state *); void ftp_relay(int ctl6, int ctl4) diff --git a/usr.sbin/faithd/prefix.c b/usr.sbin/faithd/prefix.c index 335b5375ae1..a8689c5a34b 100644 --- a/usr.sbin/faithd/prefix.c +++ b/usr.sbin/faithd/prefix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prefix.c,v 1.3 2001/11/21 04:53:13 itojun Exp $ */ +/* $OpenBSD: prefix.c,v 1.4 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: prefix.c,v 1.9 2001/07/02 14:36:49 itojun Exp $ */ /* @@ -47,11 +47,11 @@ #include "faithd.h" #include "prefix.h" -static int prefix_set __P((const char *, struct prefix *, int)); -static struct config *config_load1 __P((const char *)); +static int prefix_set(const char *, struct prefix *, int); +static struct config *config_load1(const char *); #if 0 -static void config_show1 __P((const struct config *)); -static void config_show __P((void)); +static void config_show1(const struct config *); +static void config_show(void); #endif struct config *config_list = NULL; diff --git a/usr.sbin/faithd/prefix.h b/usr.sbin/faithd/prefix.h index 971a4347f9a..b8d930ea76c 100644 --- a/usr.sbin/faithd/prefix.h +++ b/usr.sbin/faithd/prefix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prefix.h,v 1.1 2001/02/15 17:37:33 itojun Exp $ */ +/* $OpenBSD: prefix.h,v 1.2 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: prefix.h,v 1.3 2000/11/19 11:45:38 itojun Exp $ */ /* @@ -46,7 +46,7 @@ struct config { #define _PATH_PREFIX_CONF "/etc/faithd.conf" -extern const char *prefix_string __P((const struct prefix *)); -extern int prefix_match __P((const struct prefix *, const struct sockaddr *)); -extern int config_load __P((const char *)); -extern const struct config *config_match __P((struct sockaddr *, struct sockaddr *)); +extern const char *prefix_string(const struct prefix *); +extern int prefix_match(const struct prefix *, const struct sockaddr *); +extern int config_load(const char *); +extern const struct config *config_match(struct sockaddr *, struct sockaddr *); diff --git a/usr.sbin/faithd/tcp.c b/usr.sbin/faithd/tcp.c index 6f026212cd2..86058322b43 100644 --- a/usr.sbin/faithd/tcp.c +++ b/usr.sbin/faithd/tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp.c,v 1.9 2001/11/17 19:49:38 deraadt Exp $ */ +/* $OpenBSD: tcp.c,v 1.10 2002/02/16 21:28:02 millert Exp $ */ /* $KAME: tcp.c,v 1.6 2001/07/02 14:36:49 itojun Exp $ */ /* @@ -62,12 +62,12 @@ static pid_t ppid = (pid_t)0; volatile time_t child_lastactive = (time_t)0; static time_t parent_lastactive = (time_t)0; -static void sig_ctimeout __P((int)); -static void sig_child __P((int)); -static void notify_inactive __P((void)); -static void notify_active __P((void)); -static void send_data __P((int, int, const char *, int)); -static void relay __P((int, int, const char *, int)); +static void sig_ctimeout(int); +static void sig_child(int); +static void notify_inactive(void); +static void notify_active(void); +static void send_data(int, int, const char *, int); +static void relay(int, int, const char *, int); /* * Inactivity timer: diff --git a/usr.sbin/grfconfig/grfconfig.c b/usr.sbin/grfconfig/grfconfig.c index a3babd2b2ad..479c950a3fa 100644 --- a/usr.sbin/grfconfig/grfconfig.c +++ b/usr.sbin/grfconfig/grfconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Exp $ */ +/* $OpenBSD: grfconfig.c,v 1.5 2002/02/16 21:28:02 millert Exp $ */ /* $NetBSD: grfconfig.c,v 1.6 1997/07/29 23:41:12 veego Exp $ */ /*- @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #ifndef lint -static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Exp $"; +static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.5 2002/02/16 21:28:02 millert Exp $"; #endif /* not lint */ #include <sys/file.h> @@ -57,8 +57,8 @@ static char rcsid[] = "$OpenBSD: grfconfig.c,v 1.4 1997/09/18 22:03:45 niklas Ex extern char *optarg; extern int optind; -int main __P((int, char **)); -static void print_rawdata __P((struct grfvideo_mode *, int)); +int main(int, char **); +static void print_rawdata(struct grfvideo_mode *, int); static struct grf_flag { u_short grf_flag_number; diff --git a/usr.sbin/gspa/gspahextoc/gspahextoc.l b/usr.sbin/gspa/gspahextoc/gspahextoc.l index 1c3fdf10c6b..a0e39b5873e 100644 --- a/usr.sbin/gspa/gspahextoc/gspahextoc.l +++ b/usr.sbin/gspa/gspahextoc/gspahextoc.l @@ -35,10 +35,10 @@ unsigned long binads; - void dumpstart __P((char *address)); - void dumpbuf __P((void)); - void initbuf __P((char *address)); - void checkbuf __P((void)); + void dumpstart(char *address); + void dumpbuf(void); + void initbuf(char *address); + void checkbuf(void); %% :[0-9A-Za-z]+ {if (bufptr>0) dumpbuf(); dumpstart(yytext+1);} @[0-9A-Za-z]+ {if (bufptr>0) dumpbuf(); initbuf(yytext+1);} diff --git a/usr.sbin/httpd/src/regex/mkh b/usr.sbin/httpd/src/regex/mkh index b766fff1673..ee56cd15807 100644 --- a/usr.sbin/httpd/src/regex/mkh +++ b/usr.sbin/httpd/src/regex/mkh @@ -26,7 +26,7 @@ do ;; -b) # funny Berkeley __P macro peel="$peel - "'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));' + "'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(\2);' shift ;; -s) # compiler doesn't like `static foo();' diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c index aa8a73e8530..10aaaba9d1a 100644 --- a/usr.sbin/ifmcstat/ifmcstat.c +++ b/usr.sbin/ifmcstat/ifmcstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifmcstat.c,v 1.3 2001/11/16 04:46:54 itojun Exp $ */ +/* $OpenBSD: ifmcstat.c,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -76,16 +76,16 @@ struct nlist nl[] = { { "" }, }; -const char *inet6_n2a __P((struct in6_addr *)); -int main __P((int, char **)); -char *ifname __P((struct ifnet *)); -void kread __P((u_long, void *, int)); +const char *inet6_n2a(struct in6_addr *); +int main(int, char **); +char *ifname(struct ifnet *); +void kread(u_long, void *, int); #if !(defined(__FreeBSD__) && __FreeBSD__ >= 3) -void acmc __P((struct ether_multi *)); +void acmc(struct ether_multi *); #endif -void if6_addrlist __P((struct ifaddr *)); -void in6_multilist __P((struct in6_multi *)); -struct in6_multi * in6_multientry __P((struct in6_multi *)); +void if6_addrlist(struct ifaddr *); +void in6_multilist(struct in6_multi *); +struct in6_multi * in6_multientry(struct in6_multi *); #if !defined(__NetBSD__) && !(defined(__FreeBSD__) && __FreeBSD__ >= 3) && !defined(__OpenBSD__) #ifdef __bsdi__ @@ -93,7 +93,7 @@ struct ether_addr { u_int8_t ether_addr_octet[6]; }; #endif -static char *ether_ntoa __P((struct ether_addr *)); +static char *ether_ntoa(struct ether_addr *); #endif #define KREAD(addr, buf, type) \ diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 16ab573dc8f..1669e5d8244 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp $ */ +/* $OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ -static char rcsid[] = "$OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp $"; +static char rcsid[] = "$OpenBSD: inetd.c,v 1.88 2002/02/16 21:28:03 millert Exp $"; #endif /* not lint */ /* @@ -174,14 +174,14 @@ static char rcsid[] = "$OpenBSD: inetd.c,v 1.87 2002/02/10 01:19:02 millert Exp #define CNT_INTVL 60 /* servers in CNT_INTVL sec. */ #define RETRYTIME (60*10) /* retry after bind or server fail */ -void config __P((int)); -void doconfig __P((void)); -void reap __P((int)); -void doreap __P((void)); -void retry __P((int)); -void doretry __P((void)); -void die __P((int)); -void dodie __P((void)); +void config(int); +void doconfig(void); +void reap(int); +void doreap(void); +void retry(int); +void doretry(void); +void die(int); +void dodie(void); int debug = 0; int nsock, maxsock; @@ -246,23 +246,23 @@ struct servtab { struct servtab *se_next; } *servtab; -void echo_stream __P((int, struct servtab *)); -void discard_stream __P((int, struct servtab *)); -void machtime_stream __P((int, struct servtab *)); -void daytime_stream __P((int, struct servtab *)); -void chargen_stream __P((int, struct servtab *)); -void echo_dg __P((int, struct servtab *)); -void discard_dg __P((int, struct servtab *)); -void machtime_dg __P((int, struct servtab *)); -void daytime_dg __P((int, struct servtab *)); -void chargen_dg __P((int, struct servtab *)); +void echo_stream(int, struct servtab *); +void discard_stream(int, struct servtab *); +void machtime_stream(int, struct servtab *); +void daytime_stream(int, struct servtab *); +void chargen_stream(int, struct servtab *); +void echo_dg(int, struct servtab *); +void discard_dg(int, struct servtab *); +void machtime_dg(int, struct servtab *); +void daytime_dg(int, struct servtab *); +void chargen_dg(int, struct servtab *); struct biltin { char *bi_service; /* internally provided service name */ int bi_socktype; /* type of socket supported */ short bi_fork; /* 1 if should fork before call */ short bi_wait; /* 1 if should wait for child */ - void (*bi_fn) __P((int, struct servtab *)); + void (*bi_fn)(int, struct servtab *); } biltins[] = { /* Echo received data */ { "echo", SOCK_STREAM, 1, 0, echo_stream }, @@ -298,7 +298,7 @@ char **Argv; char *LastArg; char *progname; -void logpid __P((void)); +void logpid(void); void fd_grow(fd_set **fdsp, int *bytes, int fd) @@ -764,17 +764,17 @@ doreap(void) } } -int setconfig __P((void)); -void endconfig __P((void)); +int setconfig(void); +void endconfig(void); -void register_rpc __P((struct servtab *)); -void unregister_rpc __P((struct servtab *)); -void freeconfig __P((struct servtab *)); -void print_service __P((char *, struct servtab *)); -void setup __P((struct servtab *)); -struct servtab *getconfigent __P((void)); -struct servtab *enter __P((struct servtab *)); -int matchconf __P((struct servtab *, struct servtab *)); +void register_rpc(struct servtab *); +void unregister_rpc(struct servtab *); +void freeconfig(struct servtab *); +void print_service(char *, struct servtab *); +void setup(struct servtab *); +struct servtab *getconfigent(void); +struct servtab *enter(struct servtab *); +int matchconf(struct servtab *, struct servtab *); void config(int sig) @@ -1063,7 +1063,7 @@ dodie(void) exit(0); } -int bump_nofile __P((void)); +int bump_nofile(void); void setup(sep) @@ -1255,10 +1255,10 @@ matchconf (old, new) FILE *fconfig = NULL; char line[1024]; char *defhost; -char *skip __P((char **, int)); -char *nextline __P((FILE *)); -char *newstr __P((char *)); -struct servtab *dupconfig __P((struct servtab *)); +char *skip(char **, int); +char *nextline(FILE *); +char *newstr(char *); +struct servtab *dupconfig(struct servtab *); int setconfig() diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 4ea321db198..d923d6b79a5 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iostat.c,v 1.11 2001/11/17 19:49:38 deraadt Exp $ */ +/* $OpenBSD: iostat.c,v 1.12 2002/02/16 21:28:03 millert Exp $ */ /* $NetBSD: iostat.c,v 1.10 1996/10/25 18:21:58 scottr Exp $ */ /* @@ -113,18 +113,18 @@ volatile sig_atomic_t wantheader; #define SHOW_STATS_2 0x0008 #define SHOW_TOTALS 0x0080 -static void cpustats __P((void)); -static void disk_stats __P((double)); -static void disk_stats2 __P((double)); -static void sigheader __P((int)); -static void header __P(()); -static void usage __P((void)); -static void display __P((void)); -static void selectdrives __P((int, char **)); - -void dkswap __P((void)); -void dkreadstats __P((void)); -int dkinit __P((int)); +static void cpustats(void); +static void disk_stats(double); +static void disk_stats2(double); +static void sigheader(int); +static void header(); +static void usage(void); +static void display(void); +static void selectdrives(int, char **); + +void dkswap(void); +void dkreadstats(void); +int dkinit(int); int main(argc, argv) diff --git a/usr.sbin/iteconfig/iteconfig.c b/usr.sbin/iteconfig/iteconfig.c index da6c621afdf..95504d40767 100644 --- a/usr.sbin/iteconfig/iteconfig.c +++ b/usr.sbin/iteconfig/iteconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iteconfig.c,v 1.3 2000/01/19 16:33:00 espie Exp $ */ +/* $OpenBSD: iteconfig.c,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /* $NetBSD: iteconfig.c,v 1.4.6.1 1996/06/04 16:48:24 is Exp $ */ /* Copyright (c) 1999 Marc Espie * All rights reserved. @@ -93,12 +93,12 @@ #include "pathnames.h" -void printcmap __P((colormap_t *, int)); -void usage __P((void)); -void xioctl __P((int, int, void *)); -colormap_t *xgetcmap __P((int, int)); -long xstrtol __P((char *)); -int main __P((int, char **)); +void printcmap(colormap_t *, int); +void usage(void); +void xioctl(int, int, void *); +colormap_t *xgetcmap(int, int); +long xstrtol(char *); +int main(int, char **); int main(argc, argv) diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index 4f5d109d86d..ded4251051f 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgmon.c,v 1.6 2001/09/17 13:42:35 art Exp $ */ +/* $OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1992, 1993 @@ -41,7 +41,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)kgmon.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$OpenBSD: kgmon.c,v 1.6 2001/09/17 13:42:35 art Exp $"; +static char *rcsid = "$OpenBSD: kgmon.c,v 1.7 2002/02/16 21:28:03 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -75,13 +75,13 @@ struct kvmvars { int bflag, hflag, kflag, rflag, pflag; int debug = 0; -void setprof __P((struct kvmvars *kvp, int state)); -void dumpstate __P((struct kvmvars *kvp)); -void reset __P((struct kvmvars *kvp)); -void kern_readonly __P((int)); -int getprof __P((struct kvmvars *kvp)); -int getprofhz __P((struct kvmvars *kvp)); -int openfiles __P((char *system, char *kmemf, struct kvmvars *kvp)); +void setprof(struct kvmvars *kvp, int state); +void dumpstate(struct kvmvars *kvp); +void reset(struct kvmvars *kvp); +void kern_readonly(int); +int getprof(struct kvmvars *kvp); +int getprofhz(struct kvmvars *kvp); +int openfiles(char *system, char *kmemf, struct kvmvars *kvp); int main(int argc, char **argv) diff --git a/usr.sbin/kvm_mkdb/extern.h b/usr.sbin/kvm_mkdb/extern.h index 2e8b6069771..e4b08f23dfc 100644 --- a/usr.sbin/kvm_mkdb/extern.h +++ b/usr.sbin/kvm_mkdb/extern.h @@ -31,8 +31,8 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $OpenBSD: extern.h,v 1.5 1998/08/23 00:57:12 millert Exp $ + * $OpenBSD: extern.h,v 1.6 2002/02/16 21:28:03 millert Exp $ */ -int create_knlist __P((char *, int, DB *)); -int testdb __P((char *)); +int create_knlist(char *, int, DB *); +int testdb(char *); diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.c b/usr.sbin/kvm_mkdb/kvm_mkdb.c index 33de5885c49..350dc7aa0f4 100644 --- a/usr.sbin/kvm_mkdb/kvm_mkdb.c +++ b/usr.sbin/kvm_mkdb/kvm_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp $ */ +/* $OpenBSD: kvm_mkdb.c,v 1.11 2002/02/16 21:28:03 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "from: @(#)kvm_mkdb.c 8.3 (Berkeley) 5/4/95"; #else -static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp $"; +static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.11 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -67,8 +67,8 @@ static char *rcsid = "$OpenBSD: kvm_mkdb.c,v 1.10 1999/04/18 17:11:11 espie Exp #include "extern.h" -void usage __P((void)); -int kvm_mkdb __P((int, char *, char *, int)); +void usage(void); +int kvm_mkdb(int, char *, char *, int); HASHINFO openinfo = { 4096, /* bsize */ diff --git a/usr.sbin/kvm_mkdb/nlist.c b/usr.sbin/kvm_mkdb/nlist.c index d084523d169..85d6106e3d6 100644 --- a/usr.sbin/kvm_mkdb/nlist.c +++ b/usr.sbin/kvm_mkdb/nlist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nlist.c,v 1.22 2001/05/11 13:08:09 art Exp $ */ +/* $OpenBSD: nlist.c,v 1.23 2002/02/16 21:28:03 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "from: @(#)nlist.c 8.1 (Berkeley) 6/6/93"; #else -static char *rcsid = "$OpenBSD: nlist.c,v 1.22 2001/05/11 13:08:09 art Exp $"; +static char *rcsid = "$OpenBSD: nlist.c,v 1.23 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ static char *fmterr; #if defined(_NLIST_DO_AOUT) -static u_long get_kerntext __P((char *kfn, u_int magic)); +static u_long get_kerntext(char *kfn, u_int magic); int __aout_knlist(fd, db) @@ -626,7 +626,7 @@ out: #endif /* _NLIST_DO_ECOFF */ static struct knlist_handlers { - int (*fn) __P((int fd, DB *db)); + int (*fn)(int fd, DB *db); } nlist_fn[] = { #ifdef _NLIST_DO_AOUT { __aout_knlist }, diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index bb1468459e4..48b4f45eea0 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,7 +42,7 @@ #if 0 static const char sccsid[] = "@(#)common.c 8.5 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: common.c,v 1.14 2001/12/06 03:12:30 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: common.c,v 1.15 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -121,7 +121,7 @@ char *printcapdb[2] = { _PATH_PRINTCAP, 0 }; extern uid_t uid, euid; -static int compar __P((const void *, const void *)); +static int compar(const void *, const void *); /* * Create a TCP connection to host "rhost" at port "rport". diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 01f0a3c599c..335b90d8332 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.h,v 1.6 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: lp.h,v 1.7 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -105,28 +105,28 @@ struct queue { __BEGIN_DECLS struct dirent; -void blankfill __P((int)); -char *checkremote __P((void)); -int chk __P((char *)); -void displayq __P((int)); -void dump __P((char *, char *, int)); -void fatal __P((const char *, ...)); -int getline __P((FILE *)); -int getport __P((char *, int)); +void blankfill(int); +char *checkremote(void); +int chk(char *); +void displayq(int); +void dump(char *, char *, int); +void fatal(const char *, ...); +int getline(FILE *); +int getport(char *, int); int getq __P((struct queue *(*[]))); -void header __P((void)); -void inform __P((char *)); -int inlist __P((char *, char *)); -int iscf __P((struct dirent *)); -int isowner __P((char *, char *)); -void ldump __P((char *, char *, int)); -int lockchk __P((char *)); -void prank __P((int)); -void process __P((char *)); -void rmjob __P((void)); -void rmremote __P((void)); -void show __P((char *, char *, int)); -int startdaemon __P((char *)); -void nodaemon __P((void)); -void delay __P((int)); +void header(void); +void inform(char *); +int inlist(char *, char *); +int iscf(struct dirent *); +int isowner(char *, char *); +void ldump(char *, char *, int); +int lockchk(char *); +void prank(int); +void process(char *); +void rmjob(void); +void rmremote(void); +void show(char *, char *, int); +int startdaemon(char *); +void nodaemon(void); +void delay(int); __END_DECLS diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 279d06c35c5..fe7e125c3b9 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -37,7 +37,7 @@ #if 0 static const char sccsid[] = "@(#)rmjob.c 8.2 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.11 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: rmjob.c,v 1.12 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -75,7 +75,7 @@ static char current[NAME_MAX]; /* active control file name */ extern uid_t uid, euid; /* real and effective user id's */ -static void do_unlink __P((char *)); +static void do_unlink(char *); void rmjob() diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index 206d8e435ad..ac98baf23c4 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: cmds.c,v 1.15 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -74,20 +74,20 @@ static const char rcsid[] = "$OpenBSD: cmds.c,v 1.14 2001/08/30 17:38:13 millert extern uid_t uid, euid; -void abortpr __P((int)); -void cleanpr __P((void)); -void disablepr __P((void)); -int doarg __P((char *)); -int doselect __P((struct dirent *)); -void enablepr __P((void)); -void prstat __P((void)); -void putmsg __P((int, char **)); -int sortq __P((const void *, const void *)); -void startpr __P((int)); -void stoppr __P((void)); -int touch __P((struct queue *)); -void unlinkf __P((char *)); -void upstat __P((char *)); +void abortpr(int); +void cleanpr(void); +void disablepr(void); +int doarg(char *); +int doselect(struct dirent *); +void enablepr(void); +void prstat(void); +void putmsg(int, char **); +int sortq(const void *, const void *); +void startpr(int); +void stoppr(void); +int touch(struct queue *); +void unlinkf(char *); +void upstat(char *); /* * kill an existing daemon and disable printing. diff --git a/usr.sbin/lpr/lpc/extern.h b/usr.sbin/lpr/lpc/extern.h index 88624141133..16a1c725bb4 100644 --- a/usr.sbin/lpr/lpc/extern.h +++ b/usr.sbin/lpr/lpc/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.2 1997/01/17 16:12:36 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -41,19 +41,19 @@ __BEGIN_DECLS -void clean __P((int, char **)); -void disable __P((int, char **)); -void doabort __P((int, char **)); -void down __P((int, char **)); -void enable __P((int, char **)); -void help __P((int, char **)); -void quit __P((int, char **)); -void restart __P((int, char **)); -void startcmd __P((int, char **)); -void status __P((int, char **)); -void stop __P((int, char **)); -void topq __P((int, char **)); -void up __P((int, char **)); +void clean(int, char **); +void disable(int, char **); +void doabort(int, char **); +void down(int, char **); +void enable(int, char **); +void help(int, char **); +void quit(int, char **); +void restart(int, char **); +void startcmd(int, char **); +void status(int, char **); +void stop(int, char **); +void topq(int, char **); +void up(int, char **); __END_DECLS extern int NCMDS; diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c index 3c3ffe04331..5b4cfc20c2a 100644 --- a/usr.sbin/lpr/lpc/lpc.c +++ b/usr.sbin/lpr/lpc/lpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $ */ +/* $OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: lpc.c,v 1.11 2001/12/06 03:12:30 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpc.c,v 1.12 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -82,11 +82,11 @@ int margc; char *margv[MAX_MARGV]; uid_t uid, euid; -void cmdscanner __P((void)); -struct cmd *getcmd __P((char *)); -void intr __P((int)); -void makeargv __P((void)); -int ingroup __P((char *)); +void cmdscanner(void); +struct cmd *getcmd(char *); +void intr(int); +void makeargv(void); +int ingroup(char *); int main(argc, argv) diff --git a/usr.sbin/lpr/lpc/lpc.h b/usr.sbin/lpr/lpc/lpc.h index bc5378e7ecd..281eb2d2c1e 100644 --- a/usr.sbin/lpr/lpc/lpc.h +++ b/usr.sbin/lpr/lpc/lpc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lpc.h,v 1.2 1997/01/17 16:12:38 millert Exp $ */ +/* $OpenBSD: lpc.h,v 1.3 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -42,6 +42,6 @@ struct cmd { char *c_name; /* command name */ char *c_help; /* help message */ /* routine to do the work */ - void (*c_handler) __P((int, char *[])); + void (*c_handler)(int, char *[]); int c_priv; /* privileged command */ }; diff --git a/usr.sbin/lpr/lpd/extern.h b/usr.sbin/lpr/lpd/extern.h index ae075c35690..9c1ff356469 100644 --- a/usr.sbin/lpr/lpd/extern.h +++ b/usr.sbin/lpr/lpd/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1997/07/17 09:09:11 deraadt Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -53,11 +53,11 @@ struct info { struct winsize win; /* window info */ }; -void printjob __P((void)); -void recvjob __P((void)); -void sttyclearflags __P((struct termios *tp, int flags)); -void sttysetflags __P((struct termios *tp, int flags)); -void sttyclearlflags __P((struct termios *tp, int flags)); -void sttysetlflags __P((struct termios *tp, int flags)); -int ksearch __P((char ***, struct info *)); -int msearch __P((char ***, struct info *)); +void printjob(void); +void recvjob(void); +void sttyclearflags(struct termios *tp, int flags); +void sttysetflags(struct termios *tp, int flags); +void sttyclearlflags(struct termios *tp, int flags); +void sttysetlflags(struct termios *tp, int flags); +int ksearch(char ***, struct info *); +int msearch(char ***, struct info *); diff --git a/usr.sbin/lpr/lpd/key.c b/usr.sbin/lpr/lpd/key.c index a4f8df16149..259e97f28a6 100644 --- a/usr.sbin/lpr/lpd/key.c +++ b/usr.sbin/lpr/lpd/key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $ */ +/* $OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static const char sccsid[] = "@(#)key.c 8.3 (Berkeley) 4/2/94"; #else -static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: key.c,v 1.4 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -56,22 +56,22 @@ static const char rcsid[] = "$OpenBSD: key.c,v 1.3 2001/08/30 17:38:13 millert E #include "extern.h" __BEGIN_DECLS -void f_cbreak __P((struct info *)); -void f_columns __P((struct info *)); -void f_dec __P((struct info *)); -void f_extproc __P((struct info *)); -void f_ispeed __P((struct info *)); -void f_nl __P((struct info *)); -void f_ospeed __P((struct info *)); -void f_raw __P((struct info *)); -void f_rows __P((struct info *)); -void f_sane __P((struct info *)); -void f_tty __P((struct info *)); +void f_cbreak(struct info *); +void f_columns(struct info *); +void f_dec(struct info *); +void f_extproc(struct info *); +void f_ispeed(struct info *); +void f_nl(struct info *); +void f_ospeed(struct info *); +void f_raw(struct info *); +void f_rows(struct info *); +void f_sane(struct info *); +void f_tty(struct info *); __END_DECLS static struct key { char *name; /* name */ - void (*f) __P((struct info *)); /* function */ + void (*f)(struct info *); /* function */ #define F_NEEDARG 0x01 /* needs an argument */ #define F_OFFOK 0x02 /* can turn off */ int flags; diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index 7a9429446f0..d9465a32cc9 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $ */ +/* $OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $ */ /* $NetBSD: lpd.c,v 1.7 1996/04/24 14:54:06 mrg Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: lpd.c,v 1.28 2002/02/16 21:28:03 millert Exp $"; #endif #endif /* not lint */ @@ -104,17 +104,17 @@ static const char rcsid[] = "$OpenBSD: lpd.c,v 1.27 2002/01/21 17:30:38 deraadt #include "pathnames.h" #include "extern.h" -extern int __ivaliduser __P((FILE *, in_addr_t, const char *, const char *)); +extern int __ivaliduser(FILE *, in_addr_t, const char *, const char *); int lflag; /* log requests flag */ int from_remote; /* from remote socket */ -static void reapchild __P((int)); -static void mcleanup __P((int)); -static void doit __P((void)); -static void startup __P((void)); -static void chkhost __P((struct sockaddr_in *)); -static int ckqueue __P((char *)); +static void reapchild(int); +static void mcleanup(int); +static void doit(void); +static void startup(void); +static void chkhost(struct sockaddr_in *); +static int ckqueue(char *); /* unused, needed for lpc */ volatile sig_atomic_t gotintr; diff --git a/usr.sbin/lpr/lpd/printjob.c b/usr.sbin/lpr/lpd/printjob.c index 14586c9a374..fb10a6dbcae 100644 --- a/usr.sbin/lpr/lpd/printjob.c +++ b/usr.sbin/lpr/lpd/printjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printjob.c,v 1.29 2002/01/21 17:30:38 deraadt Exp $ */ +/* $OpenBSD: printjob.c,v 1.30 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: printjob.c,v 1.9.4.3 1996/07/12 22:31:39 jtc Exp $ */ /* @@ -115,25 +115,25 @@ static char pxwidth[10] = "-x"; /* page width in pixels */ static char tempfile[] = "errsXXXXXXXXXX"; /* file name for filter output */ static char width[10] = "-w"; /* page width in static characters */ -static void abortpr __P((int)); -static void banner __P((char *, char *)); -static int dofork __P((int)); -static int dropit __P((int)); -static void init __P((void)); -static void openpr __P((void)); -static void opennet __P((char *)); -static void opentty __P((void)); -static void openrem __P((void)); -static int print __P((int, char *)); -static int printit __P((char *)); -static void pstatus __P((const char *, ...)); -static char response __P((void)); -static void scan_out __P((int, char *, int)); -static char *scnline __P((int, char *, int)); -static int sendfile __P((int, char *)); -static int sendit __P((char *)); -static void sendmail __P((char *, int)); -static void setty __P((void)); +static void abortpr(int); +static void banner(char *, char *); +static int dofork(int); +static int dropit(int); +static void init(void); +static void openpr(void); +static void opennet(char *); +static void opentty(void); +static void openrem(void); +static int print(int, char *); +static int printit(char *); +static void pstatus(const char *, ...); +static char response(void); +static void scan_out(int, char *, int); +static char *scnline(int, char *, int); +static int sendfile(int, char *); +static int sendit(char *); +static void sendmail(char *, int); +static void setty(void); void printjob() diff --git a/usr.sbin/lpr/lpd/recvjob.c b/usr.sbin/lpr/lpd/recvjob.c index 490485d3142..71021f5114b 100644 --- a/usr.sbin/lpr/lpd/recvjob.c +++ b/usr.sbin/lpr/lpd/recvjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $ */ +/* $OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)recvjob.c 8.2 (Berkeley) 4/27/95"; #else -static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.17 2001/11/27 17:24:27 millert Exp $"; +static const char rcsid[] = "$OpenBSD: recvjob.c,v 1.18 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -77,13 +77,13 @@ static int minfree; /* keep at least minfree blocks available */ static char *sp = ""; static char tfname[NAME_MAX]; /* tmp copy of cf before linking */ -static int chksize __P((int)); -static void frecverr __P((const char *, ...)); -static int noresponse __P((void)); -static void rcleanup __P((int)); -static int read_number __P((char *)); -static int readfile __P((char *, int)); -static int readjob __P((void)); +static int chksize(int); +static void frecverr(const char *, ...); +static int noresponse(void); +static void rcleanup(int); +static int read_number(char *); +static int readfile(char *, int); +static int readjob(void); void diff --git a/usr.sbin/lpr/lpq/lpq.c b/usr.sbin/lpr/lpq/lpq.c index 6e2b09ec64a..7d578382b3e 100644 --- a/usr.sbin/lpr/lpq/lpq.c +++ b/usr.sbin/lpr/lpq/lpq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpq.c 8.3 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpq.c,v 1.10 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpq.c,v 1.11 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -79,8 +79,8 @@ uid_t uid, euid; volatile sig_atomic_t gotintr; -static int ckqueue __P((char *)); -void usage __P((void)); +static int ckqueue(char *); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/lpr/lpr/lpr.c b/usr.sbin/lpr/lpr/lpr.c index 71054fe86b6..99c84378bc8 100644 --- a/usr.sbin/lpr/lpr/lpr.c +++ b/usr.sbin/lpr/lpr/lpr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: lpr.c,v 1.10 1996/03/21 18:12:25 jtc Exp $ */ /* @@ -50,7 +50,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpr.c 8.4 (Berkeley) 4/28/95"; #else -static const char rcsid[] = "$OpenBSD: lpr.c,v 1.23 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lpr.c,v 1.24 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -108,16 +108,16 @@ static struct stat statb; volatile sig_atomic_t gotintr; -static void card __P((int, char *)); -static void chkprinter __P((char *)); -static void cleanup __P((int)); -static void copy __P((int, char [])); -static char *linked __P((char *)); -static char *lmktemp __P((char *, int, int)); -static void mktemps __P((void)); -static int nfile __P((char *)); -static int test __P((char *)); -static char *itoa __P((int)); +static void card(int, char *); +static void chkprinter(char *); +static void cleanup(int); +static void copy(int, char []); +static char *linked(char *); +static char *lmktemp(char *, int, int); +static void mktemps(void); +static int nfile(char *); +static int test(char *); +static char *itoa(int); uid_t uid, euid; diff --git a/usr.sbin/lpr/lprm/lprm.c b/usr.sbin/lpr/lprm/lprm.c index e94c43a0974..226730c6302 100644 --- a/usr.sbin/lpr/lprm/lprm.c +++ b/usr.sbin/lpr/lprm/lprm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $ */ +/* $OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1983, 1993 @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lprm.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: lprm.c,v 1.9 2001/12/06 03:12:31 ericj Exp $"; +static const char rcsid[] = "$OpenBSD: lprm.c,v 1.10 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -86,7 +86,7 @@ static char luser[MAXLOGNAME]; /* buffer for person */ volatile sig_atomic_t gotintr; -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/lpr/pac/pac.c b/usr.sbin/lpr/pac/pac.c index 7ba97d9615e..f355056a4e8 100644 --- a/usr.sbin/lpr/pac/pac.c +++ b/usr.sbin/lpr/pac/pac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $ */ +/* $OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: pac.c,v 1.7 1996/03/21 18:21:20 jtc Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)pac.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: pac.c,v 1.11 2001/11/23 03:58:19 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: pac.c,v 1.12 2002/02/16 21:28:04 millert Exp $"; #endif #endif /* not lint */ @@ -100,15 +100,15 @@ struct hent { static struct hent *hashtab[HSHSIZE]; /* Hash table proper */ -static void account __P((FILE *)); -static int any __P((int, char [])); -static int chkprinter __P((char *)); -static void dumpit __P((void)); -static int hash __P((char [])); -static struct hent *enter __P((char [])); -static struct hent *lookup __P((char [])); -static int qucmp __P((const void *, const void *)); -static void rewrite __P((void)); +static void account(FILE *); +static int any(int, char []); +static int chkprinter(char *); +static void dumpit(void); +static int hash(char []); +static struct hent *enter(char []); +static struct hent *lookup(char []); +static int qucmp(const void *, const void *); +static void rewrite(void); int main(argc, argv) diff --git a/usr.sbin/mailwrapper/mailwrapper.c b/usr.sbin/mailwrapper/mailwrapper.c index acafd45307e..a4284da0b04 100644 --- a/usr.sbin/mailwrapper/mailwrapper.c +++ b/usr.sbin/mailwrapper/mailwrapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mailwrapper.c,v 1.9 2001/08/08 00:47:52 jakob Exp $ */ +/* $OpenBSD: mailwrapper.c,v 1.10 2002/02/16 21:28:04 millert Exp $ */ /* $NetBSD: mailwrapper.c,v 1.2 1999/02/20 22:10:07 thorpej Exp $ */ /* @@ -48,11 +48,11 @@ struct arglist { char **argv; }; -int main __P((int, char *[], char *[])); +int main(int, char *[], char *[]); -static void initarg __P((struct arglist *)); -static void addarg __P((struct arglist *, const char *, int)); -static void freearg __P((struct arglist *, int)); +static void initarg(struct arglist *); +static void addarg(struct arglist *, const char *, int); +static void freearg(struct arglist *, int); extern const char *__progname; /* from crt0.o */ diff --git a/usr.sbin/map-mbone/mapper.c b/usr.sbin/map-mbone/mapper.c index 531ffa15b69..4fdcc9ea833 100644 --- a/usr.sbin/map-mbone/mapper.c +++ b/usr.sbin/map-mbone/mapper.c @@ -87,22 +87,22 @@ int show_names = TRUE; vifi_t numvifs; /* to keep loader happy */ /* (see COPY_TABLES macro called in kern.c) */ -Node * find_node __P((u_int32_t addr, Node **ptr)); -Interface * find_interface __P((u_int32_t addr, Node *node)); -Neighbor * find_neighbor __P((u_int32_t addr, Node *node)); -int main __P((int argc, char *argv[])); -void ask __P((u_int32_t dst)); -void ask2 __P((u_int32_t dst)); -int retry_requests __P((Node *node)); -char * inet_name __P((u_int32_t addr)); -void print_map __P((Node *node)); -char * graph_name __P((u_int32_t addr, char *buf)); -void graph_edges __P((Node *node)); -void elide_aliases __P((Node *node)); -void graph_map __P((void)); +Node * find_node(u_int32_t addr, Node **ptr); +Interface * find_interface(u_int32_t addr, Node *node); +Neighbor * find_neighbor(u_int32_t addr, Node *node); +int main(int argc, char *argv[]); +void ask(u_int32_t dst); +void ask2(u_int32_t dst); +int retry_requests(Node *node); +char * inet_name(u_int32_t addr); +void print_map(Node *node); +char * graph_name(u_int32_t addr, char *buf); +void graph_edges(Node *node); +void elide_aliases(Node *node); +void graph_map(void); int get_number __P((int *var, int deflt, char ***pargv, int *pargc)); -u_int32_t host_addr __P((char *name)); +u_int32_t host_addr(char *name); Node *find_node(addr, ptr) diff --git a/usr.sbin/memconfig/memconfig.c b/usr.sbin/memconfig/memconfig.c index b4aa5e0ecb9..e73847f86d0 100644 --- a/usr.sbin/memconfig/memconfig.c +++ b/usr.sbin/memconfig/memconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memconfig.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: memconfig.c,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /*- * Copyright (c) 1999 Michael Smith <msmith@freebsd.org> * All rights reserved. @@ -58,17 +58,17 @@ struct {NULL, 0, 0} }; -static void listfunc __P((int, int, char *[])); -static void setfunc __P((int, int, char *[])); -static void clearfunc __P((int, int, char *[])); -static void helpfunc __P((int, int, char *[])); -static void help __P((char *)); +static void listfunc(int, int, char *[]); +static void setfunc(int, int, char *[]); +static void clearfunc(int, int, char *[]); +static void helpfunc(int, int, char *[]); +static void help(char *); struct { char *cmd; char *desc; - void (*func) __P((int, int, char *[])); + void (*func)(int, int, char *[]); } functions[] = { {"list", "List current memory range attributes\n" diff --git a/usr.sbin/mopd/common/cmp.h b/usr.sbin/mopd/common/cmp.h index ceca08b87bb..dda18aa514c 100644 --- a/usr.sbin/mopd/common/cmp.h +++ b/usr.sbin/mopd/common/cmp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: cmp.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: cmp.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -39,7 +39,7 @@ int mopCmpEAddr (/* u_char *,u_char * */); #else __BEGIN_DECLS -int mopCmpEAddr __P((u_char *,u_char *)); +int mopCmpEAddr(u_char *,u_char *); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/device.h b/usr.sbin/mopd/common/device.h index a981cbedb9d..b305a83eb18 100644 --- a/usr.sbin/mopd/common/device.h +++ b/usr.sbin/mopd/common/device.h @@ -1,4 +1,4 @@ -/* $OpenBSD: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $ */ +/* $OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: device.h,v 1.2 1996/09/21 19:11:24 maja Exp $ + * $OpenBSD: device.h,v 1.3 2002/02/16 21:28:04 millert Exp $ * */ @@ -44,10 +44,10 @@ void deviceInitAll (/* void */); #else __BEGIN_DECLS #ifdef DEV_NEW_CONF -void deviceEthAddr __P((char *,u_char *)); +void deviceEthAddr(char *,u_char *); #endif -void deviceInitOne __P((char *)); -void deviceInitAll __P((void)); +void deviceInitOne(char *); +void deviceInitAll(void); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/dl.h b/usr.sbin/mopd/common/dl.h index 8e01586efad..99a3bd79e0b 100644 --- a/usr.sbin/mopd/common/dl.h +++ b/usr.sbin/mopd/common/dl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: dl.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: dl.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -39,7 +39,7 @@ void mopDumpDL (/* FILE *, u_char *, int */); #else __BEGIN_DECLS -void mopDumpDL __P((FILE *, u_char *, int)); +void mopDumpDL(FILE *, u_char *, int); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/file.h b/usr.sbin/mopd/common/file.h index 3db49491dc0..076e31b8e50 100644 --- a/usr.sbin/mopd/common/file.h +++ b/usr.sbin/mopd/common/file.h @@ -1,4 +1,4 @@ -/* $OpenBSD: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: file.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: file.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -50,14 +50,14 @@ int GetFileInfo (/* int, u_long *, u_long *, int *, u_long *, u_long *, u_long *, u_long *, u_long *, u_long * */); #else __BEGIN_DECLS -void mopFilePutLX __P((u_char *, int, u_long, int)); -void mopFilePutBX __P((u_char *, int, u_long, int)); -u_long mopFileGetLX __P((u_char *, int, int)); -u_long mopFileGetBX __P((u_char *, int, int)); -void mopFileSwapX __P((u_char *, int, int)); -int CheckMopFile __P((int)); -int GetMopFileInfo __P((int, u_long *, u_long *)); -int CheckAOutFile __P((int)); +void mopFilePutLX(u_char *, int, u_long, int); +void mopFilePutBX(u_char *, int, u_long, int); +u_long mopFileGetLX(u_char *, int, int); +u_long mopFileGetBX(u_char *, int, int); +void mopFileSwapX(u_char *, int, int); +int CheckMopFile(int); +int GetMopFileInfo(int, u_long *, u_long *); +int CheckAOutFile(int); int GetAOutFileInfo __P((int, u_long *, u_long *, u_long *, u_long *, u_long *, u_long *, u_long *, u_long *, int *)); int GetFileInfo __P((int, u_long *, u_long *, int *, diff --git a/usr.sbin/mopd/common/get.h b/usr.sbin/mopd/common/get.h index 7af425ae5e4..03c32018325 100644 --- a/usr.sbin/mopd/common/get.h +++ b/usr.sbin/mopd/common/get.h @@ -1,4 +1,4 @@ -/* $OpenBSD: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: get.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: get.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -46,14 +46,14 @@ void mopGetHeader (/* u_char *, int *, u_char **, u_char **, u_short *, u_short mopGetLength (/* u_char *, int */); #else __BEGIN_DECLS -u_char mopGetChar __P((u_char *,int *)); -u_short mopGetShort __P((u_char *,int *)); -u_long mopGetLong __P((u_char *,int *)); -void mopGetMulti __P((u_char *,int *,u_char *,int)); -int mopGetTrans __P((u_char *, int)); +u_char mopGetChar(u_char *,int *); +u_short mopGetShort(u_char *,int *); +u_long mopGetLong(u_char *,int *); +void mopGetMulti(u_char *,int *,u_char *,int); +int mopGetTrans(u_char *, int); void mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *, int *, int)); -u_short mopGetLength __P((u_char *, int)); +u_short mopGetLength(u_char *, int); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/loop-bsd.c b/usr.sbin/mopd/common/loop-bsd.c index b85f38633d6..7e308d774dc 100644 --- a/usr.sbin/mopd/common/loop-bsd.c +++ b/usr.sbin/mopd/common/loop-bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $ */ +/* $OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.4 1998/07/07 17:32:46 art Exp $"; +static char rcsid[] = "$OpenBSD: loop-bsd.c,v 1.5 2002/02/16 21:28:04 millert Exp $"; #endif #include <stdlib.h> @@ -93,7 +93,7 @@ mopReadDL() */ struct if_info *iflist; -void mopProcess __P((struct if_info *, u_char *)); +void mopProcess(struct if_info *, u_char *); /* * Loop indefinitely listening for MOP requests on the diff --git a/usr.sbin/mopd/common/nma.h b/usr.sbin/mopd/common/nma.h index 5694dda2857..1ead51b5007 100644 --- a/usr.sbin/mopd/common/nma.h +++ b/usr.sbin/mopd/common/nma.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1995 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: nma.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: nma.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -40,8 +40,8 @@ char *nmaGetShort (/* int */); char *nmaGetDevice (/* int */); #else __BEGIN_DECLS -char *nmaGetShort __P((int)); -char *nmaGetDevice __P((int)); +char *nmaGetShort(int); +char *nmaGetDevice(int); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/pf.h b/usr.sbin/mopd/common/pf.h index 3277d98e940..fcec3fbecec 100644 --- a/usr.sbin/mopd/common/pf.h +++ b/usr.sbin/mopd/common/pf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: pf.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: pf.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -45,13 +45,13 @@ int pfRead (/* int, u_char *, int */); int pfWrite (/* int, u_char *, int, int */); #else __BEGIN_DECLS -int pfTrans __P((char *)); -int pfInit __P((char *, int, u_short, int)); -int pfEthAddr __P((int, u_char *)); -int pfAddMulti __P((int, char *, char *)); -int pfDelMulti __P((int, char *, char *)); -int pfRead __P((int, u_char *, int)); -int pfWrite __P((int, u_char *, int, int)); +int pfTrans(char *); +int pfInit(char *, int, u_short, int); +int pfEthAddr(int, u_char *); +int pfAddMulti(int, char *, char *); +int pfDelMulti(int, char *, char *); +int pfRead(int, u_char *, int); +int pfWrite(int, u_char *, int, int); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/print.h b/usr.sbin/mopd/common/print.h index b7fa4d3af13..d79f58e27c2 100644 --- a/usr.sbin/mopd/common/print.h +++ b/usr.sbin/mopd/common/print.h @@ -1,4 +1,4 @@ -/* $OpenBSD: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: print.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: print.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -48,14 +48,14 @@ void mopPrintInfo (/* FILE *, u_char *, int *, u_short, u_char, int */); #else __BEGIN_DECLS -void mopPrintHWA __P((FILE *, u_char *)); -void mopPrintBPTY __P((FILE *, u_char)); -void mopPrintPGTY __P((FILE *, u_char)); -void mopPrintOneline __P((FILE *, u_char *, int)); -void mopPrintHeader __P((FILE *, u_char *, int)); -void mopPrintMopHeader __P((FILE *, u_char *, int)); -void mopPrintDevice __P((FILE *, u_char)); -void mopPrintTime __P((FILE *, u_char *)); +void mopPrintHWA(FILE *, u_char *); +void mopPrintBPTY(FILE *, u_char); +void mopPrintPGTY(FILE *, u_char); +void mopPrintOneline(FILE *, u_char *, int); +void mopPrintHeader(FILE *, u_char *, int); +void mopPrintMopHeader(FILE *, u_char *, int); +void mopPrintDevice(FILE *, u_char); +void mopPrintTime(FILE *, u_char *); void mopPrintInfo __P((FILE *, u_char *, int *, u_short, u_char, int)); __END_DECLS diff --git a/usr.sbin/mopd/common/put.h b/usr.sbin/mopd/common/put.h index 4d3a08c0186..34d9b34e9ab 100644 --- a/usr.sbin/mopd/common/put.h +++ b/usr.sbin/mopd/common/put.h @@ -1,4 +1,4 @@ -/* $OpenBSD: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: put.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: put.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -45,13 +45,13 @@ void mopPutHeader (/* u_char *, int *, u_char *, u_char *, u_short, int */); void mopPutLength (/* u_char *, int, u_short */); #else __BEGIN_DECLS -void mopPutChar __P((u_char *, int *, u_char)); -void mopPutShort __P((u_char *, int *, u_short)); -void mopPutLong __P((u_char *, int *, u_long)); -void mopPutMulti __P((u_char *, int *, u_char *, int)); -void mopPutTime __P((u_char *, int *, time_t)); -void mopPutHeader __P((u_char *, int *, u_char *, u_char *, u_short, int)); -void mopPutLength __P((u_char *, int, u_short)); +void mopPutChar(u_char *, int *, u_char); +void mopPutShort(u_char *, int *, u_short); +void mopPutLong(u_char *, int *, u_long); +void mopPutMulti(u_char *, int *, u_char *, int); +void mopPutTime(u_char *, int *, time_t); +void mopPutHeader(u_char *, int *, u_char *, u_char *, u_short, int); +void mopPutLength(u_char *, int, u_short); __END_DECLS #endif diff --git a/usr.sbin/mopd/common/rc.h b/usr.sbin/mopd/common/rc.h index 4a0cf294e89..e168d7dc44a 100644 --- a/usr.sbin/mopd/common/rc.h +++ b/usr.sbin/mopd/common/rc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -28,7 +28,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: rc.h,v 1.3 2001/08/12 12:03:03 heko Exp $ + * $OpenBSD: rc.h,v 1.4 2002/02/16 21:28:04 millert Exp $ * */ @@ -39,7 +39,7 @@ void mopDumpRC (/* FILE *, u_char *, int */); #else __BEGIN_DECLS -void mopDumpRC __P((FILE *, u_char *, int)); +void mopDumpRC(FILE *, u_char *, int); __END_DECLS #endif diff --git a/usr.sbin/mopd/mopchk/mopchk.c b/usr.sbin/mopd/mopchk/mopchk.c index 0c1bb020131..f26f19afd59 100644 --- a/usr.sbin/mopd/mopchk/mopchk.c +++ b/usr.sbin/mopd/mopchk/mopchk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $ */ +/* $OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1995-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopchk.c,v 1.5 2001/11/16 21:18:06 miod Exp $"; +static char rcsid[] = "$OpenBSD: mopchk.c,v 1.6 2002/02/16 21:28:04 millert Exp $"; #endif /* @@ -56,8 +56,8 @@ struct if_info *iflist; void Usage (/* void */); void mopProcess (/* struct if_info *, u_char * */); #else -void Usage __P((void)); -void mopProcess __P((struct if_info *, u_char *)); +void Usage(void); +void mopProcess(struct if_info *, u_char *); #endif int AllFlag = 0; /* listen on "all" interfaces */ diff --git a/usr.sbin/mopd/mopd/mopd.c b/usr.sbin/mopd/mopd/mopd.c index 4fd2af0baeb..1988707b45a 100644 --- a/usr.sbin/mopd/mopd/mopd.c +++ b/usr.sbin/mopd/mopd/mopd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $ */ +/* $OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopd.c,v 1.4 1998/03/04 20:21:59 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: mopd.c,v 1.5 2002/02/16 21:28:04 millert Exp $"; #endif /* @@ -63,9 +63,9 @@ void Loop (/* void */); void Usage (/* void */); void mopProcess (/* struct if_info *, u_char * */); #else -void Loop __P((void)); -void Usage __P((void)); -void mopProcess __P((struct if_info *, u_char *)); +void Loop(void); +void Usage(void); +void mopProcess(struct if_info *, u_char *); #endif int AllFlag = 0; /* listen on "all" interfaces */ diff --git a/usr.sbin/mopd/mopprobe/mopprobe.c b/usr.sbin/mopd/mopprobe/mopprobe.c index ae3b6430705..1f0c020dd85 100644 --- a/usr.sbin/mopd/mopprobe/mopprobe.c +++ b/usr.sbin/mopd/mopprobe/mopprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $ */ +/* $OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-96 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.5 1999/03/27 14:31:22 maja Exp $"; +static char rcsid[] = "$OpenBSD: mopprobe.c,v 1.6 2002/02/16 21:28:04 millert Exp $"; #endif /* @@ -61,9 +61,9 @@ void Loop (/* void */); void Usage (/* void */); void mopProcess (/* struct if_info *, u_char * */); #else -void Loop __P((void)); -void Usage __P((void)); -void mopProcess __P((struct if_info *, u_char *)); +void Loop(void); +void Usage(void); +void mopProcess(struct if_info *, u_char *); #endif struct once { diff --git a/usr.sbin/mopd/moptrace/moptrace.c b/usr.sbin/mopd/moptrace/moptrace.c index 880ceef3dd4..bd394e154ba 100644 --- a/usr.sbin/mopd/moptrace/moptrace.c +++ b/usr.sbin/mopd/moptrace/moptrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $ */ +/* $OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $ */ /* * Copyright (c) 1993-95 Mats O Jansson. All rights reserved. @@ -30,7 +30,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: moptrace.c,v 1.4 1998/03/19 07:40:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: moptrace.c,v 1.5 2002/02/16 21:28:04 millert Exp $"; #endif /* @@ -61,9 +61,9 @@ void Loop (/* void */); void Usage (/* void */); void mopProcess (/* struct if_info *, u_char * */); #else -void Loop __P((void)); -void Usage __P((void)); -void mopProcess __P((struct if_info *, u_char *)); +void Loop(void); +void Usage(void); +void mopProcess(struct if_info *, u_char *); #endif int AllFlag = 0; /* listen on "all" interfaces */ diff --git a/usr.sbin/mopd/otherOS/loop-linux2.c b/usr.sbin/mopd/otherOS/loop-linux2.c index d726211726b..62b500f71ea 100644 --- a/usr.sbin/mopd/otherOS/loop-linux2.c +++ b/usr.sbin/mopd/otherOS/loop-linux2.c @@ -28,7 +28,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: loop-linux2.c,v 1.1 1999/03/27 14:31:22 maja Exp $"; +static char rcsid[] = "$Id: loop-linux2.c,v 1.2 2002/02/16 21:28:04 millert Exp $"; #endif #include <stdlib.h> @@ -90,7 +90,7 @@ mopReadDL() */ struct if_info *iflist; -void mopProcess __P((struct if_info *, u_char *)); +void mopProcess(struct if_info *, u_char *); /* * Loop indefinitely listening for MOP requests on the diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c index 1bfa27e267b..7f6e6c8480e 100644 --- a/usr.sbin/mrinfo/mrinfo.c +++ b/usr.sbin/mrinfo/mrinfo.c @@ -105,16 +105,16 @@ int target_level = 0; vifi_t numvifs; /* to keep loader happy */ /* (see COPY_TABLES macro called in kern.c) */ -char * inet_name __P((u_int32_t addr)); -void ask __P((u_int32_t dst)); -void ask2 __P((u_int32_t dst)); +char * inet_name(u_int32_t addr); +void ask(u_int32_t dst); +void ask2(u_int32_t dst); int get_number __P((int *var, int deflt, char ***pargv, int *pargc)); -u_int32_t host_addr __P((char *name)); -void usage __P((void)); +u_int32_t host_addr(char *name); +void usage(void); /* to shut up -Wstrict-prototypes */ -int main __P((int argc, char *argv[])); +int main(int argc, char *argv[]); char * diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c index 9c3acf02202..38fe5c11f28 100644 --- a/usr.sbin/mrouted/callout.c +++ b/usr.sbin/mrouted/callout.c @@ -26,7 +26,7 @@ struct timeout_q { }; #ifdef IGMP_DEBUG -static void print_Q __P((void)); +static void print_Q(void); #else #define print_Q() #endif diff --git a/usr.sbin/mrouted/cfparse.y b/usr.sbin/mrouted/cfparse.y index 0ac0123b8e9..4dbeae54eff 100644 --- a/usr.sbin/mrouted/cfparse.y +++ b/usr.sbin/mrouted/cfparse.y @@ -35,14 +35,14 @@ /* * Local function declarations */ -static void fatal __P((char *fmt, ...)); -static void warn __P((char *fmt, ...)); -static void yyerror __P((char *s)); -static char * next_word __P((void)); -static int yylex __P((void)); -static u_int32_t valid_if __P((char *s)); -static struct ifreq * ifconfaddr __P((struct ifconf *ifcp, u_int32_t a)); -int yyparse __P((void)); +static void fatal(char *fmt, ...); +static void warn(char *fmt, ...); +static void yyerror(char *s); +static char * next_word(void); +static int yylex(void); +static u_int32_t valid_if(char *s); +static struct ifreq * ifconfaddr(struct ifconf *ifcp, u_int32_t a); +int yyparse(void); static FILE *f; diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h index 27172d990be..666e11a561e 100644 --- a/usr.sbin/mrouted/defs.h +++ b/usr.sbin/mrouted/defs.h @@ -44,8 +44,8 @@ #endif #endif -typedef void (*cfunc_t) __P((void *)); -typedef void (*ihfunc_t) __P((int, fd_set *)); +typedef void (*cfunc_t)(void *); +typedef void (*ihfunc_t)(int, fd_set *); #include "dvmrp.h" #include "vif.h" @@ -161,66 +161,66 @@ extern char * sys_errlist[]; #endif /* main.c */ -extern void log __P((int, int, char *, ...)); -extern int register_input_handler __P((int fd, ihfunc_t func)); +extern void log(int, int, char *, ...); +extern int register_input_handler(int fd, ihfunc_t func); /* igmp.c */ -extern void init_igmp __P((void)); -extern void accept_igmp __P((int recvlen)); +extern void init_igmp(void); +extern void accept_igmp(int recvlen); extern void send_igmp __P((u_int32_t src, u_int32_t dst, int type, int code, u_int32_t group, int datalen)); /* callout.c */ -extern void callout_init __P((void)); -extern void age_callout_queue __P((void)); +extern void callout_init(void); +extern void age_callout_queue(void); extern int timer_setTimer __P((int delay, cfunc_t action, char *data)); -extern void timer_clearTimer __P((int timer_id)); +extern void timer_clearTimer(int timer_id); /* route.c */ -extern void init_routes __P((void)); -extern void start_route_updates __P((void)); +extern void init_routes(void); +extern void start_route_updates(void); extern void update_route __P((u_int32_t origin, u_int32_t mask, u_int metric, u_int32_t src, vifi_t vifi)); -extern void age_routes __P((void)); -extern void expire_all_routes __P((void)); -extern void free_all_routes __P((void)); +extern void age_routes(void); +extern void expire_all_routes(void); +extern void free_all_routes(void); extern void accept_probe __P((u_int32_t src, u_int32_t dst, char *p, int datalen, u_int32_t level)); extern void accept_report __P((u_int32_t src, u_int32_t dst, char *p, int datalen, u_int32_t level)); -extern struct rtentry * determine_route __P((u_int32_t src)); +extern struct rtentry * determine_route(u_int32_t src); extern void report __P((int which_routes, vifi_t vifi, u_int32_t dst)); -extern void report_to_all_neighbors __P((int which_routes)); -extern int report_next_chunk __P((void)); -extern void add_vif_to_routes __P((vifi_t vifi)); -extern void delete_vif_from_routes __P((vifi_t vifi)); +extern void report_to_all_neighbors(int which_routes); +extern int report_next_chunk(void); +extern void add_vif_to_routes(vifi_t vifi); +extern void delete_vif_from_routes(vifi_t vifi); extern void delete_neighbor_from_routes __P((u_int32_t addr, vifi_t vifi)); -extern void dump_routes __P((FILE *fp)); -extern void start_route_updates __P((void)); +extern void dump_routes(FILE *fp); +extern void start_route_updates(void); /* vif.c */ -extern void init_vifs __P((void)); -extern void check_vif_state __P((void)); -extern vifi_t find_vif __P((u_int32_t src, u_int32_t dst)); -extern void age_vifs __P((void)); -extern void dump_vifs __P((FILE *fp)); -extern void stop_all_vifs __P((void)); -extern struct listaddr *neighbor_info __P((vifi_t vifi, u_int32_t addr)); +extern void init_vifs(void); +extern void check_vif_state(void); +extern vifi_t find_vif(u_int32_t src, u_int32_t dst); +extern void age_vifs(void); +extern void dump_vifs(FILE *fp); +extern void stop_all_vifs(void); +extern struct listaddr *neighbor_info(vifi_t vifi, u_int32_t addr); extern void accept_group_report __P((u_int32_t src, u_int32_t dst, u_int32_t group, int r_type)); -extern void query_groups __P((void)); -extern void probe_for_neighbors __P((void)); +extern void query_groups(void); +extern void probe_for_neighbors(void); extern int update_neighbor __P((vifi_t vifi, u_int32_t addr, int msgtype, char *p, int datalen, u_int32_t level)); -extern void accept_neighbor_request __P((u_int32_t src, u_int32_t dst)); +extern void accept_neighbor_request(u_int32_t src, u_int32_t dst); extern void accept_neighbor_request2 __P((u_int32_t src, u_int32_t dst)); extern void accept_neighbors __P((u_int32_t src, u_int32_t dst, @@ -233,38 +233,38 @@ extern void accept_membership_query __P((u_int32_t src, u_int32_t dst, u_int32_t group, int tmo)); /* config.c */ -extern void config_vifs_from_kernel __P((void)); +extern void config_vifs_from_kernel(void); /* cfparse.y */ -extern void config_vifs_from_file __P((void)); +extern void config_vifs_from_file(void); /* inet.c */ -extern int inet_valid_host __P((u_int32_t naddr)); -extern int inet_valid_subnet __P((u_int32_t nsubnet, u_int32_t nmask)); -extern char * inet_fmt __P((u_int32_t addr, char *s)); -extern char * inet_fmts __P((u_int32_t addr, u_int32_t mask, char *s)); -extern u_int32_t inet_parse __P((char *s)); -extern int inet_cksum __P((u_short *addr, u_int len)); +extern int inet_valid_host(u_int32_t naddr); +extern int inet_valid_subnet(u_int32_t nsubnet, u_int32_t nmask); +extern char * inet_fmt(u_int32_t addr, char *s); +extern char * inet_fmts(u_int32_t addr, u_int32_t mask, char *s); +extern u_int32_t inet_parse(char *s); +extern int inet_cksum(u_short *addr, u_int len); /* prune.c */ extern unsigned kroutes; -extern void add_table_entry __P((u_int32_t origin, u_int32_t mcastgrp)); +extern void add_table_entry(u_int32_t origin, u_int32_t mcastgrp); extern void del_table_entry __P((struct rtentry *r, u_int32_t mcastgrp, u_int del_flag)); -extern void update_table_entry __P((struct rtentry *r)); -extern void init_ktable __P((void)); +extern void update_table_entry(struct rtentry *r); +extern void init_ktable(void); extern void accept_prune __P((u_int32_t src, u_int32_t dst, char *p, int datalen)); -extern void steal_sources __P((struct rtentry *rt)); -extern void reset_neighbor_state __P((vifi_t vifi, u_int32_t addr)); -extern int grplst_mem __P((vifi_t vifi, u_int32_t mcastgrp)); -extern int scoped_addr __P((vifi_t vifi, u_int32_t addr)); -extern void free_all_prunes __P((void)); -extern void age_table_entry __P((void)); -extern void dump_cache __P((FILE *fp2)); -extern void update_lclgrp __P((vifi_t vifi, u_int32_t mcastgrp)); -extern void delete_lclgrp __P((vifi_t vifi, u_int32_t mcastgrp)); -extern void chkgrp_graft __P((vifi_t vifi, u_int32_t mcastgrp)); +extern void steal_sources(struct rtentry *rt); +extern void reset_neighbor_state(vifi_t vifi, u_int32_t addr); +extern int grplst_mem(vifi_t vifi, u_int32_t mcastgrp); +extern int scoped_addr(vifi_t vifi, u_int32_t addr); +extern void free_all_prunes(void); +extern void age_table_entry(void); +extern void dump_cache(FILE *fp2); +extern void update_lclgrp(vifi_t vifi, u_int32_t mcastgrp); +extern void delete_lclgrp(vifi_t vifi, u_int32_t mcastgrp); +extern void chkgrp_graft(vifi_t vifi, u_int32_t mcastgrp); extern void accept_graft __P((u_int32_t src, u_int32_t dst, char *p, int datalen)); extern void accept_g_ack __P((u_int32_t src, u_int32_t dst, char *p, @@ -275,26 +275,26 @@ extern void accept_mtrace __P((u_int32_t src, u_int32_t dst, int datalen)); /* kern.c */ -extern void k_set_rcvbuf __P((int bufsize)); -extern void k_hdr_include __P((int bool)); -extern void k_set_ttl __P((int t)); -extern void k_set_loop __P((int l)); -extern void k_set_if __P((u_int32_t ifa)); -extern void k_join __P((u_int32_t grp, u_int32_t ifa)); -extern void k_leave __P((u_int32_t grp, u_int32_t ifa)); -extern void k_init_dvmrp __P((void)); -extern void k_stop_dvmrp __P((void)); -extern void k_add_vif __P((vifi_t vifi, struct uvif *v)); -extern void k_del_vif __P((vifi_t vifi)); -extern void k_add_rg __P((u_int32_t origin, struct gtable *g)); -extern int k_del_rg __P((u_int32_t origin, struct gtable *g)); -extern int k_get_version __P((void)); +extern void k_set_rcvbuf(int bufsize); +extern void k_hdr_include(int bool); +extern void k_set_ttl(int t); +extern void k_set_loop(int l); +extern void k_set_if(u_int32_t ifa); +extern void k_join(u_int32_t grp, u_int32_t ifa); +extern void k_leave(u_int32_t grp, u_int32_t ifa); +extern void k_init_dvmrp(void); +extern void k_stop_dvmrp(void); +extern void k_add_vif(vifi_t vifi, struct uvif *v); +extern void k_del_vif(vifi_t vifi); +extern void k_add_rg(u_int32_t origin, struct gtable *g); +extern int k_del_rg(u_int32_t origin, struct gtable *g); +extern int k_get_version(void); #ifdef SNMP /* prune.c */ -extern struct rtentry * snmp_find_route __P(()); -extern struct gtable * find_grp __P(()); -extern struct stable * find_grp_src __P(()); +extern struct rtentry * snmp_find_route(); +extern struct gtable * find_grp(); +extern struct stable * find_grp_src(); #endif #ifdef RSRR @@ -305,9 +305,9 @@ extern int find_src_grp __P((u_int32_t src, u_int32_t mask, u_int32_t grp)); /* rsrr.c */ -extern void rsrr_init __P((void)); -extern void rsrr_read __P((int f, fd_set *rfd)); -extern void rsrr_clean __P((void)); -extern void rsrr_cache_send __P((struct gtable *gt, int notify)); -extern void rsrr_cache_clean __P((struct gtable *gt)); +extern void rsrr_init(void); +extern void rsrr_read(int f, fd_set *rfd); +extern void rsrr_clean(void); +extern void rsrr_cache_send(struct gtable *gt, int notify); +extern void rsrr_cache_clean(struct gtable *gt); #endif /* RSRR */ diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c index 5ac21537f4c..c966fa2620c 100644 --- a/usr.sbin/mrouted/igmp.c +++ b/usr.sbin/mrouted/igmp.c @@ -28,8 +28,8 @@ u_int32_t dvmrp_genid; /* IGMP generation id */ * Local function definitions. */ /* u_char promoted to u_int */ -static char * packet_kind __P((u_int type, u_int code)); -static int igmp_log_level __P((u_int type, u_int code)); +static char * packet_kind(u_int type, u_int code); +static int igmp_log_level(u_int type, u_int code); /* * Open and initialize the igmp socket, and fill in the non-changing diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c index 536518f5831..756a35cfe9e 100644 --- a/usr.sbin/mrouted/main.c +++ b/usr.sbin/mrouted/main.c @@ -34,7 +34,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: main.c,v 1.7 2001/12/01 23:27:23 miod Exp $"; + "@(#) $Id: main.c,v 1.8 2002/02/16 21:28:05 millert Exp $"; #endif extern char *configfilename; @@ -65,18 +65,18 @@ static int nhandlers = 0; /* * Forward declarations. */ -static void fasttimer __P((int)); -static void done __P((int)); -static void dump __P((int)); -static void fdump __P((int)); -static void cdump __P((int)); -static void restart __P((int)); -static void timer __P((void)); -static void cleanup __P((void)); -static void resetlogging __P((void *)); +static void fasttimer(int); +static void done(int); +static void dump(int); +static void fdump(int); +static void cdump(int); +static void restart(int); +static void timer(void); +static void cleanup(void); +static void resetlogging(void *); /* To shut up gcc -Wstrict-prototypes */ -int main __P((int argc, char **argv)); +int main(int argc, char **argv); int register_input_handler(fd, func) diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c index de62b4b83e9..cd79b73fe2c 100644 --- a/usr.sbin/mrouted/prune.c +++ b/usr.sbin/mrouted/prune.c @@ -50,17 +50,17 @@ unsigned int kroutes; /* current number of cache entries */ /**************************************************************************** Functions that are local to prune.c ****************************************************************************/ -static void prun_add_ttls __P((struct gtable *gt)); -static int pruning_neighbor __P((vifi_t vifi, u_int32_t addr)); -static int can_mtrace __P((vifi_t vifi, u_int32_t addr)); -static struct ptable * find_prune_entry __P((u_int32_t vr, struct ptable *pt)); -static void expire_prune __P((vifi_t vifi, struct gtable *gt)); -static void send_prune __P((struct gtable *gt)); -static void send_graft __P((struct gtable *gt)); +static void prun_add_ttls(struct gtable *gt); +static int pruning_neighbor(vifi_t vifi, u_int32_t addr); +static int can_mtrace(vifi_t vifi, u_int32_t addr); +static struct ptable * find_prune_entry(u_int32_t vr, struct ptable *pt); +static void expire_prune(vifi_t vifi, struct gtable *gt); +static void send_prune(struct gtable *gt); +static void send_graft(struct gtable *gt); static void send_graft_ack __P((u_int32_t src, u_int32_t dst, u_int32_t origin, u_int32_t grp)); -static void update_kernel __P((struct gtable *g)); -static char * scaletime __P((u_long t)); +static void update_kernel(struct gtable *g); +static char * scaletime(u_long t); /* * Updates the ttl values for each vif. diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c index 6765ae95548..7657cdd25ef 100644 --- a/usr.sbin/mrouted/route.c +++ b/usr.sbin/mrouted/route.c @@ -42,10 +42,10 @@ unsigned int nroutes; /* current number of route entries */ */ static int init_children_and_leaves __P((struct rtentry *r, vifi_t parent)); -static int find_route __P((u_int32_t origin, u_int32_t mask)); -static void create_route __P((u_int32_t origin, u_int32_t mask)); -static void discard_route __P((struct rtentry *prev_r)); -static int compare_rts __P((const void *rt1, const void *rt2)); +static int find_route(u_int32_t origin, u_int32_t mask); +static void create_route(u_int32_t origin, u_int32_t mask); +static void discard_route(struct rtentry *prev_r); +static int compare_rts(const void *rt1, const void *rt2); static int report_chunk __P((struct rtentry *start_rt, vifi_t vifi, u_int32_t dst)); diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c index 0b736b8aa33..017dc152d19 100644 --- a/usr.sbin/mrouted/rsrr.c +++ b/usr.sbin/mrouted/rsrr.c @@ -74,11 +74,11 @@ int client_length = sizeof(client_addr); /* * Procedure definitions needed internally. */ -static void rsrr_accept __P((int recvlen)); -static void rsrr_accept_iq __P((void)); +static void rsrr_accept(int recvlen); +static void rsrr_accept_iq(void); static int rsrr_accept_rq __P((struct rsrr_rq *route_query, int flags, struct gtable *gt_notify)); -static int rsrr_send __P((int sendlen)); +static int rsrr_send(int sendlen); static void rsrr_cache __P((struct gtable *gt, struct rsrr_rq *route_query)); diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c index 326d17dcd67..ea84bc76629 100644 --- a/usr.sbin/mrouted/vif.c +++ b/usr.sbin/mrouted/vif.c @@ -35,16 +35,16 @@ typedef struct { /* * Forward declarations. */ -static void start_vif __P((vifi_t vifi)); -static void start_vif2 __P((vifi_t vifi)); -static void stop_vif __P((vifi_t vifi)); -static void age_old_hosts __P((void)); -static void send_probe_on_vif __P((struct uvif *v)); -static int info_version __P((char *p)); -static void DelVif __P((void *arg)); -static int SetTimer __P((int vifi, struct listaddr *g)); -static int DeleteTimer __P((int id)); -static void SendQuery __P((void *arg)); +static void start_vif(vifi_t vifi); +static void start_vif2(vifi_t vifi); +static void stop_vif(vifi_t vifi); +static void age_old_hosts(void); +static void send_probe_on_vif(struct uvif *v); +static int info_version(char *p); +static void DelVif(void *arg); +static int SetTimer(int vifi, struct listaddr *g); +static int DeleteTimer(int id); +static void SendQuery(void *arg); static int SetQueryTimer __P((struct listaddr *g, vifi_t vifi, int to_expire, int q_time)); diff --git a/usr.sbin/mtrace/mtrace.c b/usr.sbin/mtrace/mtrace.c index a62efd2932f..81d76614a44 100644 --- a/usr.sbin/mtrace/mtrace.c +++ b/usr.sbin/mtrace/mtrace.c @@ -52,7 +52,7 @@ #ifndef lint static char rcsid[] = - "@(#) $Id: mtrace.c,v 1.9 2001/12/10 20:30:46 deraadt Exp $"; + "@(#) $Id: mtrace.c,v 1.10 2002/02/16 21:28:05 millert Exp $"; #endif #include <netdb.h> @@ -139,23 +139,23 @@ extern long random(); #endif extern int errno; -char * inet_name __P((u_int32_t addr)); -u_int32_t host_addr __P((char *name)); +char * inet_name(u_int32_t addr); +u_int32_t host_addr(char *name); /* u_int is promoted u_char */ -char * proto_type __P((u_int type)); -char * flag_type __P((u_int type)); +char * proto_type(u_int type); +char * flag_type(u_int type); -u_int32_t get_netmask __P((int s, u_int32_t dst)); -int get_ttl __P((struct resp_buf *buf)); -int t_diff __P((u_long a, u_long b)); -u_long fixtime __P((u_long time)); +u_int32_t get_netmask(int s, u_int32_t dst); +int get_ttl(struct resp_buf *buf); +int t_diff(u_long a, u_long b); +u_long fixtime(u_long time); int send_recv __P((u_int32_t dst, int type, int code, int tries, struct resp_buf *save)); -char * print_host __P((u_int32_t addr)); -char * print_host2 __P((u_int32_t addr1, u_int32_t addr2)); -void print_trace __P((int index, struct resp_buf *buf)); -int what_kind __P((struct resp_buf *buf, char *why)); -char * scale __P((int *hop)); +char * print_host(u_int32_t addr); +char * print_host2(u_int32_t addr1, u_int32_t addr2); +void print_trace(int index, struct resp_buf *buf); +int what_kind(struct resp_buf *buf, char *why); +char * scale(int *hop); void stat_line __P((struct tr_resp *r, struct tr_resp *s, int have_next, int *res)); void fixup_stats __P((struct resp_buf *base, @@ -164,9 +164,9 @@ void fixup_stats __P((struct resp_buf *base, int print_stats __P((struct resp_buf *base, struct resp_buf *prev, struct resp_buf *new)); -void check_vif_state __P((void)); +void check_vif_state(void); -int main __P((int argc, char *argv[])); +int main(int argc, char *argv[]); diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c index 6a0d5981375..4ef751fa23b 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/mtree/compare.c @@ -1,5 +1,5 @@ /* $NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $ */ -/* $OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jakob Exp $ */ +/* $OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)compare.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jakob Exp $"; +static const char rcsid[] = "$OpenBSD: compare.c,v 1.14 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* not lint */ @@ -58,7 +58,7 @@ static const char rcsid[] = "$OpenBSD: compare.c,v 1.13 2001/10/01 16:48:18 jako extern int lflag, tflag, uflag; -static char *ftype __P((u_int)); +static char *ftype(u_int); #define INDENTNAMELEN 8 #define LABEL \ diff --git a/usr.sbin/mtree/create.c b/usr.sbin/mtree/create.c index 2c6b5493643..8160a844997 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/mtree/create.c @@ -1,5 +1,5 @@ /* $NetBSD: create.c,v 1.11 1996/09/05 09:24:19 mycroft Exp $ */ -/* $OpenBSD: create.c,v 1.13 2001/08/10 02:37:14 millert Exp $ */ +/* $OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)create.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: create.c,v 1.13 2001/08/10 02:37:14 millert Exp $"; +static const char rcsid[] = "$OpenBSD: create.c,v 1.14 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* not lint */ @@ -72,10 +72,10 @@ static gid_t gid; static uid_t uid; static mode_t mode; -static int dsort __P((const FTSENT **, const FTSENT **)); -static void output __P((int, int *, const char *, ...)); -static int statd __P((FTS *, FTSENT *, uid_t *, gid_t *, mode_t *)); -static void statf __P((int, FTSENT *)); +static int dsort(const FTSENT **, const FTSENT **); +static void output(int, int *, const char *, ...); +static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *); +static void statf(int, FTSENT *); void cwalk() diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/mtree/extern.h index eea6c805b73..44289d80141 100644 --- a/usr.sbin/mtree/extern.h +++ b/usr.sbin/mtree/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1997/07/18 05:49:03 millert Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:05 millert Exp $ */ /* $NetBSD: extern.h,v 1.3 1995/03/07 21:12:07 cgd Exp $ */ /*- @@ -36,12 +36,12 @@ * @(#)extern.h 8.1 (Berkeley) 6/6/93 */ -int compare __P((char *, NODE *, FTSENT *)); -int crc __P((int, u_int32_t *, u_int32_t *)); -void cwalk __P((void)); -void error __P((const char *, ...)); -char *inotype __P((u_int)); -u_int parsekey __P((char *, int *)); -char *rlink __P((char *)); -NODE *spec __P((void)); -int verify __P((void)); +int compare(char *, NODE *, FTSENT *); +int crc(int, u_int32_t *, u_int32_t *); +void cwalk(void); +void error(const char *, ...); +char *inotype(u_int); +u_int parsekey(char *, int *); +char *rlink(char *); +NODE *spec(void); +int verify(void); diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/mtree/misc.c index 2a033f7aace..32c2ab6907b 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/mtree/misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: misc.c,v 1.9 2001/08/10 02:33:46 millert Exp $ */ +/* $OpenBSD: misc.c,v 1.10 2002/02/16 21:28:05 millert Exp $ */ /* $NetBSD: misc.c,v 1.4 1995/03/07 21:26:23 cgd Exp $ */ /*- @@ -80,7 +80,7 @@ parsekey(name, needvaluep) int *needvaluep; { KEY *k, tmp; - int keycompare __P((const void *, const void *)); + int keycompare(const void *, const void *); tmp.name = name; k = (KEY *)bsearch(&tmp, keylist, sizeof(keylist) / sizeof(KEY), diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/mtree/mtree.c index 2d4f631536e..48be9f6ce9c 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/mtree/mtree.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtree.c,v 1.13 2001/10/01 16:48:19 jakob Exp $ */ +/* $OpenBSD: mtree.c,v 1.14 2002/02/16 21:28:05 millert Exp $ */ /* $NetBSD: mtree.c,v 1.7 1996/09/05 23:29:22 thorpej Exp $ */ /*- @@ -44,7 +44,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)mtree.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: mtree.c,v 1.13 2001/10/01 16:48:19 jakob Exp $"; +static const char rcsid[] = "$OpenBSD: mtree.c,v 1.14 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* not lint */ @@ -65,7 +65,7 @@ int cflag, dflag, eflag, iflag, lflag, nflag, qflag, rflag, sflag, tflag, u_int keys; char fullpath[MAXPATHLEN]; -static void usage __P((void)); +static void usage(void); int main(argc, argv) diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/mtree/spec.c index 0c6960de39c..52217c89fc8 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/mtree/spec.c @@ -1,5 +1,5 @@ /* $NetBSD: spec.c,v 1.6 1995/03/07 21:12:12 cgd Exp $ */ -/* $OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert Exp $ */ +/* $OpenBSD: spec.c,v 1.13 2002/02/16 21:28:05 millert Exp $ */ /*- * Copyright (c) 1989, 1993 @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)spec.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert Exp $"; +static const char rcsid[] = "$OpenBSD: spec.c,v 1.13 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* not lint */ @@ -56,8 +56,8 @@ static const char rcsid[] = "$OpenBSD: spec.c,v 1.12 2001/08/10 02:37:14 millert int lineno; /* Current spec line number. */ -static void set __P((char *, NODE *)); -static void unset __P((char *, NODE *)); +static void set(char *, NODE *); +static void unset(char *, NODE *); NODE * spec() diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/mtree/verify.c index f1f1b36e43f..a29484b927b 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/mtree/verify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: verify.c,v 1.7 2001/08/10 02:37:14 millert Exp $ */ +/* $OpenBSD: verify.c,v 1.8 2002/02/16 21:28:05 millert Exp $ */ /* $NetBSD: verify.c,v 1.10 1995/03/07 21:26:28 cgd Exp $ */ /*- @@ -38,7 +38,7 @@ #if 0 static const char sccsid[] = "@(#)verify.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: verify.c,v 1.7 2001/08/10 02:37:14 millert Exp $"; +static const char rcsid[] = "$OpenBSD: verify.c,v 1.8 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* not lint */ @@ -61,8 +61,8 @@ extern char fullpath[MAXPATHLEN]; static NODE *root; static char path[MAXPATHLEN]; -static void miss __P((NODE *, char *)); -static int vwalk __P((void)); +static void miss(NODE *, char *); +static int vwalk(void); int verify() diff --git a/usr.sbin/named/conf/portability.h b/usr.sbin/named/conf/portability.h index 7ae3e2957bc..7d4ad88e1f9 100644 --- a/usr.sbin/named/conf/portability.h +++ b/usr.sbin/named/conf/portability.h @@ -286,9 +286,9 @@ struct timezoneBSD { # endif # ifndef NeXT -extern char *getenv __P((char *)); +extern char *getenv(char *); # else -extern char *getenv __P((const char *)); +extern char *getenv(const char *); # endif # if !defined(DMALLOC) && !defined(NeXT) @@ -309,9 +309,9 @@ extern void free(); # define STDERR_FILENO 2 extern int errno; -extern int getdtablesize __P((void)); +extern int getdtablesize(void); # ifdef SHORT_FNAMES -extern long pathconf __P((const char *path, int name)); +extern long pathconf(const char *path, int name); # endif #endif /*USE_POSIX*/ @@ -351,7 +351,7 @@ extern long pathconf __P((const char *path, int name)); #endif #if !defined(__convex__) && (!defined(BSD) || (BSD < 199103)) -int strcasecmp __P((const char *, const char *)); +int strcasecmp(const char *, const char *); #endif /* is USE_POSIX the right thing to use here? */ @@ -362,7 +362,7 @@ int strcasecmp __P((const char *, const char *)); # if !defined(NCR) extern void syslog(); # endif -extern char *ctime __P((const time_t *clock)); +extern char *ctime(const time_t *clock); # if !defined(M_UNIX) extern int close(), setitimer(), recv(), sendto(), sigsetmask(), atoi(), getpid(), fork(), read(), ioctl(), @@ -455,8 +455,8 @@ extern int bcmp(); #if !defined(ntohl) && !defined(htonl) && defined(BSD) && (BSD <= 43) /* if these aren't null macros in netinet/in.h, extern them here. */ -extern u_short htons __P((u_short)), ntohs __P((u_short)); -extern u_long htonl __P((u_long)), ntohl __P((u_long)); +extern u_short htons(u_short), ntohs(u_short); +extern u_long htonl(u_long), ntohl(u_long); #endif #if defined(USE_POSIX) && !defined(sun) && !defined(__sgi) \ @@ -632,19 +632,19 @@ extern u_long htonl __P((u_long)), ntohl __P((u_long)); * Prototype the functions we'll be supplying. */ #ifdef NEED_PUTENV -extern int putenv __P((char *)); +extern int putenv(char *); #endif #ifdef NEED_GETTIMEOFDAY -extern int gettimeofday __P((struct timeval *, struct _TIMEZONE *)); +extern int gettimeofday(struct timeval *, struct _TIMEZONE *); #endif #if defined(SVR4) && defined(sun) -extern int gethostname __P((char *, size_t)); +extern int gethostname(char *, size_t); #endif #ifdef NEED_STRDUP -extern char *strdup __P((const char *)); +extern char *strdup(const char *); #endif #endif /*__BIND_PORTABILITY_H*/ diff --git a/usr.sbin/named/include/arpa/inet.h b/usr.sbin/named/include/arpa/inet.h index 71ae3b59117..dc9864e54c7 100644 --- a/usr.sbin/named/include/arpa/inet.h +++ b/usr.sbin/named/include/arpa/inet.h @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.h,v 1.2 1997/03/12 11:21:16 downsj Exp $ */ +/* $OpenBSD: inet.h,v 1.3 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1983, 1993 @@ -74,20 +74,20 @@ #include <sys/cdefs.h> __BEGIN_DECLS -unsigned long inet_addr __P((const char *)); -int inet_aton __P((const char *, struct in_addr *)); -unsigned long inet_lnaof __P((struct in_addr)); -struct in_addr inet_makeaddr __P((u_long , u_long)); -char * inet_neta __P((u_long, char *, size_t)); -unsigned long inet_netof __P((struct in_addr)); -unsigned long inet_network __P((const char *)); -char *inet_net_ntop __P((int, const void *, int, char *, size_t)); -int inet_net_pton __P((int, const char *, void *, size_t)); -char *inet_ntoa __P((struct in_addr)); -int inet_pton __P((int, const char *, void *)); -const char *inet_ntop __P((int, const void *, char *, size_t)); -u_int inet_nsap_addr __P((const char *, u_char *, int)); -char *inet_nsap_ntoa __P((int, const u_char *, char *)); +unsigned long inet_addr(const char *); +int inet_aton(const char *, struct in_addr *); +unsigned long inet_lnaof(struct in_addr); +struct in_addr inet_makeaddr(u_long , u_long); +char * inet_neta(u_long, char *, size_t); +unsigned long inet_netof(struct in_addr); +unsigned long inet_network(const char *); +char *inet_net_ntop(int, const void *, int, char *, size_t); +int inet_net_pton(int, const char *, void *, size_t); +char *inet_ntoa(struct in_addr); +int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *, char *, size_t); +u_int inet_nsap_addr(const char *, u_char *, int); +char *inet_nsap_ntoa(int, const u_char *, char *); __END_DECLS #endif /* !_INET_H_ */ diff --git a/usr.sbin/named/include/arpa/nameser.h b/usr.sbin/named/include/arpa/nameser.h index 65a10f4c175..69bf856af7a 100644 --- a/usr.sbin/named/include/arpa/nameser.h +++ b/usr.sbin/named/include/arpa/nameser.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nameser.h,v 1.2 1997/03/12 11:21:16 downsj Exp $ */ +/* $OpenBSD: nameser.h,v 1.3 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1983, 1989, 1993 @@ -346,8 +346,8 @@ typedef struct { */ #define INDIR_MASK 0xc0 -extern u_int16_t _getshort __P((const u_char *)); -extern u_int32_t _getlong __P((const u_char *)); +extern u_int16_t _getshort(const u_char *); +extern u_int32_t _getlong(const u_char *); /* * Inline versions of get/put short/long. Pointer is advanced. diff --git a/usr.sbin/named/include/netdb.h b/usr.sbin/named/include/netdb.h index a4d246b1eb3..844bf9255ac 100644 --- a/usr.sbin/named/include/netdb.h +++ b/usr.sbin/named/include/netdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netdb.h,v 1.3 1998/05/22 00:47:15 millert Exp $ */ +/* $OpenBSD: netdb.h,v 1.4 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1980, 1983, 1988, 1993 @@ -129,30 +129,30 @@ struct protoent { #define NO_ADDRESS NO_DATA /* no address, look for MX record */ __BEGIN_DECLS -void endhostent __P((void)); -void endnetent __P((void)); -void endprotoent __P((void)); -void endservent __P((void)); -struct hostent *gethostbyaddr __P((const char *, int, int)); -struct hostent *gethostbyname __P((const char *)); -struct hostent *gethostbyname2 __P((const char *, int)); -struct hostent *gethostent __P((void)); -struct netent *getnetbyaddr __P((unsigned long, int)); -struct netent *getnetbyname __P((const char *)); -struct netent *getnetent __P((void)); -struct protoent *getprotobyname __P((const char *)); -struct protoent *getprotobynumber __P((int)); -struct protoent *getprotoent __P((void)); -struct servent *getservbyname __P((const char *, const char *)); -struct servent *getservbyport __P((int, const char *)); -struct servent *getservent __P((void)); -void herror __P((const char *)); -const char *hstrerror __P((int)); -void sethostent __P((int)); -/* void sethostfile __P((const char *)); */ -void setnetent __P((int)); -void setprotoent __P((int)); -void setservent __P((int)); +void endhostent(void); +void endnetent(void); +void endprotoent(void); +void endservent(void); +struct hostent *gethostbyaddr(const char *, int, int); +struct hostent *gethostbyname(const char *); +struct hostent *gethostbyname2(const char *, int); +struct hostent *gethostent(void); +struct netent *getnetbyaddr(unsigned long, int); +struct netent *getnetbyname(const char *); +struct netent *getnetent(void); +struct protoent *getprotobyname(const char *); +struct protoent *getprotobynumber(int); +struct protoent *getprotoent(void); +struct servent *getservbyname(const char *, const char *); +struct servent *getservbyport(int, const char *); +struct servent *getservent(void); +void herror(const char *); +const char *hstrerror(int); +void sethostent(int); +/* void sethostfile(const char *); */ +void setnetent(int); +void setprotoent(int); +void setservent(int); __END_DECLS /* This is nec'y to make this include file properly replace the sun version. */ diff --git a/usr.sbin/named/include/resolv.h b/usr.sbin/named/include/resolv.h index f6bdaef9a2a..193c97213af 100644 --- a/usr.sbin/named/include/resolv.h +++ b/usr.sbin/named/include/resolv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolv.h,v 1.3 1998/05/22 00:47:17 millert Exp $ */ +/* $OpenBSD: resolv.h,v 1.4 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1983, 1987, 1989, 1993 @@ -243,56 +243,56 @@ extern const struct res_sym __p_type_syms[]; #endif __BEGIN_DECLS -int res_hnok __P((const char *)); -int res_ownok __P((const char *)); -int res_mailok __P((const char *)); -int res_dnok __P((const char *)); -int sym_ston __P((const struct res_sym *, char *, int *)); -const char * sym_ntos __P((const struct res_sym *, int, int *)); -const char * sym_ntop __P((const struct res_sym *, int, int *)); -int b64_ntop __P((u_char const *, size_t, char *, size_t)); -int b64_pton __P((char const *, u_char *, size_t)); -int loc_aton __P((const char *, u_char *)); -const char * loc_ntoa __P((const u_char *, char *)); -int dn_skipname __P((const u_char *, const u_char *)); -void fp_resstat __P((struct __res_state *, FILE *)); -void fp_query __P((const u_char *, FILE *)); -void fp_nquery __P((const u_char *, int, FILE *)); -const char * hostalias __P((const char *)); -void putlong __P((u_int32_t, u_char *)); -void putshort __P((u_int16_t, u_char *)); -const char * p_class __P((int)); -const char * p_time __P((u_int32_t)); -const char * p_type __P((int)); -void p_query __P((const u_char *)); -const u_char * p_cdnname __P((const u_char *, const u_char *, int, FILE *)); -const u_char * p_cdname __P((const u_char *, const u_char *, FILE *)); +int res_hnok(const char *); +int res_ownok(const char *); +int res_mailok(const char *); +int res_dnok(const char *); +int sym_ston(const struct res_sym *, char *, int *); +const char * sym_ntos(const struct res_sym *, int, int *); +const char * sym_ntop(const struct res_sym *, int, int *); +int b64_ntop(u_char const *, size_t, char *, size_t); +int b64_pton(char const *, u_char *, size_t); +int loc_aton(const char *, u_char *); +const char * loc_ntoa(const u_char *, char *); +int dn_skipname(const u_char *, const u_char *); +void fp_resstat(struct __res_state *, FILE *); +void fp_query(const u_char *, FILE *); +void fp_nquery(const u_char *, int, FILE *); +const char * hostalias(const char *); +void putlong(u_int32_t, u_char *); +void putshort(u_int16_t, u_char *); +const char * p_class(int); +const char * p_time(u_int32_t); +const char * p_type(int); +void p_query(const u_char *); +const u_char * p_cdnname(const u_char *, const u_char *, int, FILE *); +const u_char * p_cdname(const u_char *, const u_char *, FILE *); const u_char * p_fqnname __P((const u_char *cp, const u_char *msg, int, char *, int)); -const u_char * p_fqname __P((const u_char *, const u_char *, FILE *)); -const u_char * p_rr __P((const u_char *, const u_char *, FILE *)); -const char * p_option __P((u_long option)); -char * p_secstodate __P((u_long)); -int dn_count_labels __P((char *)); +const u_char * p_fqname(const u_char *, const u_char *, FILE *); +const u_char * p_rr(const u_char *, const u_char *, FILE *); +const char * p_option(u_long option); +char * p_secstodate(u_long); +int dn_count_labels(char *); int dn_comp __P((const char *, u_char *, int, u_char **, u_char **)); int dn_expand __P((const u_char *, const u_char *, const u_char *, char *, int)); -int res_init __P((void)); -u_int res_randomid __P((void)); -int res_query __P((const char *, int, int, u_char *, int)); -int res_search __P((const char *, int, int, u_char *, int)); +int res_init(void); +u_int res_randomid(void); +int res_query(const char *, int, int, u_char *, int); +int res_search(const char *, int, int, u_char *, int); int res_querydomain __P((const char *, const char *, int, int, u_char *, int)); int res_mkquery __P((int, const char *, int, int, const u_char *, int, const u_char *, u_char *, int)); -int res_send __P((const u_char *, int, u_char *, int)); -int res_isourserver __P((const struct sockaddr_in *)); +int res_send(const u_char *, int, u_char *, int); +int res_isourserver(const struct sockaddr_in *); int res_nameinquery __P((const char *, int, int, const u_char *, const u_char *)); int res_queriesmatch __P((const u_char *, const u_char *, const u_char *, const u_char *)); -void res_close __P((void)); +void res_close(void); __END_DECLS #endif /* !_RESOLV_H_ */ diff --git a/usr.sbin/named/libresolv/gethnamaddr.c b/usr.sbin/named/libresolv/gethnamaddr.c index aaea43549ea..728b68103b5 100644 --- a/usr.sbin/named/libresolv/gethnamaddr.c +++ b/usr.sbin/named/libresolv/gethnamaddr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gethnamaddr.c,v 1.3 1998/05/22 07:09:07 millert Exp $ */ +/* $OpenBSD: gethnamaddr.c,v 1.4 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1985, 1988, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: gethnamaddr.c,v 1.3 1998/05/22 07:09:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: gethnamaddr.c,v 1.4 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -116,11 +116,11 @@ static u_char host_addr[16]; /* IPv4 or IPv6 */ static FILE *hostf = NULL; static int stayopen = 0; -static void map_v4v6_address __P((const char *src, char *dst)); -static void map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len)); +static void map_v4v6_address(const char *src, char *dst); +static void map_v4v6_hostent(struct hostent *hp, char **bp, int *len); #ifdef RESOLVSORT -static void addrsort __P((char **, int)); +static void addrsort(char **, int); #endif #if PACKETSZ > 1024 @@ -192,7 +192,7 @@ getanswer(answer, anslen, qname, qtype) int toobig = 0; char tbuf[MAXDNAME]; const char *tname; - int (*name_ok) __P((const char *)); + int (*name_ok)(const char *); tname = qname; host.h_name = NULL; diff --git a/usr.sbin/named/libresolv/getnetent.c b/usr.sbin/named/libresolv/getnetent.c index 96b0e648773..1f567f558e3 100644 --- a/usr.sbin/named/libresolv/getnetent.c +++ b/usr.sbin/named/libresolv/getnetent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetent.c,v 1.2 1998/05/22 00:47:19 millert Exp $ */ +/* $OpenBSD: getnetent.c,v 1.3 2002/02/16 21:28:05 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)getnetent.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: getnetent.c,v 1.2 1998/05/22 00:47:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: getnetent.c,v 1.3 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -76,8 +76,8 @@ static struct netent net; static char *net_aliases[MAXALIASES]; int _net_stayopen; -void _setnetent __P((int)); -void _endnetent __P((void)); +void _setnetent(int); +void _endnetent(void); void setnetent(stayopen) diff --git a/usr.sbin/named/libresolv/getnetnamadr.c b/usr.sbin/named/libresolv/getnetnamadr.c index 5ed407d6d5c..59ae82b6e4c 100644 --- a/usr.sbin/named/libresolv/getnetnamadr.c +++ b/usr.sbin/named/libresolv/getnetnamadr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetnamadr.c,v 1.2 1998/05/22 00:47:20 millert Exp $ */ +/* $OpenBSD: getnetnamadr.c,v 1.3 2002/02/16 21:28:05 millert Exp $ */ /* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro * Dep. Matematica Universidade de Coimbra, Portugal, Europe @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93"; static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03"; static char rcsid[] = "$From: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.2 1998/05/22 00:47:20 millert Exp $"; +static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.3 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -70,8 +70,8 @@ extern int h_errno; extern int errno; #endif -struct netent *_getnetbyaddr __P((long net, int type)); -struct netent *_getnetbyname __P((const char *name)); +struct netent *_getnetbyaddr(long net, int type); +struct netent *_getnetbyname(const char *name); #define BYADDR 0 #define BYNAME 1 diff --git a/usr.sbin/named/libresolv/inet_ntop.c b/usr.sbin/named/libresolv/inet_ntop.c index e3da069e7ef..08488ed1bce 100644 --- a/usr.sbin/named/libresolv/inet_ntop.c +++ b/usr.sbin/named/libresolv/inet_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Exp $ */ +/* $OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:28:05 millert Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -20,7 +20,7 @@ #if 0 static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Exp $"; +static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.2 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -46,8 +46,8 @@ static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/12 10:42:06 downsj Ex * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)); -static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)); +static const char *inet_ntop4(const u_char *src, char *dst, size_t size); +static const char *inet_ntop6(const u_char *src, char *dst, size_t size); /* char * * inet_ntop(af, src, dst, size) diff --git a/usr.sbin/named/libresolv/inet_pton.c b/usr.sbin/named/libresolv/inet_pton.c index 035d152770b..078e24c6402 100644 --- a/usr.sbin/named/libresolv/inet_pton.c +++ b/usr.sbin/named/libresolv/inet_pton.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Exp $ */ +/* $OpenBSD: inet_pton.c,v 1.2 2002/02/16 21:28:05 millert Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -20,7 +20,7 @@ #if 0 static char rcsid[] = "$From: inet_pton.c,v 8.7 1996/08/05 08:31:35 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Exp $"; +static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.2 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -39,8 +39,8 @@ static char rcsid[] = "$OpenBSD: inet_pton.c,v 1.1 1997/03/12 10:42:07 downsj Ex * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. */ -static int inet_pton4 __P((const char *src, u_char *dst)); -static int inet_pton6 __P((const char *src, u_char *dst)); +static int inet_pton4(const char *src, u_char *dst); +static int inet_pton6(const char *src, u_char *dst); /* int * inet_pton(af, src, dst) diff --git a/usr.sbin/named/libresolv/res_comp.c b/usr.sbin/named/libresolv/res_comp.c index 132f99f3b55..9bf9acda04d 100644 --- a/usr.sbin/named/libresolv/res_comp.c +++ b/usr.sbin/named/libresolv/res_comp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp $ */ +/* $OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1985, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_comp.c,v 8.14 1998/05/11 04:19:47 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp $"; +static char rcsid[] = "$OpenBSD: res_comp.c,v 1.5 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -81,8 +81,8 @@ static char rcsid[] = "$OpenBSD: res_comp.c,v 1.4 2001/01/28 02:12:49 niklas Exp # include "../conf/portability.h" #endif -static int ns_name_ntop __P((const u_char *, char *, size_t)); -static int ns_name_pton __P((const char *, u_char *, size_t)); +static int ns_name_ntop(const u_char *, char *, size_t); +static int ns_name_pton(const char *, u_char *, size_t); static int ns_name_unpack __P((const u_char *, const u_char *, const u_char *, u_char *, size_t)); static int ns_name_pack __P((const u_char *, u_char *, int, @@ -91,7 +91,7 @@ static int ns_name_uncompress __P((const u_char *, const u_char *, const u_char *, char *, size_t)); static int ns_name_compress __P((const char *, u_char *, size_t, const u_char **, const u_char **)); -static int ns_name_skip __P((const u_char **, const u_char *)); +static int ns_name_skip(const u_char **, const u_char *); /* * Expand compressed domain name 'comp_dn' to full domain name. diff --git a/usr.sbin/named/libresolv/res_init.c b/usr.sbin/named/libresolv/res_init.c index a8183f6917e..da938536c3f 100644 --- a/usr.sbin/named/libresolv/res_init.c +++ b/usr.sbin/named/libresolv/res_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp $ */ +/* $OpenBSD: res_init.c,v 1.6 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1985, 1989, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; static char rcsid[] = "$From: res_init.c,v 8.8 1997/06/01 20:34:37 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp $"; +static char rcsid[] = "$OpenBSD: res_init.c,v 1.6 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -109,19 +109,19 @@ static char rcsid[] = "$OpenBSD: res_init.c,v 1.5 2000/11/10 17:25:49 provos Exp # include <netinfo/ni.h> # define NI_PATH_RESCONF "/locations/resolver" # define NI_TIMEOUT 10 -static int netinfo_res_init __P((int *haveenv, int *havesearch)); +static int netinfo_res_init(int *haveenv, int *havesearch); #endif #if defined(USE_OPTIONS_H) # include "../conf/options.h" #endif -static void res_setoptions __P((char *, char *)); +static void res_setoptions(char *, char *); #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask __P((struct in_addr)); +static u_int32_t net_mask(struct in_addr); #endif #if !defined(isascii) /* XXX - could be a function */ diff --git a/usr.sbin/named/libresolv/res_query.c b/usr.sbin/named/libresolv/res_query.c index ad91c0374c2..836cc745c71 100644 --- a/usr.sbin/named/libresolv/res_query.c +++ b/usr.sbin/named/libresolv/res_query.c @@ -1,4 +1,4 @@ -/* $OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert Exp $ */ +/* $OpenBSD: res_query.c,v 1.4 2002/02/16 21:28:05 millert Exp $ */ /* * ++Copyright++ 1988, 1993 @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; static char rcsid[] = "$From: res_query.c,v 8.10 1997/06/01 20:34:37 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: res_query.c,v 1.4 2002/02/16 21:28:05 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -92,7 +92,7 @@ static char rcsid[] = "$OpenBSD: res_query.c,v 1.3 1998/05/22 00:47:25 millert E #define MAXPACKET 1024 #endif -const char *hostalias __P((const char *)); +const char *hostalias(const char *); int h_errno; /* diff --git a/usr.sbin/named/named-xfer/named-xfer.c b/usr.sbin/named/named-xfer/named-xfer.c index 858028dce61..bf365c3786a 100644 --- a/usr.sbin/named/named-xfer/named-xfer.c +++ b/usr.sbin/named/named-xfer/named-xfer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: named-xfer.c,v 1.8 2001/10/24 13:06:36 mpech Exp $ */ +/* $OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $ */ /* * The original version of xfer by Kevin Dunlap. @@ -97,7 +97,7 @@ char copyright[] = static char sccsid[] = "@(#)named-xfer.c 4.18 (Berkeley) 3/7/91"; static char rcsid[] = "$From: named-xfer.c,v 8.24 1998/04/07 04:59:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.8 2001/10/24 13:06:36 mpech Exp $"; +static char rcsid[] = "$OpenBSD: named-xfer.c,v 1.9 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -156,14 +156,14 @@ static FILE *fp = NULL, static char *ProgName; -static void usage __P((const char *)); -static int getzone __P((struct zoneinfo *, u_int32_t, int)), +static void usage(const char *); +static int getzone(struct zoneinfo *, u_int32_t, int), print_output __P((struct zoneinfo *, u_int32_t, u_char *, int, u_char *)), - netread __P((int, char *, int, int)); -static SIG_FN read_alarm __P(()); -static SIG_FN term_handler __P(()); -static const char *soa_zinfo __P((struct zoneinfo *, u_char *, u_char*)); + netread(int, char *, int, int); +static SIG_FN read_alarm(); +static SIG_FN term_handler(); +static const char *soa_zinfo(struct zoneinfo *, u_char *, u_char*); struct zoneinfo zp_start, zp_finish; diff --git a/usr.sbin/named/named/db_dump.c b/usr.sbin/named/named/db_dump.c index b98310aa7b0..76e9c4fcbf5 100644 --- a/usr.sbin/named/named/db_dump.c +++ b/usr.sbin/named/named/db_dump.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp $ */ +/* $OpenBSD: db_dump.c,v 1.5 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_dump.c 4.33 (Berkeley) 3/3/91"; static char rcsid[] = "$From: db_dump.c,v 8.19 1996/10/08 04:51:03 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_dump.c,v 1.5 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -101,11 +101,11 @@ static char rcsid[] = "$OpenBSD: db_dump.c,v 1.4 1998/06/23 22:40:36 millert Exp #include "named.h" -static int scan_root __P((struct hashbuf *)); -static const char *MkCredStr __P((int)); +static int scan_root(struct hashbuf *); +static const char *MkCredStr(int); #ifdef ALLOW_T_UNSPEC -static void putbyte __P((int, char **)); +static void putbyte(int, char **); #endif /* diff --git a/usr.sbin/named/named/db_func.h b/usr.sbin/named/named/db_func.h index b0e006a7f1e..f609532a78f 100644 --- a/usr.sbin/named/named/db_func.h +++ b/usr.sbin/named/named/db_func.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_func.h,v 1.4 1998/05/23 19:24:48 millert Exp $ */ +/* $OpenBSD: db_func.h,v 1.5 2002/02/16 21:28:06 millert Exp $ */ /* db_proc.h - prototypes for functions in db_*.c * @@ -11,37 +11,37 @@ extern int db_update __P((char name[], struct databuf *newdp, int flags, struct hashbuf *htp)), - db_cmp __P((struct databuf *,struct databuf *)), - findMyZone __P((struct namebuf *np, int class)); -extern void fixttl __P((struct databuf *dp)); + db_cmp(struct databuf *,struct databuf *), + findMyZone(struct namebuf *np, int class); +extern void fixttl(struct databuf *dp); /* --from db_update.c-- */ /* ++from db_reload.c++ */ -extern void db_reload __P((int)); +extern void db_reload(int); /* --from db_reload.c-- */ /* ++from db_save.c++ */ -extern struct namebuf *savename __P((const char *, int)); -extern struct databuf *savedata __P((int, int, u_int32_t, u_char *, int)); -extern struct hashbuf *savehash __P((struct hashbuf *)); +extern struct namebuf *savename(const char *, int); +extern struct databuf *savedata(int, int, u_int32_t, u_char *, int); +extern struct hashbuf *savehash(struct hashbuf *); /* --from db_save.c-- */ /* ++from db_dump.c++ */ -extern int db_dump __P((struct hashbuf *, FILE *, int, char *)), - zt_dump __P((FILE *)), - atob __P((char *, int, char *, int, int *)); -extern void doachkpt __P((void)), - doadump __P((void)); -extern u_int db_getclev __P((const char *)); +extern int db_dump(struct hashbuf *, FILE *, int, char *), + zt_dump(FILE *), + atob(char *, int, char *, int, int *); +extern void doachkpt(void), + doadump(void); +extern u_int db_getclev(const char *); /* --from db_dump.c-- */ /* ++from db_load.c++ */ -extern void endline __P((FILE *)), +extern void endline(FILE *), get_netlist __P((FILE *, struct netinfo **, int, char *)), - free_netlist __P((struct netinfo **)); -extern int getword __P((char *, int, FILE *, int)), - getnum __P((FILE *, const char *, int)), + free_netlist(struct netinfo **); +extern int getword(char *, int, FILE *, int), + getnum(FILE *, const char *, int), db_load __P((const char *, const char *, struct zoneinfo *, const char *)), position_on_netlist __P((struct in_addr, @@ -51,28 +51,28 @@ extern struct netinfo *addr_on_netlist __P((struct in_addr, /* --from db_load.c-- */ /* ++from db_glue.c++ */ -extern const char *sin_ntoa __P((const struct sockaddr_in *)); -extern void panic __P((int, const char *)), - buildservicelist __P((void)), - buildprotolist __P((void)), - gettime __P((struct timeval *)), - getname __P((struct namebuf *, char *, int)); -extern int servicenumber __P((char *)), - protocolnumber __P((char *)), - my_close __P((int)), - my_fclose __P((FILE *)), +extern const char *sin_ntoa(const struct sockaddr_in *); +extern void panic(int, const char *), + buildservicelist(void), + buildprotolist(void), + gettime(struct timeval *), + getname(struct namebuf *, char *, int); +extern int servicenumber(char *), + protocolnumber(char *), + my_close(int), + my_fclose(FILE *), #ifdef GEN_AXFR - get_class __P((char *)), + get_class(char *), #endif - writemsg __P((int, u_char *, int)), - dhash __P((const u_char *, int)), - nhash __P((const char *)), - samedomain __P((const char *, const char *)); -extern char *protocolname __P((int)), - *servicename __P((u_int16_t, char *)), - *savestr __P((const char *)); + writemsg(int, u_char *, int), + dhash(const u_char *, int), + nhash(const char *), + samedomain(const char *, const char *); +extern char *protocolname(int), + *servicename(u_int16_t, char *), + *savestr(const char *); #ifndef BSD -extern int getdtablesize __P((void)); +extern int getdtablesize(void); #endif extern struct databuf *rm_datum __P((struct databuf *, struct namebuf *, @@ -81,26 +81,26 @@ extern struct namebuf *rm_name __P((struct namebuf *, struct namebuf **, struct namebuf *)); #ifdef INVQ -extern void addinv __P((struct namebuf *, struct databuf *)), - rminv __P((struct databuf *)); -struct invbuf *saveinv __P((void)); +extern void addinv(struct namebuf *, struct databuf *), + rminv(struct databuf *); +struct invbuf *saveinv(void); #endif -extern char * ctimel __P((long)); -extern struct in_addr data_inaddr __P((const u_char *data)); +extern char * ctimel(long); +extern struct in_addr data_inaddr(const u_char *data); extern void setsignal __P((int, int, SIG_FN (*)())), resignal __P((int, int, SIG_FN (*)())); -extern void db_free __P((struct databuf *)); +extern void db_free(struct databuf *); /* --from db_glue.c-- */ /* ++from db_lookup.c++ */ extern struct namebuf *nlookup __P((const char *, struct hashbuf **, const char **, int)); -extern struct namebuf *np_parent __P((struct namebuf *)); -extern int match __P((struct databuf *, int, int)); +extern struct namebuf *np_parent(struct namebuf *); +extern int match(struct databuf *, int, int); /* --from db_lookup.c-- */ /* ++from db_secure.c++ */ #ifdef SECURE_ZONES -extern int build_secure_netlist __P((struct zoneinfo *)); +extern int build_secure_netlist(struct zoneinfo *); #endif /* --from db_secure.c-- */ diff --git a/usr.sbin/named/named/db_glue.c b/usr.sbin/named/named/db_glue.c index d623152676a..0653f6c9bad 100644 --- a/usr.sbin/named/named/db_glue.c +++ b/usr.sbin/named/named/db_glue.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_glue.c,v 1.2 1997/03/12 10:42:23 downsj Exp $ */ +/* $OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_glue.c 4.4 (Berkeley) 6/1/90"; static char rcsid[] = "$From: db_glue.c,v 8.16 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_glue.c,v 1.2 1997/03/12 10:42:23 downsj Exp $"; +static char rcsid[] = "$OpenBSD: db_glue.c,v 1.3 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -95,7 +95,7 @@ static struct valuelist *servicelist, *protolist; * forcing both to drag in our own res_send rather than ultrix's hesiod * version of that. */ -static const int (*unused_junk)__P((const u_char *, int, u_char *, int)) = +static const int (*unused_junk)(const u_char *, int, u_char *, int) = res_send; ; #endif diff --git a/usr.sbin/named/named/db_load.c b/usr.sbin/named/named/db_load.c index 2c872941679..bfafd9d96c9 100644 --- a/usr.sbin/named/named/db_load.c +++ b/usr.sbin/named/named/db_load.c @@ -1,11 +1,11 @@ -/* $OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp $ */ +/* $OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)db_load.c 4.38 (Berkeley) 3/2/91"; static char rcsid[] = "$From: db_load.c,v 8.33 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp $"; +static char rcsid[] = "$OpenBSD: db_load.c,v 1.6 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -111,22 +111,22 @@ static char rcsid[] = "$OpenBSD: db_load.c,v 1.5 1998/05/22 07:09:13 millert Exp #define ALLOW_LONG_TXT_RDATA -static int gettoken __P((register FILE *, const char *)), - getnonblank __P((FILE *, const char *)), - getprotocol __P((FILE *, const char *)), - getservices __P((int, char *, FILE *, const char *)), - getcharstring __P((char *, char *, int, int, int, FILE *, const char *)); -static void makename __P((char *, const char *)); +static int gettoken(register FILE *, const char *), + getnonblank(FILE *, const char *), + getprotocol(FILE *, const char *), + getservices(int, char *, FILE *, const char *), + getcharstring(char *, char *, int, int, int, FILE *, const char *); +static void makename(char *, const char *); static int makename_ok __P((char *name, const char *origin, int class, enum transport transport, enum context context, const char *owner, const char *filename, int lineno)); -static int getmlword __P((char *, int, FILE *, int)); -static int getallwords __P((char *, int, FILE *, int)); -static u_int32_t wordtouint32 __P((char *)); -static u_int32_t datetosecs __P((char *, int *)); +static int getmlword(char *, int, FILE *, int); +static int getallwords(char *, int, FILE *, int); +static u_int32_t wordtouint32(char *); +static u_int32_t datetosecs(char *, int *); static int wordtouint32_error = 0; static int empty_token = 0; diff --git a/usr.sbin/named/named/ns_forw.c b/usr.sbin/named/named/ns_forw.c index 4c48cc33058..c75ef1c19bf 100644 --- a/usr.sbin/named/named/ns_forw.c +++ b/usr.sbin/named/named/ns_forw.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_forw.c,v 1.5 2001/01/28 02:12:50 niklas Exp $ */ +/* $OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_forw.c 4.32 (Berkeley) 3/3/91"; static char rcsid[] = "$From: ns_forw.c,v 8.19 1996/12/02 09:27:36 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.5 2001/01/28 02:12:50 niklas Exp $"; +static char rcsid[] = "$OpenBSD: ns_forw.c,v 1.6 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -672,7 +672,7 @@ nslookup(nsp, qp, syslogdname, sysloginfo) } if (n > 1) { qsort((char *)qp->q_addr, n, sizeof(struct qserv), - (int (*)__P((const void *, const void *)))qcomp); + (int (*)(const void *, const void *))qcomp); } return (n - naddr); } diff --git a/usr.sbin/named/named/ns_func.h b/usr.sbin/named/named/ns_func.h index eddec048789..8a64bd15a74 100644 --- a/usr.sbin/named/named/ns_func.h +++ b/usr.sbin/named/named/ns_func.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ns_func.h,v 1.2 1997/03/12 10:42:29 downsj Exp $ */ +/* $OpenBSD: ns_func.h,v 1.3 2002/02/16 21:28:06 millert Exp $ */ /* ns_func.h - declarations for ns_*.c's externally visible functions * @@ -6,23 +6,23 @@ */ /* ++from ns_resp.c++ */ -extern void ns_resp __P((u_char *, int)), - prime_cache __P((void)), - delete_all __P((struct namebuf *, int, int)), - delete_stale __P((struct namebuf *)); +extern void ns_resp(u_char *, int), + prime_cache(void), + delete_all(struct namebuf *, int, int), + delete_stale(struct namebuf *); extern struct qinfo *sysquery __P((const char *, int, int, struct in_addr *, int, int)); extern struct notify *findNotifyPeer __P((const struct zoneinfo *, struct in_addr)); -extern void sysnotify __P((const char *, int, int)); +extern void sysnotify(const char *, int, int); extern int doupdate __P((u_char *, int, u_char *, int, struct databuf **, int, u_int)), - send_msg __P((u_char *, int, struct qinfo *)), + send_msg(u_char *, int, struct qinfo *), findns __P((struct namebuf **, int, struct databuf **, int *, int)), finddata __P((struct namebuf *, int, int, HEADER *, char **, int *, int *)), - wanted __P((struct databuf *, int, int)), + wanted(struct databuf *, int, int), add_data __P((struct namebuf *, struct databuf **, u_char *, int, int *)); @@ -33,12 +33,12 @@ extern void ns_req __P((u_char *, int, int, struct qstream *, struct sockaddr_in *, int)), - free_addinfo __P((void)), - free_nsp __P((struct databuf **)); -extern int stale __P((struct databuf *)), + free_addinfo(void), + free_nsp(struct databuf **); +extern int stale(struct databuf *), make_rr __P((const char *, struct databuf *, u_char *, int, int)), - doaddinfo __P((HEADER *, u_char *, int)), + doaddinfo(HEADER *, u_char *, int), doaddauth __P((HEADER *, u_char *, int, struct namebuf *, struct databuf *)); @@ -49,7 +49,7 @@ extern int findZonePri __P((const struct zoneinfo *, /* --from ns_req.c-- */ /* ++from ns_forw.c++ */ -extern time_t retrytime __P((struct qinfo *)); +extern time_t retrytime(struct qinfo *); extern int ns_forw __P((struct databuf *nsp[], u_char *msg, int msglen, @@ -60,96 +60,96 @@ extern int ns_forw __P((struct databuf *nsp[], char *dname, int class, int type, struct namebuf *np)), - haveComplained __P((const char *, const char *)), + haveComplained(const char *, const char *), nslookup __P((struct databuf *nsp[], struct qinfo *qp, const char *syslogdname, const char *sysloginfo)), - qcomp __P((struct qserv *, struct qserv *)); -extern struct qdatagram *aIsUs __P((struct in_addr)); -extern void schedretry __P((struct qinfo *, time_t)), - unsched __P((struct qinfo *)), - retry __P((struct qinfo *)), - qflush __P((void)), - qremove __P((struct qinfo *)), - nsfree __P((struct qinfo *, char *)), - qfree __P((struct qinfo *)); -extern struct qinfo *qfindid __P((u_int16_t)), - *qnew __P((const char *, int, int)); + qcomp(struct qserv *, struct qserv *); +extern struct qdatagram *aIsUs(struct in_addr); +extern void schedretry(struct qinfo *, time_t), + unsched(struct qinfo *), + retry(struct qinfo *), + qflush(void), + qremove(struct qinfo *), + nsfree(struct qinfo *, char *), + qfree(struct qinfo *); +extern struct qinfo *qfindid(u_int16_t), + *qnew(const char *, int, int); /* --from ns_forw.c-- */ /* ++from ns_main.c++ */ -extern u_int32_t net_mask __P((struct in_addr)); -extern void sqrm __P((struct qstream *)), - sqflush __P((struct qstream *allbut)), - dqflush __P((time_t gen)), - sq_done __P((struct qstream *)), - ns_setproctitle __P((char *, int)), - getnetconf __P((void)), - nsid_init __P((void)); -extern u_int16_t nsid_next __P((void)); -extern struct netinfo *findnetinfo __P((struct in_addr)); +extern u_int32_t net_mask(struct in_addr); +extern void sqrm(struct qstream *), + sqflush(struct qstream *allbut), + dqflush(time_t gen), + sq_done(struct qstream *), + ns_setproctitle(char *, int), + getnetconf(void), + nsid_init(void); +extern u_int16_t nsid_next(void); +extern struct netinfo *findnetinfo(struct in_addr); /* --from ns_main.c-- */ /* ++from ns_maint.c++ */ -extern void ns_maint __P((void)), - sched_maint __P((void)), +extern void ns_maint(void), + sched_maint(void), #ifdef CLEANCACHE - remove_zone __P((struct hashbuf *, int, int)), + remove_zone(struct hashbuf *, int, int), #else - remove_zone __P((struct hashbuf *, int)), + remove_zone(struct hashbuf *, int), #endif #ifdef PURGE_ZONE - purge_zone __P((const char *, struct hashbuf *, int)), + purge_zone(const char *, struct hashbuf *, int), #endif - loadxfer __P((void)), - qserial_query __P((struct zoneinfo *)), - qserial_answer __P((struct qinfo *, u_int32_t)); -extern void holdsigchld __P((void)); -extern void releasesigchld __P((void)); -extern SIG_FN reapchild __P(()); -extern void endxfer __P((void)); -extern const char * zoneTypeString __P((const struct zoneinfo *)); + loadxfer(void), + qserial_query(struct zoneinfo *), + qserial_answer(struct qinfo *, u_int32_t); +extern void holdsigchld(void); +extern void releasesigchld(void); +extern SIG_FN reapchild(); +extern void endxfer(void); +extern const char * zoneTypeString(const struct zoneinfo *); #ifdef DEBUG -extern void printzoneinfo __P((int)); +extern void printzoneinfo(int); #endif /* --from ns_maint.c-- */ /* ++from ns_sort.c++ */ -extern struct netinfo *local __P((struct sockaddr_in *)); +extern struct netinfo *local(struct sockaddr_in *); extern void sort_response __P((u_char *, int, struct netinfo *, u_char *)); /* --from ns_sort.c-- */ /* ++from ns_init.c++ */ -extern void ns_refreshtime __P((struct zoneinfo *, time_t)), - ns_retrytime __P((struct zoneinfo *, time_t)), - ns_init __P((char *)); -extern enum context ns_ptrcontext __P((const char *owner)); -extern enum context ns_ownercontext __P((int type, enum transport)); +extern void ns_refreshtime(struct zoneinfo *, time_t), + ns_retrytime(struct zoneinfo *, time_t), + ns_init(char *); +extern enum context ns_ptrcontext(const char *owner); +extern enum context ns_ownercontext(int type, enum transport); extern int ns_nameok __P((const char *name, int class, enum transport, enum context, const char *owner, struct in_addr source)); -extern int ns_wildcard __P((const char *name)); +extern int ns_wildcard(const char *name); /* --from ns_init.c-- */ /* ++from ns_ncache.c++ */ -extern void cache_n_resp __P((u_char *, int)); +extern void cache_n_resp(u_char *, int); /* --from ns_ncache.c-- */ /* ++from ns_udp.c++ */ -extern void ns_udp __P((void)); +extern void ns_udp(void); /* --from ns_udp.c-- */ /* ++from ns_stats.c++ */ -extern void ns_stats __P((void)); +extern void ns_stats(void); #ifdef XSTATS -extern void ns_logstats __P((void)); +extern void ns_logstats(void); #endif -extern void qtypeIncr __P((int qtype)); -extern struct nameser *nameserFind __P((struct in_addr addr, int flags)); +extern void qtypeIncr(int qtype); +extern struct nameser *nameserFind(struct in_addr addr, int flags); #define NS_F_INSERT 0x0001 extern void nameserIncr __P((struct in_addr addr, enum nameserStats which)); @@ -166,7 +166,7 @@ extern int #endif dovalidate __P((u_char *, int, u_char *, int, int, char *, struct sockaddr_in *, int *)), - update_msg __P((u_char *, int *, int Vlist[], int)); + update_msg(u_char *, int *, int Vlist[], int); extern void store_name_addr __P((const char *, struct in_addr, const char *, const char *)); /* --from ns_validate.c-- */ diff --git a/usr.sbin/named/named/ns_init.c b/usr.sbin/named/named/ns_init.c index 6ff86230845..0d6d6ffe46e 100644 --- a/usr.sbin/named/named/ns_init.c +++ b/usr.sbin/named/named/ns_init.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp $ */ +/* $OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_init.c 4.38 (Berkeley) 3/21/91"; static char rcsid[] = "$From: ns_init.c,v 8.26 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_init.c,v 1.7 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -83,22 +83,22 @@ static char rcsid[] = "$OpenBSD: ns_init.c,v 1.6 1998/05/22 07:09:15 millert Exp enum limit { Datasize , Files }; -static void zoneinit __P((struct zoneinfo *)), - get_forwarders __P((FILE *)), - boot_read __P((const char *filename, int includefile)), +static void zoneinit(struct zoneinfo *), + get_forwarders(FILE *), + boot_read(const char *filename, int includefile), #ifdef DEBUG - content_zone __P((int)), + content_zone(int), #endif - do_reload __P((char *, int, int)), - free_forwarders __P((void)), - ns_limit __P((const char *name, int value)), + do_reload(char *, int, int), + free_forwarders(void), + ns_limit(const char *name, int value), ns_checknames __P((const char *names, const char *severity)), ns_rlimit __P((const char *name, enum limit limit, long value)), - ns_option __P((const char *name)); + ns_option(const char *name); -static struct zoneinfo *find_zone __P((char *, int, int)); +static struct zoneinfo *find_zone(char *, int, int); static enum severity checkname_severity[num_trans]; diff --git a/usr.sbin/named/named/ns_main.c b/usr.sbin/named/named/ns_main.c index 9015b3690d6..8ec43398cef 100644 --- a/usr.sbin/named/named/ns_main.c +++ b/usr.sbin/named/named/ns_main.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_main.c,v 1.17 2001/11/29 01:10:31 millert Exp $ */ +/* $OpenBSD: ns_main.c,v 1.18 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; static char rcsid[] = "$From: ns_main.c,v 8.26 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_main.c,v 1.17 2001/11/29 01:10:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_main.c,v 1.18 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -139,30 +139,30 @@ static size_t mask_size; static char **Argv = NULL; static char *LastArg = NULL; /* end of argv */ -static struct qstream *sqadd __P((void)); +static struct qstream *sqadd(void); static int only_digits(const char *); -static void sq_query __P((struct qstream *)), - opensocket __P((struct qdatagram *)), +static void sq_query(struct qstream *), + opensocket(struct qdatagram *), #ifdef DEBUG - printnetinfo __P((struct netinfo *)), + printnetinfo(struct netinfo *), #endif - setdebug __P((int)); -static int sq_here __P((struct qstream *)); + setdebug(int); +static int sq_here(struct qstream *); -static SIG_FN onintr __P(()), - maint_alarm __P(()), - setdumpflg __P(()), - onhup __P(()), +static SIG_FN onintr(), + maint_alarm(), + setdumpflg(), + onhup(), #if defined(QRYLOG) && defined(SIGWINCH) - setQrylogFlg __P(()), + setQrylogFlg(), #endif - setIncrDbgFlg __P(()), - setNoDbgFlg __P(()), + setIncrDbgFlg(), + setNoDbgFlg(), #ifdef SIGSYS - sigprof __P(()), + sigprof(), #endif /* SIGSYS */ - setchkptflg __P(()), - setstatsflg __P(()); + setchkptflg(), + setstatsflg(); static void usage() diff --git a/usr.sbin/named/named/ns_maint.c b/usr.sbin/named/named/ns_maint.c index c555795b82f..905dca1ed29 100644 --- a/usr.sbin/named/named/ns_maint.c +++ b/usr.sbin/named/named/ns_maint.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_maint.c,v 1.3 1998/05/23 19:24:52 millert Exp $ */ +/* $OpenBSD: ns_maint.c,v 1.4 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_maint.c 4.39 (Berkeley) 3/2/91"; static char rcsid[] = "$From: ns_maint.c,v 8.18 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.3 1998/05/23 19:24:52 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_maint.c,v 1.4 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -87,12 +87,12 @@ static int xfers_running, /* # of xfers running */ xfers_deferred, /* # of needed xfers not run yet */ qserials_running, alarm_pending, /* flag */ - nxfers __P((struct zoneinfo *, int)); + nxfers(struct zoneinfo *, int); -static void startxfer __P((struct zoneinfo *)), - abortxfer __P((struct zoneinfo *)), - addxfer __P((struct zoneinfo *)), - tryxfer __P((void)); +static void startxfer(struct zoneinfo *), + abortxfer(struct zoneinfo *), + addxfer(struct zoneinfo *), + tryxfer(void); #define qserial_qfull() (qserials_running == MAXQSERIAL) @@ -632,8 +632,8 @@ remove_zone(htp, zone) } #ifdef PURGE_ZONE -static void purge_z_2 __P((struct hashbuf *, int)); -static bottom_of_zone __P((struct databuf *, int)); +static void purge_z_2(struct hashbuf *, int); +static bottom_of_zone(struct databuf *, int); void purge_zone(dname, htp, class) diff --git a/usr.sbin/named/named/ns_req.c b/usr.sbin/named/named/ns_req.c index 16fe0fa9c24..8b1012e8fe5 100644 --- a/usr.sbin/named/named/ns_req.c +++ b/usr.sbin/named/named/ns_req.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_req.c,v 1.7 2001/01/28 02:12:50 niklas Exp $ */ +/* $OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_req.c 4.47 (Berkeley) 7/1/91"; static char rcsid[] = "$From: ns_req.c,v 8.30 1998/05/11 04:19:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_req.c,v 1.7 2001/01/28 02:12:50 niklas Exp $"; +static char rcsid[] = "$OpenBSD: ns_req.c,v 1.8 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -126,7 +126,7 @@ static enum req_action req_notify __P((HEADER *hp, u_char **cpp, u_char *eom, u_char *msg,struct sockaddr_in *from)); #endif -static void fwritemsg __P((FILE *, u_char *, int)), +static void fwritemsg(FILE *, u_char *, int), doaxfr __P((struct namebuf *, FILE *, struct namebuf *, int)), startxfr __P((struct qstream *, struct namebuf *, @@ -135,7 +135,7 @@ static void fwritemsg __P((FILE *, u_char *, int)), static struct addinfo addinfo[NADDRECS]; static void addname __P((const char *, const char *, u_int16_t, u_int16_t)); -static void copyCharString __P((u_char **, const char *)); +static void copyCharString(u_char **, const char *); /* * Process request using database; assemble and send response. diff --git a/usr.sbin/named/named/ns_resp.c b/usr.sbin/named/named/ns_resp.c index e13396b5a34..c5d4ef9870a 100644 --- a/usr.sbin/named/named/ns_resp.c +++ b/usr.sbin/named/named/ns_resp.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_resp.c,v 1.5 1998/05/22 07:09:19 millert Exp $ */ +/* $OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; static char rcsid[] = "$From: ns_resp.c,v 8.41 1998/04/07 04:59:45 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.5 1998/05/22 07:09:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: ns_resp.c,v 1.6 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -137,20 +137,20 @@ struct flush_set { static void rrsetadd __P((struct flush_set *, char *, struct databuf *)), - rrsetupdate __P((struct flush_set *, int flags)), - flushrrset __P((struct flush_set *)), - free_flushset __P((struct flush_set *)); -static int rrsetcmp __P((char *, struct db_list *)), - check_root __P((void)), - check_ns __P((void)), + rrsetupdate(struct flush_set *, int flags), + flushrrset(struct flush_set *), + free_flushset(struct flush_set *); +static int rrsetcmp(char *, struct db_list *), + check_root(void), + check_ns(void), rrextract __P((u_char *, int, u_char *, struct databuf **, char *, int, char **)); -static void add_related_additional __P((char *)); -static void free_related_additional __P((void)); -static int related_additional __P((char *)); -static void maybe_free __P((char **)); +static void add_related_additional(char *); +static void free_related_additional(void); +static int related_additional(char *); +static void maybe_free(char **); #define MAX_RELATED 100 diff --git a/usr.sbin/named/named/ns_sort.c b/usr.sbin/named/named/ns_sort.c index 26e8a5dee5d..7380c98170a 100644 --- a/usr.sbin/named/named/ns_sort.c +++ b/usr.sbin/named/named/ns_sort.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp $ */ +/* $OpenBSD: ns_sort.c,v 1.3 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_sort.c 4.10 (Berkeley) 3/3/91"; static char rcsid[] = "$From: ns_sort.c,v 8.3 1995/12/22 10:20:30 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp $"; +static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.3 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -77,7 +77,7 @@ static char rcsid[] = "$OpenBSD: ns_sort.c,v 1.2 1997/03/12 10:42:35 downsj Exp #include "named.h" -static int sort_rr __P((u_char *cp, int count, struct netinfo *ntp, u_char *eom)); +static int sort_rr(u_char *cp, int count, struct netinfo *ntp, u_char *eom); #ifdef SORT_RESPONSE struct netinfo * diff --git a/usr.sbin/named/named/ns_stats.c b/usr.sbin/named/named/ns_stats.c index e3746b97dd2..f822c60b5f8 100644 --- a/usr.sbin/named/named/ns_stats.c +++ b/usr.sbin/named/named/ns_stats.c @@ -1,11 +1,11 @@ -/* $OpenBSD: ns_stats.c,v 1.4 2000/06/29 07:20:52 deraadt Exp $ */ +/* $OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $ */ #if !defined(lint) && !defined(SABER) #if 0 static char sccsid[] = "@(#)ns_stats.c 4.10 (Berkeley) 6/27/90"; static char rcsid[] = "$From: ns_stats.c,v 8.8 1996/09/22 00:13:10 vixie Exp $"; #else -static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.4 2000/06/29 07:20:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ns_stats.c,v 1.5 2002/02/16 21:28:06 millert Exp $"; #endif #endif /* not lint */ @@ -114,7 +114,7 @@ static const char *typenames[T_ANY+1] = { 0, 0, "AXFR", "MAILB", "MAILA", "ANY" }; -static void nameserStats __P((FILE *)); +static void nameserStats(FILE *); void ns_stats() diff --git a/usr.sbin/named/named/ns_validate.c b/usr.sbin/named/named/ns_validate.c index e412f25a5d3..2eba777c7a6 100644 --- a/usr.sbin/named/named/ns_validate.c +++ b/usr.sbin/named/named/ns_validate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ns_validate.c,v 1.3 1998/05/22 00:47:46 millert Exp $ */ +/* $OpenBSD: ns_validate.c,v 1.4 2002/02/16 21:28:06 millert Exp $ */ /************************************************************************** * ns_validate.c (was security.c in original ISI contribution) @@ -27,7 +27,7 @@ #ifdef VALIDATE -static int isvalid __P((struct namebuf *, int, int, char *, int)), +static int isvalid(struct namebuf *, int, int, char *, int), check_addr_ns __P((struct databuf **, struct sockaddr_in *, char *)), @@ -35,7 +35,7 @@ static int isvalid __P((struct namebuf *, int, int, char *, int)), struct sockaddr_in *, char *)); #if 0 -static void stick_in_queue __P((char *, int, int, char *)); +static void stick_in_queue(char *, int, int, char *); #endif static NAMEADDR nameaddrlist[MAXNAMECACHE]; diff --git a/usr.sbin/named/named/storage.c b/usr.sbin/named/named/storage.c index e63a9645897..0bd21de63b9 100644 --- a/usr.sbin/named/named/storage.c +++ b/usr.sbin/named/named/storage.c @@ -1,4 +1,4 @@ -/* $OpenBSD: storage.c,v 1.3 1998/05/22 00:47:47 millert Exp $ */ +/* $OpenBSD: storage.c,v 1.4 2002/02/16 21:28:06 millert Exp $ */ /* * ++Copyright++ 1985, 1989 @@ -61,7 +61,7 @@ #include "../conf/portability.h" #include "../conf/options.h" -extern void panic __P((int, const char *)); +extern void panic(int, const char *); #ifdef DSTORAGE /* diff --git a/usr.sbin/named/named/tree.h b/usr.sbin/named/named/tree.h index 75e89500cef..7d2af9e03ec 100644 --- a/usr.sbin/named/named/tree.h +++ b/usr.sbin/named/named/tree.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tree.h,v 1.3 1998/05/22 00:47:49 millert Exp $ */ +/* $OpenBSD: tree.h,v 1.4 2002/02/16 21:28:06 millert Exp $ */ /* tree.h - declare structures used by tree library * @@ -39,7 +39,7 @@ typedef struct tree_s { tree; -void tree_init __P((tree **)); +void tree_init(tree **); tree_t tree_srch __P((tree **, int (*)(), tree_t)); tree_t tree_add __P((tree **, int (*)(), tree_t, void (*)())); int tree_delete __P((tree **, int (*)(), tree_t, void (*)())); diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 4491b05ee88..fb7ff983b28 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ndp.c,v 1.12 2001/11/08 09:52:02 itojun Exp $ */ +/* $OpenBSD: ndp.c,v 1.13 2002/02/16 21:28:06 millert Exp $ */ /* $KAME: ndp.c,v 1.69 2001/07/23 14:46:31 itojun Exp $ */ /* @@ -139,33 +139,33 @@ char ntop_buf[INET6_ADDRSTRLEN]; /* inet_ntop() */ char host_buf[NI_MAXHOST]; /* getnameinfo() */ char ifix_buf[IFNAMSIZ]; /* if_indextoname() */ -int main __P((int, char **)); -int file __P((char *)); -void getsocket __P((void)); -int set __P((int, char **)); -void get __P((char *)); -int delete __P((char *)); -void dump __P((struct in6_addr *)); +int main(int, char **); +int file(char *); +void getsocket(void); +int set(int, char **); +void get(char *); +int delete(char *); +void dump(struct in6_addr *); static struct in6_nbrinfo *getnbrinfo __P((struct in6_addr *addr, int ifindex, int)); -static char *ether_str __P((struct sockaddr_dl *)); -int ndp_ether_aton __P((char *, u_char *)); -void usage __P((void)); -int rtmsg __P((int)); -void ifinfo __P((int, char **)); -void rtrlist __P((void)); -void plist __P((void)); -void pfx_flush __P((void)); -void rtrlist __P((void)); -void rtr_flush __P((void)); -void harmonize_rtr __P((void)); +static char *ether_str(struct sockaddr_dl *); +int ndp_ether_aton(char *, u_char *); +void usage(void); +int rtmsg(int); +void ifinfo(int, char **); +void rtrlist(void); +void plist(void); +void pfx_flush(void); +void rtrlist(void); +void rtr_flush(void); +void harmonize_rtr(void); #ifdef SIOCSDEFIFACE_IN6 /* XXX: check SIOCGDEFIFACE_IN6 as well? */ -static void getdefif __P((void)); -static void setdefif __P((char *)); +static void getdefif(void); +static void setdefif(char *); #endif -static char *sec2str __P((time_t t)); -static char *ether_str __P((struct sockaddr_dl *sdl)); -static void ts_print __P((const struct timeval *)); +static char *sec2str(time_t t); +static char *ether_str(struct sockaddr_dl *sdl); +static void ts_print(const struct timeval *); #ifdef ICMPV6CTL_ND6_DRLIST static char *rtpref_str[] = { diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c index f0b56ef022b..dedd22da1fc 100644 --- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.c +++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $ */ +/* $OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ #ifndef lint -static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.8 2000/06/30 16:00:26 millert Exp $"; +static char *rcsid = "$OpenBSD: netgroup_mkdb.c,v 1.9 2002/02/16 21:28:06 millert Exp $"; #endif #include <sys/types.h> @@ -70,23 +70,23 @@ struct nentry { }; -static DB *ng_insert __P((DB *, const char *)); +static DB *ng_insert(DB *, const char *); static void ng_reventry __P((DB *, DB *, struct nentry *, char *, size_t, struct stringlist *)); -static void ng_print __P((struct nentry *, struct string *)); -static void ng_rprint __P((DB *, struct string *)); -static DB *ng_reverse __P((DB *, size_t)); -static DB *ng_load __P((const char *)); -static void ng_write __P((DB *, DB *, int)); -static void ng_rwrite __P((DB *, DB *, int)); -static void usage __P((void)); -static void cleanup __P((void)); +static void ng_print(struct nentry *, struct string *); +static void ng_rprint(DB *, struct string *); +static DB *ng_reverse(DB *, size_t); +static DB *ng_load(const char *); +static void ng_write(DB *, DB *, int); +static void ng_rwrite(DB *, DB *, int); +static void usage(void); +static void cleanup(void); #ifdef DEBUG_NG static int debug = 0; -static void ng_dump __P((DB *)); -static void ng_rdump __P((DB *)); +static void ng_dump(DB *); +static void ng_rdump(DB *); #endif /* DEBUG_NG */ diff --git a/usr.sbin/netgroup_mkdb/str.h b/usr.sbin/netgroup_mkdb/str.h index 92f0b1dc27f..6906ac5ed51 100644 --- a/usr.sbin/netgroup_mkdb/str.h +++ b/usr.sbin/netgroup_mkdb/str.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: str.h,v 1.1.1.1 1995/10/18 08:47:57 deraadt Exp $ + * $Id: str.h,v 1.2 2002/02/16 21:28:06 millert Exp $ */ #include <sys/types.h> @@ -40,8 +40,8 @@ struct string { }; __BEGIN_DECLS -void str_init __P((struct string *)); -void str_append __P((struct string *, const char *, int)); -void str_prepend __P((struct string *, const char *, int)); -void str_free __P((struct string *)); +void str_init(struct string *); +void str_append(struct string *, const char *, int); +void str_prepend(struct string *, const char *, int); +void str_free(struct string *); __END_DECLS diff --git a/usr.sbin/netgroup_mkdb/util.h b/usr.sbin/netgroup_mkdb/util.h index a9773fa2cb5..84523a4f422 100644 --- a/usr.sbin/netgroup_mkdb/util.h +++ b/usr.sbin/netgroup_mkdb/util.h @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __BEGIN_DECLS -void *emalloc __P((size_t)); -void *erealloc __P((void *, size_t)); -char *getline __P((FILE *, size_t *)); +void *emalloc(size_t); +void *erealloc(void *, size_t); +char *getline(FILE *, size_t *); __END_DECLS diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c index fc6eb94d2ff..b7ca89ff9e3 100644 --- a/usr.sbin/pkg_install/add/main.c +++ b/usr.sbin/pkg_install/add/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.13 2001/04/08 16:45:46 espie Exp $ */ +/* $OpenBSD: main.c,v 1.14 2002/02/16 21:28:06 millert Exp $ */ #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.13 2001/04/08 16:45:46 espie Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.14 2002/02/16 21:28:06 millert Exp $"; #endif /* @@ -47,7 +47,7 @@ add_mode_t AddMode = NORMAL; char **pkgs; int pkg_count = 0; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c index 621bf09b71c..d3ff7c44439 100644 --- a/usr.sbin/pkg_install/create/main.c +++ b/usr.sbin/pkg_install/create/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.9 2001/04/08 16:45:46 espie Exp $ */ +/* $OpenBSD: main.c,v 1.10 2002/02/16 21:28:06 millert Exp $ */ #ifndef lint -static const char *rcsid = "$OpenBSD: main.c,v 1.9 2001/04/08 16:45:46 espie Exp $"; +static const char *rcsid = "$OpenBSD: main.c,v 1.10 2002/02/16 21:28:06 millert Exp $"; #endif /* @@ -39,7 +39,7 @@ size_t PlayPenSize = sizeof(PlayPen); int Dereference = 0; int PlistOnly = 0; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c index 911f8ab936d..33384acbd97 100644 --- a/usr.sbin/pkg_install/delete/main.c +++ b/usr.sbin/pkg_install/delete/main.c @@ -1,8 +1,8 @@ -/* $OpenBSD: main.c,v 1.8 2001/04/08 16:45:47 espie Exp $ */ +/* $OpenBSD: main.c,v 1.9 2002/02/16 21:28:07 millert Exp $ */ #include <sys/cdefs.h> #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.8 2001/04/08 16:45:47 espie Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.9 2002/02/16 21:28:07 millert Exp $"; #endif /* @@ -36,7 +36,7 @@ char *Prefix = NULL; Boolean NoDeInstall = FALSE; Boolean CleanDirs = FALSE; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c index ff89924ed21..d56147701fd 100644 --- a/usr.sbin/pkg_install/info/main.c +++ b/usr.sbin/pkg_install/info/main.c @@ -1,7 +1,7 @@ -/* $OpenBSD: main.c,v 1.13 2001/04/08 16:45:47 espie Exp $ */ +/* $OpenBSD: main.c,v 1.14 2002/02/16 21:28:07 millert Exp $ */ #ifndef lint -static char *rcsid = "$OpenBSD: main.c,v 1.13 2001/04/08 16:45:47 espie Exp $"; +static char *rcsid = "$OpenBSD: main.c,v 1.14 2002/02/16 21:28:07 millert Exp $"; #endif /* @@ -39,7 +39,7 @@ char PlayPen[FILENAME_MAX]; size_t PlayPenSize = sizeof(PlayPen); char *CheckPkg = NULL; -static void usage __P((void)); +static void usage(void); int main(int argc, char **argv) diff --git a/usr.sbin/pkg_install/sign/extern.h b/usr.sbin/pkg_install/sign/extern.h index b8aa2365164..181a8c5c765 100644 --- a/usr.sbin/pkg_install/sign/extern.h +++ b/usr.sbin/pkg_install/sign/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.3 1999/10/07 16:30:32 espie Exp $ */ +/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */ /*- * Copyright (c) 1999 Marc Espie. * @@ -41,7 +41,7 @@ struct signature; extern int read_header_and_diagnose __P((FILE *file, \ /*@out@*/struct mygzip_header *h, /*@null@*/struct signature **sign, \ const char *filename)); -extern int reap __P((pid_t pid)); +extern int reap(pid_t pid); /* sign.c */ extern int sign __P((/*@observer@*/const char *filename, int type, \ @@ -72,7 +72,7 @@ extern void *new_sha1_checker __P((struct mygzip_header *h, \ extern void sha1_add __P((void *arg, const char *buffer, \ size_t length)); -extern int sha1_sign_ok __P((void *arg)); +extern int sha1_sign_ok(void *arg); extern int retrieve_sha1_marker __P((const char *filename, \ struct signature **sign, const char *userid)); diff --git a/usr.sbin/pkg_install/sign/gzip.h b/usr.sbin/pkg_install/sign/gzip.h index dc3267ea5c8..f55be34cf15 100644 --- a/usr.sbin/pkg_install/sign/gzip.h +++ b/usr.sbin/pkg_install/sign/gzip.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gzip.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */ +/* $OpenBSD: gzip.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /*- * Copyright (c) 1999 Marc Espie. * @@ -77,8 +77,8 @@ extern int gzip_copy_header __P((const struct mygzip_header *h, \ /*@null@*/struct signature *sign, \ void (*add)(void *, const char *, size_t), void *data)); -extern void free_signature __P((/*@null@*/struct signature *sign)); -extern void sign_fill_tag __P((struct signature *sign)); +extern void free_signature(/*@null@*/struct signature *sign); +extern void sign_fill_tag(struct signature *sign); #define KNOWN_TAGS 3 #define TAG_PGP 0 #define TAG_SHA1 1 diff --git a/usr.sbin/pkg_install/sign/pgp.h b/usr.sbin/pkg_install/sign/pgp.h index 4487ce413aa..641ab4cbab4 100644 --- a/usr.sbin/pkg_install/sign/pgp.h +++ b/usr.sbin/pkg_install/sign/pgp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pgp.h,v 1.2 1999/10/04 21:46:28 espie Exp $ */ +/* $OpenBSD: pgp.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /* Estimate size of pgp signature */ #define MAXPGPSIGNSIZE 1024 @@ -16,9 +16,9 @@ extern void *new_pgp_checker __P((struct mygzip_header *h, \ extern void pgp_add __P((void *arg, const char *buffer, \ size_t length)); -extern int pgp_sign_ok __P((void *arg)); +extern int pgp_sign_ok(void *arg); -extern void handle_pgp_passphrase __P((void)); +extern void handle_pgp_passphrase(void); extern int retrieve_pgp_signature __P((const char *filename, \ struct signature **sign, const char *userid, char *envp[])); diff --git a/usr.sbin/pkg_install/sign/stand.h b/usr.sbin/pkg_install/sign/stand.h index c411ad3d2ef..9dda6faa520 100644 --- a/usr.sbin/pkg_install/sign/stand.h +++ b/usr.sbin/pkg_install/sign/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.2 1999/10/04 21:46:30 espie Exp $ */ +/* $OpenBSD: stand.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /* provided to cater for BSD idiosyncrasies */ @@ -17,9 +17,9 @@ #if defined(BSD4_4) #include <err.h> #else -extern void set_program_name __P((const char * name)); -extern void warn __P((const char *fmt, ...)); -extern void warnx __P((const char *fmt, ...)); +extern void set_program_name(const char * name); +extern void warn(const char *fmt, ...); +extern void warnx(const char *fmt, ...); #endif #ifndef __GNUC__ diff --git a/usr.sbin/portmap/portmap.c b/usr.sbin/portmap/portmap.c index def3ae3da88..e8a53478797 100644 --- a/usr.sbin/portmap/portmap.c +++ b/usr.sbin/portmap/portmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: portmap.c,v 1.19 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $ */ /*- * Copyright (c) 1996, 1997 Theo de Raadt (OpenBSD). All rights reserved. @@ -44,7 +44,7 @@ char copyright[] = #if 0 static char sccsid[] = "from: @(#)portmap.c 5.4 (Berkeley) 4/19/91"; #else -static char rcsid[] = "$OpenBSD: portmap.c,v 1.19 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$OpenBSD: portmap.c,v 1.20 2002/02/16 21:28:07 millert Exp $"; #endif #endif /* not lint */ @@ -103,10 +103,10 @@ static char sccsid[] = "@(#)portmap.c 1.32 87/08/06 Copyr 1984 Sun Micro"; #include <rpcsvc/nfs_prot.h> #include <arpa/inet.h> -void reg_service __P((struct svc_req *, SVCXPRT *)); -void reap __P((void)); -void callit __P((struct svc_req *, SVCXPRT *)); -int check_callit __P((struct sockaddr_in *, u_long, u_long, u_long)); +void reg_service(struct svc_req *, SVCXPRT *); +void reap(void); +void callit(struct svc_req *, SVCXPRT *); +int check_callit(struct sockaddr_in *, u_long, u_long, u_long); struct pmaplist *pmaplist; int debugging = 0; diff --git a/usr.sbin/pppd/auth.c b/usr.sbin/pppd/auth.c index 7d050ce47a4..60d5b4e49de 100644 --- a/usr.sbin/pppd/auth.c +++ b/usr.sbin/pppd/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.20 2001/07/09 22:21:54 pjanzen Exp $ */ +/* $OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $ */ /* * auth.c - PPP authentication and phase control. @@ -38,7 +38,7 @@ #if 0 static char rcsid[] = "Id: auth.c,v 1.37 1998/03/26 04:46:03 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: auth.c,v 1.20 2001/07/09 22:21:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: auth.c,v 1.21 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -129,25 +129,25 @@ static int passwd_from_file; #define CHAP_WITHPEER 4 #define CHAP_PEER 8 -extern char *crypt __P((const char *, const char *)); +extern char *crypt(const char *, const char *); /* Prototypes for procedures local to this file. */ -static void network_phase __P((int)); -static void check_idle __P((void *)); -static void connect_time_expired __P((void *)); -static int plogin __P((char *, char *, char **, int *)); -static void plogout __P((void)); -static int null_login __P((int)); -static int get_pap_passwd __P((char *)); -static int have_pap_secret __P((void)); -static int have_chap_secret __P((char *, char *, u_int32_t)); -static int ip_addr_check __P((u_int32_t, struct wordlist *)); +static void network_phase(int); +static void check_idle(void *); +static void connect_time_expired(void *); +static int plogin(char *, char *, char **, int *); +static void plogout(void); +static int null_login(int); +static int get_pap_passwd(char *); +static int have_pap_secret(void); +static int have_chap_secret(char *, char *, u_int32_t); +static int ip_addr_check(u_int32_t, struct wordlist *); static int scan_authfile __P((FILE *, char *, char *, u_int32_t, char *, struct wordlist **, char *)); -static void free_wordlist __P((struct wordlist *)); -static void auth_script __P((char *)); -static void set_allowed_addrs __P((int, struct wordlist *)); +static void free_wordlist(struct wordlist *); +static void auth_script(char *); +static void set_allowed_addrs(int, struct wordlist *); /* * An Open on LCP has requested a change from Dead to Establish phase. diff --git a/usr.sbin/pppd/cbcp.c b/usr.sbin/pppd/cbcp.c index 6c98ff29232..439d73a8395 100644 --- a/usr.sbin/pppd/cbcp.c +++ b/usr.sbin/pppd/cbcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $ */ +/* $OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /* * cbcp - Call Back Configuration Protocol. @@ -24,7 +24,7 @@ #if 0 static char rcsid[] = "Id: cbcp.c,v 1.2 1997/04/30 05:50:26 paulus Exp"; #else -static char rcsid[] = "$OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $"; +static char rcsid[] = "$OpenBSD: cbcp.c,v 1.3 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -43,13 +43,13 @@ static char rcsid[] = "$OpenBSD: cbcp.c,v 1.2 1997/09/05 04:32:33 millert Exp $" /* * Protocol entry points. */ -static void cbcp_init __P((int unit)); -static void cbcp_open __P((int unit)); -static void cbcp_lowerup __P((int unit)); -static void cbcp_input __P((int unit, u_char *pkt, int len)); -static void cbcp_protrej __P((int unit)); +static void cbcp_init(int unit); +static void cbcp_open(int unit); +static void cbcp_lowerup(int unit); +static void cbcp_input(int unit, u_char *pkt, int len); +static void cbcp_protrej(int unit); static int cbcp_printpkt __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), + void (*printer)(void *, char *, ...), void *arg)); struct protent cbcp_protent = { @@ -74,11 +74,11 @@ cbcp_state cbcp[NUM_PPP]; /* internal prototypes */ -static void cbcp_recvreq __P((cbcp_state *us, char *pckt, int len)); -static void cbcp_resp __P((cbcp_state *us)); -static void cbcp_up __P((cbcp_state *us)); -static void cbcp_recvack __P((cbcp_state *us, char *pckt, int len)); -static void cbcp_send __P((cbcp_state *us, u_char code, u_char *buf, int len)); +static void cbcp_recvreq(cbcp_state *us, char *pckt, int len); +static void cbcp_resp(cbcp_state *us); +static void cbcp_up(cbcp_state *us); +static void cbcp_recvack(cbcp_state *us, char *pckt, int len); +static void cbcp_send(cbcp_state *us, u_char code, u_char *buf, int len); /* init state */ static void @@ -191,7 +191,7 @@ static int cbcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, opt, id, len, olen, delay; diff --git a/usr.sbin/pppd/ccp.c b/usr.sbin/pppd/ccp.c index 74b75a92bd3..f9cfad3e793 100644 --- a/usr.sbin/pppd/ccp.c +++ b/usr.sbin/pppd/ccp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $ */ +/* $OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $ */ /* * ccp.c - PPP Compression Control Protocol. @@ -31,7 +31,7 @@ #if 0 static char rcsid[] = "Id: ccp.c,v 1.22 1998/03/25 01:25:02 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $"; +static char rcsid[] = "$OpenBSD: ccp.c,v 1.9 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -48,17 +48,17 @@ static char rcsid[] = "$OpenBSD: ccp.c,v 1.8 1998/05/08 04:52:19 millert Exp $"; /* * Protocol entry points from main code. */ -static void ccp_init __P((int unit)); -static void ccp_open __P((int unit)); -static void ccp_close __P((int unit, char *)); -static void ccp_lowerup __P((int unit)); -static void ccp_lowerdown __P((int)); -static void ccp_input __P((int unit, u_char *pkt, int len)); -static void ccp_protrej __P((int unit)); +static void ccp_init(int unit); +static void ccp_open(int unit); +static void ccp_close(int unit, char *); +static void ccp_lowerup(int unit); +static void ccp_lowerdown(int); +static void ccp_input(int unit, u_char *pkt, int len); +static void ccp_protrej(int unit); static int ccp_printpkt __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), + void (*printer)(void *, char *, ...), void *arg)); -static void ccp_datainput __P((int unit, u_char *pkt, int len)); +static void ccp_datainput(int unit, u_char *pkt, int len); struct protent ccp_protent = { PPP_CCP, @@ -87,18 +87,18 @@ ccp_options ccp_hisoptions[NUM_PPP]; /* what we agreed to do */ /* * Callbacks for fsm code. */ -static void ccp_resetci __P((fsm *)); -static int ccp_cilen __P((fsm *)); -static void ccp_addci __P((fsm *, u_char *, int *)); -static int ccp_ackci __P((fsm *, u_char *, int)); -static int ccp_nakci __P((fsm *, u_char *, int)); -static int ccp_rejci __P((fsm *, u_char *, int)); -static int ccp_reqci __P((fsm *, u_char *, int *, int)); -static void ccp_up __P((fsm *)); -static void ccp_down __P((fsm *)); -static int ccp_extcode __P((fsm *, int, int, u_char *, int)); -static void ccp_rack_timeout __P((void *)); -static char *method_name __P((ccp_options *, ccp_options *)); +static void ccp_resetci(fsm *); +static int ccp_cilen(fsm *); +static void ccp_addci(fsm *, u_char *, int *); +static int ccp_ackci(fsm *, u_char *, int); +static int ccp_nakci(fsm *, u_char *, int); +static int ccp_rejci(fsm *, u_char *, int); +static int ccp_reqci(fsm *, u_char *, int *, int); +static void ccp_up(fsm *); +static void ccp_down(fsm *); +static int ccp_extcode(fsm *, int, int, u_char *, int); +static void ccp_rack_timeout(void *); +static char *method_name(ccp_options *, ccp_options *); static fsm_callbacks ccp_callbacks = { ccp_resetci, @@ -960,7 +960,7 @@ static int ccp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { u_char *p0, *optend; diff --git a/usr.sbin/pppd/chap.c b/usr.sbin/pppd/chap.c index 6648526cf3a..cc2819530a0 100644 --- a/usr.sbin/pppd/chap.c +++ b/usr.sbin/pppd/chap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $ */ +/* $OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $ */ /* * chap.c - Challenge Handshake Authentication Protocol. @@ -39,7 +39,7 @@ #if 0 static char rcsid[] = "Id: chap.c,v 1.15 1997/11/27 06:07:48 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $"; +static char rcsid[] = "$OpenBSD: chap.c,v 1.9 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -64,13 +64,13 @@ static char rcsid[] = "$OpenBSD: chap.c,v 1.8 2001/06/23 15:34:02 lebel Exp $"; /* * Protocol entry points. */ -static void ChapInit __P((int)); -static void ChapLowerUp __P((int)); -static void ChapLowerDown __P((int)); -static void ChapInput __P((int, u_char *, int)); -static void ChapProtocolReject __P((int)); +static void ChapInit(int); +static void ChapLowerUp(int); +static void ChapLowerDown(int); +static void ChapInput(int, u_char *, int); +static void ChapProtocolReject(int); static int ChapPrintPkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); + void (*)(void *, char *, ...), void *)); struct protent chap_protent = { PPP_CHAP, @@ -92,20 +92,20 @@ struct protent chap_protent = { chap_state chap[NUM_PPP]; /* CHAP state; one for each unit */ -static void ChapChallengeTimeout __P((void *)); -static void ChapResponseTimeout __P((void *)); -static void ChapReceiveChallenge __P((chap_state *, u_char *, int, int)); -static void ChapRechallenge __P((void *)); -static void ChapReceiveResponse __P((chap_state *, u_char *, int, int)); -static void ChapReceiveSuccess __P((chap_state *, u_char *, int, int)); -static void ChapReceiveFailure __P((chap_state *, u_char *, int, int)); -static void ChapSendStatus __P((chap_state *, int)); -static void ChapSendChallenge __P((chap_state *)); -static void ChapSendResponse __P((chap_state *)); -static void ChapGenChallenge __P((chap_state *)); - -extern double drand48 __P((void)); -extern void srand48 __P((long)); +static void ChapChallengeTimeout(void *); +static void ChapResponseTimeout(void *); +static void ChapReceiveChallenge(chap_state *, u_char *, int, int); +static void ChapRechallenge(void *); +static void ChapReceiveResponse(chap_state *, u_char *, int, int); +static void ChapReceiveSuccess(chap_state *, u_char *, int, int); +static void ChapReceiveFailure(chap_state *, u_char *, int, int); +static void ChapSendStatus(chap_state *, int); +static void ChapSendChallenge(chap_state *); +static void ChapSendResponse(chap_state *); +static void ChapGenChallenge(chap_state *); + +extern double drand48(void); +extern void srand48(long); /* * ChapInit - Initialize a CHAP unit. @@ -820,7 +820,7 @@ static int ChapPrintPkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len; diff --git a/usr.sbin/pppd/chap.h b/usr.sbin/pppd/chap.h index 115ea46d0d2..fe9bd07c564 100644 --- a/usr.sbin/pppd/chap.h +++ b/usr.sbin/pppd/chap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chap.h,v 1.6 1997/09/05 04:32:35 millert Exp $ */ +/* $OpenBSD: chap.h,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * chap.h - Challenge Handshake Authentication Protocol definitions. @@ -117,8 +117,8 @@ typedef struct chap_state { extern chap_state chap[]; -void ChapAuthWithPeer __P((int, char *, int)); -void ChapAuthPeer __P((int, char *, int)); +void ChapAuthWithPeer(int, char *, int); +void ChapAuthPeer(int, char *, int); extern struct protent chap_protent; diff --git a/usr.sbin/pppd/chap_ms.c b/usr.sbin/pppd/chap_ms.c index c7525a33e84..e1cc58204ab 100644 --- a/usr.sbin/pppd/chap_ms.c +++ b/usr.sbin/pppd/chap_ms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chap_ms.c,v 1.5 1998/05/08 04:52:22 millert Exp $ */ +/* $OpenBSD: chap_ms.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * chap_ms.c - Microsoft MS-CHAP compatible implementation. @@ -37,7 +37,7 @@ #if 0 static char rcsid[] = "Id: chap_ms.c,v 1.8 1998/04/01 00:15:43 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.5 1998/05/08 04:52:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: chap_ms.c,v 1.6 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -72,18 +72,18 @@ typedef struct { in case this struct gets padded. */ -static void ChallengeResponse __P((u_char *, u_char *, u_char *)); -static void DesEncrypt __P((u_char *, u_char *, u_char *)); -static void MakeKey __P((u_char *, u_char *)); -static u_char Get7Bits __P((u_char *, int)); -static void ChapMS_NT __P((char *, int, char *, int, MS_ChapResponse *)); +static void ChallengeResponse(u_char *, u_char *, u_char *); +static void DesEncrypt(u_char *, u_char *, u_char *); +static void MakeKey(u_char *, u_char *); +static u_char Get7Bits(u_char *, int); +static void ChapMS_NT(char *, int, char *, int, MS_ChapResponse *); #ifdef MSLANMAN -static void ChapMS_LANMan __P((char *, int, char *, int, MS_ChapResponse *)); +static void ChapMS_LANMan(char *, int, char *, int, MS_ChapResponse *); #endif #ifdef USE_CRYPT -static void Expand __P((u_char *, u_char *)); -static void Collapse __P((u_char *, u_char *)); +static void Expand(u_char *, u_char *); +static void Collapse(u_char *, u_char *); #endif static void diff --git a/usr.sbin/pppd/chap_ms.h b/usr.sbin/pppd/chap_ms.h index a5a78858923..62512bc3baf 100644 --- a/usr.sbin/pppd/chap_ms.h +++ b/usr.sbin/pppd/chap_ms.h @@ -1,4 +1,4 @@ -/* $OpenBSD: chap_ms.h,v 1.3 1998/01/17 20:30:20 millert Exp $ */ +/* $OpenBSD: chap_ms.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */ /* * chap.h - Challenge Handshake Authentication Protocol definitions. @@ -29,7 +29,7 @@ #define MD4_SIGNATURE_SIZE 16 /* 16 bytes in a MD4 message digest */ #define MAX_NT_PASSWORD 256 /* Maximum number of (Unicode) chars in an NT password */ -void ChapMS __P((chap_state *, char *, int, char *, int)); +void ChapMS(chap_state *, char *, int, char *, int); #define __CHAPMS_INCLUDE__ #endif /* __CHAPMS_INCLUDE__ */ diff --git a/usr.sbin/pppd/chat/chat.c b/usr.sbin/pppd/chat/chat.c index c61cbf56974..8b927b4ba4f 100644 --- a/usr.sbin/pppd/chat/chat.c +++ b/usr.sbin/pppd/chat/chat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: chat.c,v 1.13 2001/09/05 22:32:46 deraadt Exp $ */ +/* $OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $ */ /* * Chat -- a program for automatic session establishment (i.e. dial @@ -83,7 +83,7 @@ #if 0 static char rcsid[] = "Id: chat.c,v 1.19 1998/03/24 23:57:48 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: chat.c,v 1.13 2001/09/05 22:32:46 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: chat.c,v 1.14 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -193,38 +193,38 @@ int clear_report_next = 0; int say_next = 0, hup_next = 0; -void *dup_mem __P((void *b, size_t c)); -void *copy_of __P((char *s)); -void usage __P((void)); -void logf __P((const char *fmt, ...)); -void fatal __P((int code, const char *fmt, ...)); -SIGTYPE sigalrm __P((int signo)); -SIGTYPE sigint __P((int signo)); -SIGTYPE sigterm __P((int signo)); -SIGTYPE sighup __P((int signo)); -void unalarm __P((void)); -void init __P((void)); -void set_tty_parameters __P((void)); -void echo_stderr __P((int)); -void break_sequence __P((void)); -void terminate __P((int status)); -void do_file __P((char *chat_file)); -int get_string __P((register char *string)); -int put_string __P((register char *s)); -int write_char __P((int c)); -int put_char __P((int c)); -int get_char __P((void)); -void chat_send __P((register char *s)); -char *character __P((int c)); -void chat_expect __P((register char *s)); -char *clean __P((register char *s, int sending)); -void break_sequence __P((void)); -void terminate __P((int status)); -void pack_array __P((char **array, int end)); -char *expect_strtok __P((char *, char *)); -int vfmtmsg __P((char *, int, const char *, va_list)); /* vsprintf++ */ - -int main __P((int, char *[])); +void *dup_mem(void *b, size_t c); +void *copy_of(char *s); +void usage(void); +void logf(const char *fmt, ...); +void fatal(int code, const char *fmt, ...); +SIGTYPE sigalrm(int signo); +SIGTYPE sigint(int signo); +SIGTYPE sigterm(int signo); +SIGTYPE sighup(int signo); +void unalarm(void); +void init(void); +void set_tty_parameters(void); +void echo_stderr(int); +void break_sequence(void); +void terminate(int status); +void do_file(char *chat_file); +int get_string(register char *string); +int put_string(register char *s); +int write_char(int c); +int put_char(int c); +int get_char(void); +void chat_send(register char *s); +char *character(int c); +void chat_expect(register char *s); +char *clean(register char *s, int sending); +void break_sequence(void); +void terminate(int status); +void pack_array(char **array, int end); +char *expect_strtok(char *, char *); +int vfmtmsg(char *, int, const char *, va_list); /* vsprintf++ */ + +int main(int, char *[]); void *dup_mem(b, c) void *b; diff --git a/usr.sbin/pppd/demand.c b/usr.sbin/pppd/demand.c index 2f5de37bf33..cb9f64597ce 100644 --- a/usr.sbin/pppd/demand.c +++ b/usr.sbin/pppd/demand.c @@ -1,4 +1,4 @@ -/* $OpenBSD: demand.c,v 1.6 1998/07/12 04:34:39 angelos Exp $ */ +/* $OpenBSD: demand.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * demand.c - Support routines for demand-dialling. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: demand.c,v 1.7 1997/11/27 06:08:26 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: demand.c,v 1.6 1998/07/12 04:34:39 angelos Exp $"; +static char rcsid[] = "$OpenBSD: demand.c,v 1.7 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -68,7 +68,7 @@ struct packet { struct packet *pend_q; struct packet *pend_qtail; -static int active_packet __P((unsigned char *, int)); +static int active_packet(unsigned char *, int); /* * demand_conf - configure the interface for doing dial-on-demand. diff --git a/usr.sbin/pppd/fsm.c b/usr.sbin/pppd/fsm.c index 23eeb1bb290..d5c0f1c850b 100644 --- a/usr.sbin/pppd/fsm.c +++ b/usr.sbin/pppd/fsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $ */ +/* $OpenBSD: fsm.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * fsm.c - {Link, IP} Control Protocol Finite State Machine. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: fsm.c,v 1.13 1997/04/30 05:52:17 paulus Exp"; #else -static char rcsid[] = "$OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $"; +static char rcsid[] = "$OpenBSD: fsm.c,v 1.6 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -41,14 +41,14 @@ static char rcsid[] = "$OpenBSD: fsm.c,v 1.5 1998/01/17 20:30:22 millert Exp $"; #include "pppd.h" #include "fsm.h" -static void fsm_timeout __P((void *)); -static void fsm_rconfreq __P((fsm *, int, u_char *, int)); -static void fsm_rconfack __P((fsm *, int, u_char *, int)); -static void fsm_rconfnakrej __P((fsm *, int, int, u_char *, int)); -static void fsm_rtermreq __P((fsm *, int, u_char *, int)); -static void fsm_rtermack __P((fsm *)); -static void fsm_rcoderej __P((fsm *, u_char *, int)); -static void fsm_sconfreq __P((fsm *, int)); +static void fsm_timeout(void *); +static void fsm_rconfreq(fsm *, int, u_char *, int); +static void fsm_rconfack(fsm *, int, u_char *, int); +static void fsm_rconfnakrej(fsm *, int, int, u_char *, int); +static void fsm_rtermreq(fsm *, int, u_char *, int); +static void fsm_rtermack(fsm *); +static void fsm_rcoderej(fsm *, u_char *, int); +static void fsm_sconfreq(fsm *, int); #define PROTO_NAME(f) ((f)->callbacks->proto_name) @@ -514,7 +514,7 @@ fsm_rconfnakrej(f, code, id, inp, len) u_char *inp; int len; { - int (*proc) __P((fsm *, u_char *, int)); + int (*proc)(fsm *, u_char *, int); int ret; FSMDEBUG((LOG_INFO, "fsm_rconfnakrej(%s): Rcvd id %d.", diff --git a/usr.sbin/pppd/fsm.h b/usr.sbin/pppd/fsm.h index eac650e57f1..e6f7e96f633 100644 --- a/usr.sbin/pppd/fsm.h +++ b/usr.sbin/pppd/fsm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fsm.h,v 1.3 1997/09/05 04:32:38 millert Exp $ */ +/* $OpenBSD: fsm.h,v 1.4 2002/02/16 21:28:07 millert Exp $ */ /* * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions. @@ -64,33 +64,33 @@ typedef struct fsm { typedef struct fsm_callbacks { void (*resetci) /* Reset our Configuration Information */ - __P((fsm *)); +(fsm *); int (*cilen) /* Length of our Configuration Information */ - __P((fsm *)); +(fsm *); void (*addci) /* Add our Configuration Information */ - __P((fsm *, u_char *, int *)); +(fsm *, u_char *, int *); int (*ackci) /* ACK our Configuration Information */ - __P((fsm *, u_char *, int)); +(fsm *, u_char *, int); int (*nakci) /* NAK our Configuration Information */ - __P((fsm *, u_char *, int)); +(fsm *, u_char *, int); int (*rejci) /* Reject our Configuration Information */ - __P((fsm *, u_char *, int)); +(fsm *, u_char *, int); int (*reqci) /* Request peer's Configuration Information */ - __P((fsm *, u_char *, int *, int)); +(fsm *, u_char *, int *, int); void (*up) /* Called when fsm reaches OPENED state */ - __P((fsm *)); +(fsm *); void (*down) /* Called when fsm leaves OPENED state */ - __P((fsm *)); +(fsm *); void (*starting) /* Called when we want the lower layer */ - __P((fsm *)); +(fsm *); void (*finished) /* Called when we don't want the lower layer */ - __P((fsm *)); +(fsm *); void (*protreject) /* Called when Protocol-Reject received */ - __P((int)); +(int); void (*retransmit) /* Retransmission is necessary */ - __P((fsm *)); +(fsm *); int (*extcode) /* Called when unknown code received */ - __P((fsm *, int, int, u_char *, int)); +(fsm *, int, int, u_char *, int); char *proto_name; /* String name for protocol (for messages) */ } fsm_callbacks; @@ -130,14 +130,14 @@ typedef struct fsm_callbacks { /* * Prototypes */ -void fsm_init __P((fsm *)); -void fsm_lowerup __P((fsm *)); -void fsm_lowerdown __P((fsm *)); -void fsm_open __P((fsm *)); -void fsm_close __P((fsm *, char *)); -void fsm_input __P((fsm *, u_char *, int)); -void fsm_protreject __P((fsm *)); -void fsm_sdata __P((fsm *, int, int, u_char *, int)); +void fsm_init(fsm *); +void fsm_lowerup(fsm *); +void fsm_lowerdown(fsm *); +void fsm_open(fsm *); +void fsm_close(fsm *, char *); +void fsm_input(fsm *, u_char *, int); +void fsm_protreject(fsm *); +void fsm_sdata(fsm *, int, int, u_char *, int); /* diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c index df4e2eabd76..424b20c58b1 100644 --- a/usr.sbin/pppd/ipcp.c +++ b/usr.sbin/pppd/ipcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipcp.c,v 1.6 1998/05/08 04:52:23 millert Exp $ */ +/* $OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * ipcp.c - PPP IP Control Protocol. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: ipcp.c,v 1.6 1998/05/08 04:52:23 millert Exp $"; +static char rcsid[] = "$OpenBSD: ipcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -59,17 +59,17 @@ static int proxy_arp_set[NUM_PPP]; /* Have created proxy arp entry */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void ipcp_resetci __P((fsm *)); /* Reset our CI */ -static int ipcp_cilen __P((fsm *)); /* Return length of our CI */ -static void ipcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ -static int ipcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int ipcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int ipcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int ipcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ -static void ipcp_up __P((fsm *)); /* We're UP */ -static void ipcp_down __P((fsm *)); /* We're DOWN */ -static void ipcp_script __P((fsm *, char *)); /* Run an up/down script */ -static void ipcp_finished __P((fsm *)); /* Don't need lower layer */ +static void ipcp_resetci(fsm *); /* Reset our CI */ +static int ipcp_cilen(fsm *); /* Return length of our CI */ +static void ipcp_addci(fsm *, u_char *, int *); /* Add our CI */ +static int ipcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int ipcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int ipcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int ipcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */ +static void ipcp_up(fsm *); /* We're UP */ +static void ipcp_down(fsm *); /* We're DOWN */ +static void ipcp_script(fsm *, char *); /* Run an up/down script */ +static void ipcp_finished(fsm *); /* Don't need lower layer */ fsm ipcp_fsm[NUM_PPP]; /* IPCP fsm structure */ @@ -94,18 +94,18 @@ static fsm_callbacks ipcp_callbacks = { /* IPCP callback routines */ /* * Protocol entry points from main code. */ -static void ipcp_init __P((int)); -static void ipcp_open __P((int)); -static void ipcp_close __P((int, char *)); -static void ipcp_lowerup __P((int)); -static void ipcp_lowerdown __P((int)); -static void ipcp_input __P((int, u_char *, int)); -static void ipcp_protrej __P((int)); +static void ipcp_init(int); +static void ipcp_open(int); +static void ipcp_close(int, char *); +static void ipcp_lowerup(int); +static void ipcp_lowerdown(int); +static void ipcp_input(int, u_char *, int); +static void ipcp_protrej(int); static int ipcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); -static void ip_check_options __P((void)); -static int ip_demand_conf __P((int)); -static int ip_active_pkt __P((u_char *, int)); + void (*)(void *, char *, ...), void *)); +static void ip_check_options(void); +static int ip_demand_conf(int); +static int ip_active_pkt(u_char *, int); struct protent ipcp_protent = { PPP_IPCP, @@ -125,7 +125,7 @@ struct protent ipcp_protent = { ip_active_pkt }; -static void ipcp_clear_addrs __P((int)); +static void ipcp_clear_addrs(int); /* * Lengths of configuration options. @@ -1373,7 +1373,7 @@ static int ipcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/ipcp.h b/usr.sbin/pppd/ipcp.h index a5143f2f623..dc0ff4cbbcc 100644 --- a/usr.sbin/pppd/ipcp.h +++ b/usr.sbin/pppd/ipcp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipcp.h,v 1.5 1998/05/08 04:52:24 millert Exp $ */ +/* $OpenBSD: ipcp.h,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * ipcp.h - IP Control Protocol definitions. @@ -67,6 +67,6 @@ extern ipcp_options ipcp_gotoptions[]; extern ipcp_options ipcp_allowoptions[]; extern ipcp_options ipcp_hisoptions[]; -char *ip_ntoa __P((u_int32_t)); +char *ip_ntoa(u_int32_t); extern struct protent ipcp_protent; diff --git a/usr.sbin/pppd/ipxcp.c b/usr.sbin/pppd/ipxcp.c index 7b36f2eccf9..081166b6c60 100644 --- a/usr.sbin/pppd/ipxcp.c +++ b/usr.sbin/pppd/ipxcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipxcp.c,v 1.5 1998/05/08 04:52:25 millert Exp $ */ +/* $OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * ipxcp.c - PPP IPX Control Protocol. @@ -24,7 +24,7 @@ #if 0 static char rcsid[] = "Id: ipxcp.c,v 1.6 1998/03/25 03:08:16 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.5 1998/05/08 04:52:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: ipxcp.c,v 1.6 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -59,16 +59,16 @@ ipxcp_options ipxcp_hisoptions[NUM_PPP]; /* Options that we ack'd */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void ipxcp_resetci __P((fsm *)); /* Reset our CI */ -static int ipxcp_cilen __P((fsm *)); /* Return length of our CI */ -static void ipxcp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ -static int ipxcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int ipxcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int ipxcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int ipxcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ -static void ipxcp_up __P((fsm *)); /* We're UP */ -static void ipxcp_down __P((fsm *)); /* We're DOWN */ -static void ipxcp_script __P((fsm *, char *)); /* Run an up/down script */ +static void ipxcp_resetci(fsm *); /* Reset our CI */ +static int ipxcp_cilen(fsm *); /* Return length of our CI */ +static void ipxcp_addci(fsm *, u_char *, int *); /* Add our CI */ +static int ipxcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int ipxcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int ipxcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int ipxcp_reqci(fsm *, u_char *, int *, int); /* Rcv CI */ +static void ipxcp_up(fsm *); /* We're UP */ +static void ipxcp_down(fsm *); /* We're DOWN */ +static void ipxcp_script(fsm *, char *); /* Run an up/down script */ fsm ipxcp_fsm[NUM_PPP]; /* IPXCP fsm structure */ @@ -94,15 +94,15 @@ static fsm_callbacks ipxcp_callbacks = { /* IPXCP callback routines */ * Protocol entry points. */ -static void ipxcp_init __P((int)); -static void ipxcp_open __P((int)); -static void ipxcp_close __P((int, char *)); -static void ipxcp_lowerup __P((int)); -static void ipxcp_lowerdown __P((int)); -static void ipxcp_input __P((int, u_char *, int)); -static void ipxcp_protrej __P((int)); +static void ipxcp_init(int); +static void ipxcp_open(int); +static void ipxcp_close(int, char *); +static void ipxcp_lowerup(int); +static void ipxcp_lowerdown(int); +static void ipxcp_input(int, u_char *, int); +static void ipxcp_protrej(int); static int ipxcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); + void (*)(void *, char *, ...), void *)); struct protent ipxcp_protent = { PPP_IPXCP, @@ -1283,7 +1283,7 @@ static int ipxcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/lcp.c b/usr.sbin/pppd/lcp.c index 5acc924395a..fa8fd8f60dc 100644 --- a/usr.sbin/pppd/lcp.c +++ b/usr.sbin/pppd/lcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lcp.c,v 1.6 1998/01/17 20:30:24 millert Exp $ */ +/* $OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * lcp.c - PPP Link Control Protocol. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: lcp.c,v 1.31 1997/11/27 06:08:44 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: lcp.c,v 1.6 1998/01/17 20:30:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: lcp.c,v 1.7 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -64,31 +64,31 @@ static u_char nak_buffer[PPP_MRU]; /* where we construct a nak packet */ /* * Callbacks for fsm code. (CI = Configuration Information) */ -static void lcp_resetci __P((fsm *)); /* Reset our CI */ -static int lcp_cilen __P((fsm *)); /* Return length of our CI */ -static void lcp_addci __P((fsm *, u_char *, int *)); /* Add our CI to pkt */ -static int lcp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -static int lcp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -static int lcp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -static int lcp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv peer CI */ -static void lcp_up __P((fsm *)); /* We're UP */ -static void lcp_down __P((fsm *)); /* We're DOWN */ -static void lcp_starting __P((fsm *)); /* We need lower layer up */ -static void lcp_finished __P((fsm *)); /* We need lower layer down */ -static int lcp_extcode __P((fsm *, int, int, u_char *, int)); -static void lcp_rprotrej __P((fsm *, u_char *, int)); +static void lcp_resetci(fsm *); /* Reset our CI */ +static int lcp_cilen(fsm *); /* Return length of our CI */ +static void lcp_addci(fsm *, u_char *, int *); /* Add our CI to pkt */ +static int lcp_ackci(fsm *, u_char *, int); /* Peer ack'd our CI */ +static int lcp_nakci(fsm *, u_char *, int); /* Peer nak'd our CI */ +static int lcp_rejci(fsm *, u_char *, int); /* Peer rej'd our CI */ +static int lcp_reqci(fsm *, u_char *, int *, int); /* Rcv peer CI */ +static void lcp_up(fsm *); /* We're UP */ +static void lcp_down(fsm *); /* We're DOWN */ +static void lcp_starting(fsm *); /* We need lower layer up */ +static void lcp_finished(fsm *); /* We need lower layer down */ +static int lcp_extcode(fsm *, int, int, u_char *, int); +static void lcp_rprotrej(fsm *, u_char *, int); /* * routines to send LCP echos to peer */ -static void lcp_echo_lowerup __P((int)); -static void lcp_echo_lowerdown __P((int)); -static void LcpEchoTimeout __P((void *)); -static void lcp_received_echo_reply __P((fsm *, int, u_char *, int)); -static void LcpSendEchoRequest __P((fsm *)); -static void LcpLinkFailure __P((fsm *)); -static void LcpEchoCheck __P((fsm *)); +static void lcp_echo_lowerup(int); +static void lcp_echo_lowerdown(int); +static void LcpEchoTimeout(void *); +static void lcp_received_echo_reply(fsm *, int, u_char *, int); +static void LcpSendEchoRequest(fsm *); +static void LcpLinkFailure(fsm *); +static void LcpEchoCheck(fsm *); static fsm_callbacks lcp_callbacks = { /* LCP callback routines */ lcp_resetci, /* Reset our Configuration Information */ @@ -113,11 +113,11 @@ static fsm_callbacks lcp_callbacks = { /* LCP callback routines */ * Some of these are called directly. */ -static void lcp_init __P((int)); -static void lcp_input __P((int, u_char *, int)); -static void lcp_protrej __P((int)); +static void lcp_init(int); +static void lcp_input(int, u_char *, int); +static void lcp_protrej(int); static int lcp_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); + void (*)(void *, char *, ...), void *)); struct protent lcp_protent = { PPP_LCP, @@ -1561,7 +1561,7 @@ static int lcp_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len, olen; diff --git a/usr.sbin/pppd/lcp.h b/usr.sbin/pppd/lcp.h index 727b2de00bc..3a26937463b 100644 --- a/usr.sbin/pppd/lcp.h +++ b/usr.sbin/pppd/lcp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lcp.h,v 1.5 1997/09/05 04:32:41 millert Exp $ */ +/* $OpenBSD: lcp.h,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * lcp.h - Link Control Protocol definitions. @@ -77,11 +77,11 @@ extern u_int32_t xmit_accm[][8]; #define MINMRU 128 /* No MRUs below this */ #define MAXMRU 16384 /* Normally limit MRU to this */ -void lcp_open __P((int)); -void lcp_close __P((int, char *)); -void lcp_lowerup __P((int)); -void lcp_lowerdown __P((int)); -void lcp_sprotrej __P((int, u_char *, int)); /* send protocol reject */ +void lcp_open(int); +void lcp_close(int, char *); +void lcp_lowerup(int); +void lcp_lowerdown(int); +void lcp_sprotrej(int, u_char *, int); /* send protocol reject */ extern struct protent lcp_protent; diff --git a/usr.sbin/pppd/magic.c b/usr.sbin/pppd/magic.c index 7728ec06fa4..0fef78c87e2 100644 --- a/usr.sbin/pppd/magic.c +++ b/usr.sbin/pppd/magic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $ */ +/* $OpenBSD: magic.c,v 1.5 2002/02/16 21:28:07 millert Exp $ */ /* * magic.c - PPP Magic Number routines. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: magic.c,v 1.7 1998/03/25 03:07:49 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $"; +static char rcsid[] = "$OpenBSD: magic.c,v 1.5 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -35,8 +35,8 @@ static char rcsid[] = "$OpenBSD: magic.c,v 1.4 1998/05/08 04:52:26 millert Exp $ #include "pppd.h" #include "magic.h" -extern long mrand48 __P((void)); -extern void srand48 __P((long)); +extern long mrand48(void); +extern void srand48(long); /* * magic_init - Initialize the magic number generator. diff --git a/usr.sbin/pppd/magic.h b/usr.sbin/pppd/magic.h index ec990214457..80149796942 100644 --- a/usr.sbin/pppd/magic.h +++ b/usr.sbin/pppd/magic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: magic.h,v 1.2 1997/09/05 04:32:42 millert Exp $ */ +/* $OpenBSD: magic.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /* * magic.h - PPP Magic Number definitions. @@ -21,5 +21,5 @@ * Id: magic.h,v 1.3 1994/09/21 06:47:37 paulus Exp */ -void magic_init __P((void)); /* Initialize the magic number generator */ -u_int32_t magic __P((void)); /* Returns the next magic number */ +void magic_init(void); /* Initialize the magic number generator */ +u_int32_t magic(void); /* Returns the next magic number */ diff --git a/usr.sbin/pppd/main.c b/usr.sbin/pppd/main.c index ab67092be82..b1598b35a1b 100644 --- a/usr.sbin/pppd/main.c +++ b/usr.sbin/pppd/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.32 2001/11/05 09:58:13 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $ */ /* * main.c - Point-to-Point Protocol main module @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.32 2001/11/05 09:58:13 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.33 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -113,27 +113,27 @@ char *no_ppp_msg = "Sorry - this system lacks PPP kernel support\n"; /* Prototypes for procedures local to this file. */ -static void create_pidfile __P((void)); -static void cleanup __P((void)); -static void close_tty __P((void)); -static void get_input __P((void)); -static void calltimeout __P((void)); -static struct timeval *timeleft __P((struct timeval *)); -static void kill_my_pg __P((int)); -static void hup __P((int)); -static void term __P((int)); -static void chld __P((int)); -static void toggle_debug __P((int)); -static void open_ccp __P((int)); -static void bad_signal __P((int)); -static void holdoff_end __P((void *)); -static int device_script __P((char *, int, int)); -static void reap_kids __P((void)); -static void pr_log __P((void *, char *, ...)); - -extern char *ttyname __P((int)); -extern char *getlogin __P((void)); -int main __P((int, char *[])); +static void create_pidfile(void); +static void cleanup(void); +static void close_tty(void); +static void get_input(void); +static void calltimeout(void); +static struct timeval *timeleft(struct timeval *); +static void kill_my_pg(int); +static void hup(int); +static void term(int); +static void chld(int); +static void toggle_debug(int); +static void open_ccp(int); +static void bad_signal(int); +static void holdoff_end(void *); +static int device_script(char *, int, int); +static void reap_kids(void); +static void pr_log(void *, char *, ...); + +extern char *ttyname(int); +extern char *getlogin(void); +int main(int, char *[]); #ifdef ultrix #undef O_NONBLOCK @@ -809,7 +809,7 @@ close_tty() struct callout { struct timeval c_time; /* time at which to call routine */ void *c_arg; /* argument to routine */ - void (*c_func) __P((void *)); /* routine */ + void (*c_func)(void *); /* routine */ struct callout *c_next; }; @@ -824,7 +824,7 @@ static struct timeval timenow; /* Current time */ */ void timeout(func, arg, time) - void (*func) __P((void *)); + void (*func)(void *); void *arg; int time; { @@ -864,7 +864,7 @@ timeout(func, arg, time) */ void untimeout(func, arg) - void (*func) __P((void *)); + void (*func)(void *); void *arg; { struct callout **copp, *freep; @@ -1266,7 +1266,7 @@ void format_packet(p, len, printer, arg) u_char *p; int len; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int i, n; @@ -1334,7 +1334,7 @@ void print_string(p, len, printer, arg) char *p; int len; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int c; diff --git a/usr.sbin/pppd/options.c b/usr.sbin/pppd/options.c index 348ac987849..e5fb33cb15d 100644 --- a/usr.sbin/pppd/options.c +++ b/usr.sbin/pppd/options.c @@ -1,4 +1,4 @@ -/* $OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Exp $ */ +/* $OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $ */ /* * options.c - handles option processing for PPP. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: options.c,v 1.42 1998/03/26 04:46:06 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: options.c,v 1.15 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -70,7 +70,7 @@ static char rcsid[] = "$OpenBSD: options.c,v 1.14 2001/07/09 22:21:54 pjanzen Ex #define TRUE 1 #if defined(ultrix) || defined(NeXT) -char *strdup __P((char *)); +char *strdup(char *); #endif #ifndef GIDSET_TYPE @@ -139,133 +139,133 @@ pcap_t pc; /* Fake struct pcap so we can compile expr */ /* * Prototypes */ -static int setdevname __P((char *, int)); -static int setipaddr __P((char *)); -static int setspeed __P((char *)); -static int setdebug __P((char **)); -static int setkdebug __P((char **)); -static int setpassive __P((char **)); -static int setsilent __P((char **)); -static int noopt __P((char **)); -static int setnovj __P((char **)); -static int setnovjccomp __P((char **)); -static int setvjslots __P((char **)); -static int reqpap __P((char **)); -static int nopap __P((char **)); +static int setdevname(char *, int); +static int setipaddr(char *); +static int setspeed(char *); +static int setdebug(char **); +static int setkdebug(char **); +static int setpassive(char **); +static int setsilent(char **); +static int noopt(char **); +static int setnovj(char **); +static int setnovjccomp(char **); +static int setvjslots(char **); +static int reqpap(char **); +static int nopap(char **); #ifdef OLD_OPTIONS -static int setupapfile __P((char **)); +static int setupapfile(char **); #endif -static int nochap __P((char **)); -static int reqchap __P((char **)); -static int noaccomp __P((char **)); -static int noasyncmap __P((char **)); -static int noip __P((char **)); -static int nomagicnumber __P((char **)); -static int setasyncmap __P((char **)); -static int setescape __P((char **)); -static int setmru __P((char **)); -static int setmtu __P((char **)); +static int nochap(char **); +static int reqchap(char **); +static int noaccomp(char **); +static int noasyncmap(char **); +static int noip(char **); +static int nomagicnumber(char **); +static int setasyncmap(char **); +static int setescape(char **); +static int setmru(char **); +static int setmtu(char **); #ifdef CBCP_SUPPORT -static int setcbcp __P((char **)); +static int setcbcp(char **); #endif -static int nomru __P((char **)); -static int nopcomp __P((char **)); -static int setconnector __P((char **)); -static int setdisconnector __P((char **)); -static int setwelcomer __P((char **)); -static int setmaxconnect __P((char **)); -static int setdomain __P((char **)); -static int setnetmask __P((char **)); -static int setcrtscts __P((char **)); -static int setnocrtscts __P((char **)); -static int setxonxoff __P((char **)); -static int setnodetach __P((char **)); -static int setupdetach __P((char **)); -static int setmodem __P((char **)); -static int setmodem_chat __P((char **)); -static int setlocal __P((char **)); -static int setlock __P((char **)); -static int setname __P((char **)); -static int setuser __P((char **)); -static int setremote __P((char **)); -static int setauth __P((char **)); -static int setnoauth __P((char **)); -static int readfile __P((char **)); -static int callfile __P((char **)); -static int setdefaultroute __P((char **)); -static int setnodefaultroute __P((char **)); -static int setproxyarp __P((char **)); -static int setnoproxyarp __P((char **)); -static int setpersist __P((char **)); -static int setnopersist __P((char **)); -static int setdologin __P((char **)); -static int setusehostname __P((char **)); -static int setnoipdflt __P((char **)); -static int setlcptimeout __P((char **)); -static int setlcpterm __P((char **)); -static int setlcpconf __P((char **)); -static int setlcpfails __P((char **)); -static int setipcptimeout __P((char **)); -static int setipcpterm __P((char **)); -static int setipcpconf __P((char **)); -static int setipcpfails __P((char **)); -static int setpaptimeout __P((char **)); -static int setpapreqs __P((char **)); -static int setpapreqtime __P((char **)); -static int setchaptimeout __P((char **)); -static int setchapchal __P((char **)); -static int setchapintv __P((char **)); -static int setipcpaccl __P((char **)); -static int setipcpaccr __P((char **)); -static int setlcpechointv __P((char **)); -static int setlcpechofails __P((char **)); -static int noccp __P((char **)); -static int setbsdcomp __P((char **)); -static int setnobsdcomp __P((char **)); -static int setdeflate __P((char **)); -static int setnodeflate __P((char **)); -static int setnodeflatedraft __P((char **)); -static int setdemand __P((char **)); -static int setpred1comp __P((char **)); -static int setnopred1comp __P((char **)); -static int setipparam __P((char **)); -static int setpapcrypt __P((char **)); -static int setidle __P((char **)); -static int setholdoff __P((char **)); -static int setdnsaddr __P((char **)); -static int resetipxproto __P((char **)); -static int setwinsaddr __P((char **)); -static int showversion __P((char **)); -static int showhelp __P((char **)); +static int nomru(char **); +static int nopcomp(char **); +static int setconnector(char **); +static int setdisconnector(char **); +static int setwelcomer(char **); +static int setmaxconnect(char **); +static int setdomain(char **); +static int setnetmask(char **); +static int setcrtscts(char **); +static int setnocrtscts(char **); +static int setxonxoff(char **); +static int setnodetach(char **); +static int setupdetach(char **); +static int setmodem(char **); +static int setmodem_chat(char **); +static int setlocal(char **); +static int setlock(char **); +static int setname(char **); +static int setuser(char **); +static int setremote(char **); +static int setauth(char **); +static int setnoauth(char **); +static int readfile(char **); +static int callfile(char **); +static int setdefaultroute(char **); +static int setnodefaultroute(char **); +static int setproxyarp(char **); +static int setnoproxyarp(char **); +static int setpersist(char **); +static int setnopersist(char **); +static int setdologin(char **); +static int setusehostname(char **); +static int setnoipdflt(char **); +static int setlcptimeout(char **); +static int setlcpterm(char **); +static int setlcpconf(char **); +static int setlcpfails(char **); +static int setipcptimeout(char **); +static int setipcpterm(char **); +static int setipcpconf(char **); +static int setipcpfails(char **); +static int setpaptimeout(char **); +static int setpapreqs(char **); +static int setpapreqtime(char **); +static int setchaptimeout(char **); +static int setchapchal(char **); +static int setchapintv(char **); +static int setipcpaccl(char **); +static int setipcpaccr(char **); +static int setlcpechointv(char **); +static int setlcpechofails(char **); +static int noccp(char **); +static int setbsdcomp(char **); +static int setnobsdcomp(char **); +static int setdeflate(char **); +static int setnodeflate(char **); +static int setnodeflatedraft(char **); +static int setdemand(char **); +static int setpred1comp(char **); +static int setnopred1comp(char **); +static int setipparam(char **); +static int setpapcrypt(char **); +static int setidle(char **); +static int setholdoff(char **); +static int setdnsaddr(char **); +static int resetipxproto(char **); +static int setwinsaddr(char **); +static int showversion(char **); +static int showhelp(char **); #ifdef PPP_FILTER -static int setpdebug __P((char **)); -static int setpassfilter __P((char **)); -static int setactivefilter __P((char **)); +static int setpdebug(char **); +static int setpassfilter(char **); +static int setactivefilter(char **); #endif #ifdef IPX_CHANGE -static int setipxproto __P((char **)); -static int setipxanet __P((char **)); -static int setipxalcl __P((char **)); -static int setipxarmt __P((char **)); -static int setipxnetwork __P((char **)); -static int setipxnode __P((char **)); -static int setipxrouter __P((char **)); -static int setipxname __P((char **)); -static int setipxcptimeout __P((char **)); -static int setipxcpterm __P((char **)); -static int setipxcpconf __P((char **)); -static int setipxcpfails __P((char **)); +static int setipxproto(char **); +static int setipxanet(char **); +static int setipxalcl(char **); +static int setipxarmt(char **); +static int setipxnetwork(char **); +static int setipxnode(char **); +static int setipxrouter(char **); +static int setipxname(char **); +static int setipxcptimeout(char **); +static int setipxcpterm(char **); +static int setipxcpconf(char **); +static int setipxcpfails(char **); #endif /* IPX_CHANGE */ #ifdef MSLANMAN -static int setmslanman __P((char **)); +static int setmslanman(char **); #endif -static int number_option __P((char *, u_int32_t *, int)); -static int int_option __P((char *, int *)); -static int readable __P((int fd)); +static int number_option(char *, u_int32_t *, int); +static int int_option(char *, int *); +static int readable(int fd); /* * Valid arguments. @@ -273,7 +273,7 @@ static int readable __P((int fd)); static struct cmd { char *cmd_name; int num_args; - int (*cmd_func) __P((char **)); + int (*cmd_func)(char **); } cmds[] = { {"-all", 0, noopt}, /* Don't request/allow any options (useless) */ {"noaccomp", 0, noaccomp}, /* Disable Address/Control compression */ diff --git a/usr.sbin/pppd/pppd.h b/usr.sbin/pppd/pppd.h index dc7bba871cd..e9a83a306c3 100644 --- a/usr.sbin/pppd/pppd.h +++ b/usr.sbin/pppd/pppd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pppd.h,v 1.10 1998/07/12 04:34:42 angelos Exp $ */ +/* $OpenBSD: pppd.h,v 1.11 2002/02/16 21:28:07 millert Exp $ */ /* * pppd.h - PPP daemon global declarations. @@ -142,33 +142,33 @@ extern int ms_lanman; /* Nonzero if use LanMan password instead of NT */ struct protent { u_short protocol; /* PPP protocol number */ /* Initialization procedure */ - void (*init) __P((int unit)); + void (*init)(int unit); /* Process a received packet */ - void (*input) __P((int unit, u_char *pkt, int len)); + void (*input)(int unit, u_char *pkt, int len); /* Process a received protocol-reject */ - void (*protrej) __P((int unit)); + void (*protrej)(int unit); /* Lower layer has come up */ - void (*lowerup) __P((int unit)); + void (*lowerup)(int unit); /* Lower layer has gone down */ - void (*lowerdown) __P((int unit)); + void (*lowerdown)(int unit); /* Open the protocol */ - void (*open) __P((int unit)); + void (*open)(int unit); /* Close the protocol */ - void (*close) __P((int unit, char *reason)); + void (*close)(int unit, char *reason); /* Print a packet in readable form */ int (*printpkt) __P((u_char *pkt, int len, - void (*printer) __P((void *, char *, ...)), + void (*printer)(void *, char *, ...), void *arg)); /* Process a received data packet */ - void (*datainput) __P((int unit, u_char *pkt, int len)); + void (*datainput)(int unit, u_char *pkt, int len); int enabled_flag; /* 0 iff protocol is disabled */ char *name; /* Text name of protocol */ /* Check requested options, assign defaults */ - void (*check_options) __P((void)); + void (*check_options)(void); /* Configure interface for demand-dial */ - int (*demand_conf) __P((int unit)); + int (*demand_conf)(int unit); /* Say whether to bring up link for this pkt */ - int (*active_pkt) __P((u_char *pkt, int len)); + int (*active_pkt)(u_char *pkt, int len); }; /* Table of pointers to supported protocols */ @@ -179,148 +179,148 @@ extern struct protent *protocols[]; */ /* Procedures exported from main.c. */ -void detach __P((void)); /* Detach from controlling tty */ -void die __P((int)); /* Cleanup and exit */ -void quit __P((void)); /* like die(1) */ -void novm __P((char *)); /* Say we ran out of memory, and die */ +void detach(void); /* Detach from controlling tty */ +void die(int); /* Cleanup and exit */ +void quit(void); /* like die(1) */ +void novm(char *); /* Say we ran out of memory, and die */ void timeout __P((void (*func)(void *), void *arg, int t)); /* Call func(arg) after t seconds */ void untimeout __P((void (*func)(void *), void *arg)); /* Cancel call to func(arg) */ -int run_program __P((char *prog, char **args, int must_exist)); +int run_program(char *prog, char **args, int must_exist); /* Run program prog with args in child */ -void demuxprotrej __P((int, int)); +void demuxprotrej(int, int); /* Demultiplex a Protocol-Reject */ void format_packet __P((u_char *, int, void (*) (void *, char *, ...), void *)); /* Format a packet in human-readable form */ -void log_packet __P((u_char *, int, char *, int)); +void log_packet(u_char *, int, char *, int); /* Format a packet and log it with syslog */ void print_string __P((char *, int, void (*) (void *, char *, ...), void *)); /* Format a string for output */ -int fmtmsg __P((char *, int, char *, ...)); /* sprintf++ */ -int vfmtmsg __P((char *, int, char *, va_list)); /* vsprintf++ */ -void script_setenv __P((char *, char *)); /* set script env var */ -void script_unsetenv __P((char *)); /* unset script env var */ +int fmtmsg(char *, int, char *, ...); /* sprintf++ */ +int vfmtmsg(char *, int, char *, va_list); /* vsprintf++ */ +void script_setenv(char *, char *); /* set script env var */ +void script_unsetenv(char *); /* unset script env var */ /* Procedures exported from auth.c */ -void link_required __P((int)); /* we are starting to use the link */ -void link_terminated __P((int)); /* we are finished with the link */ -void link_down __P((int)); /* the LCP layer has left the Opened state */ -void link_established __P((int)); /* the link is up; authenticate now */ -void np_up __P((int, int)); /* a network protocol has come up */ -void np_down __P((int, int)); /* a network protocol has gone down */ -void np_finished __P((int, int)); /* a network protocol no longer needs link */ -void auth_peer_fail __P((int, int)); +void link_required(int); /* we are starting to use the link */ +void link_terminated(int); /* we are finished with the link */ +void link_down(int); /* the LCP layer has left the Opened state */ +void link_established(int); /* the link is up; authenticate now */ +void np_up(int, int); /* a network protocol has come up */ +void np_down(int, int); /* a network protocol has gone down */ +void np_finished(int, int); /* a network protocol no longer needs link */ +void auth_peer_fail(int, int); /* peer failed to authenticate itself */ -void auth_peer_success __P((int, int, char *, int)); +void auth_peer_success(int, int, char *, int); /* peer successfully authenticated itself */ -void auth_withpeer_fail __P((int, int)); +void auth_withpeer_fail(int, int); /* we failed to authenticate ourselves */ -void auth_withpeer_success __P((int, int)); +void auth_withpeer_success(int, int); /* we successfully authenticated ourselves */ -void auth_check_options __P((void)); +void auth_check_options(void); /* check authentication options supplied */ -void auth_reset __P((int)); /* check what secrets we have */ -int check_passwd __P((int, char *, int, char *, int, char **, int *)); +void auth_reset(int); /* check what secrets we have */ +int check_passwd(int, char *, int, char *, int, char **, int *); /* Check peer-supplied username/password */ -int get_secret __P((int, char *, char *, char *, int *, int)); +int get_secret(int, char *, char *, char *, int *, int); /* get "secret" for chap */ -int auth_ip_addr __P((int, u_int32_t)); +int auth_ip_addr(int, u_int32_t); /* check if IP address is authorized */ -int bad_ip_adrs __P((u_int32_t)); +int bad_ip_adrs(u_int32_t); /* check if IP address is unreasonable */ -void check_access __P((FILE *, char *)); +void check_access(FILE *, char *); /* check permissions on secrets file */ /* Procedures exported from demand.c */ -void demand_conf __P((void)); /* config interface(s) for demand-dial */ -void demand_block __P((void)); /* set all NPs to queue up packets */ -void demand_drop __P((void)); /* set all NPs to drop packets */ -void demand_unblock __P((void)); /* set all NPs to pass packets */ -void demand_discard __P((void)); /* set all NPs to discard packets */ -void demand_rexmit __P((int)); /* retransmit saved frames for an NP */ -int loop_chars __P((unsigned char *, int)); /* process chars from loopback */ -int loop_frame __P((unsigned char *, int)); /* process frame from loopback */ +void demand_conf(void); /* config interface(s) for demand-dial */ +void demand_block(void); /* set all NPs to queue up packets */ +void demand_drop(void); /* set all NPs to drop packets */ +void demand_unblock(void); /* set all NPs to pass packets */ +void demand_discard(void); /* set all NPs to discard packets */ +void demand_rexmit(int); /* retransmit saved frames for an NP */ +int loop_chars(unsigned char *, int); /* process chars from loopback */ +int loop_frame(unsigned char *, int); /* process frame from loopback */ /* Procedures exported from sys-*.c */ -void sys_init __P((void)); /* Do system-dependent initialization */ -void sys_cleanup __P((void)); /* Restore system state before exiting */ -void sys_check_options __P((void)); /* Check options specified */ -void sys_close __P((void)); /* Clean up in a child before execing */ -int ppp_available __P((void)); /* Test whether ppp kernel support exists */ -void open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */ -void establish_ppp __P((int)); /* Turn serial port into a ppp interface */ -void restore_loop __P((void)); /* Transfer ppp unit back to loopback */ -void disestablish_ppp __P((int)); /* Restore port to normal operation */ -void clean_check __P((void)); /* Check if line was 8-bit clean */ -void set_up_tty __P((int, int)); /* Set up port's speed, parameters, etc. */ -void restore_tty __P((int)); /* Restore port's original parameters */ -void setdtr __P((int, int)); /* Raise or lower port's DTR line */ -void output __P((int, u_char *, int)); /* Output a PPP packet */ -void wait_input __P((struct timeval *)); +void sys_init(void); /* Do system-dependent initialization */ +void sys_cleanup(void); /* Restore system state before exiting */ +void sys_check_options(void); /* Check options specified */ +void sys_close(void); /* Clean up in a child before execing */ +int ppp_available(void); /* Test whether ppp kernel support exists */ +void open_ppp_loopback(void); /* Open loopback for demand-dialling */ +void establish_ppp(int); /* Turn serial port into a ppp interface */ +void restore_loop(void); /* Transfer ppp unit back to loopback */ +void disestablish_ppp(int); /* Restore port to normal operation */ +void clean_check(void); /* Check if line was 8-bit clean */ +void set_up_tty(int, int); /* Set up port's speed, parameters, etc. */ +void restore_tty(int); /* Restore port's original parameters */ +void setdtr(int, int); /* Raise or lower port's DTR line */ +void output(int, u_char *, int); /* Output a PPP packet */ +void wait_input(struct timeval *); /* Wait for input, with timeout */ -void wait_loop_output __P((struct timeval *)); +void wait_loop_output(struct timeval *); /* Wait for pkt from loopback, with timeout */ -void wait_time __P((struct timeval *)); /* Wait for given length of time */ -int read_packet __P((u_char *)); /* Read PPP packet */ -int get_loop_output __P((void)); /* Read pkts from loopback */ -void ppp_send_config __P((int, int, u_int32_t, int, int)); +void wait_time(struct timeval *); /* Wait for given length of time */ +int read_packet(u_char *); /* Read PPP packet */ +int get_loop_output(void); /* Read pkts from loopback */ +void ppp_send_config(int, int, u_int32_t, int, int); /* Configure i/f transmit parameters */ -void ppp_set_xaccm __P((int, ext_accm)); +void ppp_set_xaccm(int, ext_accm); /* Set extended transmit ACCM */ -void ppp_recv_config __P((int, int, u_int32_t, int, int)); +void ppp_recv_config(int, int, u_int32_t, int, int); /* Configure i/f receive parameters */ -int ccp_test __P((int, u_char *, int, int)); +int ccp_test(int, u_char *, int, int); /* Test support for compression scheme */ -void ccp_flags_set __P((int, int, int)); +void ccp_flags_set(int, int, int); /* Set kernel CCP state */ -int ccp_fatal_error __P((int)); /* Test for fatal decomp error in kernel */ -int get_idle_time __P((int, struct ppp_idle *)); +int ccp_fatal_error(int); /* Test for fatal decomp error in kernel */ +int get_idle_time(int, struct ppp_idle *); /* Find out how long link has been idle */ -int sifvjcomp __P((int, int, int, int)); +int sifvjcomp(int, int, int, int); /* Configure VJ TCP header compression */ -int sifup __P((int)); /* Configure i/f up (for IP) */ -int sifnpmode __P((int u, int proto, enum NPmode mode)); +int sifup(int); /* Configure i/f up (for IP) */ +int sifnpmode(int u, int proto, enum NPmode mode); /* Set mode for handling packets for proto */ -int sifdown __P((int)); /* Configure i/f down (for IP) */ -int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); +int sifdown(int); /* Configure i/f down (for IP) */ +int sifaddr(int, u_int32_t, u_int32_t, u_int32_t); /* Configure IP addresses for i/f */ -int cifaddr __P((int, u_int32_t, u_int32_t)); +int cifaddr(int, u_int32_t, u_int32_t); /* Reset i/f IP addresses */ -int sifdefaultroute __P((int, u_int32_t, u_int32_t)); +int sifdefaultroute(int, u_int32_t, u_int32_t); /* Create default route through i/f */ -int cifdefaultroute __P((int, u_int32_t, u_int32_t)); +int cifdefaultroute(int, u_int32_t, u_int32_t); /* Delete default route through i/f */ -int sifproxyarp __P((int, u_int32_t)); +int sifproxyarp(int, u_int32_t); /* Add proxy ARP entry for peer */ -int cifproxyarp __P((int, u_int32_t)); +int cifproxyarp(int, u_int32_t); /* Delete proxy ARP entry for peer */ -u_int32_t GetMask __P((u_int32_t)); /* Get appropriate netmask for address */ -int lock __P((char *)); /* Create lock file for device */ -void unlock __P((void)); /* Delete previously-created lock file */ -int daemon __P((int, int)); /* Detach us from terminal session */ -void logwtmp __P((const char *, const char *, const char *)); +u_int32_t GetMask(u_int32_t); /* Get appropriate netmask for address */ +int lock(char *); /* Create lock file for device */ +void unlock(void); /* Delete previously-created lock file */ +int daemon(int, int); /* Detach us from terminal session */ +void logwtmp(const char *, const char *, const char *); /* Write entry to wtmp file */ -int get_host_seed __P((void)); /* Get host-dependent random number seed */ +int get_host_seed(void); /* Get host-dependent random number seed */ #ifdef PPP_FILTER -int set_filters __P((struct bpf_program *pass, struct bpf_program *active)); +int set_filters(struct bpf_program *pass, struct bpf_program *active); /* Set filter programs in kernel */ #endif /* Procedures exported from options.c */ -int parse_args __P((int argc, char **argv)); +int parse_args(int argc, char **argv); /* Parse options from arguments given */ -void usage __P((void)); /* Print a usage message */ +void usage(void); /* Print a usage message */ int options_from_file __P((char *filename, int must_exist, int check_prot, int privileged)); /* Parse options from an options file */ -int options_from_user __P((void)); /* Parse options from user's .ppprc */ -int options_for_tty __P((void)); /* Parse options from /etc/ppp/options.tty */ -void scan_args __P((int argc, char **argv)); +int options_from_user(void); /* Parse options from user's .ppprc */ +int options_for_tty(void); /* Parse options from /etc/ppp/options.tty */ +void scan_args(int argc, char **argv); /* Look for tty name in command-line args */ -int getword __P((FILE *f, char *word, int *newlinep, char *filename)); +int getword(FILE *f, char *word, int *newlinep, char *filename); /* Read a word from a file */ -void option_error __P((char *fmt, ...)); +void option_error(char *fmt, ...); /* Print an error message about an option */ /* diff --git a/usr.sbin/pppd/pppstats/pppstats.c b/usr.sbin/pppd/pppstats/pppstats.c index 5e23b402642..aa8b67fc65e 100644 --- a/usr.sbin/pppd/pppstats/pppstats.c +++ b/usr.sbin/pppd/pppstats/pppstats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pppstats.c,v 1.6 2001/08/09 08:45:31 deraadt Exp $ */ +/* $OpenBSD: pppstats.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * print PPP statistics: @@ -37,7 +37,7 @@ #if 0 static char rcsid[] = "Id: pppstats.c,v 1.22 1998/03/31 23:48:03 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: pppstats.c,v 1.6 2001/08/09 08:45:31 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: pppstats.c,v 1.7 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -69,12 +69,12 @@ int s; /* socket file descriptor */ int signalled; /* set if alarm goes off "early" */ char interface[IFNAMSIZ]; -void usage __P((void)); -void catchalarm __P((int)); -void get_ppp_stats __P((struct ppp_stats *)); -void get_ppp_cstats __P((struct ppp_comp_stats *)); -void intpr __P((void)); -int main __P((int, char *argv[])); +void usage(void); +void catchalarm(int); +void get_ppp_stats(struct ppp_stats *); +void get_ppp_cstats(struct ppp_comp_stats *); +void intpr(void); +int main(int, char *argv[]); void usage() diff --git a/usr.sbin/pppd/sys-bsd.c b/usr.sbin/pppd/sys-bsd.c index 84450cbfced..8c079afb03d 100644 --- a/usr.sbin/pppd/sys-bsd.c +++ b/usr.sbin/pppd/sys-bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys-bsd.c,v 1.15 2001/06/23 15:34:02 lebel Exp $ */ +/* $OpenBSD: sys-bsd.c,v 1.16 2002/02/16 21:28:07 millert Exp $ */ /* * sys-bsd.c - System-dependent procedures for setting up @@ -26,7 +26,7 @@ #if 0 static char rcsid[] = "Id: sys-bsd.c,v 1.31 1998/04/02 12:04:19 paulus Exp $"; #else -static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.15 2001/06/23 15:34:02 lebel Exp $"; +static char rcsid[] = "$OpenBSD: sys-bsd.c,v 1.16 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -111,8 +111,8 @@ static u_int32_t default_route_gateway; /* gateway addr for default route */ static u_int32_t proxy_arp_addr; /* remote addr for proxy arp */ /* Prototypes for procedures local to this file. */ -static int dodefaultroute __P((u_int32_t, int)); -static int get_ether_addr __P((u_int32_t, struct sockaddr_dl *)); +static int dodefaultroute(u_int32_t, int); +static int get_ether_addr(u_int32_t, struct sockaddr_dl *); /* diff --git a/usr.sbin/pppd/upap.c b/usr.sbin/pppd/upap.c index 20deee29f38..edb2d67f61a 100644 --- a/usr.sbin/pppd/upap.c +++ b/usr.sbin/pppd/upap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $ */ +/* $OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * upap.c - User/Password Authentication Protocol. @@ -23,7 +23,7 @@ #if 0 static char rcsid[] = "Id: upap.c,v 1.11 1997/04/30 05:59:56 paulus Exp"; #else -static char rcsid[] = "$OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $"; +static char rcsid[] = "$OpenBSD: upap.c,v 1.7 2002/02/16 21:28:07 millert Exp $"; #endif #endif @@ -43,13 +43,13 @@ static char rcsid[] = "$OpenBSD: upap.c,v 1.6 1998/01/17 20:30:30 millert Exp $" /* * Protocol entry points. */ -static void upap_init __P((int)); -static void upap_lowerup __P((int)); -static void upap_lowerdown __P((int)); -static void upap_input __P((int, u_char *, int)); -static void upap_protrej __P((int)); +static void upap_init(int); +static void upap_lowerup(int); +static void upap_lowerdown(int); +static void upap_input(int, u_char *, int); +static void upap_protrej(int); static int upap_printpkt __P((u_char *, int, - void (*) __P((void *, char *, ...)), void *)); + void (*)(void *, char *, ...), void *)); struct protent pap_protent = { PPP_PAP, @@ -71,13 +71,13 @@ struct protent pap_protent = { upap_state upap[NUM_PPP]; /* UPAP state; one for each unit */ -static void upap_timeout __P((void *)); -static void upap_reqtimeout __P((void *)); -static void upap_rauthreq __P((upap_state *, u_char *, int, int)); -static void upap_rauthack __P((upap_state *, u_char *, int, int)); -static void upap_rauthnak __P((upap_state *, u_char *, int, int)); -static void upap_sauthreq __P((upap_state *)); -static void upap_sresp __P((upap_state *, int, int, char *, int)); +static void upap_timeout(void *); +static void upap_reqtimeout(void *); +static void upap_rauthreq(upap_state *, u_char *, int, int); +static void upap_rauthack(upap_state *, u_char *, int, int); +static void upap_rauthnak(upap_state *, u_char *, int, int); +static void upap_sauthreq(upap_state *); +static void upap_sresp(upap_state *, int, int, char *, int); /* @@ -557,7 +557,7 @@ static int upap_printpkt(p, plen, printer, arg) u_char *p; int plen; - void (*printer) __P((void *, char *, ...)); + void (*printer)(void *, char *, ...); void *arg; { int code, id, len; diff --git a/usr.sbin/pppd/upap.h b/usr.sbin/pppd/upap.h index f95a93a8ddb..86cfa5ef67c 100644 --- a/usr.sbin/pppd/upap.h +++ b/usr.sbin/pppd/upap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: upap.h,v 1.4 1997/09/05 04:32:46 millert Exp $ */ +/* $OpenBSD: upap.h,v 1.5 2002/02/16 21:28:07 millert Exp $ */ /* * upap.h - User/Password Authentication Protocol definitions. @@ -83,7 +83,7 @@ typedef struct upap_state { extern upap_state upap[]; -void upap_authwithpeer __P((int, char *, char *)); -void upap_authpeer __P((int)); +void upap_authwithpeer(int, char *, char *); +void upap_authpeer(int); extern struct protent pap_protent; diff --git a/usr.sbin/pppoe/client.c b/usr.sbin/pppoe/client.c index 30167f802f1..0d022c82eac 100644 --- a/usr.sbin/pppoe/client.c +++ b/usr.sbin/pppoe/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.12 2001/11/17 19:54:57 deraadt Exp $ */ +/* $OpenBSD: client.c,v 1.13 2002/02/16 21:28:07 millert Exp $ */ /* * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net @@ -68,7 +68,7 @@ int pppfd, client_state; static int getpackets __P((int, char *, char *, struct ether_addr *, struct ether_addr *)); -static int send_padi __P((int, struct ether_addr *, u_int8_t *)); +static int send_padi(int, struct ether_addr *, u_int8_t *); static int send_padr __P((int, char *, struct ether_addr *, struct ether_addr *, struct ether_header *, struct pppoe_header *, struct tag_list *)); @@ -81,10 +81,10 @@ static int recv_pads __P((int, char *, char *, struct ether_addr *, static int recv_padt __P((int, struct ether_addr *, struct ether_addr *, struct ether_header *, struct pppoe_header *, u_long, u_int8_t *)); -void timer_handler __P((int)); -int timer_set __P((u_int)); -int timer_clr __P((void)); -int timer_hit __P((void)); +void timer_handler(int); +int timer_set(u_int); +int timer_clr(void); +int timer_hit(void); int client_mode(bfd, sysname, srvname, myea) diff --git a/usr.sbin/pppoe/common.c b/usr.sbin/pppoe/common.c index 0de402e942f..195e942cd42 100644 --- a/usr.sbin/pppoe/common.c +++ b/usr.sbin/pppoe/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.5 2001/07/09 07:05:04 deraadt Exp $ */ +/* $OpenBSD: common.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net @@ -61,7 +61,7 @@ #define PPP_PROG "/usr/sbin/ppp" -void debugv __P((char *, struct iovec *, int)); +void debugv(char *, struct iovec *, int); int runppp(bpffd, sysname) diff --git a/usr.sbin/pppoe/pppoe.c b/usr.sbin/pppoe/pppoe.c index 6c6597bf98e..cc3451bb458 100644 --- a/usr.sbin/pppoe/pppoe.c +++ b/usr.sbin/pppoe/pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pppoe.c,v 1.6 2002/01/10 18:21:38 jason Exp $ */ +/* $OpenBSD: pppoe.c,v 1.7 2002/02/16 21:28:07 millert Exp $ */ /* * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net @@ -59,12 +59,12 @@ int option_verbose = 0; u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -int main __P((int, char **)); -void usage __P((void)); -int getifhwaddr __P((char *, char *, struct ether_addr *)); -int setupfilter __P((char *, struct ether_addr *, int)); -void child_handler __P((int)); -int signal_init __P((void)); +int main(int, char **); +void usage(void); +int getifhwaddr(char *, char *, struct ether_addr *); +int setupfilter(char *, struct ether_addr *, int); +void child_handler(int); +int signal_init(void); int main(int argc, char **argv) { diff --git a/usr.sbin/pppoe/pppoe.h b/usr.sbin/pppoe/pppoe.h index 7d5f5397eb6..238a9e236a8 100644 --- a/usr.sbin/pppoe/pppoe.h +++ b/usr.sbin/pppoe/pppoe.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pppoe.h,v 1.2 2001/04/24 05:02:34 jason Exp $ */ +/* $OpenBSD: pppoe.h,v 1.3 2002/02/16 21:28:07 millert Exp $ */ /* * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net @@ -89,8 +89,8 @@ struct pppoe_tag { extern int option_verbose; extern u_char etherbroadcastaddr[]; -void server_mode __P((int, char *, char *, struct ether_addr *)); -int client_mode __P((int, char *, char *, struct ether_addr *)); +void server_mode(int, char *, char *, struct ether_addr *); +int client_mode(int, char *, char *, struct ether_addr *); struct tag_list { LIST_HEAD(, tag_node) thelist; @@ -104,14 +104,14 @@ struct tag_node { int _ref; }; -void tag_init __P((struct tag_list *)); -void tag_show __P((struct tag_list *)); -void tag_destroy __P((struct tag_list *)); -struct tag_node *tag_lookup __P((struct tag_list *, u_int16_t, int)); -int tag_add __P((struct tag_list *, u_int16_t, u_int16_t, u_int8_t *)); -int tag_pkt __P((struct tag_list *, u_long, u_int8_t *)); -void tag_hton __P((struct tag_list *)); -void tag_ntoh __P((struct tag_list *)); +void tag_init(struct tag_list *); +void tag_show(struct tag_list *); +void tag_destroy(struct tag_list *); +struct tag_node *tag_lookup(struct tag_list *, u_int16_t, int); +int tag_add(struct tag_list *, u_int16_t, u_int16_t, u_int8_t *); +int tag_pkt(struct tag_list *, u_long, u_int8_t *); +void tag_hton(struct tag_list *); +void tag_ntoh(struct tag_list *); struct pppoe_session { LIST_ENTRY(pppoe_session) s_next; @@ -128,19 +128,19 @@ struct pppoe_session_master { extern struct pppoe_session_master session_master; -void session_init __P((void)); -void session_destroy __P((struct pppoe_session *)); -struct pppoe_session *session_new __P((struct ether_addr *)); -struct pppoe_session *session_find_eaid __P((struct ether_addr *, u_int16_t)); -struct pppoe_session *session_find_fd __P((int)); +void session_init(void); +void session_destroy(struct pppoe_session *); +struct pppoe_session *session_new(struct ether_addr *); +struct pppoe_session *session_find_eaid(struct ether_addr *, u_int16_t); +struct pppoe_session *session_find_fd(int); -int runppp __P((int, char *)); -int bpf_to_ppp __P((int, u_long, u_int8_t *)); +int runppp(int, char *); +int bpf_to_ppp(int, u_long, u_int8_t *); int ppp_to_bpf __P((int, int, struct ether_addr *, struct ether_addr *, u_int16_t)); -int send_padt __P((int, struct ether_addr *, struct ether_addr *, u_int16_t)); +int send_padt(int, struct ether_addr *, struct ether_addr *, u_int16_t); void recv_debug __P((int, struct ether_addr *, struct ether_header *, struct pppoe_header *, u_long, u_int8_t *)); -void debug_packet __P((u_int8_t *, int)); +void debug_packet(u_int8_t *, int); -u_int32_t cookie_bake __P((void)); +u_int32_t cookie_bake(void); diff --git a/usr.sbin/pppoe/server.c b/usr.sbin/pppoe/server.c index 1c61b1e7274..d861f306af7 100644 --- a/usr.sbin/pppoe/server.c +++ b/usr.sbin/pppoe/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.5 2001/11/29 16:49:09 miod Exp $ */ +/* $OpenBSD: server.c,v 1.6 2002/02/16 21:28:07 millert Exp $ */ /* * Copyright (c) 2000 Network Security Technologies, Inc. http://www.netsec.net @@ -62,7 +62,7 @@ static char ac_cookie_key[8]; -static void getpackets __P((int, char *, struct ether_addr *)); +static void getpackets(int, char *, struct ether_addr *); static void recv_padi __P((int, struct ether_addr *, struct ether_header *, struct pppoe_header *, u_long, u_int8_t *)); @@ -75,9 +75,9 @@ static void send_pado __P((int, struct ether_addr *, struct ether_header *, struct pppoe_header *, u_long, u_int8_t *)); static void send_pads __P((int, char *, struct ether_addr *, struct ether_header *, struct pppoe_header *, u_long, u_int8_t *)); -static void key_gen __P((void)); -static u_int8_t *key_make __P((u_int8_t *, int, u_int8_t *, int)); -static int key_cmp __P((u_int8_t *, int, u_int8_t *, int, u_int8_t *, int)); +static void key_gen(void); +static u_int8_t *key_make(u_int8_t *, int, u_int8_t *, int); +static int key_cmp(u_int8_t *, int, u_int8_t *, int, u_int8_t *, int); void server_mode(bpffd, sysname, srvname, ea) diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index e215040bf82..d1f0305a5c4 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.28 2002/01/19 00:03:29 millert Exp $ */ +/* $OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.28 2002/01/19 00:03:29 millert Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.29 2002/02/16 21:28:07 millert Exp $"; #endif #endif /* not lint */ @@ -121,28 +121,28 @@ kvm_t *kd; return (0); \ } -void filemode __P((void)); -int getfiles __P((char **, int *)); +void filemode(void); +int getfiles(char **, int *); struct mount * - getmnt __P((struct mount *)); + getmnt(struct mount *); struct e_vnode * - kinfo_vnodes __P((int *)); + kinfo_vnodes(int *); struct e_vnode * - loadvnodes __P((int *)); -void mount_print __P((struct mount *)); -void nfs_header __P((void)); -int nfs_print __P((struct vnode *)); -void swapmode __P((void)); -void ttymode __P((void)); -void ttyprt __P((struct tty *)); -void ufs_header __P((void)); -int ufs_print __P((struct vnode *)); -void ext2fs_header __P((void)); -int ext2fs_print __P((struct vnode *)); -void usage __P((void)); -void vnode_header __P((void)); -void vnode_print __P((struct vnode *, struct vnode *)); -void vnodemode __P((void)); + loadvnodes(int *); +void mount_print(struct mount *); +void nfs_header(void); +int nfs_print(struct vnode *); +void swapmode(void); +void ttymode(void); +void ttyprt(struct tty *); +void ufs_header(void); +int ufs_print(struct vnode *); +void ext2fs_header(void); +int ext2fs_print(struct vnode *); +void usage(void); +void vnode_header(void); +void vnode_print(struct vnode *, struct vnode *); +void vnodemode(void); int main(argc, argv) diff --git a/usr.sbin/pwd_mkdb/pwd_mkdb.c b/usr.sbin/pwd_mkdb/pwd_mkdb.c index e154334725f..1de1d15d0de 100644 --- a/usr.sbin/pwd_mkdb/pwd_mkdb.c +++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pwd_mkdb.c,v 1.26 2001/09/17 14:30:39 mpech Exp $ */ +/* $OpenBSD: pwd_mkdb.c,v 1.27 2002/02/16 21:28:08 millert Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -45,7 +45,7 @@ static char copyright[] = #if 0 static char sccsid[] = "from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94"; #else -static char *rcsid = "$OpenBSD: pwd_mkdb.c,v 1.26 2001/09/17 14:30:39 mpech Exp $"; +static char *rcsid = "$OpenBSD: pwd_mkdb.c,v 1.27 2002/02/16 21:28:08 millert Exp $"; #endif #endif /* not lint */ @@ -88,15 +88,15 @@ static char *basedir; /* dir holding master.passwd */ static int clean; /* what to remove on cleanup */ static int hasyp; /* are we running YP? */ -void cleanup __P((void)); -void error __P((char *)); -void errorx __P((char *)); -void cp __P((char *, char *, mode_t)); -void mv __P((char *, char *)); -int scan __P((FILE *, struct passwd *, int *)); -void usage __P((void)); -char *changedir __P((char *path, char *dir)); -void db_store __P((FILE *, FILE *, DB *, DB *,struct passwd *, int, char *, uid_t)); +void cleanup(void); +void error(char *); +void errorx(char *); +void cp(char *, char *, mode_t); +void mv(char *, char *); +int scan(FILE *, struct passwd *, int *); +void usage(void); +char *changedir(char *path, char *dir); +void db_store(FILE *, FILE *, DB *, DB *,struct passwd *, int, char *, uid_t); int main(argc, argv) diff --git a/usr.sbin/rarpd/arptab.c b/usr.sbin/rarpd/arptab.c index 29d7107ad8f..de88496e9b6 100644 --- a/usr.sbin/rarpd/arptab.c +++ b/usr.sbin/rarpd/arptab.c @@ -96,8 +96,8 @@ struct { char m_space[512]; } m_rtmsg; -int arptab_set __P((u_char *, u_int32_t)); -int rtmsg __P((int)); +int arptab_set(u_char *, u_int32_t); +int rtmsg(int); /* * Set an individual arp entry diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index ca425c15aeb..e86594082c4 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rarpd.c,v 1.31 2001/12/01 23:27:23 miod Exp $ */ +/* $OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $ */ /* $NetBSD: rarpd.c,v 1.25 1998/04/23 02:48:33 mrg Exp $ */ /* @@ -28,7 +28,7 @@ char copyright[] = #endif /* not lint */ #ifndef lint -static char rcsid[] = "$OpenBSD: rarpd.c,v 1.31 2001/12/01 23:27:23 miod Exp $"; +static char rcsid[] = "$OpenBSD: rarpd.c,v 1.32 2002/02/16 21:28:08 millert Exp $"; #endif @@ -89,22 +89,22 @@ struct if_info { */ struct if_info *iflist; -int rarp_open __P((char *)); -void init_one __P((char *)); -void init_all __P((void)); -void rarp_loop __P((void)); -void lookup_addrs __P((char *, struct if_info *)); -void usage __P((void)); -void rarp_process __P((struct if_info *, u_char *)); +int rarp_open(char *); +void init_one(char *); +void init_all(void); +void rarp_loop(void); +void lookup_addrs(char *, struct if_info *); +void usage(void); +void rarp_process(struct if_info *, u_char *); void rarp_reply __P((struct if_info *, struct if_addr *, struct ether_header *, u_int32_t, struct hostent *)); -void update_arptab __P((u_char *, u_int32_t)); -void err __P((int, const char *,...)); -void debug __P((const char *,...)); -u_int32_t ipaddrtonetmask __P((u_int32_t)); +void update_arptab(u_char *, u_int32_t); +void err(int, const char *,...); +void debug(const char *,...); +u_int32_t ipaddrtonetmask(u_int32_t); #ifdef REQUIRE_TFTPBOOT -int rarp_bootable __P((u_int32_t)); +int rarp_bootable(u_int32_t); #endif int aflag = 0; /* listen on "all" interfaces */ @@ -835,7 +835,7 @@ lookup_addrs(ifname, p) #endif } -int arptab_set __P((u_char *eaddr, u_int32_t host)); +int arptab_set(u_char *eaddr, u_int32_t host); /* * Poke the kernel arp tables with the ethernet/ip address combinataion diff --git a/usr.sbin/rbootd/defs.h b/usr.sbin/rbootd/defs.h index f02a81c9abb..7eba93dedd7 100644 --- a/usr.sbin/rbootd/defs.h +++ b/usr.sbin/rbootd/defs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: defs.h,v 1.3 2001/12/01 23:27:23 miod Exp $ */ +/* $OpenBSD: defs.h,v 1.4 2002/02/16 21:28:08 millert Exp $ */ /* $NetBSD: defs.h,v 1.5 1995/10/06 05:12:14 thorpej Exp $ */ /* @@ -150,36 +150,36 @@ extern RMPCONN *RmpConns; /* list of active connections */ extern u_int8_t RmpMcastAddr[]; /* RMP multicast address */ -void AddConn __P((RMPCONN *)); -int BootDone __P((RMPCONN *)); -void BpfClose __P((void)); -char *BpfGetIntfName __P((char **)); -int BpfOpen __P((void)); -int BpfRead __P((RMPCONN *, int)); -int BpfWrite __P((RMPCONN *)); -void DebugOff __P((int)); -void DebugOn __P((int)); -void DispPkt __P((RMPCONN *, int)); -void DoTimeout __P((void)); -void DspFlnm __P((u_int, char *)); -void Exit __P((int)); -CLIENT *FindClient __P((RMPCONN *)); -RMPCONN *FindConn __P((RMPCONN *)); -void FreeClients __P((void)); -void FreeConn __P((RMPCONN *)); -void FreeConns __P((void)); -int GetBootFiles __P((void)); -char *GetEtherAddr __P((u_int8_t *)); -CLIENT *NewClient __P((u_int8_t *)); -RMPCONN *NewConn __P((RMPCONN *)); -char *NewStr __P((char *)); -u_int8_t *ParseAddr __P((char *)); -int ParseConfig __P((void)); -void ProcessPacket __P((RMPCONN *, CLIENT *)); -void ReConfig __P((int)); -void RemoveConn __P((RMPCONN *)); -int SendBootRepl __P((struct rmp_packet *, RMPCONN *, char *[])); -int SendFileNo __P((struct rmp_packet *, RMPCONN *, char *[])); -int SendPacket __P((RMPCONN *)); -int SendReadRepl __P((RMPCONN *)); -int SendServerID __P((RMPCONN *)); +void AddConn(RMPCONN *); +int BootDone(RMPCONN *); +void BpfClose(void); +char *BpfGetIntfName(char **); +int BpfOpen(void); +int BpfRead(RMPCONN *, int); +int BpfWrite(RMPCONN *); +void DebugOff(int); +void DebugOn(int); +void DispPkt(RMPCONN *, int); +void DoTimeout(void); +void DspFlnm(u_int, char *); +void Exit(int); +CLIENT *FindClient(RMPCONN *); +RMPCONN *FindConn(RMPCONN *); +void FreeClients(void); +void FreeConn(RMPCONN *); +void FreeConns(void); +int GetBootFiles(void); +char *GetEtherAddr(u_int8_t *); +CLIENT *NewClient(u_int8_t *); +RMPCONN *NewConn(RMPCONN *); +char *NewStr(char *); +u_int8_t *ParseAddr(char *); +int ParseConfig(void); +void ProcessPacket(RMPCONN *, CLIENT *); +void ReConfig(int); +void RemoveConn(RMPCONN *); +int SendBootRepl(struct rmp_packet *, RMPCONN *, char *[]); +int SendFileNo(struct rmp_packet *, RMPCONN *, char *[]); +int SendPacket(RMPCONN *); +int SendReadRepl(RMPCONN *); +int SendServerID(RMPCONN *); diff --git a/usr.sbin/repquota/repquota.c b/usr.sbin/repquota/repquota.c index b662a753717..0b3c9a357b8 100644 --- a/usr.sbin/repquota/repquota.c +++ b/usr.sbin/repquota/repquota.c @@ -42,7 +42,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)repquota.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: repquota.c,v 1.14 2001/01/15 05:19:10 angelos Exp $"; +static char *rcsid = "$Id: repquota.c,v 1.15 2002/02/16 21:28:08 millert Exp $"; #endif /* not lint */ /* @@ -78,10 +78,10 @@ uid_t highid[MAXQUOTAS]; /* highest addid()'ed identifier per type */ int vflag; /* verbose */ int aflag; /* all file systems */ -void usage __P((void)); -int repquota __P((struct fstab *, int, char *)); -int hasquota __P((struct fstab *, int, char **)); -int oneof __P((char *, char *[], int)); +void usage(void); +int repquota(struct fstab *, int, char *); +int hasquota(struct fstab *, int, char **); +int oneof(char *, char *[], int); int main(argc, argv) diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c index 01d10649558..c2bd954dfcd 100644 --- a/usr.sbin/rip6query/rip6query.c +++ b/usr.sbin/rip6query/rip6query.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rip6query.c,v 1.5 2001/11/17 19:49:40 deraadt Exp $ */ +/* $OpenBSD: rip6query.c,v 1.6 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: rip6query.c,v 1.15 2001/11/16 07:01:21 itojun Exp $ */ /* @@ -64,11 +64,11 @@ struct rip6 *ripbuf; #define RIPSIZE(n) (sizeof(struct rip6) + (n-1) * sizeof(struct netinfo6)) -int main __P((int, char **)); -static void usage __P((void)); -static void sigalrm_handler __P((int)); -static const char *sa_n2a __P((struct sockaddr *)); -static const char *inet6_n2a __P((struct in6_addr *)); +int main(int, char **); +static void usage(void); +static void sigalrm_handler(int); +static const char *sa_n2a(struct sockaddr *); +static const char *inet6_n2a(struct in6_addr *); int main(argc, argv) diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c index ec706e35fa6..141eef14210 100644 --- a/usr.sbin/rmt/rmt.c +++ b/usr.sbin/rmt/rmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmt.c,v 1.6 2000/07/20 01:41:13 jason Exp $ */ +/* $OpenBSD: rmt.c,v 1.7 2002/02/16 21:28:08 millert Exp $ */ /* * Copyright (c) 1983 Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rmt.c 5.6 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id: rmt.c,v 1.6 2000/07/20 01:41:13 jason Exp $"; +static char rcsid[] = "$Id: rmt.c,v 1.7 2002/02/16 21:28:08 millert Exp $"; #endif /* not lint */ /* @@ -75,9 +75,9 @@ FILE *debug; #define DEBUG1(f,a) if (debug) fprintf(debug, f, a) #define DEBUG2(f,a1,a2) if (debug) fprintf(debug, f, a1, a2) -char *checkbuf __P((char *, int)); -void getstring __P((char *)); -void error __P((int)); +char *checkbuf(char *, int); +void getstring(char *); +void error(int); int main(argc, argv) diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index 48ed2e12590..c0243a429e9 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.22 2002/01/11 03:51:08 itojun Exp $ */ +/* $OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: route6d.c,v 1.73 2001/09/05 01:12:34 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #if 0 -static char _rcsid[] = "$OpenBSD: route6d.c,v 1.22 2002/01/11 03:51:08 itojun Exp $"; +static char _rcsid[] = "$OpenBSD: route6d.c,v 1.23 2002/02/16 21:28:08 millert Exp $"; #endif #include <stdio.h> @@ -212,66 +212,66 @@ volatile sig_atomic_t seenusr1; #define RRTF_SENDANYWAY 0x40000000 #define RRTF_CHANGED 0x80000000 -int main __P((int, char **)); -void sighandler __P((int)); -void ripalarm __P((void)); -void riprecv __P((void)); -void ripsend __P((struct ifc *, struct sockaddr_in6 *, int)); -int out_filter __P((struct riprt *, struct ifc *)); -void init __P((void)); -void sockopt __P((struct ifc *)); -void ifconfig __P((void)); -void ifconfig1 __P((const char *, const struct sockaddr *, struct ifc *, int)); -void rtrecv __P((void)); +int main(int, char **); +void sighandler(int); +void ripalarm(void); +void riprecv(void); +void ripsend(struct ifc *, struct sockaddr_in6 *, int); +int out_filter(struct riprt *, struct ifc *); +void init(void); +void sockopt(struct ifc *); +void ifconfig(void); +void ifconfig1(const char *, const struct sockaddr *, struct ifc *, int); +void rtrecv(void); int rt_del __P((const struct sockaddr_in6 *, const struct sockaddr_in6 *, const struct sockaddr_in6 *)); int rt_deladdr __P((struct ifc *, const struct sockaddr_in6 *, const struct sockaddr_in6 *)); -void filterconfig __P((void)); -int getifmtu __P((int)); -const char *rttypes __P((struct rt_msghdr *)); -const char *rtflags __P((struct rt_msghdr *)); -const char *ifflags __P((int)); -int ifrt __P((struct ifc *, int)); -void ifrt_p2p __P((struct ifc *, int)); -void applymask __P((struct in6_addr *, struct in6_addr *)); -void applyplen __P((struct in6_addr *, int)); -void ifrtdump __P((int)); -void ifdump __P((int)); -void ifdump0 __P((FILE *, const struct ifc *)); -void rtdump __P((int)); -void rt_entry __P((struct rt_msghdr *, int)); -void rtdexit __P((void)); +void filterconfig(void); +int getifmtu(int); +const char *rttypes(struct rt_msghdr *); +const char *rtflags(struct rt_msghdr *); +const char *ifflags(int); +int ifrt(struct ifc *, int); +void ifrt_p2p(struct ifc *, int); +void applymask(struct in6_addr *, struct in6_addr *); +void applyplen(struct in6_addr *, int); +void ifrtdump(int); +void ifdump(int); +void ifdump0(FILE *, const struct ifc *); +void rtdump(int); +void rt_entry(struct rt_msghdr *, int); +void rtdexit(void); void riprequest __P((struct ifc *, struct netinfo6 *, int, struct sockaddr_in6 *)); -void ripflush __P((struct ifc *, struct sockaddr_in6 *)); -void sendrequest __P((struct ifc *)); -int sin6mask2len __P((const struct sockaddr_in6 *)); -int mask2len __P((const struct in6_addr *, int)); -int sendpacket __P((struct sockaddr_in6 *, int)); -int addroute __P((struct riprt *, const struct in6_addr *, struct ifc *)); -int delroute __P((struct netinfo6 *, struct in6_addr *)); -struct in6_addr *getroute __P((struct netinfo6 *, struct in6_addr *)); -void krtread __P((int)); -int tobeadv __P((struct riprt *, struct ifc *)); -char *allocopy __P((char *)); -char *hms __P((void)); -const char *inet6_n2p __P((const struct in6_addr *)); -struct ifac *ifa_match __P((const struct ifc *, const struct in6_addr *, int)); -struct in6_addr *plen2mask __P((int)); -struct riprt *rtsearch __P((struct netinfo6 *, struct riprt **)); -int ripinterval __P((int)); -time_t ripsuptrig __P((void)); -void fatal __P((const char *, ...)) +void ripflush(struct ifc *, struct sockaddr_in6 *); +void sendrequest(struct ifc *); +int sin6mask2len(const struct sockaddr_in6 *); +int mask2len(const struct in6_addr *, int); +int sendpacket(struct sockaddr_in6 *, int); +int addroute(struct riprt *, const struct in6_addr *, struct ifc *); +int delroute(struct netinfo6 *, struct in6_addr *); +struct in6_addr *getroute(struct netinfo6 *, struct in6_addr *); +void krtread(int); +int tobeadv(struct riprt *, struct ifc *); +char *allocopy(char *); +char *hms(void); +const char *inet6_n2p(const struct in6_addr *); +struct ifac *ifa_match(const struct ifc *, const struct in6_addr *, int); +struct in6_addr *plen2mask(int); +struct riprt *rtsearch(struct netinfo6 *, struct riprt **); +int ripinterval(int); +time_t ripsuptrig(void); +void fatal(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -void trace __P((int, const char *, ...)) +void trace(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3))); -void tracet __P((int, const char *, ...)) +void tracet(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3))); -unsigned int if_maxindex __P((void)); -struct ifc *ifc_find __P((char *)); -struct iff *iff_find __P((struct ifc *, int)); -void setindex2ifc __P((int, struct ifc *)); +unsigned int if_maxindex(void); +struct ifc *ifc_find(char *); +struct iff *iff_find(struct ifc *, int); +void setindex2ifc(int, struct ifc *); #define MALLOC(type) ((type *)malloc(sizeof(type))) diff --git a/usr.sbin/rpc.bootparamd/bootparamd.c b/usr.sbin/rpc.bootparamd/bootparamd.c index dee9ee9d1e4..9c5fce5d776 100644 --- a/usr.sbin/rpc.bootparamd/bootparamd.c +++ b/usr.sbin/rpc.bootparamd/bootparamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bootparamd.c,v 1.10 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: bootparamd.c,v 1.11 2002/02/16 21:28:08 millert Exp $ */ /* * This code is not copyright, and is placed in the public domain. @@ -31,7 +31,7 @@ static char askname[MAX_MACHINE_NAME]; static char path[MAX_PATH_LEN]; static char domain_name[MAX_MACHINE_NAME]; -extern void bootparamprog_1 __P((struct svc_req *, SVCXPRT *)); +extern void bootparamprog_1(struct svc_req *, SVCXPRT *); int _rpcsvcdirty = 0; int _rpcpmstart = 0; diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index 51aac43f0b6..3be8f52be43 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lockd.c,v 1.4 1997/09/17 23:09:36 deraadt Exp $ */ +/* $OpenBSD: lockd.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */ /* * Copyright (c) 1995 @@ -49,8 +49,8 @@ #include "lockd.h" -extern void nlm_prog_1 __P((struct svc_req, register SVCXPRT)); -extern void nlm_prog_3 __P((struct svc_req, register SVCXPRT)); +extern void nlm_prog_1(struct svc_req, register SVCXPRT); +extern void nlm_prog_3(struct svc_req, register SVCXPRT); int debug_level = 0; /* Zero means no debugging syslog() calls */ diff --git a/usr.sbin/rpc.pcnfsd/paths.h b/usr.sbin/rpc.pcnfsd/paths.h index 14336ad057b..cb9f4250054 100644 --- a/usr.sbin/rpc.pcnfsd/paths.h +++ b/usr.sbin/rpc.pcnfsd/paths.h @@ -1,4 +1,4 @@ -/* $OpenBSD: paths.h,v 1.2 2001/08/19 19:16:12 ericj Exp $ */ +/* $OpenBSD: paths.h,v 1.3 2002/02/16 21:28:08 millert Exp $ */ /* $NetBSD: paths.h,v 1.1 1995/08/14 19:50:09 gwr Exp $ */ #define SPOOLDIR "/export/pcnfs" @@ -9,17 +9,17 @@ pr_list printers; pr_queue queue; /* pcnfsd_misc.c */ -void scramble __P((char *, char *)); -void wlogin __P((char *, struct svc_req *)); -struct passwd *get_password __P((char *)); +void scramble(char *, char *); +void wlogin(char *, struct svc_req *); +struct passwd *get_password(char *); /* pcnfsd_print.c */ -void *grab __P((int)); -FILE *su_popen __P((char *, char *, int)); -int su_pclose __P((FILE *)); -int build_pr_list __P((void)); -pirstat build_pr_queue __P((printername, username, int, int *, int *)); -psrstat pr_start2 __P((char *, char *, char *, char *, char *, char **)); -pcrstat pr_cancel __P((char *, char *, char *)); +void *grab(int); +FILE *su_popen(char *, char *, int); +int su_pclose(FILE *); +int build_pr_list(void); +pirstat build_pr_queue(printername, username, int, int *, int *); +psrstat pr_start2(char *, char *, char *, char *, char *, char **); +pcrstat pr_cancel(char *, char *, char *); pirstat get_pr_status __P((printername, bool_t *, bool_t *, int *, bool_t *, char *)); diff --git a/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c b/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c index 8c08b87323c..6e03d4e99ae 100644 --- a/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c +++ b/usr.sbin/rpc.pcnfsd/pcnfsd_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcnfsd_v2.c,v 1.3 2001/08/19 19:16:12 ericj Exp $ */ +/* $OpenBSD: pcnfsd_v2.c,v 1.4 2002/02/16 21:28:08 millert Exp $ */ /* $NetBSD: pcnfsd_v2.c,v 1.4 1995/08/14 19:50:10 gwr Exp $ */ /* RE_SID: @(%)/usr/dosnfs/shades_SCCS/unix/pcnfsd/v2/src/SCCS/s.pcnfsd_v2.c 1.2 91/12/18 13:26:13 SMI */ @@ -22,7 +22,7 @@ #include "pcnfsd.h" #include "paths.h" -static void fillin_extra_groups __P((char *, u_int, int *, u_int *)); +static void fillin_extra_groups(char *, u_int, int *, u_int *); static char no_comment[] = "No comment"; static char not_supported[] = "Not supported"; diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c index 9e187fcc4b1..aac38b00b9c 100644 --- a/usr.sbin/rtadvd/advcap.c +++ b/usr.sbin/rtadvd/advcap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: advcap.c,v 1.4 2001/02/04 06:22:05 itojun Exp $ */ +/* $OpenBSD: advcap.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: advcap.c,v 1.5 2001/02/01 09:12:08 jinmei Exp $ */ /* @@ -91,15 +91,15 @@ static char *remotefile; extern char *conffile; -int tgetent __P((char *, char *)); -int getent __P((char *, char *, char *)); -int tnchktc __P((void)); -int tnamatch __P((char *)); -static char *tskip __P((char *)); -long long tgetnum __P((char *)); -int tgetflag __P((char *)); -char *tgetstr __P((char *, char **)); -static char *tdecode __P((char *, char **)); +int tgetent(char *, char *); +int getent(char *, char *, char *); +int tnchktc(void); +int tnamatch(char *); +static char *tskip(char *); +long long tgetnum(char *); +int tgetflag(char *); +char *tgetstr(char *, char **); +static char *tdecode(char *, char **); /* * Get an entry for terminal name in buffer bp, diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h index 34c3fa17d85..3c6ad980db4 100644 --- a/usr.sbin/rtadvd/advcap.h +++ b/usr.sbin/rtadvd/advcap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: advcap.h,v 1.4 2001/02/04 06:22:05 itojun Exp $ */ +/* $OpenBSD: advcap.h,v 1.5 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: advcap.h,v 1.3 2001/02/01 09:12:08 jinmei Exp $ */ /* @@ -36,10 +36,10 @@ __BEGIN_DECLS -extern int agetent __P((char *, const char *)); -extern int agetflag __P((const char *)); -extern long long agetnum __P((const char *)); -extern char *agetstr __P((const char *, char **)); +extern int agetent(char *, const char *); +extern int agetflag(const char *); +extern long long agetnum(const char *); +extern char *agetstr(const char *, char **); __END_DECLS diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 31c637cbd4b..a369c16757b 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.13 2001/06/03 09:27:31 itojun Exp $ */ +/* $OpenBSD: config.c,v 1.14 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: config.c,v 1.47 2001/06/02 18:50:46 jinmei Exp $ */ /* @@ -71,9 +71,9 @@ #include "if.h" #include "config.h" -static void makeentry __P((char *, int, char *, int)); -static void get_prefix __P((struct rainfo *)); -static int getinet6sysctl __P((int)); +static void makeentry(char *, int, char *, int); +static void get_prefix(struct rainfo *); +static int getinet6sysctl(int); extern struct rainfo *ralist; diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h index 33ce8638fcf..eb3efbe2b6a 100644 --- a/usr.sbin/rtadvd/config.h +++ b/usr.sbin/rtadvd/config.h @@ -1,4 +1,4 @@ -/* $OpenBSD: config.h,v 1.4 2000/05/23 11:23:23 itojun Exp $ */ +/* $OpenBSD: config.h,v 1.5 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: config.h,v 1.3 2000/05/16 13:34:13 itojun Exp $ */ /* @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ -extern void getconfig __P((char *)); -extern void delete_prefix __P((struct rainfo *, struct prefix *)); -extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int)); -extern void make_packet __P((struct rainfo *)); +extern void getconfig(char *); +extern void delete_prefix(struct rainfo *, struct prefix *); +extern void make_prefix(struct rainfo *, int, struct in6_addr *, int); +extern void make_packet(struct rainfo *); diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c index 38698653b43..7735afed4ce 100644 --- a/usr.sbin/rtadvd/dump.c +++ b/usr.sbin/rtadvd/dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.c,v 1.3 2001/01/15 11:06:25 itojun Exp $ */ +/* $OpenBSD: dump.c,v 1.4 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: dump.c,v 1.15 2000/11/11 06:57:22 jinmei Exp $ */ /* @@ -63,8 +63,8 @@ static FILE *fp; extern struct rainfo *ralist; -static char *ether_str __P((struct sockaddr_dl *)); -static void if_dump __P((void)); +static char *ether_str(struct sockaddr_dl *); +static void if_dump(void); #ifdef __FreeBSD__ /* XXX: see PORTABILITY */ #define LONGLONG "%qu" diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h index 698bcd63e49..41a31d93ed3 100644 --- a/usr.sbin/rtadvd/dump.h +++ b/usr.sbin/rtadvd/dump.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.h,v 1.1 2000/05/23 11:33:48 itojun Exp $ */ +/* $OpenBSD: dump.h,v 1.2 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: dump.h,v 1.1 2000/05/23 11:31:26 itojun Exp $ */ /* @@ -30,4 +30,4 @@ * SUCH DAMAGE. */ -extern void rtadvd_dump_file __P((char *)); +extern void rtadvd_dump_file(char *); diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index 03da5f24662..decc7ea844a 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.9 2001/01/21 15:42:35 itojun Exp $ */ +/* $OpenBSD: if.c,v 1.10 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: if.c,v 1.17 2001/01/21 15:27:30 itojun Exp $ */ /* @@ -74,7 +74,7 @@ int iflist_init_ok; size_t ifblock_size; char *ifblock; -static void get_iflist __P((char **buf, size_t *size)); +static void get_iflist(char **buf, size_t *size); static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf, size_t bufsize)); diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h index 67e79483912..b444d4b5e60 100644 --- a/usr.sbin/rtadvd/if.h +++ b/usr.sbin/rtadvd/if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if.h,v 1.7 2001/01/21 15:42:36 itojun Exp $ */ +/* $OpenBSD: if.h,v 1.8 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: if.h,v 1.6 2001/01/21 15:37:14 itojun Exp $ */ /* @@ -37,22 +37,22 @@ extern size_t ifblock_size; extern char *ifblock; struct nd_opt_hdr; -struct sockaddr_dl *if_nametosdl __P((char *)); -int if_getmtu __P((char *)); -int if_getflags __P((int, int)); -int lladdropt_length __P((struct sockaddr_dl *)); -void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *)); -int rtbuf_len __P((void)); -char *get_next_msg __P((char *, char *, int, size_t *, int)); -struct in6_addr *get_addr __P((char *)); -int get_rtm_ifindex __P((char *)); -int get_ifm_ifindex __P((char *)); -int get_ifam_ifindex __P((char *)); -int get_ifm_flags __P((char *)); -int get_prefixlen __P((char *)); -int prefixlen __P((u_char *, u_char *)); -int rtmsg_type __P((char *)); -int ifmsg_type __P((char *)); -int rtmsg_len __P((char *)); -int ifmsg_len __P((char *)); -void init_iflist __P((void)); +struct sockaddr_dl *if_nametosdl(char *); +int if_getmtu(char *); +int if_getflags(int, int); +int lladdropt_length(struct sockaddr_dl *); +void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *); +int rtbuf_len(void); +char *get_next_msg(char *, char *, int, size_t *, int); +struct in6_addr *get_addr(char *); +int get_rtm_ifindex(char *); +int get_ifm_ifindex(char *); +int get_ifam_ifindex(char *); +int get_ifm_flags(char *); +int get_prefixlen(char *); +int prefixlen(u_char *, u_char *); +int rtmsg_type(char *); +int ifmsg_type(char *); +int rtmsg_len(char *); +int ifmsg_len(char *); +void init_iflist(void); diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index 83342fbcd61..b4f1ce09fa7 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.c,v 1.13 2002/01/11 03:51:08 itojun Exp $ */ +/* $OpenBSD: rtadvd.c,v 1.14 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: rtadvd.c,v 1.50 2001/02/04 06:15:15 itojun Exp $ */ /* @@ -125,12 +125,12 @@ u_int32_t ndopt_flags[] = { NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU }; -int main __P((int, char *[])); -static void set_die __P((int)); -static void die __P((void)); -static void sock_open __P((void)); -static void rtsock_open __P((void)); -static void rtadvd_input __P((void)); +int main(int, char *[]); +static void set_die(int); +static void die(void); +static void sock_open(void); +static void rtsock_open(void); +static void rtadvd_input(void); static void rs_input __P((int, struct nd_router_solicit *, struct in6_pktinfo *, struct sockaddr_in6 *)); static void ra_input __P((int, struct nd_router_advert *, @@ -139,12 +139,12 @@ static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *, struct sockaddr_in6 *)); static int nd6_options __P((struct nd_opt_hdr *, int, union nd_opts *, u_int32_t)); -static void free_ndopts __P((union nd_opts *)); -static void ra_output __P((struct rainfo *)); -static void rtmsg_input __P((void)); -static void rtadvd_set_dump_file __P((void)); +static void free_ndopts(union nd_opts *); +static void ra_output(struct rainfo *); +static void rtmsg_input(void); +static void rtadvd_set_dump_file(void); -struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int)); +struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int); int main(argc, argv) diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index 456fd5257d7..6636573376c 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtadvd.h,v 1.6 2001/01/15 11:06:30 itojun Exp $ */ +/* $OpenBSD: rtadvd.h,v 1.7 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: rtadvd.h,v 1.14 2000/11/11 06:57:22 jinmei Exp $ */ /* @@ -146,11 +146,11 @@ struct rainfo { struct soliciter *soliciter; /* recent solication source */ }; -void ra_timeout __P((void *)); -void ra_timer_update __P((void *, struct timeval *)); +void ra_timeout(void *); +void ra_timer_update(void *, struct timeval *); -int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int)); -struct rainfo *if_indextorainfo __P((int)); +int prefix_match(struct in6_addr *, int, struct in6_addr *, int); +struct rainfo *if_indextorainfo(int); extern struct in6_addr in6a_site_allrouters; #ifdef MIP6 diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index 2edcdf01a90..88f2417ace2 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: timer.c,v 1.4 2000/07/06 10:14:49 itojun Exp $ */ +/* $OpenBSD: timer.c,v 1.5 2002/02/16 21:28:08 millert Exp $ */ /* $KAME: timer.c,v 1.4 2000/05/27 11:30:43 jinmei Exp $ */ /* @@ -59,8 +59,8 @@ rtadvd_timer_init() } struct rtadvd_timer * -rtadvd_add_timer(void (*timeout) __P((void *)), - void (*update) __P((void *, struct timeval *)), +rtadvd_add_timer(void (*timeout)(void *), + void (*update)(void *, struct timeval *), void *timeodata, void *updatedata) { struct rtadvd_timer *newtimer; diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h index 617f28a284d..f667e8c268b 100644 --- a/usr.sbin/rtadvd/timer.h +++ b/usr.sbin/rtadvd/timer.h @@ -1,4 +1,4 @@ -/* $OpenBSD: timer.h,v 1.4 2000/07/06 10:14:49 itojun Exp $ */ +/* $OpenBSD: timer.h,v 1.5 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: timer.h,v 1.3 2000/05/27 11:30:43 jinmei Exp $ */ /* @@ -46,19 +46,19 @@ struct rtadvd_timer { struct rainfo *rai; struct timeval tm; - void (*expire) __P((void *)); /* expiration function */ + void (*expire)(void *); /* expiration function */ void *expire_data; - void (*update) __P((void *, struct timeval *)); /* update function */ + void (*update)(void *, struct timeval *); /* update function */ void *update_data; }; -void rtadvd_timer_init __P((void)); -struct rtadvd_timer *rtadvd_add_timer __P((void (*) __P((void *)), - void (*) __P((void *, struct timeval *)), void *, void *)); -void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *)); -void rtadvd_remove_timer __P((struct rtadvd_timer **)); -struct timeval * rtadvd_check_timer __P((void)); -struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *)); +void rtadvd_timer_init(void); +struct rtadvd_timer *rtadvd_add_timer __P((void (*)(void *), + void (*)(void *, struct timeval *), void *, void *)); +void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *); +void rtadvd_remove_timer(struct rtadvd_timer **); +struct timeval * rtadvd_check_timer(void); +struct timeval * rtadvd_timer_rest(struct rtadvd_timer *); void TIMEVAL_ADD __P((struct timeval *, struct timeval *, struct timeval *)); void TIMEVAL_SUB __P((struct timeval *, struct timeval *, diff --git a/usr.sbin/rtsold/dump.c b/usr.sbin/rtsold/dump.c index 3769d11e1f0..57d614e8219 100644 --- a/usr.sbin/rtsold/dump.c +++ b/usr.sbin/rtsold/dump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dump.c,v 1.6 2001/08/22 05:34:54 itojun Exp $ */ +/* $OpenBSD: dump.c,v 1.7 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: dump.c,v 1.9 2001/08/20 06:55:54 itojun Exp $ */ /* @@ -50,8 +50,8 @@ static FILE *fp; extern struct ifinfo *iflist; -static void dump_interface_status __P((void)); -static char *sec2str __P((time_t)); +static void dump_interface_status(void); +static char *sec2str(time_t); char *ifstatstr[] = {"IDLE", "DELAY", "PROBE", "DOWN", "TENTATIVE"}; static void diff --git a/usr.sbin/rtsold/if.c b/usr.sbin/rtsold/if.c index 106c2247b57..9b52e09c1ed 100644 --- a/usr.sbin/rtsold/if.c +++ b/usr.sbin/rtsold/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.8 2001/11/14 01:59:36 itojun Exp $ */ +/* $OpenBSD: if.c,v 1.9 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: if.c,v 1.15 2001/05/22 06:04:17 jinmei Exp $ */ /* @@ -76,9 +76,9 @@ extern int rssock; static int ifsock; -static int get_llflag __P((const char *name)); +static int get_llflag(const char *name); #ifndef HAVE_GETIFADDRS -static unsigned int if_maxindex __P((void)); +static unsigned int if_maxindex(void); #endif static void get_rtaddrs __P((int addrs, struct sockaddr *sa, struct sockaddr **rti_info)); diff --git a/usr.sbin/rtsold/probe.c b/usr.sbin/rtsold/probe.c index 349b40b896b..ea1e175d8cc 100644 --- a/usr.sbin/rtsold/probe.c +++ b/usr.sbin/rtsold/probe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: probe.c,v 1.3 2000/08/13 18:24:00 itojun Exp $ */ +/* $OpenBSD: probe.c,v 1.4 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: probe.c,v 1.10 2000/08/13 06:14:59 itojun Exp $ */ /* @@ -60,7 +60,7 @@ static struct msghdr sndmhdr; static struct iovec sndiov[2]; static int probesock; -static void sendprobe __P((struct in6_addr *addr, int ifindex)); +static void sendprobe(struct in6_addr *addr, int ifindex); int diff --git a/usr.sbin/rtsold/rtsold.c b/usr.sbin/rtsold/rtsold.c index e17fc79cea2..bfa8a7bd2f9 100644 --- a/usr.sbin/rtsold/rtsold.c +++ b/usr.sbin/rtsold/rtsold.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsold.c,v 1.14 2002/01/11 03:51:08 itojun Exp $ */ +/* $OpenBSD: rtsold.c,v 1.15 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: rtsold.c,v 1.32 2001/07/09 22:34:07 itojun Exp $ */ /* @@ -83,27 +83,27 @@ static int fflag = 0; /* a == b */ #define TIMEVAL_EQ(a, b) (((a).tv_sec==(b).tv_sec) && ((a).tv_usec==(b).tv_usec)) -int main __P((int argc, char *argv[])); +int main(int argc, char *argv[]); /* static variables and functions */ static int mobile_node = 0; volatile sig_atomic_t do_dump; static char *dumpfilename = "/var/run/rtsold.dump"; /* XXX: should be configurable */ -static int ifconfig __P((char *ifname)); +static int ifconfig(char *ifname); #if 0 -static int ifreconfig __P((char *ifname)); +static int ifreconfig(char *ifname); #endif -static int make_packet __P((struct ifinfo *ifinfo)); -static struct timeval *rtsol_check_timer __P((void)); +static int make_packet(struct ifinfo *ifinfo); +static struct timeval *rtsol_check_timer(void); static void TIMEVAL_ADD __P((struct timeval *a, struct timeval *b, struct timeval *result)); static void TIMEVAL_SUB __P((struct timeval *a, struct timeval *b, struct timeval *result)); -static void rtsold_set_dump_file __P((void)); -static void usage __P((char *progname)); -static char **autoifprobe __P((void)); +static void rtsold_set_dump_file(void); +static void usage(char *progname); +static char **autoifprobe(void); int main(argc, argv) diff --git a/usr.sbin/rtsold/rtsold.h b/usr.sbin/rtsold/rtsold.h index 9459bc992cb..6c4a719c564 100644 --- a/usr.sbin/rtsold/rtsold.h +++ b/usr.sbin/rtsold/rtsold.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsold.h,v 1.6 2001/07/09 22:37:33 itojun Exp $ */ +/* $OpenBSD: rtsold.h,v 1.7 2002/02/16 21:28:09 millert Exp $ */ /* $KAME: rtsold.h,v 1.11 2000/10/10 06:18:04 itojun Exp $ */ /* @@ -62,35 +62,35 @@ struct ifinfo { /* rtsold.c */ extern struct timeval tm_max; extern int dflag; -struct ifinfo *find_ifinfo __P((int ifindex)); -void rtsol_timer_update __P((struct ifinfo *ifinfo)); -extern void warnmsg __P((int, const char *, const char *, ...)) +struct ifinfo *find_ifinfo(int ifindex); +void rtsol_timer_update(struct ifinfo *ifinfo); +extern void warnmsg(int, const char *, const char *, ...) __attribute__((__format__(__printf__, 3, 4))); /* if.c */ -extern int ifinit __P((void)); -extern int interface_up __P((char *name)); -extern int interface_status __P((struct ifinfo*)); -extern int lladdropt_length __P((struct sockaddr_dl *sdl)); +extern int ifinit(void); +extern int interface_up(char *name); +extern int interface_status(struct ifinfo*); +extern int lladdropt_length(struct sockaddr_dl *sdl); extern void lladdropt_fill __P((struct sockaddr_dl *sdl, struct nd_opt_hdr *ndopt)); -extern struct sockaddr_dl *if_nametosdl __P((char *name)); -extern int getinet6sysctl __P((int code)); +extern struct sockaddr_dl *if_nametosdl(char *name); +extern int getinet6sysctl(int code); /* rtsol.c */ -extern int sockopen __P((void)); -extern void sendpacket __P((struct ifinfo *ifinfo)); -extern void rtsol_input __P((int s)); +extern int sockopen(void); +extern void sendpacket(struct ifinfo *ifinfo); +extern void rtsol_input(int s); /* probe.c */ -extern int probe_init __P((void)); -extern void defrouter_probe __P((int ifindex)); +extern int probe_init(void); +extern void defrouter_probe(int ifindex); /* dump.c */ -extern void rtsold_dump_file __P((char *)); +extern void rtsold_dump_file(char *); #if 0 /* rtsock.c */ -extern int rtsock_open __P((void)); -extern int rtsock_input __P((int)); +extern int rtsock_open(void); +extern int rtsock_input(int); #endif diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index e3328b84de5..2511e26d902 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -39,7 +39,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)rwhod.c 8.1 (Berkeley) 6/6/93";*/ -static char rcsid[] = "$OpenBSD: rwhod.c,v 1.19 2001/11/17 19:49:40 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: rwhod.c,v 1.20 2002/02/16 21:28:09 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -101,17 +101,17 @@ volatile sig_atomic_t gothup; #define WHDRSIZE (sizeof(mywd) - sizeof(mywd.wd_we)) -int configure __P((int)); -void getboottime __P((void)); -void hup __P((int)); -void timer __P((void)); -void quit __P((char *)); -void rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -int verify __P((char *)); -void handleread __P((int s)); +int configure(int); +void getboottime(void); +void hup(int); +void timer(void); +void quit(char *); +void rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); +int verify(char *); +void handleread(int s); int Sendto __P((int, const void *, size_t, int, const struct sockaddr *, socklen_t)); -char *interval __P((int, char *)); +char *interval(int, char *); void hup(signo) diff --git a/usr.sbin/sa/extern.h b/usr.sbin/sa/extern.h index 144b00db847..5d6584a1d69 100644 --- a/usr.sbin/sa/extern.h +++ b/usr.sbin/sa/extern.h @@ -27,7 +27,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. * - * $Id: extern.h,v 1.2 1999/08/06 20:41:08 deraadt Exp $ + * $Id: extern.h,v 1.3 2002/02/16 21:28:09 millert Exp $ */ #include <sys/types.h> @@ -60,24 +60,24 @@ struct userinfo { /* typedefs */ -typedef int (*cmpf_t) __P((const DBT *, const DBT *)); +typedef int (*cmpf_t)(const DBT *, const DBT *); /* external functions in sa.c */ -int main __P((int, char **)); +int main(int, char **); /* external functions in pdb.c */ -int pacct_init __P((void)); -void pacct_destroy __P((void)); -int pacct_add __P((const struct cmdinfo *)); -int pacct_update __P((void)); -void pacct_print __P((void)); +int pacct_init(void); +void pacct_destroy(void); +int pacct_add(const struct cmdinfo *); +int pacct_update(void); +void pacct_print(void); /* external functions in usrdb.c */ -int usracct_init __P((void)); -void usracct_destroy __P((void)); -int usracct_add __P((const struct cmdinfo *)); -int usracct_update __P((void)); -void usracct_print __P((void)); +int usracct_init(void); +void usracct_destroy(void); +int usracct_add(const struct cmdinfo *); +int usracct_update(void); +void usracct_print(void); /* variables */ diff --git a/usr.sbin/sa/main.c b/usr.sbin/sa/main.c index fbbc6610adc..2d9a0bd887d 100644 --- a/usr.sbin/sa/main.c +++ b/usr.sbin/sa/main.c @@ -33,7 +33,7 @@ static char copright[] = "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\ All rights reserved.\n"; -static char rcsid[] = "$Id: main.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$Id: main.c,v 1.7 2002/02/16 21:28:09 millert Exp $"; #endif /* @@ -53,16 +53,16 @@ static char rcsid[] = "$Id: main.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $"; #include "extern.h" #include "pathnames.h" -static int acct_load __P((char *, int)); -static u_quad_t decode_comp_t __P((comp_t)); -static int cmp_comm __P((const char *, const char *)); -static int cmp_usrsys __P((const DBT *, const DBT *)); -static int cmp_avgusrsys __P((const DBT *, const DBT *)); -static int cmp_dkio __P((const DBT *, const DBT *)); -static int cmp_avgdkio __P((const DBT *, const DBT *)); -static int cmp_cpumem __P((const DBT *, const DBT *)); -static int cmp_avgcpumem __P((const DBT *, const DBT *)); -static int cmp_calls __P((const DBT *, const DBT *)); +static int acct_load(char *, int); +static u_quad_t decode_comp_t(comp_t); +static int cmp_comm(const char *, const char *); +static int cmp_usrsys(const DBT *, const DBT *); +static int cmp_avgusrsys(const DBT *, const DBT *); +static int cmp_dkio(const DBT *, const DBT *); +static int cmp_avgdkio(const DBT *, const DBT *); +static int cmp_cpumem(const DBT *, const DBT *); +static int cmp_avgcpumem(const DBT *, const DBT *); +static int cmp_calls(const DBT *, const DBT *); int aflag, bflag, cflag, dflag, Dflag, fflag, iflag, jflag, kflag; int Kflag, lflag, mflag, qflag, rflag, sflag, tflag, uflag, vflag; diff --git a/usr.sbin/sa/pdb.c b/usr.sbin/sa/pdb.c index 9472ef6024b..4157e764f88 100644 --- a/usr.sbin/sa/pdb.c +++ b/usr.sbin/sa/pdb.c @@ -29,7 +29,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: pdb.c,v 1.2 1998/12/18 20:47:34 deraadt Exp $"; +static char rcsid[] = "$Id: pdb.c,v 1.3 2002/02/16 21:28:09 millert Exp $"; #endif #include <sys/types.h> @@ -42,9 +42,9 @@ static char rcsid[] = "$Id: pdb.c,v 1.2 1998/12/18 20:47:34 deraadt Exp $"; #include "extern.h" #include "pathnames.h" -static int check_junk __P((struct cmdinfo *)); -static void add_ci __P((const struct cmdinfo *, struct cmdinfo *)); -static void print_ci __P((const struct cmdinfo *, const struct cmdinfo *)); +static int check_junk(struct cmdinfo *); +static void add_ci(const struct cmdinfo *, struct cmdinfo *); +static void print_ci(const struct cmdinfo *, const struct cmdinfo *); static DB *pacct_db; diff --git a/usr.sbin/sa/usrdb.c b/usr.sbin/sa/usrdb.c index ee92dfbca55..a2e5757b02b 100644 --- a/usr.sbin/sa/usrdb.c +++ b/usr.sbin/sa/usrdb.c @@ -29,7 +29,7 @@ */ #ifndef LINT -static char rcsid[] = "$Id: usrdb.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $"; +static char rcsid[] = "$Id: usrdb.c,v 1.4 2002/02/16 21:28:09 millert Exp $"; #endif #include <sys/types.h> @@ -41,7 +41,7 @@ static char rcsid[] = "$Id: usrdb.c,v 1.3 2001/07/27 20:34:36 pvalchev Exp $"; #include "extern.h" #include "pathnames.h" -static int uid_compare __P((const DBT *, const DBT *)); +static int uid_compare(const DBT *, const DBT *); static DB *usracct_db; diff --git a/usr.sbin/screenblank/screenblank.c b/usr.sbin/screenblank/screenblank.c index a62c236ddd5..9685c3d4b7d 100644 --- a/usr.sbin/screenblank/screenblank.c +++ b/usr.sbin/screenblank/screenblank.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screenblank.c,v 1.11 2001/12/09 14:58:21 miod Exp $ */ +/* $OpenBSD: screenblank.c,v 1.12 2002/02/16 21:28:09 millert Exp $ */ /* $NetBSD: screenblank.c,v 1.2 1996/02/28 01:18:34 thorpej Exp $ */ /*- @@ -75,13 +75,13 @@ LIST_HEAD(ds_list, dev_stat) ds_list; extern char *__progname; -void add_dev __P((char *, int)); -void change_state __P((int, int)); -void cvt_arg __P((char *, struct timeval *)); -void logpid __P((void)); -void sighandler __P((int)); -void usage __P((void)); -void cleanup __P((int)); +void add_dev(char *, int); +void change_state(int, int); +void cvt_arg(char *, struct timeval *); +void logpid(void); +void sighandler(int); +void usage(void); +void cleanup(int); int main(argc, argv) diff --git a/usr.sbin/sesd/srcs/chpmon.c b/usr.sbin/sesd/srcs/chpmon.c index fff8331d970..2fd11fceac0 100644 --- a/usr.sbin/sesd/srcs/chpmon.c +++ b/usr.sbin/sesd/srcs/chpmon.c @@ -48,7 +48,7 @@ #define BADSTAT \ (SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL) -int main __P((int, char **)); +int main(int, char **); int main(a, v) diff --git a/usr.sbin/sesd/srcs/eltsub.c b/usr.sbin/sesd/srcs/eltsub.c index 63150361069..ed32a4cc0a0 100644 --- a/usr.sbin/sesd/srcs/eltsub.c +++ b/usr.sbin/sesd/srcs/eltsub.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: eltsub.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: eltsub.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -40,9 +40,9 @@ #include <sys/ioctl.h> #include SESINC -char *geteltnm __P((int)); -static char *scode2ascii __P((u_char)); -char *stat2ascii __P((int, u_char *)); +char *geteltnm(int); +static char *scode2ascii(u_char); +char *stat2ascii(int, u_char *); char * geteltnm(type) diff --git a/usr.sbin/sesd/srcs/getencstat.c b/usr.sbin/sesd/srcs/getencstat.c index 3dbbbfb5aa9..e53c07a33b3 100644 --- a/usr.sbin/sesd/srcs/getencstat.c +++ b/usr.sbin/sesd/srcs/getencstat.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: getencstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: getencstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -41,9 +41,9 @@ #include <fcntl.h> #include SESINC -extern char *geteltnm __P((int)); -extern char *stat2ascii __P((int, u_char *)); -int main __P((int, char **)); +extern char *geteltnm(int); +extern char *stat2ascii(int, u_char *); +int main(int, char **); int main(a, v) diff --git a/usr.sbin/sesd/srcs/getnobj.c b/usr.sbin/sesd/srcs/getnobj.c index e9bc0d3b402..8c040c1e269 100644 --- a/usr.sbin/sesd/srcs/getnobj.c +++ b/usr.sbin/sesd/srcs/getnobj.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: getnobj.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: getnobj.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -42,7 +42,7 @@ #include <sys/ioctl.h> #include SESINC -int main __P((int, char **)); +int main(int, char **); int main(argc, argv) diff --git a/usr.sbin/sesd/srcs/getobjmap.c b/usr.sbin/sesd/srcs/getobjmap.c index 3bc0c863ba5..ebe1686e4c4 100644 --- a/usr.sbin/sesd/srcs/getobjmap.c +++ b/usr.sbin/sesd/srcs/getobjmap.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: getobjmap.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: getobjmap.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -41,8 +41,8 @@ #include <sys/ioctl.h> #include SESINC -int main __P((int, char **)); -extern char *geteltnm __P((int)); +int main(int, char **); +extern char *geteltnm(int); int main(a, v) diff --git a/usr.sbin/sesd/srcs/getobjstat.c b/usr.sbin/sesd/srcs/getobjstat.c index 57b81bce140..b55e1f5ff92 100644 --- a/usr.sbin/sesd/srcs/getobjstat.c +++ b/usr.sbin/sesd/srcs/getobjstat.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: getobjstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: getobjstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -40,7 +40,7 @@ #include <sys/ioctl.h> #include SESINC -int main __P((int, char **)); +int main(int, char **); int main(a, v) diff --git a/usr.sbin/sesd/srcs/inienc.c b/usr.sbin/sesd/srcs/inienc.c index 519201284d8..61be17e1bda 100644 --- a/usr.sbin/sesd/srcs/inienc.c +++ b/usr.sbin/sesd/srcs/inienc.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: inienc.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: inienc.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include SESINC -int __P((int, char **)); +int(int, char **); int main(a, v) diff --git a/usr.sbin/sesd/srcs/sesd.c b/usr.sbin/sesd/srcs/sesd.c index 237746bb7c0..93e415bcb23 100644 --- a/usr.sbin/sesd/srcs/sesd.c +++ b/usr.sbin/sesd/srcs/sesd.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: sesd.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: sesd.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -45,7 +45,7 @@ #define ALLSTAT (SES_ENCSTAT_UNRECOV | SES_ENCSTAT_CRITICAL | \ SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO) -int main __P((int, char **)); +int main(int, char **); /* * Monitor named SES devices and note (via syslog) any changes in status. diff --git a/usr.sbin/sesd/srcs/setencstat.c b/usr.sbin/sesd/srcs/setencstat.c index fc85b8fded6..358b3580b98 100644 --- a/usr.sbin/sesd/srcs/setencstat.c +++ b/usr.sbin/sesd/srcs/setencstat.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: setencstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: setencstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include SESINC -int main __P((int, char **)); +int main(int, char **); int main(a, v) diff --git a/usr.sbin/sesd/srcs/setobjstat.c b/usr.sbin/sesd/srcs/setobjstat.c index f094dff61c7..5cdd252f4e7 100644 --- a/usr.sbin/sesd/srcs/setobjstat.c +++ b/usr.sbin/sesd/srcs/setobjstat.c @@ -1,6 +1,6 @@ /* $NetBSD: $ */ /* $FreeBSD: $ */ -/* $OpenBSD: setobjstat.c,v 1.2 2000/02/22 06:21:36 mjacob Exp $ */ +/* $OpenBSD: setobjstat.c,v 1.3 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -41,7 +41,7 @@ #include <sys/ioctl.h> #include SESINC -int main __P((int, char **)); +int main(int, char **); int main(a, v) diff --git a/usr.sbin/slstats/slstats.c b/usr.sbin/slstats/slstats.c index 4390bc776c0..a3dfe98f67b 100644 --- a/usr.sbin/slstats/slstats.c +++ b/usr.sbin/slstats/slstats.c @@ -1,4 +1,4 @@ -/* $OpenBSD: slstats.c,v 1.13 2001/11/17 19:49:41 deraadt Exp $ */ +/* $OpenBSD: slstats.c,v 1.14 2002/02/16 21:28:09 millert Exp $ */ /* $NetBSD: slstats.c,v 1.6.6.1 1996/06/07 01:42:30 thorpej Exp $ */ /* @@ -25,7 +25,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: slstats.c,v 1.13 2001/11/17 19:49:41 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: slstats.c,v 1.14 2002/02/16 21:28:09 millert Exp $"; #endif #define INET @@ -67,9 +67,9 @@ int unit; int s; char interface[IFNAMSIZ]; -void catchalarm __P((void)); -void intpr __P((void)); -void usage __P((void)); +void catchalarm(void); +void intpr(void); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c index 3c80c22cc46..1e83cd0b859 100644 --- a/usr.sbin/syslogd/syslogd.c +++ b/usr.sbin/syslogd/syslogd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syslogd.c,v 1.48 2001/12/02 02:23:45 deraadt Exp $ */ +/* $OpenBSD: syslogd.c,v 1.49 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (c) 1983, 1988, 1993, 1994 @@ -43,7 +43,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; #else -static char rcsid[] = "$OpenBSD: syslogd.c,v 1.48 2001/12/02 02:23:45 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: syslogd.c,v 1.49 2002/02/16 21:28:09 millert Exp $"; #endif #endif /* not lint */ @@ -200,25 +200,25 @@ volatile sig_atomic_t DoInit; int SecureMode = 1; /* when true, speak only unix domain socks */ -void cfline __P((char *, struct filed *, char *)); -char *cvthname __P((struct sockaddr_in *)); -int decode __P((const char *, CODE *)); -void dodie __P((int)); -void doinit __P((int)); -void die __P((int)); -void domark __P((int)); -void markit __P((void)); -void fprintlog __P((struct filed *, int, char *)); -void init __P((void)); -void logerror __P((char *)); -void logmsg __P((int, char *, char *, int)); -void printline __P((char *, char *)); -void printsys __P((char *)); -void reapchild __P((int)); -char *ttymsg __P((struct iovec *, int, char *, int)); -void usage __P((void)); -void wallmsg __P((struct filed *, struct iovec *)); -int getmsgbufsize __P((void)); +void cfline(char *, struct filed *, char *); +char *cvthname(struct sockaddr_in *); +int decode(const char *, CODE *); +void dodie(int); +void doinit(int); +void die(int); +void domark(int); +void markit(void); +void fprintlog(struct filed *, int, char *); +void init(void); +void logerror(char *); +void logmsg(int, char *, char *, int); +void printline(char *, char *); +void printsys(char *); +void reapchild(int); +char *ttymsg(struct iovec *, int, char *, int); +void usage(void); +void wallmsg(struct filed *, struct iovec *); +int getmsgbufsize(void); #define MAXFUNIX 21 diff --git a/usr.sbin/tcpdump/dhcp6opt.h b/usr.sbin/tcpdump/dhcp6opt.h index 3b0ab033241..f36754d890a 100644 --- a/usr.sbin/tcpdump/dhcp6opt.h +++ b/usr.sbin/tcpdump/dhcp6opt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcp6opt.h,v 1.1 2000/04/26 21:35:38 jakob Exp $ */ +/* $OpenBSD: dhcp6opt.h,v 1.2 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (C) 1998 and 1999 WIDE Project. @@ -74,9 +74,9 @@ struct dhcp6_opt { extern struct dhcp6_opt *dh6o_pad; extern struct dhcp6_opt *dh6o_end; extern int dhcp6_param[]; -extern void dhcp6opttab_init __P((void)); -extern struct dhcp6_opt *dhcp6opttab_byname __P((char *)); -extern struct dhcp6_opt *dhcp6opttab_bycode __P((u_int)); +extern void dhcp6opttab_init(void); +extern struct dhcp6_opt *dhcp6opttab_byname(char *); +extern struct dhcp6_opt *dhcp6opttab_bycode(u_int); #endif #endif /*__DHCP6OPT_H_DEFINED*/ diff --git a/usr.sbin/tcpdump/print-dhcp6.c b/usr.sbin/tcpdump/print-dhcp6.c index 4c9a4a87e7f..e5001d1ad33 100644 --- a/usr.sbin/tcpdump/print-dhcp6.c +++ b/usr.sbin/tcpdump/print-dhcp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-dhcp6.c,v 1.3 2001/11/07 18:48:16 deraadt Exp $ */ +/* $OpenBSD: print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $ */ /* * Copyright (C) 1998 and 1999 WIDE Project. @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.3 2001/11/07 18:48:16 deraadt Exp $"; + "@(#) $Header: /home/cvs/src/usr.sbin/tcpdump/print-dhcp6.c,v 1.4 2002/02/16 21:28:09 millert Exp $"; #endif #ifdef INET6 @@ -62,10 +62,10 @@ struct rtentry; #include "dhcp6opt.h" #if 0 -static void dhcp6opttab_init __P((void)); -static struct dhcp6_opt *dhcp6opttab_byname __P((char *)); +static void dhcp6opttab_init(void); +static struct dhcp6_opt *dhcp6opttab_byname(char *); #endif -static struct dhcp6_opt *dhcp6opttab_bycode __P((u_int)); +static struct dhcp6_opt *dhcp6opttab_bycode(u_int); static char tstr[] = " [|dhcp6]"; diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index dba9bb27b37..65b64f9b375 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute.c,v 1.40 2001/08/12 12:03:03 heko Exp $ */ +/* $OpenBSD: traceroute.c,v 1.41 2002/02/16 21:28:10 millert Exp $ */ /* $NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93";*/ #else -static char rcsid[] = "$OpenBSD: traceroute.c,v 1.40 2001/08/12 12:03:03 heko Exp $"; +static char rcsid[] = "$OpenBSD: traceroute.c,v 1.41 2002/02/16 21:28:10 millert Exp $"; #endif #endif /* not lint */ @@ -268,13 +268,13 @@ int32_t usec_perturb; u_char packet[512], *outpacket; /* last inbound (icmp) packet */ -int wait_for_reply __P((int, struct sockaddr_in *, struct timeval *)); -void send_probe __P((int, int, int, struct sockaddr_in *)); -int packet_ok __P((u_char *, int, struct sockaddr_in *, int, int)); -void print __P((u_char *, int, struct sockaddr_in *)); -char *inetname __P((struct in_addr)); -u_short in_cksum __P((u_short *, int)); -void usage __P((void)); +int wait_for_reply(int, struct sockaddr_in *, struct timeval *); +void send_probe(int, int, int, struct sockaddr_in *); +int packet_ok(u_char *, int, struct sockaddr_in *, int, int); +void print(u_char *, int, struct sockaddr_in *); +char *inetname(struct in_addr); +u_short in_cksum(u_short *, int); +void usage(void); int s; /* receive (icmp) socket file descriptor */ int sndsock; /* send (udp) socket file descriptor */ diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index d4427239c96..547e41b7a13 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute6.c,v 1.16 2001/10/26 06:23:02 mpech Exp $ */ +/* $OpenBSD: traceroute6.c,v 1.17 2002/02/16 21:28:10 millert Exp $ */ /* $KAME: traceroute6.c,v 1.39 2000/12/22 15:11:05 itojun Exp $ */ /* @@ -312,23 +312,23 @@ struct opacket { u_char packet[512]; /* last inbound (icmp) packet */ struct opacket *outpacket; /* last output (udp) packet */ -int main __P((int, char *[])); -int wait_for_reply __P((int, struct msghdr *)); +int main(int, char *[]); +int wait_for_reply(int, struct msghdr *); #ifdef IPSEC #ifdef IPSEC_POLICY_IPSEC -int setpolicy __P((int so, char *policy)); +int setpolicy(int so, char *policy); #endif #endif -void send_probe __P((int, int)); -struct udphdr *get_udphdr __P((struct ip6_hdr *, u_char *)); -int get_hoplim __P((struct msghdr *)); -double deltaT __P((struct timeval *, struct timeval *)); -char *pr_type __P((int)); -int packet_ok __P((struct msghdr *, int, int)); -void print __P((struct msghdr *, int)); -void tvsub __P((struct timeval *, struct timeval *)); -const char *inetname __P((struct sockaddr *)); -void usage __P((void)); +void send_probe(int, int); +struct udphdr *get_udphdr(struct ip6_hdr *, u_char *); +int get_hoplim(struct msghdr *); +double deltaT(struct timeval *, struct timeval *); +char *pr_type(int); +int packet_ok(struct msghdr *, int, int); +void print(struct msghdr *, int); +void tvsub(struct timeval *, struct timeval *); +const char *inetname(struct sockaddr *); +void usage(void); int rcvsock; /* receive (icmp) socket file descriptor */ int sndsock; /* send (udp) socket file descriptor */ diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index e728f52c5c5..dcb2805453e 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trpt.c,v 1.8 2000/02/25 23:32:55 deraadt Exp $ */ +/* $OpenBSD: trpt.c,v 1.9 2002/02/16 21:28:10 millert Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -133,12 +133,12 @@ static int aflag, follow, sflag, tflag; extern char *__progname; -int main __P((int, char *[])); -void dotrace __P((caddr_t)); +int main(int, char *[]); +void dotrace(caddr_t); void tcp_trace __P((short, short, struct tcpcb *, struct tcpcb *, struct tcpiphdr *, int)); -int numeric __P((const void *, const void *)); -void usage __P((void)); +int numeric(const void *, const void *); +void usage(void); kvm_t *kd; diff --git a/usr.sbin/trsp/trsp.c b/usr.sbin/trsp/trsp.c index cc6a7fd9ad8..f8ea088ac4f 100644 --- a/usr.sbin/trsp/trsp.c +++ b/usr.sbin/trsp/trsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trsp.c,v 1.7 1998/07/08 22:13:33 deraadt Exp $ */ +/* $OpenBSD: trsp.c,v 1.8 2002/02/16 21:28:10 millert Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -140,12 +140,12 @@ kvm_t *kd; extern char *__progname; -int main __P((int, char *[])); -void dotrace __P((caddr_t)); -int numeric __P((const void *, const void *)); +int main(int, char *[]); +void dotrace(caddr_t); +int numeric(const void *, const void *); void spp_trace __P((short, short, struct sppcb *, struct sppcb *, struct spidp *, int)); -void usage __P((void)); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c index 41919fdcb76..6fa3d0d4e51 100644 --- a/usr.sbin/usbdevs/usbdevs.c +++ b/usr.sbin/usbdevs/usbdevs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdevs.c,v 1.2 2001/09/17 17:29:56 mickey Exp $ */ +/* $OpenBSD: usbdevs.c,v 1.3 2002/02/16 21:28:10 millert Exp $ */ /* $NetBSD: usbdevs.c,v 1.11 1999/09/08 02:39:36 augustss Exp $ */ /* @@ -52,11 +52,11 @@ int verbose; int showdevs; -void usage __P((void)); -void usbdev __P((int f, int a, int rec)); -void usbdump __P((int f)); -void dumpone __P((char *name, int f, int addr)); -int main __P((int, char **)); +void usage(void); +void usbdev(int f, int a, int rec); +void usbdump(int f); +void dumpone(char *name, int f, int addr); +int main(int, char **); extern char *__progname; diff --git a/usr.sbin/user/usermgmt.h b/usr.sbin/user/usermgmt.h index 0acdf239588..638534be285 100644 --- a/usr.sbin/user/usermgmt.h +++ b/usr.sbin/user/usermgmt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usermgmt.h,v 1.3 2001/09/18 01:50:44 millert Exp $ */ +/* $OpenBSD: usermgmt.h,v 1.4 2002/02/16 21:28:10 millert Exp $ */ /* $NetBSD: usermgmt.h,v 1.4 1999/12/24 09:08:51 agc Exp $ */ /* @@ -34,18 +34,18 @@ #ifndef USERMGMT_H_ #define USERMGMT_H_ -int useradd __P((int, char **)); -int usermod __P((int, char **)); -int userdel __P((int, char **)); -int groupadd __P((int, char **)); -int groupdel __P((int, char **)); -int groupmod __P((int, char **)); +int useradd(int, char **); +int usermod(int, char **); +int userdel(int, char **); +int groupadd(int, char **); +int groupdel(int, char **); +int groupmod(int, char **); #ifdef EXTENSIONS -int userinfo __P((int, char **)); -int groupinfo __P((int, char **)); +int userinfo(int, char **); +int groupinfo(int, char **); #endif -__dead void usermgmt_usage __P((const char *)); +__dead void usermgmt_usage(const char *); #endif diff --git a/usr.sbin/videomode/videomode.c b/usr.sbin/videomode/videomode.c index 91f49caa25a..9dfcf165b18 100644 --- a/usr.sbin/videomode/videomode.c +++ b/usr.sbin/videomode/videomode.c @@ -43,11 +43,11 @@ #include <err.h> #include <stdio.h> -void dump_mode __P((int)); -void dump_vm __P((struct grfvideo_mode *)); -int get_grf __P((void)); -void set_mode __P((int)); -void usage __P((void)); +void dump_mode(int); +void dump_vm(struct grfvideo_mode *); +int get_grf(void); +void set_mode(int); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/vipw/vipw.c b/usr.sbin/vipw/vipw.c index 9d32fa659dc..8fa6044e455 100644 --- a/usr.sbin/vipw/vipw.c +++ b/usr.sbin/vipw/vipw.c @@ -55,8 +55,8 @@ static char sccsid[] = "@(#)vipw.c 8.3 (Berkeley) 4/2/94"; #include <fcntl.h> #include <util.h> -void copyfile __P((int, int)); -void usage __P((void)); +void copyfile(int, int); +void usage(void); int main(argc, argv) diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c index 6fb22aa2374..e6925960144 100644 --- a/usr.sbin/vnconfig/vnconfig.c +++ b/usr.sbin/vnconfig/vnconfig.c @@ -62,8 +62,8 @@ int verbose = 0; -void usage __P((void)); -int config __P((char *, char *, int, char *)); +void usage(void); +int config(char *, char *, int, char *); int main(argc, argv) diff --git a/usr.sbin/wsconscfg/wsconscfg.c b/usr.sbin/wsconscfg/wsconscfg.c index cd23c9b4840..938d89d8945 100644 --- a/usr.sbin/wsconscfg/wsconscfg.c +++ b/usr.sbin/wsconscfg/wsconscfg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsconscfg.c,v 1.6 2001/07/27 20:34:36 pvalchev Exp $ */ +/* $OpenBSD: wsconscfg.c,v 1.7 2002/02/16 21:28:10 millert Exp $ */ /* $NetBSD: wsconscfg.c,v 1.4 1999/07/29 18:24:10 augustss Exp $ */ /* @@ -46,8 +46,8 @@ #define DEFDEV "/dev/ttyCcfg" -static void usage __P((void)); -int main __P((int, char**)); +static void usage(void); +int main(int, char**); static void usage() diff --git a/usr.sbin/wsfontload/wsfontload.c b/usr.sbin/wsfontload/wsfontload.c index 8a243bbbefa..a89f94eca92 100644 --- a/usr.sbin/wsfontload/wsfontload.c +++ b/usr.sbin/wsfontload/wsfontload.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfontload.c,v 1.4 2001/03/14 02:51:36 mickey Exp $ */ +/* $OpenBSD: wsfontload.c,v 1.5 2002/02/16 21:28:10 millert Exp $ */ /* $NetBSD: wsfontload.c,v 1.2 2000/01/05 18:46:43 ad Exp $ */ /* @@ -51,9 +51,9 @@ #define DEFBITORDER WSDISPLAY_FONTORDER_L2R #define DEFBYTEORDER WSDISPLAY_FONTORDER_L2R -int main __P((int, char**)); -static void usage __P((void)); -static int getencoding __P((char *)); +int main(int, char**); +static void usage(void); +static int getencoding(char *); static void usage() diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c index 0be3fd8ea28..cd0852b67c4 100644 --- a/usr.sbin/ypbind/ypbind.c +++ b/usr.sbin/ypbind/ypbind.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypbind.c,v 1.41 2001/12/29 00:50:29 deraadt Exp $ */ +/* $OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1997,1998 Theo de Raadt <deraadt@OpenBSD.org> @@ -35,7 +35,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypbind.c,v 1.41 2001/12/29 00:50:29 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypbind.c,v 1.42 2002/02/16 21:28:11 millert Exp $"; #endif #include <sys/param.h> @@ -93,14 +93,14 @@ extern bool_t xdr_domainname(), xdr_ypbind_resp(); extern bool_t xdr_ypreq_key(), xdr_ypresp_val(); extern bool_t xdr_ypbind_setdom(); -void rpc_received __P((char *dom, struct sockaddr_in *raddrp, int force)); -void checkwork __P((void)); -enum clnt_stat handle_replies __P((void)); -enum clnt_stat handle_ping __P((void)); -int broadcast __P((struct _dom_binding *ypdb, char *, int)); -int direct __P((struct _dom_binding *ypdb, char *, int)); -int ping __P((struct _dom_binding *ypdb)); -int pings __P((struct _dom_binding *ypdb)); +void rpc_received(char *dom, struct sockaddr_in *raddrp, int force); +void checkwork(void); +enum clnt_stat handle_replies(void); +enum clnt_stat handle_ping(void); +int broadcast(struct _dom_binding *ypdb, char *, int); +int direct(struct _dom_binding *ypdb, char *, int); +int ping(struct _dom_binding *ypdb); +int pings(struct _dom_binding *ypdb); char *domain; @@ -121,8 +121,8 @@ u_long rmtcr_port; SVCXPRT *udptransp, *tcptransp; SVCXPRT *ludptransp, *ltcptransp; -struct _dom_binding *xid2ypdb __P((u_int32_t xid)); -u_int32_t unique_xid __P((struct _dom_binding *ypdb)); +struct _dom_binding *xid2ypdb(u_int32_t xid); +u_int32_t unique_xid(struct _dom_binding *ypdb); /* * We name the local RPC functions ypbindproc_XXX_2x() instead diff --git a/usr.sbin/ypserv/common/ypdb.h b/usr.sbin/ypserv/common/ypdb.h index 80aac6ce77b..d3a74f7bdc7 100644 --- a/usr.sbin/ypserv/common/ypdb.h +++ b/usr.sbin/ypserv/common/ypdb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ypdb.h,v 1.5 1997/02/09 09:49:37 maja Exp $ */ +/* $OpenBSD: ypdb.h,v 1.6 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1990, 1993 @@ -64,14 +64,14 @@ typedef struct { typedef DB DBM; __BEGIN_DECLS -void ypdb_close __P((DBM *)); -datum ypdb_fetch __P((DBM *, datum)); -datum ypdb_firstkey __P((DBM *)); -datum ypdb_nextkey __P((DBM *)); -datum ypdb_setkey __P((DBM *, datum)); -DBM *ypdb_open __P((const char *, int, int)); -DBM *ypdb_open_suf __P((const char *, int, int)); -int ypdb_store __P((DBM *, datum, datum, int)); +void ypdb_close(DBM *); +datum ypdb_fetch(DBM *, datum); +datum ypdb_firstkey(DBM *); +datum ypdb_nextkey(DBM *); +datum ypdb_setkey(DBM *, datum); +DBM *ypdb_open(const char *, int, int); +DBM *ypdb_open_suf(const char *, int, int); +int ypdb_store(DBM *, datum, datum, int); __END_DECLS #endif /* !_YPDB_H_ */ diff --git a/usr.sbin/ypserv/common/yplib_host.h b/usr.sbin/ypserv/common/yplib_host.h index 814315d79c1..caa88ae235f 100644 --- a/usr.sbin/ypserv/common/yplib_host.h +++ b/usr.sbin/ypserv/common/yplib_host.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yplib_host.h,v 1.4 1997/05/01 22:14:45 niklas Exp $ */ +/* $OpenBSD: yplib_host.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1992, 1993 Theo de Raadt <deraadt@theos.com> @@ -51,7 +51,7 @@ int yp_all_host __P((CLIENT *client, char *indomain, char *inmap, struct ypall_callback *incallback)); int yp_maplist_host __P((CLIENT *client, char *indomain, struct ypmaplist **outmaplist)); -CLIENT *yp_bind_local __P((u_long program, u_long version)); +CLIENT *yp_bind_local(u_long program, u_long version); CLIENT *yp_bind_host __P((char *server, u_long program, u_long version, u_short port, int usetcp)); diff --git a/usr.sbin/ypserv/common/yplog.h b/usr.sbin/ypserv/common/yplog.h index 2f48494a272..0d847ad2b71 100644 --- a/usr.sbin/ypserv/common/yplog.h +++ b/usr.sbin/ypserv/common/yplog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: yplog.h,v 1.3 1996/05/30 09:53:04 deraadt Exp $ */ +/* $OpenBSD: yplog.h,v 1.4 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -33,10 +33,10 @@ #define _YPLOG_H_ __BEGIN_DECLS -void yplog __P((const char *, ...)); -void vyplog __P((const char *, _BSD_VA_LIST_)); -void ypopenlog __P((void)); -void ypcloselog __P((void)); +void yplog(const char *, ...); +void vyplog(const char *, _BSD_VA_LIST_); +void ypopenlog(void); +void ypcloselog(void); __END_DECLS #endif /* !_YPLOG_H_ */ diff --git a/usr.sbin/ypserv/makedbm/db.h b/usr.sbin/ypserv/makedbm/db.h index 174a67bc16f..2a5a6569bae 100644 --- a/usr.sbin/ypserv/makedbm/db.h +++ b/usr.sbin/ypserv/makedbm/db.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db.h,v 1.1 1997/07/22 10:52:59 maja Exp $ */ +/* $OpenBSD: db.h,v 1.2 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1997 Mats O Jansson <moj@stacken.kth.se> @@ -35,7 +35,7 @@ #define _MAKEDBM_DB_H_ __BEGIN_DECLS -int db_hash_list_database __P((char *)); +int db_hash_list_database(char *); __END_DECLS #endif /* !_MAKEDBM_DB_H_ */ diff --git a/usr.sbin/ypserv/revnetgroup/hash.h b/usr.sbin/ypserv/revnetgroup/hash.h index a01c28b5fe3..264a3fd2ca4 100644 --- a/usr.sbin/ypserv/revnetgroup/hash.h +++ b/usr.sbin/ypserv/revnetgroup/hash.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.h,v 1.1 1997/04/15 22:06:12 maja Exp $ */ +/* $OpenBSD: hash.h,v 1.2 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1995 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -60,9 +60,9 @@ struct group_entry { #define LINSIZ 1024 * 10 -extern void store __P(( struct group_entry ** , char *, char * )); -extern void mstore __P(( struct member_entry ** , char *, char *, char * )); -extern char *lookup __P(( struct group_entry **, char * )); -extern void __endnetgrent __P(( void )); -extern void __setnetgrent __P(( char * )); -extern int __getnetgrent __P(( char **, char **, char ** )); +extern void store( struct group_entry ** , char *, char * ); +extern void mstore( struct member_entry ** , char *, char *, char * ); +extern char *lookup( struct group_entry **, char * ); +extern void __endnetgrent( void ); +extern void __setnetgrent( char * ); +extern int __getnetgrent( char **, char **, char ** ); diff --git a/usr.sbin/ypserv/ypserv/acl.h b/usr.sbin/ypserv/ypserv/acl.h index 215d7180141..c8883a21bb6 100644 --- a/usr.sbin/ypserv/ypserv/acl.h +++ b/usr.sbin/ypserv/ypserv/acl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acl.h,v 1.4 1996/06/30 19:46:05 maja Exp $ */ +/* $OpenBSD: acl.h,v 1.5 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -76,10 +76,10 @@ struct aclent *next; }; __BEGIN_DECLS -int acl_check_host __P((struct in_addr *)); -int acl_init __P((char *)); -int acl_securenet __P((char *)); -void acl_reset __P((void)); +int acl_check_host(struct in_addr *); +int acl_init(char *); +int acl_securenet(char *); +void acl_reset(void); __END_DECLS #endif /* !_ACL_H_ */ diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c index b1ab9a3e37d..944fb7cac0d 100644 --- a/usr.sbin/ypserv/ypserv/ypserv.c +++ b/usr.sbin/ypserv/ypserv/ypserv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ypserv.c,v 1.18 2001/12/05 10:02:16 deraadt Exp $ */ +/* $OpenBSD: ypserv.c,v 1.19 2002/02/16 21:28:11 millert Exp $ */ /* * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se> @@ -32,7 +32,7 @@ */ #ifndef LINT -static char rcsid[] = "$OpenBSD: ypserv.c,v 1.18 2001/12/05 10:02:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ypserv.c,v 1.19 2002/02/16 21:28:11 millert Exp $"; #endif #include <sys/types.h> @@ -86,7 +86,7 @@ volatile sig_atomic_t wantsighup; extern int __svc_fdsetsize; extern fd_set *__svc_fdset; -extern void svc_getreqset2 __P((fd_set *, int)); +extern void svc_getreqset2(fd_set *, int); static void _msgout(char* msg) |