diff options
author | kevlo <kevlo@FreeBSD.org> | 2007-11-07 10:53:41 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2007-11-07 10:53:41 +0000 |
commit | fa3791e1a7df72dae386c39862c6dad9fb7a5304 (patch) | |
tree | 368b0b244e9ff1e4d1d1e563ee72dc5168999272 /usr.sbin/rtadvd | |
parent | 350f518402f17e189d71fde9dc889b50554369e6 (diff) | |
download | FreeBSD-src-fa3791e1a7df72dae386c39862c6dad9fb7a5304.zip FreeBSD-src-fa3791e1a7df72dae386c39862c6dad9fb7a5304.tar.gz |
Cleanup of userland __P use
Diffstat (limited to 'usr.sbin/rtadvd')
-rw-r--r-- | usr.sbin/rtadvd/advcap.c | 18 | ||||
-rw-r--r-- | usr.sbin/rtadvd/advcap.h | 8 | ||||
-rw-r--r-- | usr.sbin/rtadvd/config.c | 6 | ||||
-rw-r--r-- | usr.sbin/rtadvd/config.h | 14 | ||||
-rw-r--r-- | usr.sbin/rtadvd/dump.c | 4 | ||||
-rw-r--r-- | usr.sbin/rtadvd/dump.h | 2 | ||||
-rw-r--r-- | usr.sbin/rtadvd/if.c | 6 | ||||
-rw-r--r-- | usr.sbin/rtadvd/if.h | 38 | ||||
-rw-r--r-- | usr.sbin/rtadvd/rrenum.h | 4 | ||||
-rw-r--r-- | usr.sbin/rtadvd/rtadvd.c | 38 | ||||
-rw-r--r-- | usr.sbin/rtadvd/rtadvd.h | 10 | ||||
-rw-r--r-- | usr.sbin/rtadvd/timer.c | 4 | ||||
-rw-r--r-- | usr.sbin/rtadvd/timer.h | 26 |
13 files changed, 89 insertions, 89 deletions
diff --git a/usr.sbin/rtadvd/advcap.c b/usr.sbin/rtadvd/advcap.c index a6c5f80..792ea27 100644 --- a/usr.sbin/rtadvd/advcap.c +++ b/usr.sbin/rtadvd/advcap.c @@ -87,15 +87,15 @@ static char *remotefile; extern char *conffile; -int tgetent __P((char *, char *)); -int getent __P((char *, char *, char *)); -int tnchktc __P((void)); -int tnamatch __P((char *)); -static char *tskip __P((char *)); -int64_t tgetnum __P((char *)); -int tgetflag __P((char *)); -char *tgetstr __P((char *, char **)); -static char *tdecode __P((char *, char **)); +int tgetent(char *, char *); +int getent(char *, char *, char *); +int tnchktc(void); +int tnamatch(char *); +static char *tskip(char *); +int64_t tgetnum(char *); +int tgetflag(char *); +char *tgetstr(char *, char **); +static char *tdecode(char *, char **); /* * Get an entry for terminal name in buffer bp, diff --git a/usr.sbin/rtadvd/advcap.h b/usr.sbin/rtadvd/advcap.h index 3723871..3cc124a 100644 --- a/usr.sbin/rtadvd/advcap.h +++ b/usr.sbin/rtadvd/advcap.h @@ -36,10 +36,10 @@ __BEGIN_DECLS -extern int agetent __P((char *, const char *)); -extern int agetflag __P((const char *)); -extern int64_t agetnum __P((const char *)); -extern char *agetstr __P((const char *, char **)); +extern int agetent(char *, const char *); +extern int agetflag(const char *); +extern int64_t agetnum(const char *); +extern char *agetstr(const char *, char **); __END_DECLS diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 4682e98..5eadcc5 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -69,9 +69,9 @@ static time_t prefix_timo = (60 * 120); /* 2 hours. * XXX: should be configurable. */ extern struct rainfo *ralist; -static struct rtadvd_timer *prefix_timeout __P((void *)); -static void makeentry __P((char *, size_t, int, char *)); -static int getinet6sysctl __P((int)); +static struct rtadvd_timer *prefix_timeout(void *); +static void makeentry(char *, size_t, int, char *); +static int getinet6sysctl(int); void getconfig(intface) diff --git a/usr.sbin/rtadvd/config.h b/usr.sbin/rtadvd/config.h index aeb1c2c..2d02b8a 100644 --- a/usr.sbin/rtadvd/config.h +++ b/usr.sbin/rtadvd/config.h @@ -30,13 +30,13 @@ * SUCH DAMAGE. */ -extern void getconfig __P((char *)); -extern void delete_prefix __P((struct prefix *)); -extern void invalidate_prefix __P((struct prefix *)); -extern void update_prefix __P((struct prefix *)); -extern void make_prefix __P((struct rainfo *, int, struct in6_addr *, int)); -extern void make_packet __P((struct rainfo *)); -extern void get_prefix __P((struct rainfo *)); +extern void getconfig(char *); +extern void delete_prefix(struct prefix *); +extern void invalidate_prefix(struct prefix *); +extern void update_prefix(struct prefix *); +extern void make_prefix(struct rainfo *, int, struct in6_addr *, int); +extern void make_packet(struct rainfo *); +extern void get_prefix(struct rainfo *); /* diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c index 7b9a274..d37f5db 100644 --- a/usr.sbin/rtadvd/dump.c +++ b/usr.sbin/rtadvd/dump.c @@ -61,8 +61,8 @@ static FILE *fp; extern struct rainfo *ralist; -static char *ether_str __P((struct sockaddr_dl *)); -static void if_dump __P((void)); +static char *ether_str(struct sockaddr_dl *); +static void if_dump(void); static char *rtpref_str[] = { "medium", /* 00 */ diff --git a/usr.sbin/rtadvd/dump.h b/usr.sbin/rtadvd/dump.h index cc3b472..c8a6b22 100644 --- a/usr.sbin/rtadvd/dump.h +++ b/usr.sbin/rtadvd/dump.h @@ -30,4 +30,4 @@ * SUCH DAMAGE. */ -extern void rtadvd_dump_file __P((char *)); +extern void rtadvd_dump_file(char *); diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c index 07d9e1f..d8ed088 100644 --- a/usr.sbin/rtadvd/if.c +++ b/usr.sbin/rtadvd/if.c @@ -63,9 +63,9 @@ int iflist_init_ok; size_t ifblock_size; char *ifblock; -static void get_iflist __P((char **buf, size_t *size)); -static void parse_iflist __P((struct if_msghdr ***ifmlist_p, char *buf, - size_t bufsize)); +static void get_iflist(char **buf, size_t *size); +static void parse_iflist(struct if_msghdr ***ifmlist_p, char *buf, + size_t bufsize); static void get_rtaddrs(int addrs, struct sockaddr *sa, struct sockaddr **rti_info) diff --git a/usr.sbin/rtadvd/if.h b/usr.sbin/rtadvd/if.h index 07bb6ee..216eaa0 100644 --- a/usr.sbin/rtadvd/if.h +++ b/usr.sbin/rtadvd/if.h @@ -37,22 +37,22 @@ extern size_t ifblock_size; extern char *ifblock; struct nd_opt_hdr; -struct sockaddr_dl *if_nametosdl __P((char *)); -int if_getmtu __P((char *)); -int if_getflags __P((int, int)); -int lladdropt_length __P((struct sockaddr_dl *)); -void lladdropt_fill __P((struct sockaddr_dl *, struct nd_opt_hdr *)); -int rtbuf_len __P((void)); -char *get_next_msg __P((char *, char *, int, size_t *, int)); -struct in6_addr *get_addr __P((char *)); -int get_rtm_ifindex __P((char *)); -int get_ifm_ifindex __P((char *)); -int get_ifam_ifindex __P((char *)); -int get_ifm_flags __P((char *)); -int get_prefixlen __P((char *)); -int prefixlen __P((u_char *, u_char *)); -int rtmsg_type __P((char *)); -int ifmsg_type __P((char *)); -int rtmsg_len __P((char *)); -int ifmsg_len __P((char *)); -void init_iflist __P((void)); +struct sockaddr_dl *if_nametosdl(char *); +int if_getmtu(char *); +int if_getflags(int, int); +int lladdropt_length(struct sockaddr_dl *); +void lladdropt_fill(struct sockaddr_dl *, struct nd_opt_hdr *); +int rtbuf_len(void); +char *get_next_msg(char *, char *, int, size_t *, int); +struct in6_addr *get_addr(char *); +int get_rtm_ifindex(char *); +int get_ifm_ifindex(char *); +int get_ifam_ifindex(char *); +int get_ifm_flags(char *); +int get_prefixlen(char *); +int prefixlen(u_char *, u_char *); +int rtmsg_type(char *); +int ifmsg_type(char *); +int rtmsg_len(char *); +int ifmsg_len(char *); +void init_iflist(void); diff --git a/usr.sbin/rtadvd/rrenum.h b/usr.sbin/rtadvd/rrenum.h index ce94015..c358a2b 100644 --- a/usr.sbin/rtadvd/rrenum.h +++ b/usr.sbin/rtadvd/rrenum.h @@ -30,5 +30,5 @@ * SUCH DAMAGE. */ -void rr_input __P((int, struct icmp6_router_renum *, struct in6_pktinfo *, - struct sockaddr_in6 *, struct in6_addr *)); +void rr_input(int, struct icmp6_router_renum *, struct in6_pktinfo *, + struct sockaddr_in6 *, struct in6_addr *); diff --git a/usr.sbin/rtadvd/rtadvd.c b/usr.sbin/rtadvd/rtadvd.c index aa7c5d3..8212b32 100644 --- a/usr.sbin/rtadvd/rtadvd.c +++ b/usr.sbin/rtadvd/rtadvd.c @@ -124,25 +124,25 @@ u_int32_t ndopt_flags[] = { NDOPT_FLAG_PREFIXINFO, NDOPT_FLAG_RDHDR, NDOPT_FLAG_MTU, }; -int main __P((int, char *[])); -static void set_die __P((int)); -static void die __P((void)); -static void sock_open __P((void)); -static void rtsock_open __P((void)); -static void rtadvd_input __P((void)); -static void rs_input __P((int, struct nd_router_solicit *, - struct in6_pktinfo *, struct sockaddr_in6 *)); -static void ra_input __P((int, struct nd_router_advert *, - struct in6_pktinfo *, struct sockaddr_in6 *)); -static int prefix_check __P((struct nd_opt_prefix_info *, struct rainfo *, - struct sockaddr_in6 *)); -static int nd6_options __P((struct nd_opt_hdr *, int, - union nd_opts *, u_int32_t)); -static void free_ndopts __P((union nd_opts *)); -static void ra_output __P((struct rainfo *)); -static void rtmsg_input __P((void)); -static void rtadvd_set_dump_file __P((int)); -static void set_short_delay __P((struct rainfo *)); +int main(int, char *[]); +static void set_die(int); +static void die(void); +static void sock_open(void); +static void rtsock_open(void); +static void rtadvd_input(void); +static void rs_input(int, struct nd_router_solicit *, + struct in6_pktinfo *, struct sockaddr_in6 *); +static void ra_input(int, struct nd_router_advert *, + struct in6_pktinfo *, struct sockaddr_in6 *); +static int prefix_check(struct nd_opt_prefix_info *, struct rainfo *, + struct sockaddr_in6 *); +static int nd6_options(struct nd_opt_hdr *, int, + union nd_opts *, u_int32_t); +static void free_ndopts(union nd_opts *); +static void ra_output(struct rainfo *); +static void rtmsg_input(void); +static void rtadvd_set_dump_file(int); +static void set_short_delay(struct rainfo *); int main(argc, argv) diff --git a/usr.sbin/rtadvd/rtadvd.h b/usr.sbin/rtadvd/rtadvd.h index b1c505d..828fec6 100644 --- a/usr.sbin/rtadvd/rtadvd.h +++ b/usr.sbin/rtadvd/rtadvd.h @@ -151,11 +151,11 @@ struct rainfo { struct soliciter *soliciter; /* recent solication source */ }; -struct rtadvd_timer *ra_timeout __P((void *)); -void ra_timer_update __P((void *, struct timeval *)); +struct rtadvd_timer *ra_timeout(void *); +void ra_timer_update(void *, struct timeval *); -int prefix_match __P((struct in6_addr *, int, struct in6_addr *, int)); -struct rainfo *if_indextorainfo __P((int)); -struct prefix *find_prefix __P((struct rainfo *, struct in6_addr *, int)); +int prefix_match(struct in6_addr *, int, struct in6_addr *, int); +struct rainfo *if_indextorainfo(int); +struct prefix *find_prefix(struct rainfo *, struct in6_addr *, int); extern struct in6_addr in6a_site_allrouters; diff --git a/usr.sbin/rtadvd/timer.c b/usr.sbin/rtadvd/timer.c index 238bd8d..7fb0902 100644 --- a/usr.sbin/rtadvd/timer.c +++ b/usr.sbin/rtadvd/timer.c @@ -57,8 +57,8 @@ rtadvd_timer_init() } struct rtadvd_timer * -rtadvd_add_timer(struct rtadvd_timer *(*timeout) __P((void *)), - void (*update) __P((void *, struct timeval *)), +rtadvd_add_timer(struct rtadvd_timer *(*timeout)(void *), + void (*update)(void *, struct timeval *), void *timeodata, void *updatedata) { struct rtadvd_timer *newtimer; diff --git a/usr.sbin/rtadvd/timer.h b/usr.sbin/rtadvd/timer.h index d435bde..4526103 100644 --- a/usr.sbin/rtadvd/timer.h +++ b/usr.sbin/rtadvd/timer.h @@ -46,20 +46,20 @@ struct rtadvd_timer { struct rainfo *rai; struct timeval tm; - struct rtadvd_timer *(*expire) __P((void *)); /* expiration function */ + struct rtadvd_timer *(*expire)(void *); /* expiration function */ void *expire_data; - void (*update) __P((void *, struct timeval *)); /* update function */ + void (*update)(void *, struct timeval *); /* update function */ void *update_data; }; -void rtadvd_timer_init __P((void)); -struct rtadvd_timer *rtadvd_add_timer __P((struct rtadvd_timer *(*) __P((void *)), - void (*) __P((void *, struct timeval *)), void *, void *)); -void rtadvd_set_timer __P((struct timeval *, struct rtadvd_timer *)); -void rtadvd_remove_timer __P((struct rtadvd_timer **)); -struct timeval * rtadvd_check_timer __P((void)); -struct timeval * rtadvd_timer_rest __P((struct rtadvd_timer *)); -void TIMEVAL_ADD __P((struct timeval *, struct timeval *, - struct timeval *)); -void TIMEVAL_SUB __P((struct timeval *, struct timeval *, - struct timeval *)); +void rtadvd_timer_init(void); +struct rtadvd_timer *rtadvd_add_timer(struct rtadvd_timer *(*)(void *), + void (*)(void *, struct timeval *), void *, void *); +void rtadvd_set_timer(struct timeval *, struct rtadvd_timer *); +void rtadvd_remove_timer(struct rtadvd_timer **); +struct timeval * rtadvd_check_timer(void); +struct timeval * rtadvd_timer_rest(struct rtadvd_timer *); +void TIMEVAL_ADD(struct timeval *, struct timeval *, + struct timeval *); +void TIMEVAL_SUB(struct timeval *, struct timeval *, + struct timeval *); |