From 929ddbbb891407869938d6db5528f48f750fa90c Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Tue, 19 Mar 2002 21:54:18 +0000 Subject: [PATCH] Remove __P. --- sys/net/bpf.c | 34 ++++++------ sys/net/bpf.h | 14 ++--- sys/net/bpf_filter.c | 4 +- sys/net/bsd_comp.c | 38 ++++++------- sys/net/ethernet.h | 10 ++-- sys/net/fddi.h | 8 +-- sys/net/if.c | 2 +- sys/net/if.h | 8 +-- sys/net/if_arc.h | 22 ++++---- sys/net/if_arcsubr.c | 2 +- sys/net/if_atm.h | 10 ++-- sys/net/if_dl.h | 4 +- sys/net/if_ethersubr.c | 4 +- sys/net/if_faith.c | 16 +++--- sys/net/if_fddisubr.c | 4 +- sys/net/if_gif.c | 10 ++-- sys/net/if_gif.h | 8 +-- sys/net/if_media.c | 6 +- sys/net/if_media.h | 18 +++--- sys/net/if_ppp.c | 16 +++--- sys/net/if_pppvar.h | 26 ++++----- sys/net/if_sl.c | 20 +++---- sys/net/if_stf.c | 26 ++++----- sys/net/if_stf.h | 2 +- sys/net/if_tap.c | 12 ++-- sys/net/if_var.h | 122 ++++++++++++++++++++--------------------- sys/net/intrq.h | 2 +- sys/net/net_osdep.h | 2 +- sys/net/netisr.h | 10 ++-- sys/net/pfil.c | 18 +++--- sys/net/pfil.h | 14 ++--- sys/net/ppp_comp.h | 34 ++++++------ sys/net/ppp_deflate.c | 36 ++++++------ sys/net/ppp_tty.c | 34 ++++++------ sys/net/radix.c | 26 ++++----- sys/net/radix.h | 48 ++++++++-------- sys/net/raw_cb.h | 10 ++-- sys/net/route.c | 10 ++-- sys/net/route.h | 43 +++++++-------- sys/net/rtsock.c | 15 +++-- sys/net/slcompress.h | 11 ++-- 41 files changed, 374 insertions(+), 385 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index a46f655b7528..118861e43b44 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -92,21 +92,21 @@ SYSCTL_INT(_debug, OID_AUTO, bpf_maxbufsize, CTLFLAG_RW, static struct bpf_if *bpf_iflist; static struct mtx bpf_mtx; /* bpf global lock */ -static int bpf_allocbufs __P((struct bpf_d *)); -static void bpf_attachd __P((struct bpf_d *d, struct bpf_if *bp)); -static void bpf_detachd __P((struct bpf_d *d)); -static void bpf_freed __P((struct bpf_d *)); -static void bpf_mcopy __P((const void *, void *, size_t)); -static int bpf_movein __P((struct uio *, int, - struct mbuf **, struct sockaddr *, int *)); -static int bpf_setif __P((struct bpf_d *, struct ifreq *)); -static void bpf_timed_out __P((void *)); +static int bpf_allocbufs(struct bpf_d *); +static void bpf_attachd(struct bpf_d *d, struct bpf_if *bp); +static void bpf_detachd(struct bpf_d *d); +static void bpf_freed(struct bpf_d *); +static void bpf_mcopy(const void *, void *, size_t); +static int bpf_movein(struct uio *, int, + struct mbuf **, struct sockaddr *, int *); +static int bpf_setif(struct bpf_d *, struct ifreq *); +static void bpf_timed_out(void *); static __inline void - bpf_wakeup __P((struct bpf_d *)); -static void catchpacket __P((struct bpf_d *, u_char *, u_int, - u_int, void (*)(const void *, void *, size_t))); -static void reset_d __P((struct bpf_d *)); -static int bpf_setf __P((struct bpf_d *, struct bpf_program *)); + bpf_wakeup(struct bpf_d *); +static void catchpacket(struct bpf_d *, u_char *, u_int, + u_int, void (*)(const void *, void *, size_t)); +static void reset_d(struct bpf_d *); +static int bpf_setf(struct bpf_d *, struct bpf_program *); static d_open_t bpfopen; static d_close_t bpfclose; @@ -1140,7 +1140,7 @@ catchpacket(d, pkt, pktlen, snaplen, cpfn) register struct bpf_d *d; register u_char *pkt; register u_int pktlen, snaplen; - register void (*cpfn) __P((const void *, void *, size_t)); + register void (*cpfn)(const void *, void *, size_t); { register struct bpf_hdr *hp; register int totlen, curlen; @@ -1334,9 +1334,9 @@ bpfdetach(ifp) mtx_unlock(&bpf_mtx); } -static void bpf_drvinit __P((void *unused)); +static void bpf_drvinit(void *unused); -static void bpf_clone __P((void *arg, char *name, int namelen, dev_t *dev)); +static void bpf_clone(void *arg, char *name, int namelen, dev_t *dev); static void bpf_clone(arg, name, namelen, dev) diff --git a/sys/net/bpf.h b/sys/net/bpf.h index ed3ebf45a31d..933662e160e8 100644 --- a/sys/net/bpf.h +++ b/sys/net/bpf.h @@ -308,14 +308,14 @@ struct bpf_insn { #define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k } #ifdef _KERNEL -int bpf_validate __P((const struct bpf_insn *, int)); -void bpf_tap __P((struct ifnet *, u_char *, u_int)); -void bpf_mtap __P((struct ifnet *, struct mbuf *)); -void bpfattach __P((struct ifnet *, u_int, u_int)); -void bpfdetach __P((struct ifnet *)); +int bpf_validate(const struct bpf_insn *, int); +void bpf_tap(struct ifnet *, u_char *, u_int); +void bpf_mtap(struct ifnet *, struct mbuf *); +void bpfattach(struct ifnet *, u_int, u_int); +void bpfdetach(struct ifnet *); -void bpfilterattach __P((int)); -u_int bpf_filter __P((const struct bpf_insn *, u_char *, u_int, u_int)); +void bpfilterattach(int); +u_int bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int); #endif /* diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c index 7207efb8c705..cca30e0b240e 100644 --- a/sys/net/bpf_filter.c +++ b/sys/net/bpf_filter.c @@ -83,8 +83,8 @@ } \ } -static u_int16_t m_xhalf __P((struct mbuf *m, bpf_u_int32 k, int *err)); -static u_int32_t m_xword __P((struct mbuf *m, bpf_u_int32 k, int *err)); +static u_int16_t m_xhalf(struct mbuf *m, bpf_u_int32 k, int *err); +static u_int32_t m_xword(struct mbuf *m, bpf_u_int32 k, int *err); static u_int32_t m_xword(m, k, err) diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index 62a18cf31e56..d7d42d1ceb0c 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -128,26 +128,26 @@ struct bsd_db { #define BSD_OVHD 2 /* BSD compress overhead/packet */ #define BSD_INIT_BITS BSD_MIN_BITS -static void bsd_clear __P((struct bsd_db *db)); -static int bsd_check __P((struct bsd_db *db)); -static void *bsd_alloc __P((u_char *options, int opt_len, int decomp)); -static int bsd_init __P((struct bsd_db *db, u_char *options, int opt_len, +static void bsd_clear(struct bsd_db *db); +static int bsd_check(struct bsd_db *db); +static void *bsd_alloc(u_char *options, int opt_len, int decomp); +static int bsd_init(struct bsd_db *db, u_char *options, int opt_len, int unit, int hdrlen, int mru, int debug, - int decomp)); -static void *bsd_comp_alloc __P((u_char *options, int opt_len)); -static void *bsd_decomp_alloc __P((u_char *options, int opt_len)); -static void bsd_free __P((void *state)); -static int bsd_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int bsd_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int bsd_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void bsd_incomp __P((void *state, struct mbuf *dmsg)); -static int bsd_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void bsd_reset __P((void *state)); -static void bsd_comp_stats __P((void *state, struct compstat *stats)); + int decomp); +static void *bsd_comp_alloc(u_char *options, int opt_len); +static void *bsd_decomp_alloc(u_char *options, int opt_len); +static void bsd_free(void *state); +static int bsd_comp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int bsd_decomp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int bsd_compress(void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void bsd_incomp(void *state, struct mbuf *dmsg); +static int bsd_decompress(void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void bsd_reset(void *state); +static void bsd_comp_stats(void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index 7380e31e61d4..ca6325a53215 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -142,11 +142,11 @@ extern int (*vlan_input_tag_p)(struct ether_header *eh, struct mbuf *m, * Ethernet address conversion/parsing routines. */ __BEGIN_DECLS -struct ether_addr *ether_aton __P((const char *)); -int ether_hostton __P((const char *, struct ether_addr *)); -int ether_line __P((const char *, struct ether_addr *, char *)); -char *ether_ntoa __P((const struct ether_addr *)); -int ether_ntohost __P((char *, const struct ether_addr *)); +struct ether_addr *ether_aton(const char *); +int ether_hostton(const char *, struct ether_addr *); +int ether_line(const char *, struct ether_addr *, char *); +char *ether_ntoa(const struct ether_addr *); +int ether_ntohost(char *, const struct ether_addr *); __END_DECLS #endif /* !_KERNEL */ diff --git a/sys/net/fddi.h b/sys/net/fddi.h index 9f83882cdf10..811d06985152 100644 --- a/sys/net/fddi.h +++ b/sys/net/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/net/if.c b/sys/net/if.c index 750b0f73bc49..ec4b8c8166b6 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -92,7 +92,7 @@ static int ifhwioctl(u_long, struct ifnet *, caddr_t, struct thread *); * XXX: declare here to avoid to include many inet6 related files.. * should be more generalized? */ -extern void nd6_setmtu __P((struct ifnet *)); +extern void nd6_setmtu(struct ifnet *); #endif int if_index = 0; diff --git a/sys/net/if.h b/sys/net/if.h index 879056064155..d25d6256feda 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -329,10 +329,10 @@ struct if_nameindex { }; __BEGIN_DECLS -u_int if_nametoindex __P((const char *)); -char *if_indextoname __P((u_int, char *)); -struct if_nameindex *if_nameindex __P((void)); -void if_freenameindex __P((struct if_nameindex *)); +u_int if_nametoindex(const char *); +char *if_indextoname(u_int, char *); +struct if_nameindex *if_nameindex(void); +void if_freenameindex(struct if_nameindex *); __END_DECLS #endif diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h index 7d31e8f51842..b430698040ff 100644 --- a/sys/net/if_arc.h +++ b/sys/net/if_arc.h @@ -131,18 +131,18 @@ struct arccom { extern u_int8_t arcbroadcastaddr; extern int arc_ipmtu; /* XXX new ip only, no RFC 1051! */ -void arc_ifattach __P((struct ifnet *, u_int8_t)); -void arc_ifdetach __P((struct ifnet *)); -void arc_storelladdr __P((struct ifnet *, u_int8_t)); -char *arc_sprintf __P((u_int8_t *)); -int arc_isphds __P((int)); -void arc_input __P((struct ifnet *, struct mbuf *)); -int arc_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); -int arc_ioctl __P((struct ifnet *, int, caddr_t)); +void arc_ifattach(struct ifnet *, u_int8_t); +void arc_ifdetach(struct ifnet *); +void arc_storelladdr(struct ifnet *, u_int8_t); +char *arc_sprintf(u_int8_t *); +int arc_isphds(int); +void arc_input(struct ifnet *, struct mbuf *); +int arc_output(struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); +int arc_ioctl(struct ifnet *, int, caddr_t); -void arc_frag_init __P((struct ifnet *)); -struct mbuf * arc_frag_next __P((struct ifnet *)); +void arc_frag_init(struct ifnet *); +struct mbuf * arc_frag_next(struct ifnet *); #endif #endif /* _NET_IF_ARC_H_ */ diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c index d47dee90b62a..a4fbec2e4ddb 100644 --- a/sys/net/if_arcsubr.c +++ b/sys/net/if_arcsubr.c @@ -77,7 +77,7 @@ MODULE_VERSION(arcnet, 1); #define ARCNET_ALLOW_BROKEN_ARP -static struct mbuf *arc_defrag __P((struct ifnet *, struct mbuf *)); +static struct mbuf *arc_defrag(struct ifnet *, struct mbuf *); u_int8_t arcbroadcastaddr = 0; diff --git a/sys/net/if_atm.h b/sys/net/if_atm.h index fbd27926b271..cafe5a70fe96 100644 --- a/sys/net/if_atm.h +++ b/sys/net/if_atm.h @@ -98,10 +98,10 @@ struct atmllc { } #ifdef _KERNEL -void atm_ifattach __P((struct ifnet *)); -void atm_input __P((struct ifnet *, struct atm_pseudohdr *, - struct mbuf *, void *)); -int atm_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); +void atm_ifattach(struct ifnet *); +void atm_input(struct ifnet *, struct atm_pseudohdr *, + struct mbuf *, void *); +int atm_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); #endif diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h index 03e1626892dc..2eb33dc5bb14 100644 --- a/sys/net/if_dl.h +++ b/sys/net/if_dl.h @@ -79,8 +79,8 @@ struct sockaddr_dl { #include __BEGIN_DECLS -void link_addr __P((const char *, struct sockaddr_dl *)); -char *link_ntoa __P((const struct sockaddr_dl *)); +void link_addr(const char *, struct sockaddr_dl *); +char *link_ntoa(const struct sockaddr_dl *); __END_DECLS #endif /* !_KERNEL */ diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 1c95e7ccf4e2..868453409790 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -118,8 +118,8 @@ bdg_forward_t *bdg_forward_ptr; bdgtakeifaces_t *bdgtakeifaces_ptr; struct bdg_softc *ifp2sc; -static int ether_resolvemulti __P((struct ifnet *, struct sockaddr **, - struct sockaddr *)); +static int ether_resolvemulti(struct ifnet *, struct sockaddr **, + struct sockaddr *); u_char etherbroadcastaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; #define senderr(e) do { error = (e); goto bad;} while (0) #define IFP2AC(IFP) ((struct arpcom *)IFP) diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c index ee9a3a72e652..235915712e39 100644 --- a/sys/net/if_faith.c +++ b/sys/net/if_faith.c @@ -89,21 +89,21 @@ struct faith_softc { LIST_ENTRY(faith_softc) sc_list; }; -static int faithioctl __P((struct ifnet *, u_long, caddr_t)); -int faithoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static void faithrtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); +static int faithioctl(struct ifnet *, u_long, caddr_t); +int faithoutput(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static void faithrtrequest(int, struct rtentry *, struct rt_addrinfo *); #ifdef INET6 -static int faithprefix __P((struct in6_addr *)); +static int faithprefix(struct in6_addr *); #endif -static int faithmodevent __P((module_t, int, void *)); +static int faithmodevent(module_t, int, void *); static MALLOC_DEFINE(M_FAITH, FAITHNAME, "Firewall Assisted Tunnel Interface"); static LIST_HEAD(, faith_softc) faith_softc_list; -int faith_clone_create __P((struct if_clone *, int)); -int faith_clone_destroy __P((struct ifnet *)); +int faith_clone_create(struct if_clone *, int); +int faith_clone_destroy(struct ifnet *); struct if_clone faith_cloner = IF_CLONE_INITIALIZER(FAITHNAME, faith_clone_create, faith_clone_destroy, IF_MAXUNIT); diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c index 37f91bf9b5c4..8d8a1a911a35 100644 --- a/sys/net/if_fddisubr.c +++ b/sys/net/if_fddisubr.c @@ -94,8 +94,8 @@ extern u_char at_org_code[ 3 ]; extern u_char aarp_org_code[ 3 ]; #endif /* NETATALK */ -static int fddi_resolvemulti __P((struct ifnet *, struct sockaddr **, - struct sockaddr *)); +static int fddi_resolvemulti(struct ifnet *, struct sockaddr **, + struct sockaddr *); #define senderr(e) { error = (e); goto bad;} diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 479484fa0a0e..aa8b96a7d5b9 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -89,15 +89,15 @@ void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af); void (*ng_gif_attach_p)(struct ifnet *ifp); void (*ng_gif_detach_p)(struct ifnet *ifp); -int gif_clone_create __P((struct if_clone *, int)); -int gif_clone_destroy __P((struct ifnet *)); +int gif_clone_create(struct if_clone *, int); +int gif_clone_destroy(struct ifnet *); struct if_clone gif_cloner = IF_CLONE_INITIALIZER("gif", gif_clone_create, gif_clone_destroy, IF_MAXUNIT); -static int gifmodevent __P((module_t, int, void *)); -void gif_delete_tunnel __P((struct gif_softc *)); -static int gif_encapcheck __P((const struct mbuf *, int, int, void *)); +static int gifmodevent(module_t, int, void *); +void gif_delete_tunnel(struct gif_softc *); +static int gif_encapcheck(const struct mbuf *, int, int, void *); #ifdef INET extern struct domain inetdomain; diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h index c5dc6d3ae3f1..7a2ed857a1e9 100644 --- a/sys/net/if_gif.h +++ b/sys/net/if_gif.h @@ -82,10 +82,10 @@ struct gif_softc { #define GIF_MTU_MAX (8192) /* Maximum MTU */ /* Prototypes */ -void gif_input __P((struct mbuf *, int, struct ifnet *)); -int gif_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); -int gif_ioctl __P((struct ifnet *, u_long, caddr_t)); +void gif_input(struct mbuf *, int, struct ifnet *); +int gif_output(struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); +int gif_ioctl(struct ifnet *, u_long, caddr_t); #endif /* _KERNEL */ diff --git a/sys/net/if_media.c b/sys/net/if_media.c index fd372ca5e03b..f0b66cf63991 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -62,12 +62,12 @@ * Useful for debugging newly-ported drivers. */ -static struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, - int flags, int mask)); +static struct ifmedia_entry *ifmedia_match(struct ifmedia *ifm, + int flags, int mask); #ifdef IFMEDIA_DEBUG int ifmedia_debug = 0; -static void ifmedia_printword __P((int)); +static void ifmedia_printword(int); #endif /* diff --git a/sys/net/if_media.h b/sys/net/if_media.h index 52bbdbd3667b..541cb2f7055d 100644 --- a/sys/net/if_media.h +++ b/sys/net/if_media.h @@ -57,8 +57,8 @@ /* * Driver callbacks for media status and change requests. */ -typedef int (*ifm_change_cb_t) __P((struct ifnet *ifp)); -typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req)); +typedef int (*ifm_change_cb_t)(struct ifnet *ifp); +typedef void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req); /* * In-kernel representation of a single supported media type. @@ -84,25 +84,25 @@ struct ifmedia { }; /* Initialize an interface's struct if_media field. */ -void ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask, - ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback)); +void ifmedia_init(struct ifmedia *ifm, int dontcare_mask, + ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback); /* Remove all mediums from a struct ifmedia. */ -void ifmedia_removeall __P(( struct ifmedia *ifm)); +void ifmedia_removeall( struct ifmedia *ifm); /* Add one supported medium to a struct ifmedia. */ -void ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux)); +void ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux); /* Add an array (of ifmedia_entry) media to a struct ifmedia. */ void ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp, int count); /* Set default media type on initialization. */ -void ifmedia_set __P((struct ifmedia *ifm, int mword)); +void ifmedia_set(struct ifmedia *ifm, int mword); /* Common ioctl function for getting/setting media, called by driver. */ -int ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr, - struct ifmedia *ifm, u_long cmd)); +int ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, + struct ifmedia *ifm, u_long cmd); #endif /*_KERNEL */ diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c index 727229686db9..091b25e8cfbf 100644 --- a/sys/net/if_ppp.c +++ b/sys/net/if_ppp.c @@ -133,16 +133,16 @@ static struct ppp_softc ppp_softc[NPPP]; /* XXX layering violation */ -extern void pppasyncattach __P((void *)); +extern void pppasyncattach(void *); -static int pppsioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -static void pppintr __P((void)); +static int pppsioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +static void pppintr(void); -static void ppp_requeue __P((struct ppp_softc *)); -static void ppp_ccp __P((struct ppp_softc *, struct mbuf *m, int rcvd)); -static void ppp_ccp_closed __P((struct ppp_softc *)); -static void ppp_inproc __P((struct ppp_softc *, struct mbuf *)); -static void pppdumpm __P((struct mbuf *m0)); +static void ppp_requeue(struct ppp_softc *); +static void ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd); +static void ppp_ccp_closed(struct ppp_softc *); +static void ppp_inproc(struct ppp_softc *, struct mbuf *); +static void pppdumpm(struct mbuf *m0); /* * Some useful mbuf macros not in mbuf.h. diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h index cd6ea3d41cda..659e206164ce 100644 --- a/sys/net/if_pppvar.h +++ b/sys/net/if_pppvar.h @@ -57,10 +57,10 @@ struct ppp_softc { /*hi*/ u_int sc_flags; /* control/status bits; see if_ppp.h */ struct callout_handle sc_ch; /* Used for scheduling timeouts */ void *sc_devp; /* pointer to device-dep structure */ - void (*sc_start) __P((struct ppp_softc *)); /* start output proc */ - void (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */ - void (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */ - void (*sc_setmtu) __P((struct ppp_softc *)); /* set mtu */ + void (*sc_start)(struct ppp_softc *); /* start output proc */ + void (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */ + void (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */ + void (*sc_setmtu)(struct ppp_softc *); /* set mtu */ short sc_mru; /* max receive unit */ pid_t sc_xfer; /* used in transferring unit */ /*hi*/ struct ifqueue sc_rawq; /* received packets */ @@ -98,12 +98,12 @@ struct ppp_softc { int sc_rawin_count; /* # in sc_rawin */ }; -struct ppp_softc *pppalloc __P((pid_t pid)); -void pppdealloc __P((struct ppp_softc *sc)); -int pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data, - int flag, struct thread *td)); -int pppoutput __P((struct ifnet *ifp, struct mbuf *m0, - struct sockaddr *dst, struct rtentry *rtp)); -void ppp_restart __P((struct ppp_softc *sc)); -void ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost)); -struct mbuf *ppp_dequeue __P((struct ppp_softc *sc)); +struct ppp_softc *pppalloc(pid_t pid); +void pppdealloc(struct ppp_softc *sc); +int pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, + int flag, struct thread *td); +int pppoutput(struct ifnet *ifp, struct mbuf *m0, + struct sockaddr *dst, struct rtentry *rtp); +void ppp_restart(struct ppp_softc *sc); +void ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost); +struct mbuf *ppp_dequeue(struct ppp_softc *sc); diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index c2e0e17da969..346252a9b3f8 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -173,21 +173,21 @@ static LIST_HEAD(sl_list, sl_softc) sl_list; #define TRANS_FRAME_END 0xdc /* transposed frame end */ #define TRANS_FRAME_ESCAPE 0xdd /* transposed frame esc */ -static int slisstatic __P((int)); -static void slmarkstatic __P((int)); -static struct sl_softc *slcreate __P((void)); -static void sldestroy __P((struct sl_softc *sc)); -static struct mbuf *sl_btom __P((struct sl_softc *, int)); +static int slisstatic(int); +static void slmarkstatic(int); +static struct sl_softc *slcreate(void); +static void sldestroy(struct sl_softc *sc); +static struct mbuf *sl_btom(struct sl_softc *, int); static timeout_t sl_keepalive; static timeout_t sl_outfill; static l_close_t slclose; static l_rint_t slinput; static l_ioctl_t sltioctl; -static int slioctl __P((struct ifnet *, u_long, caddr_t)); -static int slopen __P((dev_t, struct tty *)); -static int sloutput __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -static int slstart __P((struct tty *)); +static int slioctl(struct ifnet *, u_long, caddr_t); +static int slopen(dev_t, struct tty *); +static int sloutput(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +static int slstart(struct tty *); static struct linesw slipdisc = { slopen, slclose, l_noread, l_nowrite, diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 3aaae462adab..0c45f438dc46 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -145,20 +145,20 @@ struct protosw in_stf_protosw = &rip_usrreqs }; -static int stfmodevent __P((module_t, int, void *)); -static int stf_encapcheck __P((const struct mbuf *, int, int, void *)); -static struct in6_ifaddr *stf_getsrcifa6 __P((struct ifnet *)); -static int stf_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static int stf_checkaddr4 __P((struct stf_softc *, struct in_addr *, - struct ifnet *)); -static int stf_checkaddr6 __P((struct stf_softc *, struct in6_addr *, - struct ifnet *)); -static void stf_rtrequest __P((int, struct rtentry *, struct rt_addrinfo *)); -static int stf_ioctl __P((struct ifnet *, u_long, caddr_t)); +static int stfmodevent(module_t, int, void *); +static int stf_encapcheck(const struct mbuf *, int, int, void *); +static struct in6_ifaddr *stf_getsrcifa6(struct ifnet *); +static int stf_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static int stf_checkaddr4(struct stf_softc *, struct in_addr *, + struct ifnet *); +static int stf_checkaddr6(struct stf_softc *, struct in6_addr *, + struct ifnet *); +static void stf_rtrequest(int, struct rtentry *, struct rt_addrinfo *); +static int stf_ioctl(struct ifnet *, u_long, caddr_t); -int stf_clone_create __P((struct if_clone *, int)); -int stf_clone_destroy __P((struct ifnet *)); +int stf_clone_create(struct if_clone *, int); +int stf_clone_destroy(struct ifnet *); /* only one clone is currently allowed */ struct if_clone stf_cloner = diff --git a/sys/net/if_stf.h b/sys/net/if_stf.h index 67bb2f19e9c1..998133ce13e4 100644 --- a/sys/net/if_stf.h +++ b/sys/net/if_stf.h @@ -33,6 +33,6 @@ #ifndef _NET_IF_STF_H_ #define _NET_IF_STF_H_ -void in_stf_input __P((struct mbuf *, int)); +void in_stf_input(struct mbuf *, int); #endif /* _NET_IF_STF_H_ */ diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index da0fb8acf766..88bed1a463f2 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -81,16 +81,16 @@ /* 0x007f00ff */ /* module */ -static int tapmodevent __P((module_t, int, void *)); +static int tapmodevent (module_t, int, void *); /* device */ -static void tapclone __P((void *, char *, int, dev_t *)); -static void tapcreate __P((dev_t)); +static void tapclone (void *, char *, int, dev_t *); +static void tapcreate (dev_t); /* network interface */ -static void tapifstart __P((struct ifnet *)); -static int tapifioctl __P((struct ifnet *, u_long, caddr_t)); -static void tapifinit __P((void *)); +static void tapifstart (struct ifnet *); +static int tapifioctl (struct ifnet *, u_long, caddr_t); +static void tapifinit (void *); /* character device */ static d_open_t tapopen; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 12cd7400a0fb..90bcc033f77e 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -148,35 +148,35 @@ struct ifnet { int if_amcount; /* number of all-multicast requests */ /* procedure handles */ int (*if_output) /* output routine (enqueue) */ - __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); + (struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); void (*if_start) /* initiate output routine */ - __P((struct ifnet *)); + (struct ifnet *); int (*if_done) /* output complete routine */ - __P((struct ifnet *)); /* (XXX not used; fake prototype) */ + (struct ifnet *); /* (XXX not used; fake prototype) */ int (*if_ioctl) /* ioctl routine */ - __P((struct ifnet *, u_long, caddr_t)); + (struct ifnet *, u_long, caddr_t); void (*if_watchdog) /* timer routine */ - __P((struct ifnet *)); + (struct ifnet *); int (*if_poll_recv) /* polled receive routine */ - __P((struct ifnet *, int *)); + (struct ifnet *, int *); int (*if_poll_xmit) /* polled transmit routine */ - __P((struct ifnet *, int *)); + (struct ifnet *, int *); void (*if_poll_intren) /* polled interrupt reenable routine */ - __P((struct ifnet *)); + (struct ifnet *); void (*if_poll_slowinput) /* input routine for slow devices */ - __P((struct ifnet *, struct mbuf *)); + (struct ifnet *, struct mbuf *); void (*if_init) /* Init routine */ - __P((void *)); + (void *); int (*if_resolvemulti) /* validate/resolve multicast */ - __P((struct ifnet *, struct sockaddr **, struct sockaddr *)); + (struct ifnet *, struct sockaddr **, struct sockaddr *); struct ifqueue if_snd; /* output queue */ struct ifqueue *if_poll_slowq; /* input queue for slow devices */ struct ifprefixhead if_prefixhead; /* list of prefixes per if */ u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ }; -typedef void if_init_f_t __P((void *)); +typedef void if_init_f_t(void *); #define if_mtu if_data.ifi_mtu #define if_type if_data.ifi_type @@ -335,7 +335,7 @@ struct ifaddr { struct ifnet *ifa_ifp; /* back-pointer to interface */ TAILQ_ENTRY(ifaddr) ifa_link; /* queue macro glue */ void (*ifa_rtrequest) /* check or clean routes (+ or -)'d */ - __P((int, struct rtentry *, struct rt_addrinfo *)); + (int, struct rtentry *, struct rt_addrinfo *); u_short ifa_flags; /* mostly rt_flags for cloning */ u_int ifa_refcnt; /* references to this structure */ int ifa_metric; /* cost of going out this interface */ @@ -343,7 +343,7 @@ struct ifaddr { struct rtentry *ifa_rt; /* XXXX for ROUTETOIF ????? */ #endif int (*ifa_claim_addr) /* check if an addr goes to this if */ - __P((struct ifaddr *, struct sockaddr *)); + (struct ifaddr *, struct sockaddr *); }; #define IFA_ROUTE RTF_UP /* route installed */ @@ -405,56 +405,53 @@ extern int ifqmaxlen; extern struct ifnet *loif; /* first loopback interface */ extern int if_index; -void ether_ifattach __P((struct ifnet *, int)); -void ether_ifdetach __P((struct ifnet *, int)); -void ether_input __P((struct ifnet *, struct ether_header *, struct mbuf *)); -void ether_demux __P((struct ifnet *, struct ether_header *, struct mbuf *)); -int ether_output __P((struct ifnet *, - struct mbuf *, struct sockaddr *, struct rtentry *)); -int ether_output_frame __P((struct ifnet *, struct mbuf *)); -int ether_ioctl __P((struct ifnet *, int, caddr_t)); +void ether_ifattach(struct ifnet *, int); +void ether_ifdetach(struct ifnet *, int); +void ether_input(struct ifnet *, struct ether_header *, struct mbuf *); +void ether_demux(struct ifnet *, struct ether_header *, struct mbuf *); +int ether_output(struct ifnet *, + struct mbuf *, struct sockaddr *, struct rtentry *); +int ether_output_frame(struct ifnet *, struct mbuf *); +int ether_ioctl(struct ifnet *, int, caddr_t); -int if_addmulti __P((struct ifnet *, struct sockaddr *, - struct ifmultiaddr **)); -int if_allmulti __P((struct ifnet *, int)); -void if_attach __P((struct ifnet *)); -int if_delmulti __P((struct ifnet *, struct sockaddr *)); -void if_detach __P((struct ifnet *)); -void if_down __P((struct ifnet *)); -void if_route __P((struct ifnet *, int flag, int fam)); -int if_setlladdr __P((struct ifnet *, const u_char *, int)); -void if_unroute __P((struct ifnet *, int flag, int fam)); -void if_up __P((struct ifnet *)); -/*void ifinit __P((void));*/ /* declared in systm.h for main() */ -int ifioctl __P((struct socket *, u_long, caddr_t, struct thread *)); -int ifpromisc __P((struct ifnet *, int)); -struct ifnet *ifunit __P((const char *)); -struct ifnet *if_withname __P((struct sockaddr *)); +int if_addmulti(struct ifnet *, struct sockaddr *, struct ifmultiaddr **); +int if_allmulti(struct ifnet *, int); +void if_attach(struct ifnet *); +int if_delmulti(struct ifnet *, struct sockaddr *); +void if_detach(struct ifnet *); +void if_down(struct ifnet *); +void if_route(struct ifnet *, int flag, int fam); +int if_setlladdr(struct ifnet *, const u_char *, int); +void if_unroute(struct ifnet *, int flag, int fam); +void if_up(struct ifnet *); +/*void ifinit(void);*/ /* declared in systm.h for main() */ +int ifioctl(struct socket *, u_long, caddr_t, struct thread *); +int ifpromisc(struct ifnet *, int); +struct ifnet *ifunit(const char *); +struct ifnet *if_withname(struct sockaddr *); -int if_poll_recv_slow __P((struct ifnet *ifp, int *quotap)); -void if_poll_xmit_slow __P((struct ifnet *ifp, int *quotap)); -void if_poll_throttle __P((void)); -void if_poll_unthrottle __P((void *)); -void if_poll_init __P((void)); -void if_poll __P((void)); +int if_poll_recv_slow(struct ifnet *ifp, int *quotap); +void if_poll_xmit_slow(struct ifnet *ifp, int *quotap); +void if_poll_throttle(void); +void if_poll_unthrottle(void *); +void if_poll_init(void); +void if_poll(void); -struct ifaddr *ifa_ifwithaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithdstaddr __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithnet __P((struct sockaddr *)); -struct ifaddr *ifa_ifwithroute __P((int, struct sockaddr *, - struct sockaddr *)); -struct ifaddr *ifaof_ifpforaddr __P((struct sockaddr *, struct ifnet *)); -void ifafree __P((struct ifaddr *)); +struct ifaddr *ifa_ifwithaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithdstaddr(struct sockaddr *); +struct ifaddr *ifa_ifwithnet(struct sockaddr *); +struct ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *); +struct ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *); +void ifafree(struct ifaddr *); -struct ifmultiaddr *ifmaof_ifpforaddr __P((struct sockaddr *, - struct ifnet *)); -int if_simloop __P((struct ifnet *ifp, struct mbuf *m, int af, int hlen)); +struct ifmultiaddr *ifmaof_ifpforaddr(struct sockaddr *, struct ifnet *); +int if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen); -void if_clone_attach __P((struct if_clone *)); -void if_clone_detach __P((struct if_clone *)); +void if_clone_attach(struct if_clone *); +void if_clone_detach(struct if_clone *); -int if_clone_create __P((char *, int)); -int if_clone_destroy __P((const char *)); +int if_clone_create(char *, int); +int if_clone_destroy(const char *); #define IF_LLADDR(ifp) \ LLADDR((struct sockaddr_dl *) ifaddr_byindex((ifp)->if_index)->ifa_addr) @@ -462,10 +459,9 @@ int if_clone_destroy __P((const char *)); #ifdef DEVICE_POLLING enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS, POLL_DEREGISTER }; -typedef void poll_handler_t __P((struct ifnet *ifp, - enum poll_cmd cmd, int count)); -int ether_poll_register __P((poll_handler_t *h, struct ifnet *ifp)); -int ether_poll_deregister __P((struct ifnet *ifp)); +typedef void poll_handler_t(struct ifnet *ifp, enum poll_cmd cmd, int count); +int ether_poll_register(poll_handler_t *h, struct ifnet *ifp); +int ether_poll_deregister(struct ifnet *ifp); #endif /* DEVICE_POLLING */ #endif /* _KERNEL */ diff --git a/sys/net/intrq.h b/sys/net/intrq.h index 6316be0c0025..2d01056c1bdb 100644 --- a/sys/net/intrq.h +++ b/sys/net/intrq.h @@ -39,7 +39,7 @@ extern int ipxintrq_present; extern int natmintrq_present; extern int nsintrq_present; -extern int family_enqueue __P((sa_family_t, struct mbuf *)); +extern int family_enqueue(sa_family_t, struct mbuf *); #endif #endif /* _NET_INTRQ_H_ */ diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h index 399dd3143c26..57a1fb5e1345 100644 --- a/sys/net/net_osdep.h +++ b/sys/net/net_osdep.h @@ -235,7 +235,7 @@ #ifdef _KERNEL struct ifnet; -extern const char *if_name __P((struct ifnet *)); +extern const char *if_name(struct ifnet *); #define HAVE_OLD_BPF diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 35e8cc132252..3056ef980a81 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -69,19 +69,19 @@ #ifndef LOCORE #ifdef _KERNEL -void legacy_setsoftnet __P((void)); +void legacy_setsoftnet(void); extern volatile unsigned int netisr; /* scheduling bits for network */ -extern void (*netisrs[32]) __P((void)); +extern void (*netisrs[32])(void); #define schednetisr(anisr) do { \ atomic_set_rel_int(&netisr, 1 << (anisr)); \ legacy_setsoftnet(); \ } while (0) -typedef void netisr_t __P((void)); +typedef void netisr_t(void); -int register_netisr __P((int, netisr_t *)); -int unregister_netisr __P((int)); +int register_netisr(int, netisr_t *); +int unregister_netisr(int); #endif #endif diff --git a/sys/net/pfil.c b/sys/net/pfil.c index 02d9656f287b..2ed40b2f0f4c 100644 --- a/sys/net/pfil.c +++ b/sys/net/pfil.c @@ -39,11 +39,11 @@ #include #include -static void pfil_init __P((struct pfil_head *)); +static void pfil_init(struct pfil_head *); static int pfil_list_add(pfil_list_t *, - int (*) __P((void *, int, struct ifnet *, int, struct mbuf **)), int); + int (*)(void *, int, struct ifnet *, int, struct mbuf **), int); static int pfil_list_remove(pfil_list_t *, - int (*) __P((void *, int, struct ifnet *, int, struct mbuf **))); + int (*)(void *, int, struct ifnet *, int, struct mbuf **)); static void pfil_init(ph) @@ -65,8 +65,7 @@ pfil_init(ph) */ int pfil_add_hook(func, flags, ph) - int (*func) __P((void *, int, struct ifnet *, int, - struct mbuf **)); + int (*func)(void *, int, struct ifnet *, int, struct mbuf **); int flags; struct pfil_head *ph; { @@ -92,8 +91,7 @@ pfil_add_hook(func, flags, ph) static int pfil_list_add(list, func, flags) pfil_list_t *list; - int (*func) __P((void *, int, struct ifnet *, int, - struct mbuf **)); + int (*func)(void *, int, struct ifnet *, int, struct mbuf **); int flags; { struct packet_filter_hook *pfh; @@ -121,8 +119,7 @@ pfil_list_add(list, func, flags) */ int pfil_remove_hook(func, flags, ph) - int (*func) __P((void *, int, struct ifnet *, int, - struct mbuf **)); + int (*func)(void *, int, struct ifnet *, int, struct mbuf **); int flags; struct pfil_head *ph; { @@ -145,8 +142,7 @@ pfil_remove_hook(func, flags, ph) static int pfil_list_remove(list, func) pfil_list_t *list; - int (*func) __P((void *, int, struct ifnet *, int, - struct mbuf **)); + int (*func)(void *, int, struct ifnet *, int, struct mbuf **); { struct packet_filter_hook *pfh; diff --git a/sys/net/pfil.h b/sys/net/pfil.h index e2f31d46f2fa..4df1b6fbef93 100644 --- a/sys/net/pfil.h +++ b/sys/net/pfil.h @@ -42,8 +42,8 @@ struct ifnet; */ struct packet_filter_hook { TAILQ_ENTRY(packet_filter_hook) pfil_link; - int (*pfil_func) __P((void *, int, struct ifnet *, int, - struct mbuf **)); + int (*pfil_func)(void *, int, struct ifnet *, int, + struct mbuf **); int pfil_flags; }; @@ -60,11 +60,11 @@ struct pfil_head { int ph_init; }; -struct packet_filter_hook *pfil_hook_get __P((int, struct pfil_head *)); -int pfil_add_hook __P((int (*func) __P((void *, int, - struct ifnet *, int, struct mbuf **)), int, struct pfil_head *)); -int pfil_remove_hook __P((int (*func) __P((void *, int, - struct ifnet *, int, struct mbuf **)), int, struct pfil_head *)); +struct packet_filter_hook *pfil_hook_get(int, struct pfil_head *); +int pfil_add_hook(int (*func)(void *, int, + struct ifnet *, int, struct mbuf **), int, struct pfil_head *); +int pfil_remove_hook(int (*func)(void *, int, + struct ifnet *, int, struct mbuf **), int, struct pfil_head *); /* XXX */ #if defined(_KERNEL) && !defined(KLD_MODULE) diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h index 5cf591be6411..ac9171f53923 100644 --- a/sys/net/ppp_comp.h +++ b/sys/net/ppp_comp.h @@ -38,36 +38,36 @@ struct compressor { int compress_proto; /* CCP compression protocol number */ /* Allocate space for a compressor (transmit side) */ - void *(*comp_alloc) __P((u_char *options, int opt_len)); + void *(*comp_alloc)(u_char *options, int opt_len); /* Free space used by a compressor */ - void (*comp_free) __P((void *state)); + void (*comp_free)(void *state); /* Initialize a compressor */ - int (*comp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); + int (*comp_init)(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); /* Reset a compressor */ - void (*comp_reset) __P((void *state)); + void (*comp_reset)(void *state); /* Compress a packet */ - int (*compress) __P((void *state, PACKETPTR *mret, - PACKETPTR mp, int orig_len, int max_len)); + int (*compress)(void *state, PACKETPTR *mret, + PACKETPTR mp, int orig_len, int max_len); /* Return compression statistics */ - void (*comp_stat) __P((void *state, struct compstat *stats)); + void (*comp_stat)(void *state, struct compstat *stats); /* Allocate space for a decompressor (receive side) */ - void *(*decomp_alloc) __P((u_char *options, int opt_len)); + void *(*decomp_alloc)(u_char *options, int opt_len); /* Free space used by a decompressor */ - void (*decomp_free) __P((void *state)); + void (*decomp_free)(void *state); /* Initialize a decompressor */ - int (*decomp_init) __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); + int (*decomp_init)(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); /* Reset a decompressor */ - void (*decomp_reset) __P((void *state)); + void (*decomp_reset)(void *state); /* Decompress a packet. */ - int (*decompress) __P((void *state, PACKETPTR mp, - PACKETPTR *dmpp)); + int (*decompress)(void *state, PACKETPTR mp, + PACKETPTR *dmpp); /* Update state for an incompressible packet received */ - void (*incomp) __P((void *state, PACKETPTR mp)); + void (*incomp)(void *state, PACKETPTR mp); /* Return decompression statistics */ - void (*decomp_stat) __P((void *state, struct compstat *stats)); + void (*decomp_stat)(void *state, struct compstat *stats); }; #endif /* PACKETPTR */ diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c index 091fa39d8c89..6658c40b759b 100644 --- a/sys/net/ppp_deflate.c +++ b/sys/net/ppp_deflate.c @@ -60,24 +60,24 @@ struct deflate_state { #define DEFLATE_OVHD 2 /* Deflate overhead/packet */ -static void *z_alloc __P((void *, u_int items, u_int size)); -static void z_free __P((void *, void *ptr)); -static void *z_comp_alloc __P((u_char *options, int opt_len)); -static void *z_decomp_alloc __P((u_char *options, int opt_len)); -static void z_comp_free __P((void *state)); -static void z_decomp_free __P((void *state)); -static int z_comp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int debug)); -static int z_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int hdrlen, int mru, int debug)); -static int z_compress __P((void *state, struct mbuf **mret, - struct mbuf *mp, int slen, int maxolen)); -static void z_incomp __P((void *state, struct mbuf *dmsg)); -static int z_decompress __P((void *state, struct mbuf *cmp, - struct mbuf **dmpp)); -static void z_comp_reset __P((void *state)); -static void z_decomp_reset __P((void *state)); -static void z_comp_stats __P((void *state, struct compstat *stats)); +static void *z_alloc(void *, u_int items, u_int size); +static void z_free(void *, void *ptr); +static void *z_comp_alloc(u_char *options, int opt_len); +static void *z_decomp_alloc(u_char *options, int opt_len); +static void z_comp_free(void *state); +static void z_decomp_free(void *state); +static int z_comp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int debug); +static int z_decomp_init(void *state, u_char *options, int opt_len, + int unit, int hdrlen, int mru, int debug); +static int z_compress(void *state, struct mbuf **mret, + struct mbuf *mp, int slen, int maxolen); +static void z_incomp(void *state, struct mbuf *dmsg); +static int z_decompress(void *state, struct mbuf *cmp, + struct mbuf **dmpp); +static void z_comp_reset(void *state); +static void z_decomp_reset(void *state); +static void z_comp_stats(void *state, struct compstat *stats); /* * Procedures exported to if_ppp.c. diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index 3838286f5b36..e769b1b5869a 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -94,26 +94,26 @@ #include #include -static int pppopen __P((dev_t dev, struct tty *tp)); -static int pppclose __P((struct tty *tp, int flag)); -static int pppread __P((struct tty *tp, struct uio *uio, int flag)); -static int pppwrite __P((struct tty *tp, struct uio *uio, int flag)); -static int ppptioctl __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct thread *td)); -static int pppinput __P((int c, struct tty *tp)); -static int pppstart __P((struct tty *tp)); +static int pppopen(dev_t dev, struct tty *tp); +static int pppclose(struct tty *tp, int flag); +static int pppread(struct tty *tp, struct uio *uio, int flag); +static int pppwrite(struct tty *tp, struct uio *uio, int flag); +static int ppptioctl(struct tty *tp, u_long cmd, caddr_t data, + int flag, struct thread *td); +static int pppinput(int c, struct tty *tp); +static int pppstart(struct tty *tp); -static u_short pppfcs __P((u_short fcs, u_char *cp, int len)); -static void pppasyncstart __P((struct ppp_softc *)); -static void pppasyncctlp __P((struct ppp_softc *)); -static void pppasyncrelinq __P((struct ppp_softc *)); -static void pppasyncsetmtu __P((struct ppp_softc *)); -static void ppp_timeout __P((void *)); -static void pppgetm __P((struct ppp_softc *sc)); -static void ppplogchar __P((struct ppp_softc *, int)); +static u_short pppfcs(u_short fcs, u_char *cp, int len); +static void pppasyncstart(struct ppp_softc *); +static void pppasyncctlp(struct ppp_softc *); +static void pppasyncrelinq(struct ppp_softc *); +static void pppasyncsetmtu(struct ppp_softc *); +static void ppp_timeout(void *); +static void pppgetm(struct ppp_softc *sc); +static void ppplogchar(struct ppp_softc *, int); /* XXX called from if_ppp.c - layering violation */ -void pppasyncattach __P((void *)); +void pppasyncattach(void *); /* * Some useful mbuf macros not in mbuf.h. diff --git a/sys/net/radix.c b/sys/net/radix.c index 442788c678da..2e9c03fd053a 100644 --- a/sys/net/radix.c +++ b/sys/net/radix.c @@ -51,15 +51,15 @@ #include #endif -static int rn_walktree_from __P((struct radix_node_head *h, void *a, - void *m, walktree_f_t *f, void *w)); -static int rn_walktree __P((struct radix_node_head *, walktree_f_t *, void *)); +static int rn_walktree_from(struct radix_node_head *h, void *a, + void *m, walktree_f_t *f, void *w); +static int rn_walktree(struct radix_node_head *, walktree_f_t *, void *); static struct radix_node - *rn_insert __P((void *, struct radix_node_head *, int *, - struct radix_node [2])), - *rn_newpair __P((void *, int, struct radix_node[2])), - *rn_search __P((void *, struct radix_node *)), - *rn_search_m __P((void *, struct radix_node *, void *)); + *rn_insert(void *, struct radix_node_head *, int *, + struct radix_node [2]), + *rn_newpair(void *, int, struct radix_node[2]), + *rn_search(void *, struct radix_node *), + *rn_search_m(void *, struct radix_node *, void *); static int max_keylen; static struct radix_mask *rn_mkfreelist; @@ -73,12 +73,12 @@ static char *rn_zeros, *rn_ones; #define Bcmp(a, b, l) \ (l == 0 ? 0 : bcmp((caddr_t)(a), (caddr_t)(b), (u_long)l)) -static int rn_lexobetter __P((void *m_arg, void *n_arg)); +static int rn_lexobetter(void *m_arg, void *n_arg); static struct radix_mask * - rn_new_radix_mask __P((struct radix_node *tt, - struct radix_mask *next)); -static int rn_satsifies_leaf __P((char *trial, struct radix_node *leaf, - int skip)); + rn_new_radix_mask(struct radix_node *tt, + struct radix_mask *next); +static int rn_satsifies_leaf(char *trial, struct radix_node *leaf, + int skip); /* * The data structure for the keys is a radix tree with one way diff --git a/sys/net/radix.h b/sys/net/radix.h index e6e1f9209327..5d5174558f1e 100644 --- a/sys/net/radix.h +++ b/sys/net/radix.h @@ -108,35 +108,35 @@ struct radix_mask { #define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);} -typedef int walktree_f_t __P((struct radix_node *, void *)); +typedef int walktree_f_t(struct radix_node *, void *); struct radix_node_head { struct radix_node *rnh_treetop; int rnh_addrsize; /* permit, but not require fixed keys */ int rnh_pktsize; /* permit, but not require fixed keys */ struct radix_node *(*rnh_addaddr) /* add based on sockaddr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_addpkt) /* add based on packet hdr */ - __P((void *v, void *mask, - struct radix_node_head *head, struct radix_node nodes[])); + (void *v, void *mask, + struct radix_node_head *head, struct radix_node nodes[]); struct radix_node *(*rnh_deladdr) /* remove based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_delpkt) /* remove based on packet hdr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchaddr) /* locate based on sockaddr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); struct radix_node *(*rnh_lookup) /* locate based on sockaddr */ - __P((void *v, void *mask, struct radix_node_head *head)); + (void *v, void *mask, struct radix_node_head *head); struct radix_node *(*rnh_matchpkt) /* locate based on packet hdr */ - __P((void *v, struct radix_node_head *head)); + (void *v, struct radix_node_head *head); int (*rnh_walktree) /* traverse tree */ - __P((struct radix_node_head *head, walktree_f_t *f, void *w)); + (struct radix_node_head *head, walktree_f_t *f, void *w); int (*rnh_walktree_from) /* traverse tree below a */ - __P((struct radix_node_head *head, void *a, void *m, - walktree_f_t *f, void *w)); + (struct radix_node_head *head, void *a, void *m, + walktree_f_t *f, void *w); void (*rnh_close) /* do something when the last ref drops */ - __P((struct radix_node *rn, struct radix_node_head *head)); + (struct radix_node *rn, struct radix_node_head *head); struct radix_node rnh_nodes[3]; /* empty tree for common case */ }; @@ -154,17 +154,17 @@ struct radix_node_head { #define Free(p) free((caddr_t)p, M_RTABLE); #endif /* _KERNEL */ -void rn_init __P((void)); -int rn_inithead __P((void **, int)); -int rn_refines __P((void *, void *)); +void rn_init(void); +int rn_inithead(void **, int); +int rn_refines(void *, void *); struct radix_node - *rn_addmask __P((void *, int, int)), - *rn_addroute __P((void *, void *, struct radix_node_head *, - struct radix_node [2])), - *rn_delete __P((void *, void *, struct radix_node_head *)), - *rn_lookup __P((void *v_arg, void *m_arg, - struct radix_node_head *head)), - *rn_match __P((void *, struct radix_node_head *)); + *rn_addmask(void *, int, int), + *rn_addroute (void *, void *, struct radix_node_head *, + struct radix_node [2]), + *rn_delete(void *, void *, struct radix_node_head *), + *rn_lookup (void *v_arg, void *m_arg, + struct radix_node_head *head), + *rn_match(void *, struct radix_node_head *); #endif /* _RADIX_H_ */ diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h index 59905085e658..4fe957a14f44 100644 --- a/sys/net/raw_cb.h +++ b/sys/net/raw_cb.h @@ -67,15 +67,15 @@ pr_ctlinput_t raw_ctlinput; pr_init_t raw_init; /* usrreq entries */ -int raw_attach __P((struct socket *, int)); -void raw_detach __P((struct rawcb *)); -void raw_disconnect __P((struct rawcb *)); +int raw_attach(struct socket *, int); +void raw_detach(struct rawcb *); +void raw_disconnect(struct rawcb *); #if 0 /* what the ??? */ pr_input_t raw_input; #else -void raw_input __P((struct mbuf *, - struct sockproto *, struct sockaddr *, struct sockaddr *)); +void raw_input(struct mbuf *, + struct sockproto *, struct sockaddr *, struct sockaddr *); #endif extern struct pr_usrreqs raw_usrreqs; diff --git a/sys/net/route.c b/sys/net/route.c index 627f902192da..b8e092f0f949 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -59,9 +59,9 @@ struct radix_node_head *rt_tables[AF_MAX+1]; static int rttrash; /* routes not in table but not freed */ -static void rt_maskedcopy __P((struct sockaddr *, - struct sockaddr *, struct sockaddr *)); -static void rtable_init __P((void **)); +static void rt_maskedcopy(struct sockaddr *, + struct sockaddr *, struct sockaddr *); +static void rtable_init(void **); static void rtable_init(table) @@ -456,8 +456,8 @@ ifa_ifwithroute(flags, dst, gateway) return (ifa); } -static int rt_fixdelete __P((struct radix_node *, void *)); -static int rt_fixchange __P((struct radix_node *, void *)); +static int rt_fixdelete(struct radix_node *, void *); +static int rt_fixchange(struct radix_node *, void *); struct rtfc_arg { struct rtentry *rt0; diff --git a/sys/net/route.h b/sys/net/route.h index 838915b47b37..6edb94165475 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -109,8 +109,8 @@ struct rtentry { caddr_t rt_llinfo; /* pointer to link level info cache */ struct rt_metrics rt_rmx; /* metrics used by rx'ing protocols */ struct rtentry *rt_gwroute; /* implied entry for gatewayed routes */ - int (*rt_output) __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *)); + int (*rt_output)(struct ifnet *, struct mbuf *, + struct sockaddr *, struct rtentry *); /* output routine for this (rt,if) */ struct rtentry *rt_parent; /* cloning parent of this route */ void *rt_filler2; /* more filler */ @@ -276,27 +276,26 @@ extern struct radix_node_head *rt_tables[AF_MAX+1]; struct ifmultiaddr; -void route_init __P((void)); -int rt_getifa __P((struct rt_addrinfo *)); -void rt_ifannouncemsg __P((struct ifnet *, int)); -void rt_ifmsg __P((struct ifnet *)); -void rt_missmsg __P((int, struct rt_addrinfo *, int, int)); -void rt_newaddrmsg __P((int, struct ifaddr *, int, struct rtentry *)); -void rt_newmaddrmsg __P((int, struct ifmultiaddr *)); -int rt_setgate __P((struct rtentry *, - struct sockaddr *, struct sockaddr *)); -void rtalloc __P((struct route *)); -void rtalloc_ign __P((struct route *, u_long)); +void route_init(void); +int rt_getifa(struct rt_addrinfo *); +void rt_ifannouncemsg(struct ifnet *, int); +void rt_ifmsg(struct ifnet *); +void rt_missmsg(int, struct rt_addrinfo *, int, int); +void rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *); +void rt_newmaddrmsg(int, struct ifmultiaddr *); +int rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *); +void rtalloc(struct route *); +void rtalloc_ign(struct route *, u_long); struct rtentry * - rtalloc1 __P((struct sockaddr *, int, u_long)); -void rtfree __P((struct rtentry *)); -int rtinit __P((struct ifaddr *, int, int)); -int rtioctl __P((u_long, caddr_t)); -void rtredirect __P((struct sockaddr *, struct sockaddr *, - struct sockaddr *, int, struct sockaddr *, struct rtentry **)); -int rtrequest __P((int, struct sockaddr *, - struct sockaddr *, struct sockaddr *, int, struct rtentry **)); -int rtrequest1 __P((int, struct rt_addrinfo *, struct rtentry **)); + rtalloc1(struct sockaddr *, int, u_long); +void rtfree(struct rtentry *); +int rtinit(struct ifaddr *, int, int); +int rtioctl(u_long, caddr_t); +void rtredirect(struct sockaddr *, struct sockaddr *, + struct sockaddr *, int, struct sockaddr *, struct rtentry **); +int rtrequest(int, struct sockaddr *, + struct sockaddr *, struct sockaddr *, int, struct rtentry **); +int rtrequest1(int, struct rt_addrinfo *, struct rtentry **); #endif #endif diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 1bdc439c306c..5b879910ae58 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -67,14 +67,13 @@ struct walkarg { }; static struct mbuf * - rt_msg1 __P((int, struct rt_addrinfo *)); -static int rt_msg2 __P((int, - struct rt_addrinfo *, caddr_t, struct walkarg *)); -static int rt_xaddrs __P((caddr_t, caddr_t, struct rt_addrinfo *)); -static int sysctl_dumpentry __P((struct radix_node *rn, void *vw)); -static int sysctl_iflist __P((int af, struct walkarg *w)); -static int route_output __P((struct mbuf *, struct socket *)); -static void rt_setmetrics __P((u_long, struct rt_metrics *, struct rt_metrics *)); + rt_msg1(int, struct rt_addrinfo *); +static int rt_msg2(int, struct rt_addrinfo *, caddr_t, struct walkarg *); +static int rt_xaddrs(caddr_t, caddr_t, struct rt_addrinfo *); +static int sysctl_dumpentry(struct radix_node *rn, void *vw); +static int sysctl_iflist(int af, struct walkarg *w); +static int route_output(struct mbuf *, struct socket *); +static void rt_setmetrics(u_long, struct rt_metrics *, struct rt_metrics *); /* Sleazy use of local variables throughout file, warning!!!! */ #define dst info.rti_info[RTAX_DST] diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h index 6959db0671bb..7a4af8291ea3 100644 --- a/sys/net/slcompress.h +++ b/sys/net/slcompress.h @@ -152,11 +152,10 @@ struct slcompress { /* flag values */ #define SLF_TOSS 1 /* tossing rcvd frames because of input err */ -void sl_compress_init __P((struct slcompress *, int)); -u_int sl_compress_tcp __P((struct mbuf *, - struct ip *, struct slcompress *, int)); -int sl_uncompress_tcp __P((u_char **, int, u_int, struct slcompress *)); -int sl_uncompress_tcp_core __P((u_char *, int, int, u_int, - struct slcompress *, u_char **, u_int *)); +void sl_compress_init(struct slcompress *, int); +u_int sl_compress_tcp(struct mbuf *, struct ip *, struct slcompress *, int); +int sl_uncompress_tcp(u_char **, int, u_int, struct slcompress *); +int sl_uncompress_tcp_core(u_char *, int, int, u_int, + struct slcompress *, u_char **, u_int *); #endif /* !_NET_SLCOMPRESS_H_ */