From e2881f49cc545371650e022bf57db9fee6d9f8c9 Mon Sep 17 00:00:00 2001 From: obrien Date: Fri, 22 Mar 2002 09:22:15 +0000 Subject: Remove multi-line __P() usage. --- lib/libipsec/ipsec_dump_policy.c | 7 +++-- lib/libipsec/libpfkey.h | 56 +++++++++++++++++++--------------------- lib/libipsec/pfkey.c | 28 ++++++++++---------- 3 files changed, 43 insertions(+), 48 deletions(-) (limited to 'lib/libipsec') diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c index 6fca965..721ff20 100644 --- a/lib/libipsec/ipsec_dump_policy.c +++ b/lib/libipsec/ipsec_dump_policy.c @@ -57,10 +57,9 @@ static const char *ipsp_policy_strs[] = { "discard", "none", "ipsec", "entrust", "bypass", }; -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 *ipsec_dump_ipsecrequest(char *, size_t, + struct sadb_x_ipsecrequest *, size_t); +static int set_addresses(char *, size_t, struct sockaddr *, struct sockaddr *); static char *set_address(char *, size_t, struct sockaddr *); /* diff --git a/lib/libipsec/libpfkey.h b/lib/libipsec/libpfkey.h index 79cbe7a..07ff582 100644 --- a/lib/libipsec/libpfkey.h +++ b/lib/libipsec/libpfkey.h @@ -41,44 +41,40 @@ 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 *, - 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_int64_t, - u_int64_t, u_int64_t, u_int32_t)); -int pfkey_send_add __P((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_int64_t, - u_int64_t, u_int64_t, u_int32_t)); -int pfkey_send_delete __P((int, u_int, u_int, - struct sockaddr *, struct sockaddr *, u_int32_t)); -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_getspi(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(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_int64_t, u_int64_t, u_int64_t, u_int32_t); +int pfkey_send_add(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_int64_t, u_int64_t, u_int64_t, u_int32_t); +int pfkey_send_delete(int, u_int, u_int, struct sockaddr *, struct sockaddr *, + u_int32_t); +int pfkey_send_delete_all(int, u_int, u_int, struct sockaddr *, + struct sockaddr *); +int pfkey_send_get(int, u_int, u_int, struct sockaddr *, struct sockaddr *, + u_int32_t); 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, - struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, - caddr_t, int, u_int32_t)); -int pfkey_send_spdupdate __P((int, struct sockaddr *, u_int, - struct sockaddr *, u_int, u_int, caddr_t, int, u_int32_t)); -int pfkey_send_spdupdate2 __P((int, struct sockaddr *, u_int, - struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, - 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_spdadd(int, struct sockaddr *, u_int, struct sockaddr *, u_int, + u_int, caddr_t, int, u_int32_t); +int pfkey_send_spdadd2(int, struct sockaddr *, u_int, struct sockaddr *, u_int, + u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t); +int pfkey_send_spdupdate(int, struct sockaddr *, u_int, struct sockaddr *, + u_int, u_int, caddr_t, int, u_int32_t); +int pfkey_send_spdupdate2(int, struct sockaddr *, u_int, struct sockaddr *, + u_int, u_int, u_int64_t, u_int64_t, caddr_t, int, u_int32_t); +int pfkey_send_spddelete(int, struct sockaddr *, u_int, struct sockaddr *, + u_int, u_int, caddr_t, 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_spdsetidx(int, struct sockaddr *, u_int, struct sockaddr *, + u_int, u_int, caddr_t, int, u_int32_t); int pfkey_send_spdflush(int); int pfkey_send_spddump(int); diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c index b0d773f..42137f9 100644 --- a/lib/libipsec/pfkey.c +++ b/lib/libipsec/pfkey.c @@ -54,27 +54,27 @@ __FBSDID("$FreeBSD$"); 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 *, +static int pfkey_send_x1(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)); + u_int32_t, u_int32_t, u_int32_t); +static int pfkey_send_x2(int, u_int, u_int, u_int, + struct sockaddr *, struct sockaddr *, u_int32_t); static int pfkey_send_x3(int, u_int, u_int); -static int pfkey_send_x4 __P((int, u_int, struct sockaddr *, u_int, +static int pfkey_send_x4(int, u_int, struct sockaddr *, u_int, struct sockaddr *, u_int, u_int, u_int64_t, u_int64_t, - char *, int, u_int32_t)); + char *, 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)); -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_setsadbmsg(caddr_t, caddr_t, u_int, u_int, + u_int, u_int32_t, pid_t); +static caddr_t pfkey_setsadbsa(caddr_t, caddr_t, u_int32_t, u_int, + u_int, u_int, u_int32_t); +static caddr_t pfkey_setsadbaddr(caddr_t, caddr_t, u_int, + struct sockaddr *, u_int, 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_setsadblifetime(caddr_t, caddr_t, u_int, u_int32_t, + u_int32_t, u_int32_t, u_int32_t); static caddr_t pfkey_setsadbxsa2(caddr_t, caddr_t, u_int32_t, u_int32_t); /* -- cgit v1.1