diff options
Diffstat (limited to 'sys')
89 files changed, 539 insertions, 541 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 8184d0d..77d6905 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -56,7 +56,7 @@ #include <vm/vm_map.h> #include <vm/vm_object.h> -static int exec_aout_imgact __P((struct image_params *imgp)); +static int exec_aout_imgact(struct image_params *imgp); struct sysentvec aout_sysvec = { SYS_MAXSYSCALL, diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index d7038f0..6c6810e 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -70,16 +70,16 @@ __ElfType(Brandinfo); __ElfType(Auxargs); -static int elf_check_header __P((const Elf_Ehdr *hdr)); -static int elf_freebsd_fixup __P((register_t **stack_base, - struct image_params *imgp)); -static int elf_load_file __P((struct proc *p, const char *file, u_long *addr, - u_long *entry)); -static int elf_load_section __P((struct proc *p, +static int elf_check_header(const Elf_Ehdr *hdr); +static int elf_freebsd_fixup(register_t **stack_base, + struct image_params *imgp); +static int elf_load_file(struct proc *p, const char *file, u_long *addr, + u_long *entry); +static int elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, - vm_prot_t prot)); -static int exec_elf_imgact __P((struct image_params *imgp)); + vm_prot_t prot); +static int exec_elf_imgact(struct image_params *imgp); static int elf_trace = 0; SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, ""); @@ -720,7 +720,7 @@ elf_freebsd_fixup(register_t **stack_base, struct image_params *imgp) * Code for generating ELF core dumps. */ -typedef void (*segment_callback) __P((vm_map_entry_t, void *)); +typedef void (*segment_callback)(vm_map_entry_t, void *); /* Closure for cb_put_phdr(). */ struct phdr_closure { @@ -734,16 +734,15 @@ struct sseg_closure { size_t size; /* Total size of all writable segments. */ }; -static void cb_put_phdr __P((vm_map_entry_t, void *)); -static void cb_size_segment __P((vm_map_entry_t, void *)); -static void each_writable_segment __P((struct proc *, segment_callback, - void *)); -static int elf_corehdr __P((struct thread *, struct vnode *, struct ucred *, - int, void *, size_t)); -static void elf_puthdr __P((struct proc *, void *, size_t *, - const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int)); -static void elf_putnote __P((void *, size_t *, const char *, int, - const void *, size_t)); +static void cb_put_phdr(vm_map_entry_t, void *); +static void cb_size_segment(vm_map_entry_t, void *); +static void each_writable_segment(struct proc *, segment_callback, void *); +static int elf_corehdr(struct thread *, struct vnode *, struct ucred *, + int, void *, size_t); +static void elf_puthdr(struct proc *, void *, size_t *, + const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int); +static void elf_putnote(void *, size_t *, const char *, int, + const void *, size_t); extern int osreldate; diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c index 3516daa..d0c98fe 100644 --- a/sys/kern/imgact_gzip.c +++ b/sys/kern/imgact_gzip.c @@ -57,10 +57,10 @@ struct imgact_gzip { u_long virtual_offset, file_offset, file_end, bss_size; }; -static int exec_gzip_imgact __P((struct image_params *imgp)); -static int NextByte __P((void *vp)); -static int do_aout_hdr __P((struct imgact_gzip *)); -static int Flush __P((void *vp, u_char *, u_long siz)); +static int exec_gzip_imgact(struct image_params *imgp); +static int NextByte(void *vp); +static int do_aout_hdr(struct imgact_gzip *); +static int Flush(void *vp, u_char *, u_long siz); static int exec_gzip_imgact(imgp) diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c index c101b7a..4e6ac66 100644 --- a/sys/kern/inflate.c +++ b/sys/kern/inflate.c @@ -274,14 +274,14 @@ struct huft { /* Function prototypes */ -static int huft_build __P((struct inflate *, unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *)); -static int huft_free __P((struct inflate *, struct huft *)); -static int inflate_codes __P((struct inflate *, struct huft *, struct huft *, int, int)); -static int inflate_stored __P((struct inflate *)); -static int xinflate __P((struct inflate *)); -static int inflate_fixed __P((struct inflate *)); -static int inflate_dynamic __P((struct inflate *)); -static int inflate_block __P((struct inflate *, int *)); +static int huft_build(struct inflate *, unsigned *, unsigned, unsigned, const ush *, const ush *, struct huft **, int *); +static int huft_free(struct inflate *, struct huft *); +static int inflate_codes(struct inflate *, struct huft *, struct huft *, int, int); +static int inflate_stored(struct inflate *); +static int xinflate(struct inflate *); +static int inflate_fixed(struct inflate *); +static int inflate_dynamic(struct inflate *); +static int inflate_block(struct inflate *, int *); /* The inflate algorithm uses a sliding 32K byte window on the uncompressed stream to find repeated byte strings. This is implemented here as a diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index df46af2..afb0ab0 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -74,8 +74,8 @@ * The former's operation is described in Leffler, et al., and the latter * was provided by UCB with the 4.4BSD-Lite release */ -static comp_t encode_comp_t __P((u_long, u_long)); -static void acctwatch __P((void *)); +static comp_t encode_comp_t(u_long, u_long); +static void acctwatch(void *); /* * Accounting callout used for periodic scheduling of acctwatch. diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 1b3f9c5..32ab7c0 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -74,7 +74,7 @@ extern void init_device_poll(void); extern void hardclock_device_poll(void); #endif /* DEVICE_POLLING */ -static void initclocks __P((void *dummy)); +static void initclocks(void *dummy); SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL) /* Some of these don't belong here, but it's easiest to concentrate them. */ diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 4e6d283..24187c6 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -94,16 +94,16 @@ static struct cdevsw fildesc_cdevsw = { /* flags */ 0, }; -static int do_dup __P((struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td)); -static int badfo_readwrite __P((struct file *fp, struct uio *uio, - struct ucred *cred, int flags, struct thread *td)); -static int badfo_ioctl __P((struct file *fp, u_long com, caddr_t data, - struct thread *td)); -static int badfo_poll __P((struct file *fp, int events, - struct ucred *cred, struct thread *td)); -static int badfo_kqfilter __P((struct file *fp, struct knote *kn)); -static int badfo_stat __P((struct file *fp, struct stat *sb, struct thread *td)); -static int badfo_close __P((struct file *fp, struct thread *td)); +static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td); +static int badfo_readwrite(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); +static int badfo_ioctl(struct file *fp, u_long com, caddr_t data, + struct thread *td); +static int badfo_poll(struct file *fp, int events, + struct ucred *cred, struct thread *td); +static int badfo_kqfilter(struct file *fp, struct knote *kn); +static int badfo_stat(struct file *fp, struct stat *sb, struct thread *td); +static int badfo_close(struct file *fp, struct thread *td); /* * Descriptor management. @@ -2106,7 +2106,7 @@ badfo_close(fp, td) SYSINIT(fildescdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, fildesc_drvinit,NULL) -static void filelistinit __P((void *)); +static void filelistinit(void *); SYSINIT(select, SI_SUB_LOCK, SI_ORDER_FIRST, filelistinit, NULL) /* ARGSUSED*/ diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 0899960..f25126a 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -78,7 +78,7 @@ struct execlist { TAILQ_HEAD(exec_list_head, execlist); static struct exec_list_head exec_list = TAILQ_HEAD_INITIALIZER(exec_list); -static register_t *exec_copyout_strings __P((struct image_params *)); +static register_t *exec_copyout_strings(struct image_params *); /* XXX This should be vm_size_t. */ static u_long ps_strings = PS_STRINGS; @@ -126,7 +126,7 @@ execve(td, uap) int error, len, i; struct image_params image_params, *imgp; struct vattr attr; - int (*img_first) __P((struct image_params *)); + int (*img_first)(struct image_params *); struct pargs *pa; imgp = &image_params; diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index be845fc..efa7e0d 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -78,7 +78,7 @@ MALLOC_DEFINE(M_ZOMBIE, "zombie", "zombie proc status"); static MALLOC_DEFINE(M_ATEXIT, "atexit", "atexit callback"); -static int wait1 __P((struct thread *, struct wait_args *, int)); +static int wait1(struct thread *, struct wait_args *, int); /* * callout list for things to do at exit time diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 44a74ae..23ca98f 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -588,7 +588,7 @@ legacy_setsoftnet(void) * XXX: This should really be in the network code somewhere and installed * via a SI_SUB_SOFINTR, SI_ORDER_MIDDLE sysinit. */ -void (*netisrs[32]) __P((void)); +void (*netisrs[32])(void); volatile unsigned int netisr; /* scheduling bits for network */ int diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index c66108f..4991b0d 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -55,11 +55,11 @@ static MALLOC_DEFINE(M_KTRACE, "KTRACE", "KTRACE"); #ifdef KTRACE -static struct ktr_header *ktrgetheader __P((int type)); -static void ktrwrite __P((struct vnode *, struct ktr_header *, struct uio *)); -static int ktrcanset __P((struct proc *,struct proc *)); -static int ktrsetchildren __P((struct proc *,struct proc *,int,int,struct vnode *)); -static int ktrops __P((struct proc *,struct proc *,int,int,struct vnode *)); +static struct ktr_header *ktrgetheader(int type); +static void ktrwrite(struct vnode *, struct ktr_header *, struct uio *); +static int ktrcanset(struct proc *,struct proc *); +static int ktrsetchildren(struct proc *,struct proc *,int,int,struct vnode *); +static int ktrops(struct proc *,struct proc *,int,int,struct vnode *); static struct ktr_header * diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 4ec87a0..5e47a0c 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -76,15 +76,15 @@ MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures"); #define NOLOCKF (struct lockf *)0 #define SELF 0x1 #define OTHERS 0x2 -static int lf_clearlock __P((struct lockf *)); -static int lf_findoverlap __P((struct lockf *, - struct lockf *, int, struct lockf ***, struct lockf **)); +static int lf_clearlock(struct lockf *); +static int lf_findoverlap(struct lockf *, + struct lockf *, int, struct lockf ***, struct lockf **); static struct lockf * - lf_getblock __P((struct lockf *)); -static int lf_getlock __P((struct lockf *, struct flock *)); -static int lf_setlock __P((struct lockf *)); -static void lf_split __P((struct lockf *, struct lockf *)); -static void lf_wakelock __P((struct lockf *)); + lf_getblock(struct lockf *); +static int lf_getlock(struct lockf *, struct flock *); +static int lf_setlock(struct lockf *); +static void lf_split(struct lockf *, struct lockf *); +static void lf_wakelock(struct lockf *); /* * Advisory record locking support diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 12cd4d3..e249e5b 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -76,7 +76,7 @@ MALLOC_DEFINE(M_TEMP, "temp", "misc temporary data buffers"); MALLOC_DEFINE(M_IP6OPT, "ip6opt", "IPv6 options"); MALLOC_DEFINE(M_IP6NDP, "ip6ndp", "IPv6 Neighbor Discovery"); -static void kmeminit __P((void *)); +static void kmeminit(void *); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) static MALLOC_DEFINE(M_FREE, "free", "should be on free list"); diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 76d384d..6847cde 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -591,7 +591,7 @@ _mtx_assert(struct mtx *m, int what, const char *file, int line) */ #ifdef MUTEX_DEBUG -void mtx_validate __P((struct mtx *)); +void mtx_validate(struct mtx *); void mtx_validate(struct mtx *m) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 27222fa..1f70870 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -60,13 +60,13 @@ MALLOC_DEFINE(M_SESSION, "session", "session header"); static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures"); -static struct proc *dopfind __P((register pid_t)); +static struct proc *dopfind (register pid_t); -static void doenterpgrp __P((struct proc *, struct pgrp *)); +static void doenterpgrp (struct proc *, struct pgrp *); -static void pgdelete __P((struct pgrp *)); +static void pgdelete (struct pgrp *); -static void orphanpg __P((struct pgrp *pg)); +static void orphanpg (struct pgrp *pg); /* * Other process lists diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 8f585a4..fbd76c2 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -59,7 +59,7 @@ #include <vm/pmap.h> #include <vm/vm_map.h> -static int donice __P((struct proc *curp, struct proc *chgp, int n)); +static int donice(struct proc *curp, struct proc *chgp, int n); static MALLOC_DEFINE(M_UIDINFO, "uidinfo", "uidinfo structures"); #define UIHASH(uid) (&uihashtbl[(uid) & uihash]) @@ -67,7 +67,7 @@ static struct mtx uihashtbl_mtx; static LIST_HEAD(uihashhead, uidinfo) *uihashtbl; static u_long uihash; /* size of hash table - 1 */ -static struct uidinfo *uilookup __P((uid_t uid)); +static struct uidinfo *uilookup(uid_t uid); /* * Resource controls and accounting. diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 19653de..0b06f60 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -74,16 +74,16 @@ #define ONSIG 32 /* NSIG for osig* syscalls. XXX. */ -static int coredump __P((struct thread *)); -static int do_sigaction __P((struct proc *p, int sig, struct sigaction *act, - struct sigaction *oact, int old)); -static int do_sigprocmask __P((struct proc *p, int how, sigset_t *set, - sigset_t *oset, int old)); -static char *expand_name __P((const char *, uid_t, pid_t)); -static int killpg1 __P((struct proc *cp, int sig, int pgid, int all)); -static int sig_ffs __P((sigset_t *set)); -static int sigprop __P((int sig)); -static void stop __P((struct proc *)); +static int coredump (struct thread *); +static int do_sigaction(struct proc *p, int sig, struct sigaction *act, + struct sigaction *oact, int old); +static int do_sigprocmask(struct proc *p, int how, sigset_t *set, + sigset_t *oset, int old); +static char *expand_name(const char *, uid_t, pid_t); +static int killpg1 (struct proc *cp, int sig, int pgid, int all); +static int sig_ffs (sigset_t *set); +static int sigprop (int sig); +static void stop (struct proc *); static int filt_sigattach(struct knote *kn); static void filt_sigdetach(struct knote *kn); diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 1bb8074..bb2d1e4 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -67,7 +67,7 @@ #include <machine/cpu.h> -static void sched_setup __P((void *dummy)); +static void sched_setup(void *dummy); SYSINIT(sched_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, sched_setup, NULL) int hogticks; @@ -90,10 +90,10 @@ static fixpt_t cexp[3] = { 0.9944598480048967 * FSCALE, /* exp(-1/180) */ }; -static void endtsleep __P((void *)); -static void loadav __P((void *arg)); -static void roundrobin __P((void *arg)); -static void schedcpu __P((void *arg)); +static void endtsleep(void *); +static void loadav(void *arg); +static void roundrobin(void *arg); +static void schedcpu(void *arg); static int sysctl_kern_quantum(SYSCTL_HANDLER_ARGS) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 4d5d535..85900bd 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -30,8 +30,8 @@ static MALLOC_DEFINE(M_TIMECOUNTER, "timecounter", "Timecounter stable storage"); -static void tco_setscales __P((struct timecounter *tc)); -static __inline unsigned tco_delta __P((struct timecounter *tc)); +static void tco_setscales(struct timecounter *tc); +static __inline unsigned tco_delta(struct timecounter *tc); time_t time_second; diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index f8c6aff..970cb93 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -64,11 +64,11 @@ struct timezone tz; * timers when they expire. */ -static int nanosleep1 __P((struct thread *td, struct timespec *rqt, - struct timespec *rmt)); -static int settime __P((struct proc *, struct timeval *)); -static void timevalfix __P((struct timeval *)); -static void no_lease_updatetime __P((int)); +static int nanosleep1(struct thread *td, struct timespec *rqt, + struct timespec *rmt); +static int settime(struct proc *, struct timeval *); +static void timevalfix(struct timeval *); +static void no_lease_updatetime(int); static void no_lease_updatetime(deltat) @@ -76,7 +76,7 @@ no_lease_updatetime(deltat) { } -void (*lease_updatetime) __P((int)) = no_lease_updatetime; +void (*lease_updatetime)(int) = no_lease_updatetime; static int settime(p, tv) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index da29c55..d907e83 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -283,7 +283,7 @@ void callout_reset(c, to_ticks, ftn, arg) struct callout *c; int to_ticks; - void (*ftn) __P((void *)); + void (*ftn)(void *); void *arg; { diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 9bbb7b4..5132e02 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -60,7 +60,7 @@ static TAILQ_HEAD(, intr_config_hook) intr_config_hook_list = /* ARGSUSED */ -static void run_interrupt_driven_config_hooks __P((void *dummy)); +static void run_interrupt_driven_config_hooks(void *dummy); static void run_interrupt_driven_config_hooks(dummy) void *dummy; diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c index 13ab39a..78bb231 100644 --- a/sys/kern/subr_clist.c +++ b/sys/kern/subr_clist.c @@ -38,7 +38,7 @@ #include <sys/tty.h> #include <sys/clist.h> -static void clist_init __P((void *)); +static void clist_init(void *); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) static struct cblock *cfreelist = 0; @@ -50,10 +50,10 @@ static int ctotcount; #define INITIAL_CBLOCKS 50 #endif -static struct cblock *cblock_alloc __P((void)); -static void cblock_alloc_cblocks __P((int number)); -static void cblock_free __P((struct cblock *cblockp)); -static void cblock_free_cblocks __P((int number)); +static struct cblock *cblock_alloc(void); +static void cblock_alloc_cblocks(int number); +static void cblock_free(struct cblock *cblockp); +static void cblock_free_cblocks(int number); #include "opt_ddb.h" #ifdef DDB diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index 63f116f..40d5b2d 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -83,17 +83,17 @@ static struct dos_partition historical_bogus_partition_table_fixed[NDOSPART] = { { 0x80, 0, 1, 0, DOSPTYP_386BSD, 254, 255, 255, 0, 50000, }, }; -static int check_part __P((char *sname, struct dos_partition *dp, +static int check_part(char *sname, struct dos_partition *dp, u_long offset, int nsectors, int ntracks, - u_long mbr_offset)); -static void mbr_extended __P((dev_t dev, struct disklabel *lp, + u_long mbr_offset); +static void mbr_extended(dev_t dev, struct disklabel *lp, struct diskslices *ssp, u_long ext_offset, u_long ext_size, u_long base_ext_offset, int nsectors, int ntracks, u_long mbr_offset, - int level)); -static int mbr_setslice __P((char *sname, struct disklabel *lp, + int level); +static int mbr_setslice(char *sname, struct disklabel *lp, struct diskslice *sp, struct dos_partition *dp, - u_long br_offset)); + u_long br_offset); static int check_part(sname, dp, offset, nsectors, ntracks, mbr_offset ) diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 228128d..f6736cf 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -66,18 +66,18 @@ typedef u_char bool_t; static volatile bool_t ds_debug; -static struct disklabel *clone_label __P((struct disklabel *lp)); -static void dsiodone __P((struct bio *bp)); -static char *fixlabel __P((char *sname, struct diskslice *sp, - struct disklabel *lp, int writeflag)); -static void free_ds_label __P((struct diskslices *ssp, int slice)); -static void partition_info __P((char *sname, int part, struct partition *pp)); -static void slice_info __P((char *sname, struct diskslice *sp)); -static void set_ds_label __P((struct diskslices *ssp, int slice, - struct disklabel *lp)); -static void set_ds_labeldevs __P((dev_t dev, struct diskslices *ssp)); -static void set_ds_wlabel __P((struct diskslices *ssp, int slice, - int wlabel)); +static struct disklabel *clone_label(struct disklabel *lp); +static void dsiodone(struct bio *bp); +static char *fixlabel(char *sname, struct diskslice *sp, + struct disklabel *lp, int writeflag); +static void free_ds_label(struct diskslices *ssp, int slice); +static void partition_info(char *sname, int part, struct partition *pp); +static void slice_info(char *sname, struct diskslice *sp); +static void set_ds_label(struct diskslices *ssp, int slice, + struct disklabel *lp); +static void set_ds_labeldevs(dev_t dev, struct diskslices *ssp); +static void set_ds_wlabel(struct diskslices *ssp, int slice, + int wlabel); /* * Duplicate a label for the whole disk, and initialize defaults in the diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 5b2078b..b670c67 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -85,10 +85,10 @@ struct tty *constty; /* pointer to console "window" tty */ static void (*v_putc)(int) = cnputc; /* routine to putc on virtual console */ static void msglogchar(int c, int pri); static void msgaddchar(int c, void *dummy); -static void putchar __P((int ch, void *arg)); -static char *ksprintn __P((char *nbuf, u_long num, int base, int *len)); -static char *ksprintqn __P((char *nbuf, u_quad_t num, int base, int *len)); -static void snprintf_func __P((int ch, void *arg)); +static void putchar(int ch, void *arg); +static char *ksprintn(char *nbuf, u_long num, int base, int *len); +static char *ksprintqn(char *nbuf, u_quad_t num, int base, int *len); +static void snprintf_func(int ch, void *arg); static int consintr = 1; /* Ok to handle console interrupts? */ static int msgbufmapped; /* Set when safe to use msgbuf */ diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index a5dc71b..706863d 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -53,7 +53,7 @@ static MALLOC_DEFINE(M_GPROF, "gprof", "kernel profiling buffer"); -static void kmstartup __P((void *)); +static void kmstartup(void *); SYSINIT(kmem, SI_SUB_KPROF, SI_ORDER_FIRST, kmstartup, NULL) struct gmonparam _gmonparam = { GMON_PROF_OFF }; diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index aa1d782..57db54c 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -50,7 +50,7 @@ volatile u_int stopped_cpus; volatile u_int started_cpus; -void (*cpustop_restartfunc) __P((void)); +void (*cpustop_restartfunc)(void); int mp_ncpus; volatile int smp_started; diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index 76d384d..6847cde 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -591,7 +591,7 @@ _mtx_assert(struct mtx *m, int what, const char *file, int line) */ #ifdef MUTEX_DEBUG -void mtx_validate __P((struct mtx *)); +void mtx_validate(struct mtx *); void mtx_validate(struct mtx *m) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 16fdcf8..77cb46d 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1198,7 +1198,7 @@ selwakeup(sip) mtx_unlock(&sellock); } -static void selectinit __P((void *)); +static void selectinit(void *); SYSINIT(select, SI_SUB_LOCK, SI_ORDER_FIRST, selectinit, NULL) /* ARGSUSED*/ diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index a203823..a26a172 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -37,14 +37,14 @@ static MALLOC_DEFINE(M_MSG, "msg", "SVID compatible message queues"); -static void msginit __P((void)); -static int msgunload __P((void)); -static int sysvmsg_modload __P((struct module *, int, void *)); +static void msginit(void); +static int msgunload(void); +static int sysvmsg_modload(struct module *, int, void *); #define MSG_DEBUG #undef MSG_DEBUG_OK -static void msg_freehdr __P((struct msg *msghdr)); +static void msg_freehdr(struct msg *msghdr); /* XXX casting to (sy_call_t *) is bogus, as usual. */ static sy_call_t *msgcalls[] = { diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index e60889c..af784b8 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -26,25 +26,25 @@ static MALLOC_DEFINE(M_SEM, "sem", "SVID compatible semaphores"); -static void seminit __P((void)); -static int sysvsem_modload __P((struct module *, int, void *)); -static int semunload __P((void)); -static void semexit_myhook __P((struct proc *p)); -static int sysctl_sema __P((SYSCTL_HANDLER_ARGS)); +static void seminit(void); +static int sysvsem_modload(struct module *, int, void *); +static int semunload(void); +static void semexit_myhook(struct proc *p); +static int sysctl_sema(SYSCTL_HANDLER_ARGS); #ifndef _SYS_SYSPROTO_H_ struct __semctl_args; -int __semctl __P((struct thread *td, struct __semctl_args *uap)); +int __semctl(struct thread *td, struct __semctl_args *uap); struct semget_args; -int semget __P((struct thread *td, struct semget_args *uap)); +int semget(struct thread *td, struct semget_args *uap); struct semop_args; -int semop __P((struct thread *td, struct semop_args *uap)); +int semop(struct thread *td, struct semop_args *uap); #endif -static struct sem_undo *semu_alloc __P((struct thread *td)); -static int semundo_adjust __P((struct thread *td, struct sem_undo **supptr, - int semid, int semnum, int adjval)); -static void semundo_clear __P((int semid, int semnum)); +static struct sem_undo *semu_alloc(struct thread *td); +static int semundo_adjust(struct thread *td, struct sem_undo **supptr, + int semid, int semnum, int adjval); +static void semundo_clear(int semid, int semnum); /* XXX casting to (sy_call_t *) is bogus, as usual. */ static sy_call_t *semcalls[] = { diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 1220aec..85356a0 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -61,12 +61,12 @@ static MALLOC_DEFINE(M_SHM, "shm", "SVID compatible shared memory segments"); struct oshmctl_args; -static int oshmctl __P((struct thread *td, struct oshmctl_args *uap)); +static int oshmctl(struct thread *td, struct oshmctl_args *uap); -static int shmget_allocate_segment __P((struct thread *td, - struct shmget_args *uap, int mode)); -static int shmget_existing __P((struct thread *td, struct shmget_args *uap, - int mode, int segnum)); +static int shmget_allocate_segment(struct thread *td, + struct shmget_args *uap, int mode); +static int shmget_existing(struct thread *td, struct shmget_args *uap, + int mode, int segnum); /* XXX casting to (sy_call_t *) is bogus, as usual. */ static sy_call_t *shmcalls[] = { @@ -93,18 +93,18 @@ struct shmmap_state { int shmid; }; -static void shm_deallocate_segment __P((struct shmid_ds *)); -static int shm_find_segment_by_key __P((key_t)); -static struct shmid_ds *shm_find_segment_by_shmid __P((int)); -static struct shmid_ds *shm_find_segment_by_shmidx __P((int)); -static int shm_delete_mapping __P((struct proc *p, struct shmmap_state *)); -static void shmrealloc __P((void)); -static void shminit __P((void)); -static int sysvshm_modload __P((struct module *, int, void *)); -static int shmunload __P((void)); -static void shmexit_myhook __P((struct proc *p)); -static void shmfork_myhook __P((struct proc *p1, struct proc *p2)); -static int sysctl_shmsegs __P((SYSCTL_HANDLER_ARGS)); +static void shm_deallocate_segment(struct shmid_ds *); +static int shm_find_segment_by_key(key_t); +static struct shmid_ds *shm_find_segment_by_shmid(int); +static struct shmid_ds *shm_find_segment_by_shmidx(int); +static int shm_delete_mapping(struct proc *p, struct shmmap_state *); +static void shmrealloc(void); +static void shminit(void); +static int sysvshm_modload(struct module *, int, void *); +static int shmunload(void); +static void shmexit_myhook(struct proc *p); +static void shmfork_myhook(struct proc *p1, struct proc *p2); +static int sysctl_shmsegs(SYSCTL_HANDLER_ARGS); /* * Tuneable values. diff --git a/sys/kern/tty.c b/sys/kern/tty.c index 89207e6..c9a56fd 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -101,20 +101,20 @@ MALLOC_DEFINE(M_TTYS, "ttys", "tty data structures"); -static int proc_compare __P((struct proc *p1, struct proc *p2)); -static int ttnread __P((struct tty *tp)); -static void ttyecho __P((int c, struct tty *tp)); -static int ttyoutput __P((int c, register struct tty *tp)); -static void ttypend __P((struct tty *tp)); -static void ttyretype __P((struct tty *tp)); -static void ttyrub __P((int c, struct tty *tp)); -static void ttyrubo __P((struct tty *tp, int cnt)); -static void ttyunblock __P((struct tty *tp)); -static int ttywflush __P((struct tty *tp)); -static int filt_ttyread __P((struct knote *kn, long hint)); -static void filt_ttyrdetach __P((struct knote *kn)); -static int filt_ttywrite __P((struct knote *kn, long hint)); -static void filt_ttywdetach __P((struct knote *kn)); +static int proc_compare(struct proc *p1, struct proc *p2); +static int ttnread(struct tty *tp); +static void ttyecho(int c, struct tty *tp); +static int ttyoutput(int c, register struct tty *tp); +static void ttypend(struct tty *tp); +static void ttyretype(struct tty *tp); +static void ttyrub(int c, struct tty *tp); +static void ttyrubo(struct tty *tp, int cnt); +static void ttyunblock(struct tty *tp); +static int ttywflush(struct tty *tp); +static int filt_ttyread(struct knote *kn, long hint); +static void filt_ttyrdetach(struct knote *kn); +static int filt_ttywrite(struct knote *kn, long hint); +static void filt_ttywdetach(struct knote *kn); /* * Table with character classes and parity. The 8th bit indicates parity, diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c index c104e22..75171fe 100644 --- a/sys/kern/tty_compat.c +++ b/sys/kern/tty_compat.c @@ -48,10 +48,10 @@ #include <sys/kernel.h> #include <sys/sysctl.h> -static int ttcompatgetflags __P((struct tty *tp)); -static void ttcompatsetflags __P((struct tty *tp, struct termios *t)); -static void ttcompatsetlflags __P((struct tty *tp, struct termios *t)); -static int ttcompatspeedtab __P((int speed, struct speedtab *table)); +static int ttcompatgetflags (struct tty *tp); +static void ttcompatsetflags (struct tty *tp, struct termios *t); +static void ttcompatsetlflags (struct tty *tp, struct termios *t); +static int ttcompatspeedtab (int speed, struct speedtab *table); static int ttydebug = 0; SYSCTL_INT(_debug, OID_AUTO, ttydebug, CTLFLAG_RW, &ttydebug, 0, ""); diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 7271772..f1aa946 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -59,10 +59,10 @@ static MALLOC_DEFINE(M_PTY, "ptys", "pty data structures"); -static void ptsstart __P((struct tty *tp)); -static void ptsstop __P((struct tty *tp, int rw)); -static void ptcwakeup __P((struct tty *tp, int flag)); -static dev_t ptyinit __P((dev_t cdev)); +static void ptsstart(struct tty *tp); +static void ptsstop(struct tty *tp, int rw); +static void ptcwakeup(struct tty *tp, int flag); +static dev_t ptyinit(dev_t cdev); static d_open_t ptsopen; static d_close_t ptsclose; @@ -818,9 +818,9 @@ ptyioctl(dev, cmd, data, flag, td) } -static void ptc_drvinit __P((void *unused)); +static void ptc_drvinit(void *unused); -static void pty_clone __P((void *arg, char *name, int namelen, dev_t *dev)); +static void pty_clone(void *arg, char *name, int namelen, dev_t *dev); static void pty_clone(arg, name, namelen, dev) diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index 13ab39a..78bb231 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -38,7 +38,7 @@ #include <sys/tty.h> #include <sys/clist.h> -static void clist_init __P((void *)); +static void clist_init(void *); SYSINIT(clist, SI_SUB_CLIST, SI_ORDER_FIRST, clist_init, NULL) static struct cblock *cfreelist = 0; @@ -50,10 +50,10 @@ static int ctotcount; #define INITIAL_CBLOCKS 50 #endif -static struct cblock *cblock_alloc __P((void)); -static void cblock_alloc_cblocks __P((int number)); -static void cblock_free __P((struct cblock *cblockp)); -static void cblock_free_cblocks __P((int number)); +static struct cblock *cblock_alloc(void); +static void cblock_alloc_cblocks(int number); +static void cblock_free(struct cblock *cblockp); +static void cblock_free_cblocks(int number); #include "opt_ddb.h" #ifdef DDB diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index ebb91a4..e1e03bd 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -213,7 +213,7 @@ cttypoll(dev, events, td) return (VOP_POLL(ttyvp, events, td->td_ucred, td)); } -static void ctty_clone __P((void *arg, char *name, int namelen, dev_t *dev)); +static void ctty_clone(void *arg, char *name, int namelen, dev_t *dev); static dev_t ctty; @@ -235,7 +235,7 @@ ctty_clone(void *arg, char *name, int namelen, dev_t *dev) } -static void ctty_drvinit __P((void *unused)); +static void ctty_drvinit(void *unused); static void ctty_drvinit(unused) void *unused; diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index f29e227..e51af51 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -56,14 +56,14 @@ * See DOMAIN_SET(9) for details on its use. */ -static void domaininit __P((void *)); +static void domaininit(void *); SYSINIT(domain, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, domaininit, NULL) static struct callout pffast_callout; static struct callout pfslow_callout; -static void pffasttimo __P((void *)); -static void pfslowtimo __P((void *)); +static void pffasttimo(void *); +static void pfslowtimo(void *); struct domain *domains; diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c index f2ce41f..9a6d5f2 100644 --- a/sys/kern/uipc_mbuf2.c +++ b/sys/kern/uipc_mbuf2.c @@ -76,7 +76,7 @@ #include <sys/mutex.h> /* 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_syscalls.c b/sys/kern/uipc_syscalls.c index 41fa08a..4c65827 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -77,15 +77,15 @@ SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) static struct sf_buf *sf_buf_alloc(void); static void sf_buf_free(caddr_t addr, void *args); -static int sendit __P((struct thread *td, int s, struct msghdr *mp, int flags)); -static int recvit __P((struct thread *td, int s, struct msghdr *mp, - caddr_t namelenp)); +static int sendit(struct thread *td, int s, struct msghdr *mp, int flags); +static int recvit(struct thread *td, int s, struct msghdr *mp, + caddr_t namelenp); -static int accept1 __P((struct thread *td, struct accept_args *uap, int compat)); -static int getsockname1 __P((struct thread *td, struct getsockname_args *uap, - int compat)); -static int getpeername1 __P((struct thread *td, struct getpeername_args *uap, - int compat)); +static int accept1(struct thread *td, struct accept_args *uap, int compat); +static int getsockname1(struct thread *td, struct getsockname_args *uap, + int compat); +static int getpeername1(struct thread *td, struct getpeername_args *uap, + int compat); /* * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 7246d16..1df693e 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -79,21 +79,21 @@ static struct unp_head unp_shead, unp_dhead; static struct sockaddr sun_noname = { sizeof(sun_noname), AF_LOCAL }; static ino_t unp_ino; /* prototype for fake inode numbers */ -static int unp_attach __P((struct socket *)); -static void unp_detach __P((struct unpcb *)); -static int unp_bind __P((struct unpcb *,struct sockaddr *, struct thread *)); -static int unp_connect __P((struct socket *,struct sockaddr *, - struct thread *)); -static void unp_disconnect __P((struct unpcb *)); -static void unp_shutdown __P((struct unpcb *)); -static void unp_drop __P((struct unpcb *, int)); -static void unp_gc __P((void)); -static void unp_scan __P((struct mbuf *, void (*)(struct file *))); -static void unp_mark __P((struct file *)); -static void unp_discard __P((struct file *)); -static void unp_freerights __P((struct file **, int)); -static int unp_internalize __P((struct mbuf **, struct thread *)); -static int unp_listen __P((struct unpcb *, struct thread *)); +static int unp_attach(struct socket *); +static void unp_detach(struct unpcb *); +static int unp_bind(struct unpcb *,struct sockaddr *, struct thread *); +static int unp_connect(struct socket *,struct sockaddr *, + struct thread *); +static void unp_disconnect(struct unpcb *); +static void unp_shutdown(struct unpcb *); +static void unp_drop(struct unpcb *, int); +static void unp_gc(void); +static void unp_scan(struct mbuf *, void (*)(struct file *)); +static void unp_mark(struct file *); +static void unp_discard(struct file *); +static void unp_freerights(struct file **, int); +static int unp_internalize(struct mbuf **, struct thread *); +static int unp_listen(struct unpcb *, struct thread *); static int uipc_abort(struct socket *so) @@ -1431,7 +1431,7 @@ unp_listen(unp, td) static void unp_scan(m0, op) register struct mbuf *m0; - void (*op) __P((struct file *)); + void (*op)(struct file *); { struct mbuf *m; struct file **rp; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8e50cba..2a56103 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -81,7 +81,7 @@ static void vfs_setdirty(struct buf *bp); static void vfs_vmio_release(struct buf *bp); static void vfs_backgroundwritedone(struct buf *bp); static int flushbufqueues(void); -static void buf_daemon __P((void)); +static void buf_daemon(void); int vmiodirenable = TRUE; SYSCTL_INT(_vfs, OID_AUTO, vmiodirenable, CTLFLAG_RW, &vmiodirenable, 0, @@ -2828,7 +2828,7 @@ void bufdone(struct buf *bp) { int s, error; - void (*biodone) __P((struct buf *)); + void (*biodone)(struct buf *); GIANT_REQUIRED; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 529efd1..38717e6 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -139,7 +139,7 @@ SYSCTL_OPAQUE(_vfs_cache, OID_AUTO, nchstats, CTLFLAG_RD, &nchstats, -static void cache_zap __P((struct namecache *ncp)); +static void cache_zap(struct namecache *ncp); static MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries"); diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 59b1f93..1cc549a 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -64,10 +64,10 @@ SYSCTL_INT(_debug, OID_AUTO, rcluster, CTLFLAG_RW, &rcluster, 0, static MALLOC_DEFINE(M_SEGMENT, "cluster_save buffer", "cluster_save buffer"); static struct cluster_save * - cluster_collectbufs __P((struct vnode *vp, struct buf *last_bp)); + cluster_collectbufs(struct vnode *vp, struct buf *last_bp); static struct buf * - cluster_rbuild __P((struct vnode *vp, u_quad_t filesize, daddr_t lbn, - daddr64_t blkno, long size, int run, struct buf *fbp)); + cluster_rbuild(struct vnode *vp, u_quad_t filesize, daddr_t lbn, + daddr64_t blkno, long size, int run, struct buf *fbp); static int write_behind = 1; SYSCTL_INT(_vfs, OID_AUTO, write_behind, CTLFLAG_RW, &write_behind, 0, diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 9a3a3c1..3f5f874 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -65,8 +65,8 @@ #include <vm/vnode_pager.h> #include <vm/vm_zone.h> -static int vop_nolookup __P((struct vop_lookup_args *)); -static int vop_nostrategy __P((struct vop_strategy_args *)); +static int vop_nolookup(struct vop_lookup_args *); +static int vop_nostrategy(struct vop_strategy_args *); /* * This vnode table stores what we want to do if the filesystem doesn't diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 88b0081..93546ab 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -53,10 +53,10 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); -static void vfs_free_addrlist __P((struct netexport *nep)); -static int vfs_free_netcred __P((struct radix_node *rn, void *w)); -static int vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep, - struct export_args *argp)); +static void vfs_free_addrlist(struct netexport *nep); +static int vfs_free_netcred(struct radix_node *rn, void *w); +static int vfs_hang_addrlist(struct mount *mp, struct netexport *nep, + struct export_args *argp); /* * Network address lookup element diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index cd0c724c..5d57da0 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -75,21 +75,21 @@ #include <vm/vm_zone.h> #include <vm/vm_page.h> -static int change_dir __P((struct nameidata *ndp, struct thread *td)); -static void checkdirs __P((struct vnode *olddp, struct vnode *newdp)); -static int chroot_refuse_vdir_fds __P((struct filedesc *fdp)); -static int getutimes __P((const struct timeval *, struct timespec *)); -static int setfown __P((struct thread *td, struct vnode *, uid_t, gid_t)); -static int setfmode __P((struct thread *td, struct vnode *, int)); -static int setfflags __P((struct thread *td, struct vnode *, int)); -static int setutimes __P((struct thread *td, struct vnode *, - const struct timespec *, int)); -static int vn_access __P((struct vnode *vp, int user_flags, struct ucred *cred, - struct thread *td)); +static int change_dir(struct nameidata *ndp, struct thread *td); +static void checkdirs(struct vnode *olddp, struct vnode *newdp); +static int chroot_refuse_vdir_fds(struct filedesc *fdp); +static int getutimes(const struct timeval *, struct timespec *); +static int setfown(struct thread *td, struct vnode *, uid_t, gid_t); +static int setfmode(struct thread *td, struct vnode *, int); +static int setfflags(struct thread *td, struct vnode *, int); +static int setutimes(struct thread *td, struct vnode *, + const struct timespec *, int); +static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, + struct thread *td); static int usermount = 0; /* if 1, non-root can mount fs. */ -int (*union_dircheckp) __P((struct thread *td, struct vnode **, struct file *)); +int (*union_dircheckp)(struct thread *td, struct vnode **, struct file *); SYSCTL_INT(_vfs, OID_AUTO, usermount, CTLFLAG_RW, &usermount, 0, ""); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 8e5ea28..5986277 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -73,9 +73,9 @@ static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); -static void addalias __P((struct vnode *vp, dev_t nvp_rdev)); -static void insmntque __P((struct vnode *vp, struct mount *mp)); -static void vclean __P((struct vnode *vp, int flags, struct thread *td)); +static void addalias(struct vnode *vp, dev_t nvp_rdev); +static void insmntque(struct vnode *vp, struct mount *mp); +static void vclean(struct vnode *vp, int flags, struct thread *td); static void vlruvp(struct vnode *vp); /* @@ -389,7 +389,7 @@ int lite2_vfs_mountroot() { struct vfsconf *vfsp; - extern int (*lite2_mountroot) __P((void)); + extern int (*lite2_mountroot)(void); int error; if (lite2_mountroot != NULL) @@ -1210,7 +1210,7 @@ vn_syncer_add_to_worklist(struct vnode *vp, int delay) } struct proc *updateproc; -static void sched_sync __P((void)); +static void sched_sync(void); static struct kproc_desc up_kp = { "syncer", sched_sync, @@ -2404,7 +2404,7 @@ DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) /* * Top level filesystem related information gathering. */ -static int sysctl_ovfs_conf __P((SYSCTL_HANDLER_ARGS)); +static int sysctl_ovfs_conf(SYSCTL_HANDLER_ARGS); static int vfs_sysctl(SYSCTL_HANDLER_ARGS) @@ -2804,14 +2804,14 @@ vn_pollgone(vp) /* * Routine to create and manage a filesystem syncer vnode. */ -#define sync_close ((int (*) __P((struct vop_close_args *)))nullop) -static int sync_fsync __P((struct vop_fsync_args *)); -static int sync_inactive __P((struct vop_inactive_args *)); -static int sync_reclaim __P((struct vop_reclaim_args *)); -#define sync_lock ((int (*) __P((struct vop_lock_args *)))vop_nolock) -#define sync_unlock ((int (*) __P((struct vop_unlock_args *)))vop_nounlock) -static int sync_print __P((struct vop_print_args *)); -#define sync_islocked ((int(*) __P((struct vop_islocked_args *)))vop_noislocked) +#define sync_close ((int (*)(struct vop_close_args *))nullop) +static int sync_fsync(struct vop_fsync_args *); +static int sync_inactive(struct vop_inactive_args *); +static int sync_reclaim(struct vop_reclaim_args *); +#define sync_lock ((int (*)(struct vop_lock_args *))vop_nolock) +#define sync_unlock ((int (*)(struct vop_unlock_args *))vop_nounlock) +static int sync_print(struct vop_print_args *); +#define sync_islocked ((int(*)(struct vop_islocked_args *))vop_noislocked) static vop_t **sync_vnodeop_p; static struct vnodeopv_entry_desc sync_vnodeop_entries[] = { diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index cd0c724c..5d57da0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -75,21 +75,21 @@ #include <vm/vm_zone.h> #include <vm/vm_page.h> -static int change_dir __P((struct nameidata *ndp, struct thread *td)); -static void checkdirs __P((struct vnode *olddp, struct vnode *newdp)); -static int chroot_refuse_vdir_fds __P((struct filedesc *fdp)); -static int getutimes __P((const struct timeval *, struct timespec *)); -static int setfown __P((struct thread *td, struct vnode *, uid_t, gid_t)); -static int setfmode __P((struct thread *td, struct vnode *, int)); -static int setfflags __P((struct thread *td, struct vnode *, int)); -static int setutimes __P((struct thread *td, struct vnode *, - const struct timespec *, int)); -static int vn_access __P((struct vnode *vp, int user_flags, struct ucred *cred, - struct thread *td)); +static int change_dir(struct nameidata *ndp, struct thread *td); +static void checkdirs(struct vnode *olddp, struct vnode *newdp); +static int chroot_refuse_vdir_fds(struct filedesc *fdp); +static int getutimes(const struct timeval *, struct timespec *); +static int setfown(struct thread *td, struct vnode *, uid_t, gid_t); +static int setfmode(struct thread *td, struct vnode *, int); +static int setfflags(struct thread *td, struct vnode *, int); +static int setutimes(struct thread *td, struct vnode *, + const struct timespec *, int); +static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, + struct thread *td); static int usermount = 0; /* if 1, non-root can mount fs. */ -int (*union_dircheckp) __P((struct thread *td, struct vnode **, struct file *)); +int (*union_dircheckp)(struct thread *td, struct vnode **, struct file *); SYSCTL_INT(_vfs, OID_AUTO, usermount, CTLFLAG_RW, &usermount, 0, ""); diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 4f1556a..0eab65c 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -59,17 +59,17 @@ #include <machine/limits.h> -static int vn_closefile __P((struct file *fp, struct thread *td)); -static int vn_ioctl __P((struct file *fp, u_long com, caddr_t data, - struct thread *td)); -static int vn_read __P((struct file *fp, struct uio *uio, - struct ucred *cred, int flags, struct thread *td)); -static int vn_poll __P((struct file *fp, int events, struct ucred *cred, - struct thread *td)); -static int vn_kqfilter __P((struct file *fp, struct knote *kn)); -static int vn_statfile __P((struct file *fp, struct stat *sb, struct thread *td)); -static int vn_write __P((struct file *fp, struct uio *uio, - struct ucred *cred, int flags, struct thread *td)); +static int vn_closefile(struct file *fp, struct thread *td); +static int vn_ioctl(struct file *fp, u_long com, caddr_t data, + struct thread *td); +static int vn_read(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); +static int vn_poll(struct file *fp, int events, struct ucred *cred, + struct thread *td); +static int vn_kqfilter(struct file *fp, struct knote *kn); +static int vn_statfile(struct file *fp, struct stat *sb, struct thread *td); +static int vn_write(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); struct fileops vnops = { vn_read, vn_write, vn_ioctl, vn_poll, vn_kqfilter, diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h index 756867e..7edf8e9 100644 --- a/sys/netinet/icmp6.h +++ b/sys/netinet/icmp6.h @@ -629,18 +629,18 @@ struct rtentry; struct rttimer; struct in6_multi; # endif -void icmp6_init __P((void)); -void icmp6_paramerror __P((struct mbuf *, int)); -void icmp6_error __P((struct mbuf *, int, int, int)); -int icmp6_input __P((struct mbuf **, int *, int)); -void icmp6_fasttimo __P((void)); -void icmp6_reflect __P((struct mbuf *, size_t)); -void icmp6_prepare __P((struct mbuf *)); -void icmp6_redirect_input __P((struct mbuf *, int)); -void icmp6_redirect_output __P((struct mbuf *, struct rtentry *)); +void icmp6_init(void); +void icmp6_paramerror(struct mbuf *, int); +void icmp6_error(struct mbuf *, int, int, int); +int icmp6_input(struct mbuf **, int *, int); +void icmp6_fasttimo(void); +void icmp6_reflect(struct mbuf *, size_t); +void icmp6_prepare(struct mbuf *); +void icmp6_redirect_input(struct mbuf *, int); +void icmp6_redirect_output(struct mbuf *, struct rtentry *); struct ip6ctlparam; -void icmp6_mtudisc_update __P((struct ip6ctlparam *, int)); +void icmp6_mtudisc_update(struct ip6ctlparam *, int); /* XXX: is this the right place for these macros? */ #define icmp6_ifstat_inc(ifp, tag) \ diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h index 47d381e..92e23c4 100644 --- a/sys/netinet/icmp_var.h +++ b/sys/netinet/icmp_var.h @@ -78,7 +78,7 @@ struct icmpstat { #ifdef _KERNEL SYSCTL_DECL(_net_inet_icmp); -extern int badport_bandlim __P((int)); +extern int badport_bandlim(int); #define BANDLIM_UNLIMITED -1 #define BANDLIM_ICMP_UNREACH 0 #define BANDLIM_ICMP_ECHO 1 diff --git a/sys/netinet/if_atm.h b/sys/netinet/if_atm.h index 8603825..b8cddf6 100644 --- a/sys/netinet/if_atm.h +++ b/sys/netinet/if_atm.h @@ -42,6 +42,6 @@ struct mbuf; struct rtentry; struct sockaddr; -void atm_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -int atmresolve __P((struct rtentry *, struct mbuf *, struct sockaddr *, - struct atm_pseudohdr *)); +void atm_rtrequest(int, struct rtentry *, struct rt_addrinfo *); +int atmresolve(struct rtentry *, struct mbuf *, struct sockaddr *, + struct atm_pseudohdr *); diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 5f0d356..68b2221 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -115,17 +115,17 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW, SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, &arp_proxyall, 0, ""); -static void arp_init __P((void)); -static void arp_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -static void arprequest __P((struct ifnet *, - struct in_addr *, struct in_addr *, u_char *)); -static void arpintr __P((void)); -static void arptfree __P((struct llinfo_arp *)); -static void arptimer __P((void *)); +static void arp_init(void); +static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); +static void arprequest(struct ifnet *, + struct in_addr *, struct in_addr *, u_char *); +static void arpintr(void); +static void arptfree(struct llinfo_arp *); +static void arptimer(void *); static struct llinfo_arp - *arplookup __P((u_long, int, int)); + *arplookup(u_long, int, int); #ifdef INET -static void in_arpinput __P((struct mbuf *)); +static void in_arpinput(struct mbuf *); #endif /* diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h index 4c4516e..a61bbee 100644 --- a/sys/netinet/if_ether.h +++ b/sys/netinet/if_ether.h @@ -114,9 +114,9 @@ extern u_char ether_ipmulticast_min[ETHER_ADDR_LEN]; extern u_char ether_ipmulticast_max[ETHER_ADDR_LEN]; extern struct ifqueue arpintrq; -int arpresolve __P((struct ifnet *, struct rtentry *, struct mbuf *, - struct sockaddr *, u_char *, struct rtentry *)); -void arp_ifinit __P((struct ifnet *, struct ifaddr *)); +int arpresolve(struct ifnet *, struct rtentry *, struct mbuf *, + struct sockaddr *, u_char *, struct rtentry *); +void arp_ifinit(struct ifnet *, struct ifaddr *); #endif #endif diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h index 9f83882..cc9fea3 100644 --- a/sys/netinet/if_fddi.h +++ b/sys/netinet/if_fddi.h @@ -77,10 +77,10 @@ struct fddi_header { #define fddi_delmulti ether_delmulti #define fddi_sprintf ether_sprintf -void fddi_ifattach __P((struct ifnet *)); -void fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *)); -int fddi_output __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); +void fddi_ifattach(struct ifnet *); +void fddi_input(struct ifnet *, struct fddi_header *, struct mbuf *); +int fddi_output(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); #endif diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 68aeff8..9be72a5 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -74,7 +74,7 @@ static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state"); static struct router_info * - find_rti __P((struct ifnet *ifp)); + find_rti(struct ifnet *ifp); static struct igmpstat igmpstat; @@ -87,7 +87,7 @@ static u_long igmp_all_rtrs_group; static struct mbuf *router_alert; static struct router_info *Head; -static void igmp_sendpkt __P((struct in_multi *, int, unsigned long)); +static void igmp_sendpkt(struct in_multi *, int, unsigned long); void igmp_init() diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h index d9c9490..d6451a7 100644 --- a/sys/netinet/igmp_var.h +++ b/sys/netinet/igmp_var.h @@ -85,12 +85,12 @@ struct igmpstat { */ #define IGMP_AGE_THRESHOLD 540 -void igmp_init __P((void)); -void igmp_input __P((struct mbuf *, int)); -void igmp_joingroup __P((struct in_multi *)); -void igmp_leavegroup __P((struct in_multi *)); -void igmp_fasttimo __P((void)); -void igmp_slowtimo __P((void)); +void igmp_init(void); +void igmp_input(struct mbuf *, int); +void igmp_joingroup(struct in_multi *); +void igmp_leavegroup(struct in_multi *); +void igmp_fasttimo(void); +void igmp_slowtimo(void); SYSCTL_DECL(_net_inet_igmp); diff --git a/sys/netinet/in.c b/sys/netinet/in.c index c582b8f..eb4877d 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -54,14 +54,14 @@ static MALLOC_DEFINE(M_IPMADDR, "in_multi", "internet multicast address"); -static int in_mask2len __P((struct in_addr *)); -static void in_len2mask __P((struct in_addr *, int)); -static int in_lifaddr_ioctl __P((struct socket *, u_long, caddr_t, - struct ifnet *, struct thread *)); - -static void in_socktrim __P((struct sockaddr_in *)); -static int in_ifinit __P((struct ifnet *, - struct in_ifaddr *, struct sockaddr_in *, int)); +static int in_mask2len(struct in_addr *); +static void in_len2mask(struct in_addr *, int); +static int in_lifaddr_ioctl(struct socket *, u_long, caddr_t, + struct ifnet *, struct thread *); + +static void in_socktrim(struct sockaddr_in *); +static int in_ifinit(struct ifnet *, + struct in_ifaddr *, struct sockaddr_in *, int); static int subnetsarelocal = 0; SYSCTL_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 973d0af..190638c 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -488,11 +488,11 @@ struct ifnet; struct mbuf; /* forward declarations for Standard C */ #ifdef _KERNEL -int in_broadcast __P((struct in_addr, struct ifnet *)); -int in_canforward __P((struct in_addr)); -int in_localaddr __P((struct in_addr)); -char *inet_ntoa __P((struct in_addr)); /* in libkern */ -char *inet_ntoa_r __P((struct in_addr ina, char *buf)); /* in libkern */ +int in_broadcast(struct in_addr, struct ifnet *); +int in_canforward(struct in_addr); +int in_localaddr(struct in_addr); +char *inet_ntoa(struct in_addr); /* in libkern */ +char *inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */ #define satosin(sa) ((struct sockaddr_in *)(sa)) #define sintosa(sin) ((struct sockaddr *)(sin)) @@ -503,10 +503,10 @@ char *inet_ntoa_r __P((struct in_addr ina, char *buf)); /* in libkern */ #ifndef _BYTEORDER_PROTOTYPED #define _BYTEORDER_PROTOTYPED __BEGIN_DECLS -__uint32_t htonl __P((__uint32_t)); -__uint16_t htons __P((__uint16_t)); -__uint32_t ntohl __P((__uint32_t)); -__uint16_t ntohs __P((__uint16_t)); +__uint32_t htonl(__uint32_t); +__uint16_t htons(__uint16_t); +__uint32_t ntohl(__uint32_t); +__uint16_t ntohs(__uint16_t); __END_DECLS #endif diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h index 36ed617..262d9ba 100644 --- a/sys/netinet/in_gif.h +++ b/sys/netinet/in_gif.h @@ -35,8 +35,8 @@ #define GIF_TTL 30 -void in_gif_input __P((struct mbuf *, int off)); -int in_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *)); -int gif_encapcheck4 __P((const struct mbuf *, int, int, void *)); +void in_gif_input(struct mbuf *, int off); +int in_gif_output(struct ifnet *, int, struct mbuf *, struct rtentry *); +int gif_encapcheck4(const struct mbuf *, int, int, void *); #endif /*_NETINET_IN_GIF_H_*/ diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 7d5a745..ff124bc 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -655,7 +655,7 @@ in_pcbnotifyall(head, faddr, errno, notify) struct inpcbhead *head; struct in_addr faddr; int errno; - void (*notify) __P((struct inpcb *, int)); + void (*notify)(struct inpcb *, int); { struct inpcb *inp, *ninp; int s; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 187c677..92a9a22 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -312,31 +312,31 @@ extern int ipport_lastauto; extern int ipport_hifirstauto; extern int ipport_hilastauto; -void in_pcbpurgeif0 __P((struct inpcb *, struct ifnet *)); -void in_losing __P((struct inpcb *)); -void in_rtchange __P((struct inpcb *, int)); -int in_pcballoc __P((struct socket *, struct inpcbinfo *, struct thread *)); -int in_pcbbind __P((struct inpcb *, struct sockaddr *, struct thread *)); -int in_pcbconnect __P((struct inpcb *, struct sockaddr *, struct thread *)); -void in_pcbdetach __P((struct inpcb *)); -void in_pcbdisconnect __P((struct inpcb *)); -int in_pcbinshash __P((struct inpcb *)); -int in_pcbladdr __P((struct inpcb *, struct sockaddr *, - struct sockaddr_in **)); +void in_pcbpurgeif0(struct inpcb *, struct ifnet *); +void in_losing(struct inpcb *); +void in_rtchange(struct inpcb *, int); +int in_pcballoc(struct socket *, struct inpcbinfo *, struct thread *); +int in_pcbbind(struct inpcb *, struct sockaddr *, struct thread *); +int in_pcbconnect(struct inpcb *, struct sockaddr *, struct thread *); +void in_pcbdetach(struct inpcb *); +void in_pcbdisconnect(struct inpcb *); +int in_pcbinshash(struct inpcb *); +int in_pcbladdr(struct inpcb *, struct sockaddr *, + struct sockaddr_in **); struct inpcb * - in_pcblookup_local __P((struct inpcbinfo *, - struct in_addr, u_int, int)); + in_pcblookup_local(struct inpcbinfo *, + struct in_addr, u_int, int); struct inpcb * - in_pcblookup_hash __P((struct inpcbinfo *, + in_pcblookup_hash(struct inpcbinfo *, struct in_addr, u_int, struct in_addr, u_int, - int, struct ifnet *)); -void in_pcbnotifyall __P((struct inpcbhead *, struct in_addr, - int, void (*)(struct inpcb *, int))); -void in_pcbrehash __P((struct inpcb *)); -int in_setpeeraddr __P((struct socket *so, struct sockaddr **nam)); -int in_setsockaddr __P((struct socket *so, struct sockaddr **nam)); -void in_pcbremlists __P((struct inpcb *inp)); -int prison_xinpcb __P((struct proc *p, struct inpcb *inp)); + int, struct ifnet *); +void in_pcbnotifyall(struct inpcbhead *, struct in_addr, + int, void (*)(struct inpcb *, int)); +void in_pcbrehash(struct inpcb *); +int in_setpeeraddr(struct socket *so, struct sockaddr **nam); +int in_setsockaddr(struct socket *so, struct sockaddr **nam); +void in_pcbremlists(struct inpcb *inp); +int prison_xinpcb(struct proc *p, struct inpcb *inp); #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index f1a0934..b522652 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -201,7 +201,7 @@ struct protosw inetsw[] = { }, }; -extern int in_inithead __P((void **, int)); +extern int in_inithead(void **, int); struct domain inetdomain = { AF_INET, "internet", 0, 0, 0, diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c index 59bbb8d..08052fb 100644 --- a/sys/netinet/in_rmx.c +++ b/sys/netinet/in_rmx.c @@ -56,7 +56,7 @@ #include <netinet/in_var.h> #include <netinet/ip_var.h> -extern int in_inithead __P((void **head, int off)); +extern int in_inithead(void **head, int off); #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h index 13fa81d..4282752 100644 --- a/sys/netinet/in_systm.h +++ b/sys/netinet/in_systm.h @@ -56,7 +56,7 @@ typedef u_int32_t n_long; /* long as received from the net */ typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ #ifdef _KERNEL -n_time iptime __P((void)); +n_time iptime(void); #endif #endif diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index d71dba0..2e17ee3 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -223,17 +223,17 @@ do { \ } while(0) struct route; -struct in_multi *in_addmulti __P((struct in_addr *, struct ifnet *)); -void in_delmulti __P((struct in_multi *)); -int in_control __P((struct socket *, u_long, caddr_t, struct ifnet *, - struct thread *)); -void in_rtqdrain __P((void)); -void ip_input __P((struct mbuf *)); -int in_ifadown __P((struct ifaddr *ifa, int)); -void in_ifscrub __P((struct ifnet *, struct in_ifaddr *)); -int ipflow_fastforward __P((struct mbuf *)); -void ipflow_create __P((const struct route *, struct mbuf *)); -void ipflow_slowtimo __P((void)); +struct in_multi *in_addmulti(struct in_addr *, struct ifnet *); +void in_delmulti(struct in_multi *); +int in_control(struct socket *, u_long, caddr_t, struct ifnet *, + struct thread *); +void in_rtqdrain(void); +void ip_input(struct mbuf *); +int in_ifadown(struct ifaddr *ifa, int); +void in_ifscrub(struct ifnet *, struct in_ifaddr *); +int ipflow_fastforward(struct mbuf *); +void ipflow_create(const struct route *, struct mbuf *); +void ipflow_slowtimo(void); #endif /* _KERNEL */ diff --git a/sys/netinet/ip_ecn.h b/sys/netinet/ip_ecn.h index 9aca731..1a38a48 100644 --- a/sys/netinet/ip_ecn.h +++ b/sys/netinet/ip_ecn.h @@ -44,6 +44,6 @@ #define ECN_NOCARE (-1) /* no consideration to ECN */ #ifdef _KERNEL -extern void ip_ecn_ingress __P((int, u_int8_t *, const u_int8_t *)); -extern void ip_ecn_egress __P((int, const u_int8_t *, u_int8_t *)); +extern void ip_ecn_ingress(int, u_int8_t *, const u_int8_t *); +extern void ip_ecn_egress(int, const u_int8_t *, u_int8_t *); #endif diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c index 74534fe..cdeb7ab 100644 --- a/sys/netinet/ip_encap.c +++ b/sys/netinet/ip_encap.c @@ -92,10 +92,10 @@ #include <sys/malloc.h> static MALLOC_DEFINE(M_NETADDR, "Export Host", "Export host address structure"); -static void encap_add __P((struct encaptab *)); -static int mask_match __P((const struct encaptab *, const struct sockaddr *, - const struct sockaddr *)); -static void encap_fillarg __P((struct mbuf *, const struct encaptab *)); +static void encap_add(struct encaptab *); +static int mask_match(const struct encaptab *, const struct sockaddr *, + const struct sockaddr *); +static void encap_fillarg(struct mbuf *, const struct encaptab *); #ifndef LIST_HEAD_INITIALIZER /* rely upon BSS initialization */ @@ -369,7 +369,7 @@ const struct encaptab * encap_attach_func(af, proto, func, psw, arg) int af; int proto; - int (*func) __P((const struct mbuf *, int, int, void *)); + int (*func)(const struct mbuf *, int, int, void *); const struct protosw *psw; void *arg; { diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h index 94f534b..518f502 100644 --- a/sys/netinet/ip_encap.h +++ b/sys/netinet/ip_encap.h @@ -43,22 +43,22 @@ struct encaptab { struct sockaddr_storage srcmask; struct sockaddr_storage dst; /* remote addr */ struct sockaddr_storage dstmask; - int (*func) __P((const struct mbuf *, int, int, void *)); + int (*func)(const struct mbuf *, int, int, void *); const struct protosw *psw; /* only pr_input will be used */ void *arg; /* passed via m->m_pkthdr.aux */ }; -void encap_init __P((void)); -void encap4_input __P((struct mbuf *, int)); -int encap6_input __P((struct mbuf **, int *, int)); -const struct encaptab *encap_attach __P((int, int, const struct sockaddr *, +void encap_init(void); +void encap4_input(struct mbuf *, int); +int encap6_input(struct mbuf **, int *, int); +const struct encaptab *encap_attach(int, int, const struct sockaddr *, const struct sockaddr *, const struct sockaddr *, - const struct sockaddr *, const struct protosw *, void *)); -const struct encaptab *encap_attach_func __P((int, int, - int (*) __P((const struct mbuf *, int, int, void *)), - const struct protosw *, void *)); -int encap_detach __P((const struct encaptab *)); -void *encap_getarg __P((struct mbuf *)); + const struct sockaddr *, const struct protosw *, void *); +const struct encaptab *encap_attach_func(int, int, + int (*)(const struct mbuf *, int, int, void *), + const struct protosw *, void *); +int encap_detach(const struct encaptab *); +void *encap_getarg(struct mbuf *); #endif #endif /*_NETINET_IP_ENCAP_H_*/ diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 25b303c..468d66f 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -315,7 +315,7 @@ struct ipfw_dyn_rule { /* * Function definitions. */ -void ip_fw_init __P((void)); +void ip_fw_init(void); /* Firewall hooks */ struct ip; diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c index e19c642..c671a0a 100644 --- a/sys/netinet/ip_icmp.c +++ b/sys/netinet/ip_icmp.c @@ -108,9 +108,9 @@ SYSCTL_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, int icmpprintfs = 0; #endif -static void icmp_reflect __P((struct mbuf *)); -static void icmp_send __P((struct mbuf *, struct mbuf *, struct route *)); -static int ip_next_mtu __P((int, int)); +static void icmp_reflect(struct mbuf *); +static void icmp_send(struct mbuf *, struct mbuf *, struct route *); +static int ip_next_mtu(int, int); extern struct protosw inetsw[]; @@ -236,7 +236,7 @@ icmp_input(m, off) int icmplen = ip->ip_len; register int i; struct in_ifaddr *ia; - void (*ctlfunc) __P((int, struct sockaddr *, void *)); + void (*ctlfunc)(int, struct sockaddr *, void *); int code; /* diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h index 401c7ed..927efd9 100644 --- a/sys/netinet/ip_icmp.h +++ b/sys/netinet/ip_icmp.h @@ -185,8 +185,8 @@ struct icmp { (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) #ifdef _KERNEL -void icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *)); -void icmp_input __P((struct mbuf *, int)); +void icmp_error(struct mbuf *, int, int, n_long, struct ifnet *); +void icmp_input(struct mbuf *, int); #endif #endif diff --git a/sys/netinet/ip_id.c b/sys/netinet/ip_id.c index f440159..664b4d1 100644 --- a/sys/netinet/ip_id.c +++ b/sys/netinet/ip_id.c @@ -87,9 +87,9 @@ static u_int16_t ru_msb = 0; static long ru_reseed; static u_int32_t tmp; /* Storage for unused random */ -static u_int16_t pmod __P((u_int16_t, u_int16_t, u_int16_t)); -static void ip_initid __P((void)); -u_int16_t ip_randomid __P((void)); +static u_int16_t pmod(u_int16_t, u_int16_t, u_int16_t); +static void ip_initid(void); +u_int16_t ip_randomid(void); /* * Do a fast modular exponation, returned value will be in the range diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 541510f..9d2b019 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -209,16 +209,16 @@ static struct ip_srcrt { struct sockaddr_in *ip_fw_fwd_addr; -static void save_rte __P((u_char *, struct in_addr)); -static int ip_dooptions __P((struct mbuf *, int)); -static void ip_forward __P((struct mbuf *, int)); -static void ip_freef __P((struct ipqhead *, struct ipq *)); +static void save_rte(u_char *, struct in_addr); +static int ip_dooptions(struct mbuf *, int); +static void ip_forward(struct mbuf *, int); +static void ip_freef(struct ipqhead *, struct ipq *); #ifdef IPDIVERT -static struct mbuf *ip_reass __P((struct mbuf *, struct ipqhead *, struct ipq *, u_int32_t *, u_int16_t *)); +static struct mbuf *ip_reass(struct mbuf *, struct ipqhead *, struct ipq *, u_int32_t *, u_int16_t *); #else -static struct mbuf *ip_reass __P((struct mbuf *, struct ipqhead *, struct ipq *)); +static struct mbuf *ip_reass(struct mbuf *, struct ipqhead *, struct ipq *); #endif -static void ipintr __P((void)); +static void ipintr(void); /* * IP initialization: fill in IP protocol switch table. diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 54d5cd7..3249308 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -41,13 +41,13 @@ #include <machine/in_cksum.h> #ifndef MROUTING -extern u_long _ip_mcast_src __P((int vifi)); -extern int _ip_mforward __P((struct ip *ip, struct ifnet *ifp, - struct mbuf *m, struct ip_moptions *imo)); -extern int _ip_mrouter_done __P((void)); -extern int _ip_mrouter_get __P((struct socket *so, struct sockopt *sopt)); -extern int _ip_mrouter_set __P((struct socket *so, struct sockopt *sopt)); -extern int _mrt_ioctl __P((int req, caddr_t data)); +extern u_long _ip_mcast_src(int vifi); +extern int _ip_mforward(struct ip *ip, struct ifnet *ifp, + struct mbuf *m, struct ip_moptions *imo); +extern int _ip_mrouter_done(void); +extern int _ip_mrouter_get(struct socket *so, struct sockopt *sopt); +extern int _ip_mrouter_set(struct socket *so, struct sockopt *sopt); +extern int _mrt_ioctl(int req, caddr_t data); /* * Dummy routines and globals used when multicast routing is not compiled in. @@ -246,13 +246,13 @@ static const struct encaptab *encap_cookie = NULL; static u_long last_encap_src; static struct vif *last_encap_vif; -static u_long X_ip_mcast_src __P((int vifi)); -static int X_ip_mforward __P((struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo)); -static int X_ip_mrouter_done __P((void)); -static int X_ip_mrouter_get __P((struct socket *so, struct sockopt *m)); -static int X_ip_mrouter_set __P((struct socket *so, struct sockopt *m)); -static int X_legal_vif_num __P((int vif)); -static int X_mrt_ioctl __P((int cmd, caddr_t data)); +static u_long X_ip_mcast_src(int vifi); +static int X_ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, struct ip_moptions *imo); +static int X_ip_mrouter_done(void); +static int X_ip_mrouter_get(struct socket *so, struct sockopt *m); +static int X_ip_mrouter_set(struct socket *so, struct sockopt *m); +static int X_legal_vif_num(int vif); +static int X_mrt_ioctl(int cmd, caddr_t data); static int get_sg_cnt(struct sioc_sg_req *); static int get_vif_cnt(struct sioc_vif_req *); diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 2b7bba3..0e61652 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -253,10 +253,10 @@ struct tbf struct sockopt; -extern int (*ip_mrouter_set) __P((struct socket *, struct sockopt *)); -extern int (*ip_mrouter_get) __P((struct socket *, struct sockopt *)); -extern int (*ip_mrouter_done) __P((void)); -extern int (*mrt_ioctl) __P((int, caddr_t)); +extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); +extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); +extern int (*ip_mrouter_done)(void); +extern int (*mrt_ioctl)(int, caddr_t); #endif /* _KERNEL */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index d6ee761..d46d984 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -89,17 +89,17 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); u_short ip_id; -static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *)); -static struct ifnet *ip_multicast_if __P((struct in_addr *, int *)); +static struct mbuf *ip_insertoptions(struct mbuf *, struct mbuf *, int *); +static struct ifnet *ip_multicast_if(struct in_addr *, int *); static void ip_mloopback - __P((struct ifnet *, struct mbuf *, struct sockaddr_in *, int)); + (struct ifnet *, struct mbuf *, struct sockaddr_in *, int); static int ip_getmoptions - __P((struct sockopt *, struct ip_moptions *)); -static int ip_pcbopts __P((int, struct mbuf **, struct mbuf *)); + (struct sockopt *, struct ip_moptions *); +static int ip_pcbopts(int, struct mbuf **, struct mbuf *); static int ip_setmoptions - __P((struct sockopt *, struct ip_moptions **)); + (struct sockopt *, struct ip_moptions **); -int ip_optcopy __P((struct ip *, struct ip *)); +int ip_optcopy(struct ip *, struct ip *); extern struct protosw inetsw[]; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index d8f7a0b..dad22f3 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -151,48 +151,48 @@ extern struct route ipforward_rt; /* ip forwarding cached route */ extern u_char ip_protox[]; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ -extern int (*legal_vif_num) __P((int)); -extern u_long (*ip_mcast_src) __P((int)); +extern int (*legal_vif_num)(int); +extern u_long (*ip_mcast_src)(int); extern int rsvp_on; extern struct pr_usrreqs rip_usrreqs; -int ip_ctloutput __P((struct socket *, struct sockopt *sopt)); -void ip_drain __P((void)); -void ip_freemoptions __P((struct ip_moptions *)); -void ip_init __P((void)); -extern int (*ip_mforward) __P((struct ip *, struct ifnet *, struct mbuf *, - struct ip_moptions *)); -int ip_output __P((struct mbuf *, - struct mbuf *, struct route *, int, struct ip_moptions *)); +int ip_ctloutput(struct socket *, struct sockopt *sopt); +void ip_drain(void); +void ip_freemoptions(struct ip_moptions *); +void ip_init(void); +extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, + struct ip_moptions *); +int ip_output(struct mbuf *, + struct mbuf *, struct route *, int, struct ip_moptions *); struct in_ifaddr * - ip_rtaddr __P((struct in_addr, struct route *)); -void ip_savecontrol __P((struct inpcb *, struct mbuf **, struct ip *, - struct mbuf *)); -void ip_slowtimo __P((void)); + ip_rtaddr(struct in_addr, struct route *); +void ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *, + struct mbuf *); +void ip_slowtimo(void); struct mbuf * - ip_srcroute __P((void)); -void ip_stripoptions __P((struct mbuf *, struct mbuf *)); + ip_srcroute(void); +void ip_stripoptions(struct mbuf *, struct mbuf *); #ifdef RANDOM_IP_ID u_int16_t - ip_randomid __P((void)); + ip_randomid(void); #endif -int rip_ctloutput __P((struct socket *, struct sockopt *)); -void rip_ctlinput __P((int, struct sockaddr *, void *)); -void rip_init __P((void)); -void rip_input __P((struct mbuf *, int)); -int rip_output __P((struct mbuf *, struct socket *, u_long)); -void ipip_input __P((struct mbuf *, int)); -void rsvp_input __P((struct mbuf *, int)); -int ip_rsvp_init __P((struct socket *)); -int ip_rsvp_done __P((void)); -int ip_rsvp_vif_init __P((struct socket *, struct sockopt *)); -int ip_rsvp_vif_done __P((struct socket *, struct sockopt *)); -void ip_rsvp_force_done __P((struct socket *)); +int rip_ctloutput(struct socket *, struct sockopt *); +void rip_ctlinput(int, struct sockaddr *, void *); +void rip_init(void); +void rip_input(struct mbuf *, int); +int rip_output(struct mbuf *, struct socket *, u_long); +void ipip_input(struct mbuf *, int); +void rsvp_input(struct mbuf *, int); +int ip_rsvp_init(struct socket *); +int ip_rsvp_done(void); +int ip_rsvp_vif_init(struct socket *, struct sockopt *); +int ip_rsvp_vif_done(struct socket *, struct sockopt *); +void ip_rsvp_force_done(struct socket *); #ifdef IPDIVERT -void div_init __P((void)); -void div_input __P((struct mbuf *, int)); -void divert_packet __P((struct mbuf *, int, int)); +void div_init(void); +void div_input(struct mbuf *, int); +void divert_packet(struct mbuf *, int, int); extern struct pr_usrreqs div_usrreqs; extern u_int16_t ip_divert_cookie; #endif diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index fbf64bd..b1a392f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -130,13 +130,13 @@ struct inpcbhead tcb; #define tcb6 tcb /* for KAME src sync over BSD*'s */ struct inpcbinfo tcbinfo; -static void tcp_dooptions __P((struct tcpopt *, u_char *, int, int)); -static void tcp_pulloutofband __P((struct socket *, - struct tcphdr *, struct mbuf *, int)); -static int tcp_reass __P((struct tcpcb *, struct tcphdr *, int *, - struct mbuf *)); -static void tcp_xmit_timer __P((struct tcpcb *, int)); -static int tcp_newreno __P((struct tcpcb *, struct tcphdr *)); +static void tcp_dooptions(struct tcpopt *, u_char *, int, int); +static void tcp_pulloutofband(struct socket *, + struct tcphdr *, struct mbuf *, int); +static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, + struct mbuf *); +static void tcp_xmit_timer(struct tcpcb *, int); +static int tcp_newreno(struct tcpcb *, struct tcphdr *); /* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */ #ifdef INET6 diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index fbf64bd..b1a392f 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -130,13 +130,13 @@ struct inpcbhead tcb; #define tcb6 tcb /* for KAME src sync over BSD*'s */ struct inpcbinfo tcbinfo; -static void tcp_dooptions __P((struct tcpopt *, u_char *, int, int)); -static void tcp_pulloutofband __P((struct socket *, - struct tcphdr *, struct mbuf *, int)); -static int tcp_reass __P((struct tcpcb *, struct tcphdr *, int *, - struct mbuf *)); -static void tcp_xmit_timer __P((struct tcpcb *, int)); -static int tcp_newreno __P((struct tcpcb *, struct tcphdr *)); +static void tcp_dooptions(struct tcpopt *, u_char *, int, int); +static void tcp_pulloutofband(struct socket *, + struct tcphdr *, struct mbuf *, int); +static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, + struct mbuf *); +static void tcp_xmit_timer(struct tcpcb *, int); +static int tcp_newreno(struct tcpcb *, struct tcphdr *); /* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */ #ifdef INET6 diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 94773d2..cec858c 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -148,8 +148,8 @@ static int tcp_isn_reseed_interval = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW, &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret"); -static void tcp_cleartaocache __P((void)); -static void tcp_notify __P((struct inpcb *, int)); +static void tcp_cleartaocache(void); +static void tcp_notify(struct inpcb *, int); /* * Target size of TCP PCB hash tables. Must be a power of two. @@ -998,7 +998,7 @@ tcp_ctlinput(cmd, sa, vip) struct in_addr faddr; struct inpcb *inp; struct tcpcb *tp; - void (*notify) __P((struct inpcb *, int)) = tcp_notify; + void (*notify)(struct inpcb *, int) = tcp_notify; tcp_seq icmp_seq; int s; @@ -1057,7 +1057,7 @@ tcp6_ctlinput(cmd, sa, d) void *d; { struct tcphdr th; - void (*notify) __P((struct inpcb *, int)) = tcp_notify; + void (*notify)(struct inpcb *, int) = tcp_notify; struct ip6_hdr *ip6; struct mbuf *m; struct ip6ctlparam *ip6cp = NULL; diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h index b2bcb43..ff86d2a 100644 --- a/sys/netinet/tcp_timer.h +++ b/sys/netinet/tcp_timer.h @@ -128,11 +128,11 @@ extern int tcp_msl; extern int tcp_ttl; /* time to live for TCP segs */ extern int tcp_backoff[]; -void tcp_timer_2msl __P((void *xtp)); -void tcp_timer_keep __P((void *xtp)); -void tcp_timer_persist __P((void *xtp)); -void tcp_timer_rexmt __P((void *xtp)); -void tcp_timer_delack __P((void *xtp)); +void tcp_timer_2msl(void *xtp); +void tcp_timer_keep(void *xtp); +void tcp_timer_persist(void *xtp); +void tcp_timer_rexmt(void *xtp); +void tcp_timer_delack(void *xtp); #endif /* _KERNEL */ diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 94773d2..cec858c 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -148,8 +148,8 @@ static int tcp_isn_reseed_interval = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_RW, &tcp_isn_reseed_interval, 0, "Seconds between reseeding of ISN secret"); -static void tcp_cleartaocache __P((void)); -static void tcp_notify __P((struct inpcb *, int)); +static void tcp_cleartaocache(void); +static void tcp_notify(struct inpcb *, int); /* * Target size of TCP PCB hash tables. Must be a power of two. @@ -998,7 +998,7 @@ tcp_ctlinput(cmd, sa, vip) struct in_addr faddr; struct inpcb *inp; struct tcpcb *tp; - void (*notify) __P((struct inpcb *, int)) = tcp_notify; + void (*notify)(struct inpcb *, int) = tcp_notify; tcp_seq icmp_seq; int s; @@ -1057,7 +1057,7 @@ tcp6_ctlinput(cmd, sa, d) void *d; { struct tcphdr th; - void (*notify) __P((struct inpcb *, int)) = tcp_notify; + void (*notify)(struct inpcb *, int) = tcp_notify; struct ip6_hdr *ip6; struct mbuf *m; struct ip6ctlparam *ip6cp = NULL; diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index fbe114b..e95ba64 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -88,17 +88,17 @@ */ extern char *tcpstates[]; /* XXX ??? */ -static int tcp_attach __P((struct socket *, struct thread *td)); -static int tcp_connect __P((struct tcpcb *, struct sockaddr *, - struct thread *td)); +static int tcp_attach(struct socket *, struct thread *td); +static int tcp_connect(struct tcpcb *, struct sockaddr *, + struct thread *td); #ifdef INET6 -static int tcp6_connect __P((struct tcpcb *, struct sockaddr *, - struct thread *td)); +static int tcp6_connect(struct tcpcb *, struct sockaddr *, + struct thread *td); #endif /* INET6 */ static struct tcpcb * - tcp_disconnect __P((struct tcpcb *)); + tcp_disconnect(struct tcpcb *); static struct tcpcb * - tcp_usrclosed __P((struct tcpcb *)); + tcp_usrclosed(struct tcpcb *); #ifdef TCPDEBUG #define TCPDEBUG0 int ostate = 0 diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index f4a5b75..e46a39a 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -434,40 +434,39 @@ extern int tcp_do_newreno; extern int ss_fltsz; extern int ss_fltsz_local; -void tcp_canceltimers __P((struct tcpcb *)); +void tcp_canceltimers(struct tcpcb *); struct tcpcb * - tcp_close __P((struct tcpcb *)); -void tcp_ctlinput __P((int, struct sockaddr *, void *)); -int tcp_ctloutput __P((struct socket *, struct sockopt *)); + tcp_close(struct tcpcb *); +void tcp_ctlinput(int, struct sockaddr *, void *); +int tcp_ctloutput(struct socket *, struct sockopt *); struct tcpcb * - tcp_drop __P((struct tcpcb *, int)); -void tcp_drain __P((void)); -void tcp_fasttimo __P((void)); + tcp_drop(struct tcpcb *, int); +void tcp_drain(void); +void tcp_fasttimo(void); struct rmxp_tao * - tcp_gettaocache __P((struct in_conninfo *)); -void tcp_init __P((void)); -void tcp_input __P((struct mbuf *, int)); -void tcp_mss __P((struct tcpcb *, int)); -int tcp_mssopt __P((struct tcpcb *)); -void tcp_drop_syn_sent __P((struct inpcb *, int)); -void tcp_mtudisc __P((struct inpcb *, int)); + tcp_gettaocache(struct in_conninfo *); +void tcp_init(void); +void tcp_input(struct mbuf *, int); +void tcp_mss(struct tcpcb *, int); +int tcp_mssopt(struct tcpcb *); +void tcp_drop_syn_sent(struct inpcb *, int); +void tcp_mtudisc(struct inpcb *, int); struct tcpcb * - tcp_newtcpcb __P((struct inpcb *)); -int tcp_output __P((struct tcpcb *)); -void tcp_quench __P((struct inpcb *, int)); -void tcp_respond __P((struct tcpcb *, void *, - struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int)); + tcp_newtcpcb(struct inpcb *); +int tcp_output(struct tcpcb *); +void tcp_quench(struct inpcb *, int); +void tcp_respond(struct tcpcb *, void *, + struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int); struct rtentry * - tcp_rtlookup __P((struct in_conninfo *)); -void tcp_setpersist __P((struct tcpcb *)); -void tcp_slowtimo __P((void)); + tcp_rtlookup(struct in_conninfo *); +void tcp_setpersist(struct tcpcb *); +void tcp_slowtimo(void); struct tcptemp * - tcp_maketemplate __P((struct tcpcb *)); -void tcp_fillheaders __P((struct tcpcb *, void *, void *)); + tcp_maketemplate(struct tcpcb *); +void tcp_fillheaders(struct tcpcb *, void *, void *); struct tcpcb * - tcp_timers __P((struct tcpcb *, int)); -void tcp_trace __P((int, int, struct tcpcb *, void *, struct tcphdr *, - int)); + tcp_timers(struct tcpcb *, int); +void tcp_trace(int, int, struct tcpcb *, void *, struct tcphdr *, int); void syncache_init(void); void syncache_unreach(struct in_conninfo *, struct tcphdr *); int syncache_expand(struct in_conninfo *, struct tcphdr *, @@ -480,7 +479,7 @@ void syncache_badack(struct in_conninfo *); extern struct pr_usrreqs tcp_usrreqs; extern u_long tcp_sendspace; extern u_long tcp_recvspace; -tcp_seq tcp_new_isn __P((struct tcpcb *)); +tcp_seq tcp_new_isn(struct tcpcb *); #endif /* _KERNEL */ diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 3f98ea7..e4f7e0d 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -126,15 +126,15 @@ struct udp_ip6 { } udp_ip6; #endif /* INET6 */ -static void udp_append __P((struct inpcb *last, struct ip *ip, - struct mbuf *n, int off)); +static void udp_append(struct inpcb *last, struct ip *ip, + struct mbuf *n, int off); #ifdef INET6 -static void ip_2_ip6_hdr __P((struct ip6_hdr *ip6, struct ip *ip)); +static void ip_2_ip6_hdr(struct ip6_hdr *ip6, struct ip *ip); #endif -static int udp_detach __P((struct socket *so)); -static int udp_output __P((struct inpcb *, struct mbuf *, struct sockaddr *, - struct mbuf *, struct thread *)); +static int udp_detach(struct socket *so); +static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, + struct mbuf *, struct thread *); void udp_init() @@ -509,7 +509,7 @@ udp_ctlinput(cmd, sa, vip) { struct ip *ip = vip; struct udphdr *uh; - void (*notify) __P((struct inpcb *, int)) = udp_notify; + void (*notify)(struct inpcb *, int) = udp_notify; struct in_addr faddr; struct inpcb *inp; int s; diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index ca43eef..b966396 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -103,12 +103,12 @@ extern u_long udp_recvspace; extern struct udpstat udpstat; extern int log_in_vain; -void udp_ctlinput __P((int, struct sockaddr *, void *)); -void udp_init __P((void)); -void udp_input __P((struct mbuf *, int)); +void udp_ctlinput(int, struct sockaddr *, void *); +void udp_init(void); +void udp_input(struct mbuf *, int); -void udp_notify __P((struct inpcb *inp, int errno)); -int udp_shutdown __P((struct socket *so)); +void udp_notify(struct inpcb *inp, int errno); +int udp_shutdown(struct socket *so); #endif #endif |
