From fa3791e1a7df72dae386c39862c6dad9fb7a5304 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 7 Nov 2007 10:53:41 +0000 Subject: Cleanup of userland __P use --- usr.sbin/rrenumd/lexer.l | 8 ++++---- usr.sbin/rrenumd/parser.y | 8 ++++---- usr.sbin/rrenumd/rrenumd.c | 30 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'usr.sbin/rrenumd') diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l index 6ad9953..bd0d3c0 100644 --- a/usr.sbin/rrenumd/lexer.l +++ b/usr.sbin/rrenumd/lexer.l @@ -59,9 +59,9 @@ int lineno = 1; #define LINEBUF_SIZE 1000 char linebuf[LINEBUF_SIZE]; -int parse __P((FILE **)); -void yyerror __P((const char *)); -int yylex __P((void)); +int parse(FILE **); +void yyerror(const char *); +int yylex(void); %} /* common section */ @@ -255,7 +255,7 @@ off { int parse(FILE **fp) { - extern int yyparse __P((void)); + extern int yyparse(void); yyin = *fp; diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y index d7c15ab..65dfd46 100644 --- a/usr.sbin/rrenumd/parser.y +++ b/usr.sbin/rrenumd/parser.y @@ -64,10 +64,10 @@ u_int retry; char errbuf[LINE_MAX]; extern int lineno; -extern void yyerror __P((const char *s)); -extern int yylex __P((void)); -static struct payload_list * pllist_lookup __P((int seqnum)); -static void pllist_enqueue __P((struct payload_list *pl_entry)); +extern void yyerror(const char *s); +extern int yylex(void); +static struct payload_list * pllist_lookup(int seqnum); +static void pllist_enqueue(struct payload_list *pl_entry); #define MAX_RETRYNUM 10 /* upper limit of retry in this rrenumd program */ #define MAX_SEQNUM 256 /* upper limit of seqnum in this rrenumd program */ diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c index fddd6a1..68f6847 100644 --- a/usr.sbin/rrenumd/rrenumd.c +++ b/usr.sbin/rrenumd/rrenumd.c @@ -95,29 +95,29 @@ int with_v4dest, with_v6dest; struct in6_addr prefix; /* ADHOC */ int prefixlen = 64; /* ADHOC */ -extern int parse __P((FILE **)); +extern int parse(FILE **); -static void show_usage __P((void)); -static void init_sin6 __P((struct sockaddr_in6 *, const char *)); +static void show_usage(void); +static void init_sin6(struct sockaddr_in6 *, const char *); #if 0 -static void join_multi __P((const char *)); +static void join_multi(const char *); #endif -static void init_globals __P((void)); -static void config __P((FILE **)); +static void init_globals(void); +static void config(FILE **); #ifdef IPSEC_POLICY_IPSEC -static void sock6_open __P((struct flags *, char *)); -static void sock4_open __P((struct flags *, char *)); +static void sock6_open(struct flags *, char *); +static void sock4_open(struct flags *, char *); #else -static void sock6_open __P((struct flags *)); -static void sock4_open __P((struct flags *)); +static void sock6_open(struct flags *); +static void sock4_open(struct flags *); #endif -static void rrenum_output __P((struct payload_list *, struct dst_list *)); -static void rrenum_snd_eachdst __P((struct payload_list *)); +static void rrenum_output(struct payload_list *, struct dst_list *); +static void rrenum_snd_eachdst(struct payload_list *); #if 0 -static void rrenum_snd_fullsequence __P((void)); +static void rrenum_snd_fullsequence(void); #endif -static void rrenum_input __P((int)); -int main __P((int, char *[])); +static void rrenum_input(int); +int main(int, char *[]); /* Print usage. Don't call this after daemonized. */ -- cgit v1.1