diff options
author | obrien <obrien@FreeBSD.org> | 2002-03-21 23:54:04 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-03-21 23:54:04 +0000 |
commit | fd9d7ac0ed3b0196f0165675edd10f4568d1ce88 (patch) | |
tree | 797ad825cd6005b210c12cc519012e2266372988 /lib/libipsec | |
parent | d0f7d014387d18db9910e1094a3d0696bfeccab6 (diff) | |
download | FreeBSD-src-fd9d7ac0ed3b0196f0165675edd10f4568d1ce88.zip FreeBSD-src-fd9d7ac0ed3b0196f0165675edd10f4568d1ce88.tar.gz |
Remove __P() usage.
Diffstat (limited to 'lib/libipsec')
-rw-r--r-- | lib/libipsec/ipsec_dump_policy.c | 2 | ||||
-rw-r--r-- | lib/libipsec/ipsec_strerror.h | 2 | ||||
-rw-r--r-- | lib/libipsec/libpfkey.h | 46 | ||||
-rw-r--r-- | lib/libipsec/pfkey.c | 14 | ||||
-rw-r--r-- | lib/libipsec/pfkey_dump.c | 8 | ||||
-rw-r--r-- | lib/libipsec/policy_parse.y | 24 | ||||
-rw-r--r-- | lib/libipsec/policy_token.l | 4 | ||||
-rw-r--r-- | lib/libipsec/test-policy.c | 10 |
8 files changed, 55 insertions, 55 deletions
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c index 6aa977c..6fca965 100644 --- a/lib/libipsec/ipsec_dump_policy.c +++ b/lib/libipsec/ipsec_dump_policy.c @@ -61,7 +61,7 @@ static char *ipsec_dump_ipsecrequest __P((char *, size_t, struct sadb_x_ipsecrequest *, size_t)); static int set_addresses __P((char *, size_t, struct sockaddr *, struct sockaddr *)); -static char *set_address __P((char *, size_t, struct sockaddr *)); +static char *set_address(char *, size_t, struct sockaddr *); /* * policy is sadb_x_policy buffer. diff --git a/lib/libipsec/ipsec_strerror.h b/lib/libipsec/ipsec_strerror.h index 24d4199..d9a1f0d 100644 --- a/lib/libipsec/ipsec_strerror.h +++ b/lib/libipsec/ipsec_strerror.h @@ -31,7 +31,7 @@ */ extern int __ipsec_errcode; -extern void __ipsec_set_strerror __P((const char *)); +extern void __ipsec_set_strerror(const char *); #define EIPSEC_NO_ERROR 0 /*success*/ #define EIPSEC_NOT_SUPPORTED 1 /*not supported*/ diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h index 1f25a30..79cbe7a 100644 --- a/lib/libipsec/libpfkey.h +++ b/lib/libipsec/libpfkey.h @@ -31,16 +31,16 @@ */ struct sadb_msg; -extern void pfkey_sadump __P((struct sadb_msg *)); -extern void pfkey_spdump __P((struct sadb_msg *)); +extern void pfkey_sadump(struct sadb_msg *); +extern void pfkey_spdump(struct sadb_msg *); struct sockaddr; struct sadb_alg; -int ipsec_check_keylen __P((u_int, u_int, u_int)); -int ipsec_check_keylen2 __P((u_int, u_int, u_int)); -int ipsec_get_keylen __P((u_int, u_int, struct sadb_alg *)); -u_int pfkey_set_softrate __P((u_int, u_int)); -u_int pfkey_get_softrate __P((u_int)); +int ipsec_check_keylen(u_int, u_int, u_int); +int ipsec_check_keylen2(u_int, u_int, u_int); +int ipsec_get_keylen(u_int, u_int, struct sadb_alg *); +u_int pfkey_set_softrate(u_int, u_int); +u_int pfkey_get_softrate(u_int); int pfkey_send_getspi __P((int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *, @@ -57,12 +57,12 @@ int pfkey_send_delete_all __P((int, u_int, u_int, struct sockaddr *, struct sockaddr *)); int pfkey_send_get __P((int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t)); -int pfkey_send_register __P((int, u_int)); -int pfkey_recv_register __P((int)); -int pfkey_set_supported __P((struct sadb_msg *, int)); -int pfkey_send_flush __P((int, u_int)); -int pfkey_send_dump __P((int, u_int)); -int pfkey_send_promisc_toggle __P((int, int)); +int pfkey_send_register(int, u_int); +int pfkey_recv_register(int); +int pfkey_set_supported(struct sadb_msg *, int); +int pfkey_send_flush(int, u_int); +int pfkey_send_dump(int, u_int); +int pfkey_send_promisc_toggle(int, int); int pfkey_send_spdadd __P((int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); int pfkey_send_spdadd2 __P((int, struct sockaddr *, u_int, @@ -75,16 +75,16 @@ int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int, caddr_t, int, u_int32_t)); int pfkey_send_spddelete __P((int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spddelete2 __P((int, u_int32_t)); -int pfkey_send_spdget __P((int, u_int32_t)); +int pfkey_send_spddelete2(int, u_int32_t); +int pfkey_send_spdget(int, u_int32_t); int pfkey_send_spdsetidx __P((int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spdflush __P((int)); -int pfkey_send_spddump __P((int)); +int pfkey_send_spdflush(int); +int pfkey_send_spddump(int); -int pfkey_open __P((void)); -void pfkey_close __P((int)); -struct sadb_msg *pfkey_recv __P((int)); -int pfkey_send __P((int, struct sadb_msg *, int)); -int pfkey_align __P((struct sadb_msg *, caddr_t *)); -int pfkey_check __P((caddr_t *)); +int pfkey_open(void); +void pfkey_close(int); +struct sadb_msg *pfkey_recv(int); +int pfkey_send(int, struct sadb_msg *, int); +int pfkey_align(struct sadb_msg *, caddr_t *); +int pfkey_check(caddr_t *); diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c index 355f714..b0d773f 100644 --- a/lib/libipsec/pfkey.c +++ b/lib/libipsec/pfkey.c @@ -51,20 +51,20 @@ __FBSDID("$FreeBSD$"); #define CALLOC(size, cast) (cast)calloc(1, (size)) -static int findsupportedmap __P((int)); -static int setsupportedmap __P((struct sadb_supported *)); -static struct sadb_alg *findsupportedalg __P((u_int, u_int)); +static int findsupportedmap(int); +static int setsupportedmap(struct sadb_supported *); +static struct sadb_alg *findsupportedalg(u_int, u_int); static int pfkey_send_x1 __P((int, u_int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t, u_int32_t, u_int, caddr_t, u_int, u_int, u_int, u_int, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); static int pfkey_send_x2 __P((int, u_int, u_int, u_int, struct sockaddr *, struct sockaddr *, u_int32_t)); -static int pfkey_send_x3 __P((int, u_int, u_int)); +static int pfkey_send_x3(int, u_int, u_int); static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, char *, int, u_int32_t)); -static int pfkey_send_x5 __P((int, u_int, u_int32_t)); +static int pfkey_send_x5(int, u_int, u_int32_t); static caddr_t pfkey_setsadbmsg __P((caddr_t, caddr_t, u_int, u_int, u_int, u_int32_t, pid_t)); @@ -72,10 +72,10 @@ static caddr_t pfkey_setsadbsa __P((caddr_t, caddr_t, u_int32_t, u_int, u_int, u_int, u_int32_t)); static caddr_t pfkey_setsadbaddr __P((caddr_t, caddr_t, u_int, struct sockaddr *, u_int, u_int)); -static caddr_t pfkey_setsadbkey __P((caddr_t, caddr_t, u_int, caddr_t, u_int)); +static caddr_t pfkey_setsadbkey(caddr_t, caddr_t, u_int, caddr_t, u_int); static caddr_t pfkey_setsadblifetime __P((caddr_t, caddr_t, u_int, u_int32_t, u_int32_t, u_int32_t, u_int32_t)); -static caddr_t pfkey_setsadbxsa2 __P((caddr_t, caddr_t, u_int32_t, u_int32_t)); +static caddr_t pfkey_setsadbxsa2(caddr_t, caddr_t, u_int32_t, u_int32_t); /* * make and search supported algorithm structure. diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c index e4d813c..2ea6246 100644 --- a/lib/libipsec/pfkey_dump.c +++ b/lib/libipsec/pfkey_dump.c @@ -101,10 +101,10 @@ do { \ printf("%d ", (num)); \ } while (0) -static char *str_ipaddr __P((struct sockaddr *)); -static char *str_prefport __P((u_int, u_int, u_int)); -static char *str_time __P((time_t)); -static void str_lifetime_byte __P((struct sadb_lifetime *, char *)); +static char *str_ipaddr(struct sockaddr *); +static char *str_prefport(u_int, u_int, u_int); +static char *str_time(time_t); +static void str_lifetime_byte(struct sadb_lifetime *, char *); struct val2str { int val; diff --git a/lib/libipsec/policy_parse.y b/lib/libipsec/policy_parse.y index e36d7b7..c7788f5 100644 --- a/lib/libipsec/policy_parse.y +++ b/lib/libipsec/policy_parse.y @@ -75,18 +75,18 @@ static struct sockaddr *p_src = NULL; static struct sockaddr *p_dst = NULL; struct _val; -extern void yyerror __P((char *msg)); -static struct sockaddr *parse_sockaddr __P((struct _val *buf)); -static int rule_check __P((void)); -static int init_x_policy __P((void)); -static int set_x_request __P((struct sockaddr *src, struct sockaddr *dst)); -static int set_sockaddr __P((struct sockaddr *addr)); -static void policy_parse_request_init __P((void)); -static caddr_t policy_parse __P((char *msg, int msglen)); - -extern void __policy__strbuffer__init__ __P((char *msg)); -extern int yyparse __P((void)); -extern int yylex __P((void)); +extern void yyerror(char *msg); +static struct sockaddr *parse_sockaddr(struct _val *buf); +static int rule_check(void); +static int init_x_policy(void); +static int set_x_request(struct sockaddr *src, struct sockaddr *dst); +static int set_sockaddr(struct sockaddr *addr); +static void policy_parse_request_init(void); +static caddr_t policy_parse(char *msg, int msglen); + +extern void __policy__strbuffer__init__(char *msg); +extern int yyparse(void); +extern int yylex(void); %} diff --git a/lib/libipsec/policy_token.l b/lib/libipsec/policy_token.l index 91c89dc..11e0c06 100644 --- a/lib/libipsec/policy_token.l +++ b/lib/libipsec/policy_token.l @@ -53,7 +53,7 @@ #endif #define yylval __libipsecyylval /* XXX */ -int yylex __P((void)); +int yylex(void); %} %option noyywrap @@ -132,7 +132,7 @@ unique { yylval.num = IPSEC_LEVEL_UNIQUE; return(LEVEL); } %% -void __policy__strbuffer__init__ __P((char *)); +void __policy__strbuffer__init__(char *); void __policy__strbuffer__init__(msg) diff --git a/lib/libipsec/test-policy.c b/lib/libipsec/test-policy.c index d8467e3..7909b66 100644 --- a/lib/libipsec/test-policy.c +++ b/lib/libipsec/test-policy.c @@ -86,11 +86,11 @@ struct req_t { { 0, "out ipsec esp/transport/fec0::10-fec0::11/use" }, }; -int test1 __P((void)); -int test1sub1 __P((struct req_t *)); -int test1sub2 __P((char *, int)); -int test2 __P((void)); -int test2sub __P((int)); +int test1(void); +int test1sub1(struct req_t *); +int test1sub2(char *, int); +int test2(void); +int test2sub(int); int main(ac, av) |