diff options
Diffstat (limited to 'sys/kern')
47 files changed, 318 insertions, 319 deletions
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c index 2ef35faab22..beb231e60aa 100644 --- a/sys/kern/exec_elf.c +++ b/sys/kern/exec_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf.c,v 1.37 2001/11/15 06:22:30 art Exp $ */ +/* $OpenBSD: exec_elf.c,v 1.38 2002/03/14 01:27:03 millert Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -71,8 +71,8 @@ #endif struct ELFNAME(probe_entry) { - int (*func) __P((struct proc *, struct exec_package *, char *, - u_long *, u_int8_t *)); + int (*func)(struct proc *, struct exec_package *, char *, + u_long *, u_int8_t *); int os_mask; } ELFNAME(probes)[] = { /* XXX - bogus, shouldn't be size independent.. */ diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c index d1ba66f4a82..ab13183ab83 100644 --- a/sys/kern/exec_subr.c +++ b/sys/kern/exec_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_subr.c,v 1.17 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: exec_subr.c,v 1.18 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */ /* @@ -56,7 +56,7 @@ void new_vmcmd(evsp, proc, len, addr, vp, offset, prot) struct exec_vmcmd_set *evsp; - int (*proc) __P((struct proc * p, struct exec_vmcmd *)); + int (*proc)(struct proc * p, struct exec_vmcmd *); u_long len; u_long addr; struct vnode *vp; diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index d1cd0f7c354..ed9437a6907 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.92 2002/01/30 20:29:44 nordin Exp $ */ +/* $OpenBSD: init_main.c,v 1.93 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -95,7 +95,7 @@ #endif #if defined(NFSSERVER) || defined(NFSCLIENT) -extern void nfs_init __P((void)); +extern void nfs_init(void); #endif char copyright[] = @@ -120,20 +120,20 @@ struct proc *initproc; int cmask = CMASK; extern struct user *proc0paddr; -void (*md_diskconf) __P((void)) = NULL; +void (*md_diskconf)(void) = NULL; struct vnode *rootvp, *swapdev_vp; int boothowto; struct timeval boottime; struct timeval runtime; /* XXX return int so gcc -Werror won't complain */ -int main __P((void *)); -void check_console __P((struct proc *)); -void start_init __P((void *)); -void start_cleaner __P((void *)); -void start_update __P((void *)); -void start_reaper __P((void *)); -void start_crypto __P((void *)); +int main(void *); +void check_console(struct proc *); +void start_init(void *); +void start_cleaner(void *); +void start_update(void *); +void start_reaper(void *); +void start_crypto(void *); extern char sigcode[], esigcode[]; #ifdef SYSCALL_DEBUG @@ -178,10 +178,10 @@ main(framep) int s; register_t rval[2]; extern struct pdevinit pdevinit[]; - extern void scheduler_start __P((void)); - extern void disk_init __P((void)); - extern void endtsleep __P((void *)); - extern void realitexpire __P((void *)); + extern void scheduler_start(void); + extern void disk_init(void); + extern void endtsleep(void *); + extern void realitexpire(void *); /* * Initialize the current process pointer (curproc) before diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f1eadf5977e..2756250134f 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.55 2002/02/19 06:12:13 nordin Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.56 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -74,11 +74,11 @@ struct filelist filehead; /* head of list of open files */ int nfiles; /* actual number of open files */ -static __inline void fd_used __P((struct filedesc *, int)); -static __inline void fd_unused __P((struct filedesc *, int)); -static __inline int find_next_zero __P((u_int *, int, u_int)); +static __inline void fd_used(struct filedesc *, int); +static __inline void fd_unused(struct filedesc *, int); +static __inline int find_next_zero(u_int *, int, u_int); int finishdup(struct proc *, struct file *, int, int, register_t *); -int find_last_set __P((struct filedesc *, int)); +int find_last_set(struct filedesc *, int); struct pool file_pool; struct pool fdesc_pool; diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 8224f0e2e87..311726192a5 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.40 2002/01/25 15:00:26 art Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.41 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -78,7 +78,7 @@ #include <uvm/uvm_extern.h> -void proc_zap __P((struct proc *)); +void proc_zap(struct proc *); /* * exit -- diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 9d9c799de5c..ff0c2232f55 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.53 2002/02/22 01:08:42 art Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.54 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -151,8 +151,8 @@ fork1(p1, exitsig, flags, stack, stacksize, func, arg, retval) int count; vaddr_t uaddr; int s; - extern void endtsleep __P((void *)); - extern void realitexpire __P((void *)); + extern void endtsleep(void *); + extern void realitexpire(void *); /* * Although process entries are dynamically created, we still keep diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index bc392d5ca51..c0b5766f0ce 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_kthread.c,v 1.15 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: kern_kthread.c,v 1.16 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $ */ /*- @@ -66,7 +66,7 @@ kthread_create(void (*func)(void *), void *arg, struct proc **newpp, const char *fmt, ...) #else kthread_create(func, arg, newpp, fmt, va_alist) - void (*func) __P((void *)); + void (*func)(void *); void *arg; struct proc **newpp; const char *fmt; @@ -136,7 +136,7 @@ kthread_exit(ecode) struct kthread_q { SIMPLEQ_ENTRY(kthread_q) kq_q; - void (*kq_func) __P((void *)); + void (*kq_func)(void *); void *kq_arg; }; @@ -149,7 +149,7 @@ SIMPLEQ_HEAD(, kthread_q) kthread_q = SIMPLEQ_HEAD_INITIALIZER(kthread_q); */ void kthread_create_deferred(func, arg) - void (*func) __P((void *)); + void (*func)(void *); void *arg; { struct kthread_q *kq; diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index e9e5944f139..4986e0a0d19 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_ktrace.c,v 1.26 2002/02/22 19:19:28 deraadt Exp $ */ +/* $OpenBSD: kern_ktrace.c,v 1.27 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */ /* @@ -53,12 +53,12 @@ #include <uvm/uvm_extern.h> -void ktrinitheader __P((struct ktr_header *, struct proc *, int)); -int ktrops __P((struct proc *, struct proc *, int, int, struct vnode *)); -int ktrsetchildren __P((struct proc *, struct proc *, int, int, - struct vnode *)); -int ktrwrite __P((struct proc *, struct ktr_header *)); -int ktrcanset __P((struct proc *, struct proc *)); +void ktrinitheader(struct ktr_header *, struct proc *, int); +int ktrops(struct proc *, struct proc *, int, int, struct vnode *); +int ktrsetchildren(struct proc *, struct proc *, int, int, + struct vnode *); +int ktrwrite(struct proc *, struct ktr_header *); +int ktrcanset(struct proc *, struct proc *); /* * Change the trace vnode in a correct way (to avoid races). diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index d0eaaf678fa..b365b50babe 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lkm.c,v 1.36 2002/01/09 19:05:17 ericj Exp $ */ +/* $OpenBSD: kern_lkm.c,v 1.37 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $ */ /* @@ -93,8 +93,8 @@ static int _lkm_vfs(struct lkm_table *, int); static int _lkm_dev(struct lkm_table *, int); static int _lkm_exec(struct lkm_table *, int); -void lkminit __P((void)); -int lkmexists __P((struct lkm_table *)); +void lkminit(void); +int lkmexists(struct lkm_table *); void lkminit() @@ -415,7 +415,7 @@ lkmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p) return (ENXIO); } - curp->entry = (int (*) __P((struct lkm_table *, int, int))) + curp->entry = (int (*)(struct lkm_table *, int, int)) (*((long *) (data))); #ifdef LKM_DEBUG diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 9e8a47d59ba..e21182ba649 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lock.c,v 1.11 2001/12/04 21:56:18 millert Exp $ */ +/* $OpenBSD: kern_lock.c,v 1.12 2002/03/14 01:27:04 millert Exp $ */ /* * Copyright (c) 1995 @@ -46,8 +46,8 @@ #include <machine/cpu.h> -void record_stacktrace __P((int *, int)); -void playback_stacktrace __P((int *, int)); +void record_stacktrace(int *, int); +void playback_stacktrace(int *, int); /* * Locking primitives implementation. diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index dc1b78fb8e2..acc3fd70823 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_physio.c,v 1.18 2001/12/10 17:37:51 art Exp $ */ +/* $OpenBSD: kern_physio.c,v 1.19 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $ */ /*- @@ -62,8 +62,8 @@ * I/O, so raw I/O requests don't have to be single-threaded. */ -struct buf *getphysbuf __P((void)); -void putphysbuf __P((struct buf *bp)); +struct buf *getphysbuf(void); +void putphysbuf(struct buf *bp); /* * Do "physical I/O" on behalf of a user. "Physical I/O" is I/O directly @@ -73,11 +73,11 @@ void putphysbuf __P((struct buf *bp)); */ int physio(strategy, bp, dev, flags, minphys, uio) - void (*strategy) __P((struct buf *)); + void (*strategy)(struct buf *); struct buf *bp; dev_t dev; int flags; - void (*minphys) __P((struct buf *)); + void (*minphys)(struct buf *); struct uio *uio; { struct iovec *iovp; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index d3d8cfeb7a9..bbf8b93889b 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_proc.c,v 1.12 2002/01/25 15:00:26 art Exp $ */ +/* $OpenBSD: kern_proc.c,v 1.13 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */ /* @@ -92,9 +92,9 @@ struct pool pcred_pool; struct simplelock deadproc_slock; struct proclist deadproc; /* dead, but not yet undead */ -static void orphanpg __P((struct pgrp *)); +static void orphanpg(struct pgrp *); #ifdef DEBUG -void pgrpdump __P((void)); +void pgrpdump(void); #endif /* diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 450aa0df795..c1511bab3e7 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.55 2002/02/22 19:19:28 deraadt Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.56 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -82,9 +82,9 @@ int filt_signal(struct knote *kn, long hint); struct filterops sig_filtops = { 0, filt_sigattach, filt_sigdetach, filt_signal }; -void proc_stop __P((struct proc *p)); -void killproc __P((struct proc *, char *)); -int cansignal __P((struct proc *, struct pcred *, struct proc *, int)); +void proc_stop(struct proc *p); +void killproc(struct proc *, char *); +int cansignal(struct proc *, struct pcred *, struct proc *, int); struct pool sigacts_pool; /* memory pool for sigacts structures */ diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 70b9dcecfe0..6086806b1d3 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_subr.c,v 1.20 2001/07/27 09:55:07 niklas Exp $ */ +/* $OpenBSD: kern_subr.c,v 1.21 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */ /* @@ -195,7 +195,7 @@ void * hook_establish(head, tail, fn, arg) struct hook_desc_head *head; int tail; - void (*fn) __P((void *)); + void (*fn)(void *); void *arg; { struct hook_desc *hdp; @@ -256,7 +256,7 @@ dohooks(head) struct powerhook_desc { CIRCLEQ_ENTRY(powerhook_desc) sfd_list; - void (*sfd_fn) __P((int, void *)); + void (*sfd_fn)(int, void *); void *sfd_arg; }; @@ -265,7 +265,7 @@ CIRCLEQ_HEAD(, powerhook_desc) powerhook_list = void * powerhook_establish(fn, arg) - void (*fn) __P((int, void *)); + void (*fn)(int, void *); void *arg; { struct powerhook_desc *ndp; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 220e3b01bf1..f9c6a576970 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.41 2002/03/08 07:25:29 mickey Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.42 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -61,12 +61,12 @@ u_char curpriority; /* usrpri of curproc */ int lbolt; /* once a second sleep address */ -void scheduler_start __P((void)); +void scheduler_start(void); -void roundrobin __P((void *)); -void schedcpu __P((void *)); -void updatepri __P((struct proc *)); -void endtsleep __P((void *)); +void roundrobin(void *); +void schedcpu(void *); +void updatepri(struct proc *); +void endtsleep(void *); void scheduler_start() diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index a8444eac2ea..ab7c3b3ce33 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_time.c,v 1.28 2002/02/17 06:11:05 art Exp $ */ +/* $OpenBSD: kern_time.c,v 1.29 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $ */ /* @@ -55,8 +55,8 @@ #include <machine/cpu.h> -void settime __P((struct timeval *)); -void itimerround __P((struct timeval *)); +void settime(struct timeval *); +void itimerround(struct timeval *); /* * Time of day and interval timer support. diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 86539d766d2..8a078512a97 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_timeout.c,v 1.13 2002/02/15 18:10:15 nordin Exp $ */ +/* $OpenBSD: kern_timeout.c,v 1.14 2002/03/14 01:27:04 millert Exp $ */ /* * Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org> * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org> @@ -262,7 +262,7 @@ softclock(void) } #ifdef DDB -void db_show_callout_bucket __P((struct circq *)); +void db_show_callout_bucket(struct circq *); void db_show_callout_bucket(struct circq *bucket) diff --git a/sys/kern/kgdb_stub.c b/sys/kern/kgdb_stub.c index 663d3e732f1..89ff65afc61 100644 --- a/sys/kern/kgdb_stub.c +++ b/sys/kern/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_stub.c,v 1.2 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: kgdb_stub.c,v 1.3 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.6 1998/08/30 20:30:57 scottr Exp $ */ /* @@ -70,18 +70,18 @@ int kgdb_debug_init = 0; /* != 0 waits for remote at system init */ int kgdb_debug_panic = 0; /* != 0 waits for remote on panic */ label_t *kgdb_recover = 0; -static void kgdb_copy __P((void *, void *, int)); -/* static void kgdb_zero __P((void *, int)); */ -static void kgdb_send __P((u_char *)); -static int kgdb_recv __P((u_char *, int)); -static int digit2i __P((u_char)); -static u_char i2digit __P((int)); -static void mem2hex __P((void *, void *, int)); -static u_char *hex2mem __P((void *, u_char *, int)); -static vaddr_t hex2i __P((u_char **)); - -static int (*kgdb_getc) __P((void *)); -static void (*kgdb_putc) __P((void *, int)); +static void kgdb_copy(void *, void *, int); +/* static void kgdb_zero(void *, int); */ +static void kgdb_send(u_char *); +static int kgdb_recv(u_char *, int); +static int digit2i(u_char); +static u_char i2digit(int); +static void mem2hex(void *, void *, int); +static u_char *hex2mem(void *, u_char *, int); +static vaddr_t hex2i(u_char **); + +static int (*kgdb_getc)(void *); +static void (*kgdb_putc)(void *, int); static void *kgdb_ioarg; static u_char buffer[KGDB_BUFLEN]; @@ -302,8 +302,8 @@ kgdb_recv(bp, maxlen) */ void kgdb_attach(getfn, putfn, ioarg) - int (*getfn) __P((void *)); - void (*putfn) __P((void *, int)); + int (*getfn)(void *); + void (*putfn)(void *, int); void *ioarg; { kgdb_getc = getfn; diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh index 6aac60c0270..97a72978fce 100644 --- a/sys/kern/makesyscalls.sh +++ b/sys/kern/makesyscalls.sh @@ -1,5 +1,5 @@ #! /bin/sh - -# $OpenBSD: makesyscalls.sh,v 1.8 2001/08/26 04:10:56 deraadt Exp $ +# $OpenBSD: makesyscalls.sh,v 1.9 2002/03/14 01:27:04 millert Exp $ # $NetBSD: makesyscalls.sh,v 1.26 1998/01/09 06:17:51 thorpej Exp $ # # Copyright (c) 1994,1996 Christopher G. Demetriou @@ -348,7 +348,7 @@ function putent(nodefs, compatwrap) { # get none, since they always have sys_nosys() for their table # entries. if (nodefs != "INDIR") { - prototype = "__P((struct proc *, void *, register_t *))" + prototype = "(struct proc *, void *, register_t *)" if (compatwrap == "") printf("int\t%s\t%s;\n", funcname, prototype) > sysprotos diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c index e24cde8096b..744a61f6388 100644 --- a/sys/kern/spec_vnops.c +++ b/sys/kern/spec_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spec_vnops.c,v 1.22 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: spec_vnops.c,v 1.23 2002/03/14 01:27:08 millert Exp $ */ /* $NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $ */ /* @@ -65,7 +65,7 @@ char devout[] = "devout"; char devioc[] = "devioc"; char devcls[] = "devcls"; -int (**spec_vnodeop_p) __P((void *)); +int (**spec_vnodeop_p)(void *); struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_lookup_desc, spec_lookup }, /* lookup */ @@ -104,7 +104,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = { { &vop_pathconf_desc, spec_pathconf }, /* pathconf */ { &vop_advlock_desc, spec_advlock }, /* advlock */ { &vop_bwrite_desc, spec_bwrite }, /* bwrite */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } }; struct vnodeopv_desc spec_vnodeop_opv_desc = { &spec_vnodeop_p, spec_vnodeop_entries }; @@ -240,7 +240,7 @@ spec_read(v) long bsize, bscale, ssize; struct partinfo dpart; int n, on, majordev; - int (*ioctl) __P((dev_t, u_long, caddr_t, int, struct proc *)); + int (*ioctl)(dev_t, u_long, caddr_t, int, struct proc *); int error = 0; #ifdef DIAGNOSTIC @@ -341,7 +341,7 @@ spec_write(v) long bsize, bscale, ssize; struct partinfo dpart; int n, on, majordev; - int (*ioctl) __P((dev_t, u_long, caddr_t, int, struct proc *)); + int (*ioctl)(dev_t, u_long, caddr_t, int, struct proc *); int error = 0; #ifdef DIAGNOSTIC @@ -595,7 +595,7 @@ spec_close(v) } */ *ap = v; register struct vnode *vp = ap->a_vp; dev_t dev = vp->v_rdev; - int (*devclose) __P((dev_t, int, int, struct proc *)); + int (*devclose)(dev_t, int, int, struct proc *); int mode, error; switch (vp->v_type) { diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 6fff40bba87..2fb4ecbbbc1 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.29 2001/09/01 05:48:18 jason Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.30 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -59,7 +59,7 @@ * Autoconfiguration subroutines. */ -typedef int (*cond_predicate_t) __P((struct device *, void *)); +typedef int (*cond_predicate_t)(struct device *, void *); /* * ioconf.c exports exactly two names: cfdata and cfroots. All system @@ -87,18 +87,18 @@ static struct cftable staticcftable = { #endif /* AUTOCONF_VERBOSE */ int autoconf_verbose = AUTOCONF_VERBOSE; /* trace probe calls */ -static char *number __P((char *, int)); -static void mapply __P((struct matchinfo *, struct cfdata *)); +static char *number(char *, int); +static void mapply(struct matchinfo *, struct cfdata *); struct deferred_config { TAILQ_ENTRY(deferred_config) dc_queue; struct device *dc_dev; - void (*dc_func) __P((struct device *)); + void (*dc_func)(struct device *); }; TAILQ_HEAD(, deferred_config) deferred_config_queue; -void config_process_deferred_children __P((struct device *)); +void config_process_deferred_children(struct device *); struct devicelist alldevs; /* list of all devices */ struct evcntlist allevents; /* list of all event counters */ @@ -678,7 +678,7 @@ config_deactivate(dev) void config_defer(dev, func) struct device *dev; - void (*func) __P((struct device *)); + void (*func)(struct device *); { struct deferred_config *dc; @@ -908,7 +908,7 @@ attach_loadable(parentname, parentunit, cftable) } int -devcf_intable __P((struct device *, void *)); +devcf_intable(struct device *, void *); int devcf_intable(dev, arg) diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index bb5c6070d65..29c9cf86c96 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.20 2001/05/14 07:16:12 angelos Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.21 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -205,7 +205,7 @@ diskerr(bp, dname, what, pri, blkdone, lp) register struct disklabel *lp; { int unit = DISKUNIT(bp->b_dev), part = DISKPART(bp->b_dev); - register int (*pr) __P((const char *, ...)); + register int (*pr)(const char *, ...); char partname = 'a' + part; int sn; @@ -453,7 +453,7 @@ dk_mountroot() { dev_t rawdev, rrootdev; int part = DISKPART(rootdev); - int (*mountrootfn) __P((void)); + int (*mountrootfn)(void); struct disklabel dl; int error; @@ -484,7 +484,7 @@ dk_mountroot() #ifdef EXT2FS case FS_EXT2FS: { - extern int ext2fs_mountroot __P((void)); + extern int ext2fs_mountroot(void); mountrootfn = ext2fs_mountroot; } break; @@ -492,7 +492,7 @@ dk_mountroot() #ifdef FFS case FS_BSDFFS: { - extern int ffs_mountroot __P((void)); + extern int ffs_mountroot(void); mountrootfn = ffs_mountroot; } break; @@ -500,7 +500,7 @@ dk_mountroot() #ifdef LFS case FS_BSDLFS: { - extern int lfs_mountroot __P((void)); + extern int lfs_mountroot(void); mountrootfn = lfs_mountroot; } break; @@ -508,7 +508,7 @@ dk_mountroot() #ifdef CD9660 case FS_ISO9660: { - extern int cd9660_mountroot __P((void)); + extern int cd9660_mountroot(void); mountrootfn = cd9660_mountroot; } break; @@ -516,7 +516,7 @@ dk_mountroot() default: #ifdef FFS { - extern int ffs_mountroot __P((void)); + extern int ffs_mountroot(void); printf("filesystem type %d not known.. assuming ffs\n", dl.d_partitions[part].p_fstype); diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c index be00d755fc2..3ac43139310 100644 --- a/sys/kern/subr_extent.c +++ b/sys/kern/subr_extent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_extent.c,v 1.19 2002/01/23 00:39:47 art Exp $ */ +/* $OpenBSD: subr_extent.c,v 1.20 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $ */ /*- @@ -69,13 +69,12 @@ #define db_printf printf #endif -static void extent_insert_and_optimize __P((struct extent *, u_long, u_long, - int, struct extent_region *, struct extent_region *)); -static struct extent_region *extent_alloc_region_descriptor - __P((struct extent *, int)); -static void extent_free_region_descriptor __P((struct extent *, - struct extent_region *)); -static void extent_register __P((struct extent *)); +static void extent_insert_and_optimize(struct extent *, u_long, u_long, + int, struct extent_region *, struct extent_region *); +static struct extent_region *extent_alloc_region_descriptor(struct extent *, int); +static void extent_free_region_descriptor(struct extent *, + struct extent_region *); +static void extent_register(struct extent *); /* * Macro to align to an arbitrary power-of-two boundary. diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index d48ac609c39..008902126c9 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.38 2002/01/23 15:46:48 art Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.39 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -97,8 +97,8 @@ extern int uvm_doswapencrypt; * local prototypes */ -int kprintf __P((const char *, int, void *, char *, va_list)); -void putchar __P((int, int, struct tty *)); +int kprintf(const char *, int, void *, char *, va_list); +void putchar(int, int, struct tty *); /* @@ -137,7 +137,7 @@ int db_console = 0; * [e.g. to a "virtual console"]. */ -void (*v_putc) __P((int)) = cnputc; /* start with cnputc (normal cons) */ +void (*v_putc)(int) = cnputc; /* start with cnputc (normal cons) */ /* diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c index c4420eddc45..f26ebb89b01 100644 --- a/sys/kern/subr_userconf.c +++ b/sys/kern/subr_userconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_userconf.c,v 1.26 2001/06/13 07:14:39 miod Exp $ */ +/* $OpenBSD: subr_userconf.c,v 1.27 2002/03/14 01:27:04 millert Exp $ */ /* * Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se> @@ -65,32 +65,32 @@ char userconf_argbuf[40]; /* Additional input */ char userconf_cmdbuf[40]; /* Command line */ char userconf_histbuf[40]; -void userconf_init __P((void)); -int userconf_more __P((void)); -void userconf_modify __P((char *, int*)); -void userconf_hist_cmd __P((char)); -void userconf_hist_int __P((int)); -void userconf_hist_eoc __P((void)); -void userconf_pnum __P((int)); -void userconf_pdevnam __P((short)); -void userconf_pdev __P((short)); -int userconf_number __P((char *, int *)); -int userconf_device __P((char *, int *, short *, short *)); -int userconf_attr __P((char *, int *)); -void userconf_modify __P((char *, int *)); -void userconf_change __P((int)); -void userconf_disable __P((int)); -void userconf_enable __P((int)); -void userconf_help __P((void)); -void userconf_list __P((void)); -void userconf_show __P((void)); -void userconf_common_attr_val __P((short, int *, char)); -void userconf_show_attr __P((char *)); -void userconf_common_dev __P((char *, int, short, short, char)); -void userconf_common_attr __P((char *, int, char)); -void userconf_add_read __P((char *, char, char *, int, int *)); -void userconf_add __P((char *, int, short, short)); -int userconf_parse __P((char *)); +void userconf_init(void); +int userconf_more(void); +void userconf_modify(char *, int*); +void userconf_hist_cmd(char); +void userconf_hist_int(int); +void userconf_hist_eoc(void); +void userconf_pnum(int); +void userconf_pdevnam(short); +void userconf_pdev(short); +int userconf_number(char *, int *); +int userconf_device(char *, int *, short *, short *); +int userconf_attr(char *, int *); +void userconf_modify(char *, int *); +void userconf_change(int); +void userconf_disable(int); +void userconf_enable(int); +void userconf_help(void); +void userconf_list(void); +void userconf_show(void); +void userconf_common_attr_val(short, int *, char); +void userconf_show_attr(char *); +void userconf_common_dev(char *, int, short, short, char); +void userconf_common_attr(char *, int, char); +void userconf_add_read(char *, char, char *, int, int *); +void userconf_add(char *, int, short, short); +int userconf_parse(char *); #define UC_CHANGE 'c' #define UC_DISABLE 'd' diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 14fe3c2ee92..8da0f16b6ad 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.38 2002/03/13 00:24:18 miod Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.39 2002/03/14 01:27:04 millert Exp $ */ /* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */ /* @@ -65,9 +65,9 @@ #include <uvm/uvm_extern.h> -int selscan __P((struct proc *, fd_set *, fd_set *, int, register_t *)); -int seltrue __P((dev_t, int, struct proc *)); -void pollscan __P((struct proc *, struct pollfd *, int, register_t *)); +int selscan(struct proc *, fd_set *, fd_set *, int, register_t *); +int seltrue(dev_t, int, struct proc *); +void pollscan(struct proc *, struct pollfd *, int, register_t *); /* * Read system call. diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 52e6dbbbb30..ac7416eb1df 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_pipe.c,v 1.42 2002/02/08 13:53:28 art Exp $ */ +/* $OpenBSD: sys_pipe.c,v 1.43 2002/03/14 01:27:04 millert Exp $ */ /* * Copyright (c) 1996 John S. Dyson @@ -54,13 +54,13 @@ /* * interfaces to the outside world */ -int pipe_read __P((struct file *, off_t *, struct uio *, struct ucred *)); -int pipe_write __P((struct file *, off_t *, struct uio *, struct ucred *)); -int pipe_close __P((struct file *, struct proc *)); -int pipe_select __P((struct file *, int which, struct proc *)); -int pipe_kqfilter __P((struct file *fp, struct knote *kn)); -int pipe_ioctl __P((struct file *, u_long, caddr_t, struct proc *)); -int pipe_stat __P((struct file *fp, struct stat *ub, struct proc *p)); +int pipe_read(struct file *, off_t *, struct uio *, struct ucred *); +int pipe_write(struct file *, off_t *, struct uio *, struct ucred *); +int pipe_close(struct file *, struct proc *); +int pipe_select(struct file *, int which, struct proc *); +int pipe_kqfilter(struct file *fp, struct knote *kn); +int pipe_ioctl(struct file *, u_long, caddr_t, struct proc *); +int pipe_stat(struct file *fp, struct stat *ub, struct proc *p); static struct fileops pipeops = { pipe_read, pipe_write, pipe_ioctl, pipe_select, pipe_kqfilter, @@ -93,12 +93,12 @@ static int amountpipekva; struct pool pipe_pool; -void pipeclose __P((struct pipe *)); -void pipeinit __P((struct pipe *)); -static __inline int pipelock __P((struct pipe *)); -static __inline void pipeunlock __P((struct pipe *)); -static __inline void pipeselwakeup __P((struct pipe *)); -void pipespace __P((struct pipe *)); +void pipeclose(struct pipe *); +void pipeinit(struct pipe *); +static __inline int pipelock(struct pipe *); +static __inline void pipeunlock(struct pipe *); +static __inline void pipeselwakeup(struct pipe *); +void pipespace(struct pipe *); /* * The pipe system call for the DTYPE_PIPE type of pipes diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index fa6b0eead78..33fdc915183 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_msg.c,v 1.11 2001/08/12 22:50:12 millert Exp $ */ +/* $OpenBSD: sysv_msg.c,v 1.12 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: sysv_msg.c,v 1.19 1996/02/09 19:00:18 christos Exp $ */ /* @@ -41,7 +41,7 @@ struct msgmap *msgmaps; /* MSGSEG msgmap structures */ struct msg *msghdrs; /* MSGTQL msg headers */ struct msqid_ds *msqids; /* MSGMNI msqid_ds struct's */ -void msg_freehdr __P((struct msg *)); +void msg_freehdr(struct msg *); void msginit() diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index 594b54136a2..60290511b3b 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_sem.c,v 1.8 2001/09/13 14:07:14 fgsch Exp $ */ +/* $OpenBSD: sysv_sem.c,v 1.9 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: sysv_sem.c,v 1.26 1996/02/09 19:00:25 christos Exp $ */ /* @@ -25,9 +25,9 @@ struct sem *sem; /* semaphore pool */ struct sem_undo *semu_list; /* list of active undo structures */ int *semu; /* undo structure pool */ -struct sem_undo *semu_alloc __P((struct proc *)); -int semundo_adjust __P((struct proc *, struct sem_undo **, int, int, int)); -void semundo_clear __P((int, int)); +struct sem_undo *semu_alloc(struct proc *); +int semundo_adjust(struct proc *, struct sem_undo **, int, int, int); +void semundo_clear(int, int); void seminit() diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index d787fde7c5b..ae1e0a61ee3 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_shm.c,v 1.24 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: sysv_shm.c,v 1.25 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */ /* @@ -51,7 +51,7 @@ struct shminfo shminfo; struct shmid_ds *shmsegs; -struct shmid_ds *shm_find_segment_by_shmid __P((int)); +struct shmid_ds *shm_find_segment_by_shmid(int); /* * Provides the following externally accessible functions: @@ -82,13 +82,13 @@ struct shmmap_state { int shmid; }; -int shm_find_segment_by_key __P((key_t)); -void shm_deallocate_segment __P((struct shmid_ds *)); -int shm_delete_mapping __P((struct vmspace *, struct shmmap_state *)); -int shmget_existing __P((struct proc *, struct sys_shmget_args *, - int, int, register_t *)); -int shmget_allocate_segment __P((struct proc *, struct sys_shmget_args *, - int, register_t *)); +int shm_find_segment_by_key(key_t); +void shm_deallocate_segment(struct shmid_ds *); +int shm_delete_mapping(struct vmspace *, struct shmmap_state *); +int shmget_existing(struct proc *, struct sys_shmget_args *, + int, int, register_t *); +int shmget_allocate_segment(struct proc *, struct sys_shmget_args *, + int, register_t *); int shm_find_segment_by_key(key) diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 232ca05f1d9..987aac149d7 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.50 2002/01/30 20:45:35 nordin Exp $ */ +/* $OpenBSD: tty.c,v 1.51 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -65,16 +65,16 @@ #include <uvm/uvm_extern.h> #include <dev/rndvar.h> -static int ttnread __P((struct tty *)); -static void ttyblock __P((struct tty *)); -void ttyunblock __P((struct tty *)); -static void ttyecho __P((int, struct tty *)); -static void ttyrubo __P((struct tty *, int)); -static int proc_compare __P((struct proc *, struct proc *)); -int filt_ttyread __P((struct knote *kn, long hint)); -void filt_ttyrdetach __P((struct knote *kn)); -int filt_ttywrite __P((struct knote *kn, long hint)); -void filt_ttywdetach __P((struct knote *kn)); +static int ttnread(struct tty *); +static void ttyblock(struct tty *); +void ttyunblock(struct tty *); +static void ttyecho(int, struct tty *); +static void ttyrubo(struct tty *, int); +static int proc_compare(struct proc *, struct proc *); +int filt_ttyread(struct knote *kn, long hint); +void filt_ttyrdetach(struct knote *kn); +int filt_ttywrite(struct knote *kn, long hint); +void filt_ttywdetach(struct knote *kn); /* Symbolic sleep message strings. */ char ttclos[] = "ttycls"; diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index b62c570b75a..ddc820f5c2c 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_conf.c,v 1.6 1999/04/22 20:02:41 art Exp $ */ +/* $OpenBSD: tty_conf.c,v 1.7 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */ /*- @@ -48,54 +48,54 @@ #include <sys/tty.h> #include <sys/conf.h> -#define ttynodisc ((int (*) __P((dev_t, struct tty *)))enodev) -#define ttyerrclose ((int (*) __P((struct tty *, int flags)))enodev) -#define ttyerrio ((int (*) __P((struct tty *, struct uio *, int)))enodev) -#define ttyerrinput ((int (*) __P((int c, struct tty *)))enodev) -#define ttyerrstart ((int (*) __P((struct tty *)))enodev) +#define ttynodisc ((int (*)(dev_t, struct tty *))enodev) +#define ttyerrclose ((int (*)(struct tty *, int flags))enodev) +#define ttyerrio ((int (*)(struct tty *, struct uio *, int))enodev) +#define ttyerrinput ((int (*)(int c, struct tty *))enodev) +#define ttyerrstart ((int (*)(struct tty *))enodev) -int nullioctl __P((struct tty *, u_long, caddr_t, int, struct proc *)); +int nullioctl(struct tty *, u_long, caddr_t, int, struct proc *); #include "tb.h" #if NTB > 0 -int tbopen __P((dev_t dev, struct tty *tp)); -int tbclose __P((struct tty *tp, int flags)); -int tbread __P((struct tty *tp, struct uio *uio, int flags)); -int tbtioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct proc *p)); -int tbinput __P((int c, struct tty *tp)); +int tbopen(dev_t dev, struct tty *tp); +int tbclose(struct tty *tp, int flags); +int tbread(struct tty *tp, struct uio *uio, int flags); +int tbtioctl(struct tty *tp, u_long cmd, caddr_t data, + int flag, struct proc *p); +int tbinput(int c, struct tty *tp); #endif #include "sl.h" #if NSL > 0 -int slopen __P((dev_t dev, struct tty *tp)); -int slclose __P((struct tty *tp, int flags)); -int sltioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct proc *p)); -int slinput __P((int c, struct tty *tp)); -int slstart __P((struct tty *tp)); +int slopen(dev_t dev, struct tty *tp); +int slclose(struct tty *tp, int flags); +int sltioctl(struct tty *tp, u_long cmd, caddr_t data, + int flag, struct proc *p); +int slinput(int c, struct tty *tp); +int slstart(struct tty *tp); #endif #include "ppp.h" #if NPPP > 0 -int pppopen __P((dev_t dev, struct tty *tp)); -int pppclose __P((struct tty *tp, int flags)); -int ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct proc *p)); -int pppinput __P((int c, struct tty *tp)); -int pppstart __P((struct tty *tp)); -int pppread __P((struct tty *tp, struct uio *uio, int flag)); -int pppwrite __P((struct tty *tp, struct uio *uio, int flag)); +int pppopen(dev_t dev, struct tty *tp); +int pppclose(struct tty *tp, int flags); +int ppptioctl(struct tty *tp, u_long cmd, caddr_t data, + int flag, struct proc *p); +int pppinput(int c, struct tty *tp); +int pppstart(struct tty *tp); +int pppread(struct tty *tp, struct uio *uio, int flag); +int pppwrite(struct tty *tp, struct uio *uio, int flag); #endif #include "strip.h" #if NSTRIP > 0 -int stripopen __P((dev_t dev, struct tty *tp)); -int stripclose __P((struct tty *tp, int flags)); -int striptioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct proc *p)); -int stripinput __P((int c, struct tty *tp)); -int stripstart __P((struct tty *tp)); +int stripopen(dev_t dev, struct tty *tp); +int stripclose(struct tty *tp, int flags); +int striptioctl(struct tty *tp, u_long cmd, caddr_t data, + int flag, struct proc *p); +int stripinput(int c, struct tty *tp); +int stripstart(struct tty *tp); #endif struct linesw linesw[] = diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index b39f9abe104..35a94d3e24c 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_pty.c,v 1.9 2002/02/17 07:07:49 deraadt Exp $ */ +/* $OpenBSD: tty_pty.c,v 1.10 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */ /* @@ -76,10 +76,10 @@ int npty; #define PF_NOSTOP 0x40 #define PF_UCNTL 0x80 /* user control mode */ -void ptyattach __P((int)); -void ptcwakeup __P((struct tty *, int)); -struct tty *ptytty __P((dev_t)); -void ptsstart __P((struct tty *)); +void ptyattach(int); +void ptcwakeup(struct tty *, int); +struct tty *ptytty(dev_t); +void ptsstart(struct tty *); /* * Establish n (or default if n is 1) ptys in the system. @@ -291,7 +291,7 @@ ptcwakeup(tp, flag) } } -int ptcopen __P((dev_t, int, int, struct proc *)); +int ptcopen(dev_t, int, int, struct proc *); /*ARGSUSED*/ int diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 35c193ebf97..44cc5c145fe 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_subr.c,v 1.15 2001/09/28 13:03:56 art Exp $ */ +/* $OpenBSD: tty_subr.c,v 1.16 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $ */ /* @@ -50,8 +50,8 @@ */ #define QMEM(n) ((((n)-1)/NBBY)+1) -void cinit __P((void)); -void clrbits __P((u_char *, int, int)); +void cinit(void); +void clrbits(u_char *, int, int); /* * Initialize clists. diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c index 8616422eceb..7ab05b778d8 100644 --- a/sys/kern/tty_tb.c +++ b/sys/kern/tty_tb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_tb.c,v 1.2 1996/03/03 17:20:13 niklas Exp $ */ +/* $OpenBSD: tty_tb.c,v 1.3 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: tty_tb.c,v 1.18 1996/02/04 02:17:36 christos Exp $ */ /*- @@ -64,7 +64,7 @@ struct tbconf { short tbc_uiosize; /* size of data record returned user */ int tbc_sync; /* mask for finding sync byte/bit */ /* decoding routine */ - void (*tbc_decode) __P((struct tbconf *, char *, union tbpos *)); + void (*tbc_decode)(struct tbconf *, char *, union tbpos *); u_char *tbc_run; /* enter run mode sequence */ u_char *tbc_point; /* enter point mode sequence */ u_char *tbc_stop; /* stop sequence */ @@ -74,11 +74,11 @@ struct tbconf { #define TBF_INPROX 0x2 /* tablet has proximity info */ }; -static void gtcodecode __P((struct tbconf *, char *, union tbpos *)); -static void tbolddecode __P((struct tbconf *, char *, union tbpos *)); -static void tblresdecode __P((struct tbconf *, char *, union tbpos *)); -static void tbhresdecode __P((struct tbconf *, char *, union tbpos *)); -static void poldecode __P((struct tbconf *, char *, union tbpos *)); +static void gtcodecode(struct tbconf *, char *, union tbpos *); +static void tbolddecode(struct tbconf *, char *, union tbpos *); +static void tblresdecode(struct tbconf *, char *, union tbpos *); +static void tbhresdecode(struct tbconf *, char *, union tbpos *); +static void poldecode(struct tbconf *, char *, union tbpos *); struct tbconf tbconf[TBTYPE] = { @@ -109,12 +109,12 @@ struct tb { } tb[NTB]; -int tbopen __P((dev_t, struct tty *)); -void tbclose __P((struct tty *)); -int tbread __P((struct tty *, struct uio *)); -void tbinput __P((int, struct tty *)); -int tbtioctl __P((struct tty *, u_long, caddr_t, int, struct proc *)); -void tbattach __P((int)); +int tbopen(dev_t, struct tty *); +void tbclose(struct tty *); +int tbread(struct tty *, struct uio *); +void tbinput(int, struct tty *); +int tbtioctl(struct tty *, u_long, caddr_t, int, struct proc *); +void tbattach(int); /* * Open as tablet discipline; called on discipline change. diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index aff438d6597..f7201ef2932 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.12 2001/11/06 19:53:20 miod Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.13 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -49,10 +49,10 @@ #include <sys/sysctl.h> #include <sys/timeout.h> -void pffasttimo __P((void *)); -void pfslowtimo __P((void *)); +void pffasttimo(void *); +void pfslowtimo(void *); #if defined (KEY) || defined (IPSEC) -int pfkey_init __P((void)); +int pfkey_init(void); #endif /* KEY || IPSEC */ #define ADDDOMAIN(x) { \ diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 8aaddd83194..563f4eee68c 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.56 2002/02/25 04:53:16 dhartmei Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.57 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -97,9 +97,9 @@ struct pool mclpool; /* mbuf cluster pool */ struct vm_map *mb_map; -void *mclpool_alloc __P((struct pool *, int)); -void mclpool_release __P((struct pool *, void *)); -struct mbuf *m_copym0 __P((struct mbuf *, int, int, int, int)); +void *mclpool_alloc(struct pool *, int); +void mclpool_release(struct pool *, void *); +struct mbuf *m_copym0(struct mbuf *, int, int, int, int); const char *mclpool_warnmsg = "WARNING: mclpool limit reached; increase NMBCLUSTERS"; @@ -829,7 +829,7 @@ m_devget(buf, totlen, off0, ifp, copy) char *buf; int totlen, off0; struct ifnet *ifp; - void (*copy) __P((const void *, void *, size_t)); + void (*copy)(const void *, void *, size_t); { register struct mbuf *m; struct mbuf *top = NULL, **mp = ⊤ diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index 20d8f5573c2..274cfc43c62 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf2.c,v 1.16 2002/02/01 15:36:29 art Exp $ */ +/* $OpenBSD: uipc_mbuf2.c,v 1.17 2002/03/14 01:27:05 millert Exp $ */ /* $KAME: uipc_mbuf2.c,v 1.29 2001/02/14 13:42:10 itojun Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.40 1999/04/01 00:23:25 thorpej Exp $ */ @@ -77,7 +77,7 @@ ((m)->m_ext.ext_free || MCLISREFERENCED((m)))) /* can't call it m_dup(), as freebsd[34] uses m_dup() with different arg */ -static struct mbuf *m_dup1 __P((struct mbuf *, int, int, int)); +static struct mbuf *m_dup1(struct mbuf *, int, int, int); /* * ensure that [off, off + len) is contiguous on the mbuf chain "m". diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 9042a3f7644..d5038f0ef53 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_usrreq.c,v 1.20 2002/02/19 23:14:59 art Exp $ */ +/* $OpenBSD: uipc_usrreq.c,v 1.21 2002/03/14 01:27:05 millert Exp $ */ /* $NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $ */ /* @@ -941,7 +941,7 @@ unp_dispose(m) void unp_scan(m0, op, discard) struct mbuf *m0; - void (*op) __P((struct file *)); + void (*op)(struct file *); int discard; { struct mbuf *m; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 75e8949dc1c..c476c1c05ed 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.57 2002/01/30 20:45:35 nordin Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.58 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /*- @@ -105,8 +105,8 @@ struct pool bufpool; #define binsheadfree(bp, dp) TAILQ_INSERT_HEAD(dp, bp, b_freelist) #define binstailfree(bp, dp) TAILQ_INSERT_TAIL(dp, bp, b_freelist) -static __inline struct buf *bio_doread __P((struct vnode *, daddr_t, int, int)); -int getnewbuf __P((int slpflag, int slptimeo, struct buf **)); +static __inline struct buf *bio_doread(struct vnode *, daddr_t, int, int); +int getnewbuf(int slpflag, int slptimeo, struct buf **); /* * We keep a few counters to monitor the utilization of the buffer cache diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 88ac3faf875..ba25c785ddf 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cluster.c,v 1.26 2001/11/06 19:53:20 miod Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.27 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /*- @@ -50,15 +50,15 @@ /* * Local declarations */ -void cluster_callback __P((struct buf *)); -struct buf *cluster_newbuf __P((struct vnode *, struct buf *, long, daddr_t, - daddr_t, long, int)); -struct buf *cluster_rbuild __P((struct vnode *, u_quad_t, struct buf *, - daddr_t, daddr_t, long, int, long)); -void cluster_wbuild __P((struct vnode *, struct buf *, long, - daddr_t, int, daddr_t)); -struct cluster_save *cluster_collectbufs __P((struct vnode *, - struct cluster_info *, struct buf *)); +void cluster_callback(struct buf *); +struct buf *cluster_newbuf(struct vnode *, struct buf *, long, daddr_t, + daddr_t, long, int); +struct buf *cluster_rbuild(struct vnode *, u_quad_t, struct buf *, + daddr_t, daddr_t, long, int, long); +void cluster_wbuild(struct vnode *, struct buf *, long, + daddr_t, int, daddr_t); +struct cluster_save *cluster_collectbufs(struct vnode *, + struct cluster_info *, struct buf *); #ifdef DIAGNOSTIC /* diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index c192debfdcf..4f8287e4724 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_default.c,v 1.18 2002/02/26 05:47:47 fgsch Exp $ */ +/* $OpenBSD: vfs_default.c,v 1.19 2002/03/14 01:27:06 millert Exp $ */ /* * Portions of this code are: @@ -54,8 +54,8 @@ extern struct simplelock spechash_slock; -int filt_generic_readwrite __P((struct knote *kn, long hint)); -void filt_generic_detach __P((struct knote *kn)); +int filt_generic_readwrite(struct knote *kn, long hint); +void filt_generic_detach(struct knote *kn); /* * Eliminate all activity associated with the requested vnode diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 38592b6d962..0207edc5885 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_init.c,v 1.11 2001/06/22 14:14:10 deraadt Exp $ */ +/* $OpenBSD: vfs_init.c,v 1.12 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $ */ /* @@ -75,7 +75,7 @@ extern struct vnodeop_desc *vfs_op_descs[]; */ int vfs_opv_numops; -typedef int (*PFI) __P((void *)); +typedef int (*PFI)(void *); /* * A miscellaneous routine. @@ -115,7 +115,7 @@ void vfs_opv_init_explicit(vfs_opv_desc) struct vnodeopv_desc *vfs_opv_desc; { - int (**opv_desc_vector) __P((void *)); + int (**opv_desc_vector)(void *); struct vnodeopv_entry_desc *opve_descp; opv_desc_vector = *(vfs_opv_desc->opv_desc_vector_p); @@ -169,7 +169,7 @@ vfs_opv_init_default(vfs_opv_desc) struct vnodeopv_desc *vfs_opv_desc; { int j; - int (**opv_desc_vector) __P((void *)); + int (**opv_desc_vector)(void *); opv_desc_vector = *(vfs_opv_desc->opv_desc_vector_p); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c5f9b33e278..b8cc7b3a2d7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.82 2002/02/04 19:38:20 miod Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.83 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -101,21 +101,21 @@ struct simplelock mntvnode_slock; struct simplelock vnode_free_list_slock; struct simplelock spechash_slock; -void vclean __P((struct vnode *, int, struct proc *)); +void vclean(struct vnode *, int, struct proc *); -void insmntque __P((struct vnode *, struct mount *)); -int getdevvp __P((dev_t, struct vnode **, enum vtype)); +void insmntque(struct vnode *, struct mount *); +int getdevvp(dev_t, struct vnode **, enum vtype); -int vfs_hang_addrlist __P((struct mount *, struct netexport *, - struct export_args *)); -int vfs_free_netcred __P((struct radix_node *, void *)); -void vfs_free_addrlist __P((struct netexport *)); -static __inline__ void vputonfreelist __P((struct vnode *)); +int vfs_hang_addrlist(struct mount *, struct netexport *, + struct export_args *); +int vfs_free_netcred(struct radix_node *, void *); +void vfs_free_addrlist(struct netexport *); +static __inline__ void vputonfreelist(struct vnode *); int vflush_vnode(struct vnode *, void *); #ifdef DEBUG -void printlockedvnodes __P((void)); +void printlockedvnodes(void); #endif #define VN_KNOTE(vp, b) \ @@ -363,7 +363,7 @@ vattr_null(vap) /* * Routines having to do with the management of the vnode table. */ -extern int (**dead_vnodeop_p) __P((void *)); +extern int (**dead_vnodeop_p)(void *); long numvnodes; /* @@ -373,7 +373,7 @@ int getnewvnode(tag, mp, vops, vpp) enum vtagtype tag; struct mount *mp; - int (**vops) __P((void *)); + int (**vops)(void *); struct vnode **vpp; { struct proc *p = curproc; /* XXX */ @@ -830,7 +830,7 @@ vrele(vp) VOP_INACTIVE(vp, p); } -void vhold __P((struct vnode *vp)); +void vhold(struct vnode *vp); /* * Page or buffer structure gets a reference. diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c index 33a8f9b6633..730ec949533 100644 --- a/sys/kern/vfs_sync.c +++ b/sys/kern/vfs_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_sync.c,v 1.22 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: vfs_sync.c,v 1.23 2002/03/14 01:27:06 millert Exp $ */ /* * Portions of this code are: @@ -56,7 +56,7 @@ #include <sys/kernel.h> #ifdef FFS_SOFTUPDATES -int softdep_process_worklist __P((struct mount *)); +int softdep_process_worklist(struct mount *); #endif /* @@ -257,15 +257,15 @@ speedup_syncer() * Routine to create and manage a filesystem syncer vnode. */ #define sync_close nullop -int sync_fsync __P((void *)); -int sync_inactive __P((void *)); +int sync_fsync(void *); +int sync_inactive(void *); #define sync_reclaim nullop #define sync_lock vop_generic_lock #define sync_unlock vop_generic_unlock -int sync_print __P((void *)); +int sync_print(void *); #define sync_islocked vop_generic_islocked -int (**sync_vnodeop_p) __P((void *)); +int (**sync_vnodeop_p)(void *); struct vnodeopv_entry_desc sync_vnodeop_entries[] = { { &vop_default_desc, vn_default_error }, { &vop_close_desc, sync_close }, /* close */ @@ -276,7 +276,7 @@ struct vnodeopv_entry_desc sync_vnodeop_entries[] = { { &vop_unlock_desc, sync_unlock }, /* unlock */ { &vop_print_desc, sync_print }, /* print */ { &vop_islocked_desc, sync_islocked }, /* islocked */ - { (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL } + { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL } }; struct vnodeopv_desc sync_vnodeop_opv_desc = { &sync_vnodeop_p, sync_vnodeop_entries diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 7b92e02b0e6..a95ec82a9c7 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.94 2002/02/22 20:37:45 drahn Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.95 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -64,9 +64,9 @@ extern int suid_clear; int usermount = 0; /* sysctl: by default, users may not mount */ -static int change_dir __P((struct nameidata *, struct proc *)); +static int change_dir(struct nameidata *, struct proc *); -void checkdirs __P((struct vnode *)); +void checkdirs(struct vnode *); /* * Redirection info so we don't have to include the union fs routines in @@ -76,8 +76,8 @@ void checkdirs __P((struct vnode *)); * it to a stub routine. */ -int (*union_check_p) __P((struct proc *, struct vnode **, - struct file *, struct uio, int *)) = NULL; +int (*union_check_p)(struct proc *, struct vnode **, + struct file *, struct uio, int *) = NULL; /* * Virtual File System System Calls diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8314a049da7..728a5ba13f9 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vnops.c,v 1.39 2001/12/19 08:58:06 art Exp $ */ +/* $OpenBSD: vfs_vnops.c,v 1.40 2002/03/14 01:27:06 millert Exp $ */ /* $NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $ */ /* @@ -57,15 +57,15 @@ #include <uvm/uvm_extern.h> -int vn_read __P((struct file *fp, off_t *off, struct uio *uio, - struct ucred *cred)); -int vn_write __P((struct file *fp, off_t *off, struct uio *uio, - struct ucred *cred)); -int vn_select __P((struct file *fp, int which, struct proc *p)); -int vn_kqfilter __P((struct file *fp, struct knote *kn)); -int vn_closefile __P((struct file *fp, struct proc *p)); -int vn_ioctl __P((struct file *fp, u_long com, caddr_t data, - struct proc *p)); +int vn_read(struct file *fp, off_t *off, struct uio *uio, + struct ucred *cred); +int vn_write(struct file *fp, off_t *off, struct uio *uio, + struct ucred *cred); +int vn_select(struct file *fp, int which, struct proc *p); +int vn_kqfilter(struct file *fp, struct knote *kn); +int vn_closefile(struct file *fp, struct proc *p); +int vn_ioctl(struct file *fp, u_long com, caddr_t data, + struct proc *p); struct fileops vnops = { vn_read, vn_write, vn_ioctl, vn_select, vn_kqfilter, vn_statfile, |