diff options
Diffstat (limited to 'lib')
206 files changed, 1534 insertions, 1534 deletions
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/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 |