summaryrefslogtreecommitdiff
path: root/sys/netkey
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2009-03-14 14:45:51 +0000
committerdsl <dsl@NetBSD.org>2009-03-14 14:45:51 +0000
commit02cdf4d2c869ecfa1ae5484cf77eefe2fbcc6d94 (patch)
tree9a02e625d403e5fcedfdc6be4803e2404356bf31 /sys/netkey
parentdfbb3f921a23a1aba4463f31ef9233ac94ce606c (diff)
Remove all the __P() from sys (excluding sys/dist)
Diff checked with grep and MK1 eyeball. i386 and amd64 GENERIC and sys still build.
Diffstat (limited to 'sys/netkey')
-rw-r--r--sys/netkey/key.c248
-rw-r--r--sys/netkey/key.h58
-rw-r--r--sys/netkey/key_debug.c30
-rw-r--r--sys/netkey/key_debug.h24
-rw-r--r--sys/netkey/keydb.h26
-rw-r--r--sys/netkey/keysock.c10
-rw-r--r--sys/netkey/keysock.h14
7 files changed, 205 insertions, 205 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 840298f3a54..94471b1c797 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.165 2009/02/14 20:51:39 christos Exp $ */
+/* $NetBSD: key.c,v 1.166 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.165 2009/02/14 20:51:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.166 2009/03/14 14:46:11 dsl Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -332,151 +332,151 @@ struct sadb_msghdr {
int extlen[SADB_EXT_MAX + 1];
};
-static struct secasvar *key_allocsa_policy __P((struct secasindex *));
-static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int));
-static void key_delsav __P((struct secasvar *));
-static void key_delsp __P((struct secpolicy *));
-static struct secpolicy *key_getsp __P((struct secpolicyindex *, int));
+static struct secasvar *key_allocsa_policy(struct secasindex *);
+static struct secasvar *key_do_allocsa_policy(struct secashead *, u_int);
+static void key_delsav(struct secasvar *);
+static void key_delsp(struct secpolicy *);
+static struct secpolicy *key_getsp(struct secpolicyindex *, int);
#ifdef SADB_X_EXT_TAG
-static struct secpolicy *key_getspbytag __P((u_int16_t, int));
+static struct secpolicy *key_getspbytag(u_int16_t, int);
#endif
-static u_int16_t key_newreqid __P((void));
-static struct mbuf *key_gather_mbuf __P((struct mbuf *,
- const struct sadb_msghdr *, int, int, ...));
-static int key_spdadd __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddelete __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddelete2 __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spdget __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spdflush __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddump __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+static u_int16_t key_newreqid(void);
+static struct mbuf *key_gather_mbuf(struct mbuf *,
+ const struct sadb_msghdr *, int, int, ...);
+static int key_spdadd(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddelete(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddelete2(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spdget(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spdflush(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddump(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#ifdef IPSEC_NAT_T
-static int key_nat_map __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+static int key_nat_map(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#endif
-static struct mbuf *key_setspddump __P((int *));
-static u_int key_getspreqmsglen __P((struct secpolicy *));
-static int key_spdexpire __P((struct secpolicy *));
-static struct secashead *key_newsah __P((struct secasindex *));
-static void key_delsah __P((struct secashead *));
-static struct secasvar *key_newsav __P((struct mbuf *,
- const struct sadb_msghdr *, struct secashead *, int *));
-static struct secashead *key_getsah __P((struct secasindex *));
-static struct secasvar *key_checkspidup __P((struct secasindex *, u_int32_t));
-static void key_setspi __P((struct secasvar *, u_int32_t));
-static struct secasvar *key_getsavbyspi __P((struct secashead *, u_int32_t));
-static int key_setsaval __P((struct secasvar *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_mature __P((struct secasvar *));
-static struct mbuf *key_setdumpsa __P((struct secasvar *, u_int8_t,
- u_int8_t, u_int32_t, u_int32_t));
-static struct mbuf *key_setsadbmsg __P((u_int8_t, u_int16_t, u_int8_t,
- u_int32_t, pid_t, u_int16_t));
-static struct mbuf *key_setsadbsa __P((struct secasvar *));
-static struct mbuf *key_setsadbaddr __P((u_int16_t,
- struct sockaddr *, u_int8_t, u_int16_t));
+static struct mbuf *key_setspddump(int *);
+static u_int key_getspreqmsglen(struct secpolicy *);
+static int key_spdexpire(struct secpolicy *);
+static struct secashead *key_newsah(struct secasindex *);
+static void key_delsah(struct secashead *);
+static struct secasvar *key_newsav(struct mbuf *,
+ const struct sadb_msghdr *, struct secashead *, int *);
+static struct secashead *key_getsah(struct secasindex *);
+static struct secasvar *key_checkspidup(struct secasindex *, u_int32_t);
+static void key_setspi(struct secasvar *, u_int32_t);
+static struct secasvar *key_getsavbyspi(struct secashead *, u_int32_t);
+static int key_setsaval(struct secasvar *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_mature(struct secasvar *);
+static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t,
+ u_int8_t, u_int32_t, u_int32_t);
+static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t,
+ u_int32_t, pid_t, u_int16_t);
+static struct mbuf *key_setsadbsa(struct secasvar *);
+static struct mbuf *key_setsadbaddr(u_int16_t,
+ struct sockaddr *, u_int8_t, u_int16_t);
#if 0
-static struct mbuf *key_setsadbident __P((u_int16_t, u_int16_t, void *,
- int, u_int64_t));
+static struct mbuf *key_setsadbident(u_int16_t, u_int16_t, void *,
+ int, u_int64_t);
#endif
-static struct mbuf *key_setsadbxsa2 __P((u_int8_t, u_int32_t, u_int16_t));
+static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int16_t);
#ifdef SADB_X_EXT_TAG
-static struct mbuf *key_setsadbxtag __P((u_int16_t));
+static struct mbuf *key_setsadbxtag(u_int16_t);
#endif
#ifdef IPSEC_NAT_T
-static struct mbuf *key_setsadbxport __P((u_int16_t, u_int16_t));
-static struct mbuf *key_setsadbxtype __P((u_int16_t));
+static struct mbuf *key_setsadbxport(u_int16_t, u_int16_t);
+static struct mbuf *key_setsadbxtype(u_int16_t);
#endif
-static void key_porttosaddr __P((struct sockaddr *, u_int16_t));
+static void key_porttosaddr(struct sockaddr *, u_int16_t);
#define KEY_PORTTOSADDR(saddr, port) \
key_porttosaddr((struct sockaddr *)(saddr), (port))
-static int key_checksalen __P((const struct sockaddr *));
+static int key_checksalen(const struct sockaddr *);
#define KEY_CHECKSALEN(saddr) key_checksalen((const struct sockaddr *)(saddr))
-static struct mbuf *key_setsadblifetime __P((u_int16_t, u_int32_t,
- u_int64_t, u_int64_t, u_int64_t));
-static struct mbuf *key_setsadbxpolicy __P((u_int16_t, u_int8_t,
- u_int32_t));
-static void *key_newbuf __P((const void *, u_int));
-static int key_ismyaddr __P((struct sockaddr *));
+static struct mbuf *key_setsadblifetime(u_int16_t, u_int32_t,
+ u_int64_t, u_int64_t, u_int64_t);
+static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t,
+ u_int32_t);
+static void *key_newbuf(const void *, u_int);
+static int key_ismyaddr(struct sockaddr *);
#ifdef INET6
-static int key_ismyaddr6 __P((struct sockaddr_in6 *));
+static int key_ismyaddr6(struct sockaddr_in6 *);
#endif
static int key_cmpsaidx_exactly
- __P((struct secasindex *, struct secasindex *));
+(struct secasindex *, struct secasindex *);
static int key_cmpsaidx_withmode
- __P((struct secasindex *, struct secasindex *));
+(struct secasindex *, struct secasindex *);
static int key_cmpsaidx_withoutmode
- __P((struct secasindex *, struct secasindex *));
-static int key_sockaddrcmp __P((struct sockaddr *, struct sockaddr *, int));
-static int key_bbcmp __P((void *, void *, u_int));
-static u_long key_random __P((void));
-static u_int16_t key_satype2proto __P((u_int8_t));
-static u_int8_t key_proto2satype __P((u_int16_t));
-
-static int key_getspi __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static u_int32_t key_do_getnewspi __P((struct sadb_spirange *,
- struct secasindex *));
-static int key_update __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+(struct secasindex *, struct secasindex *);
+static int key_sockaddrcmp(struct sockaddr *, struct sockaddr *, int);
+static int key_bbcmp(void *, void *, u_int);
+static u_long key_random(void);
+static u_int16_t key_satype2proto(u_int8_t);
+static u_int8_t key_proto2satype(u_int16_t);
+
+static int key_getspi(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static u_int32_t key_do_getnewspi(struct sadb_spirange *,
+ struct secasindex *);
+static int key_update(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#ifdef IPSEC_DOSEQCHECK
-static struct secasvar *key_getsavbyseq __P((struct secashead *, u_int32_t));
+static struct secasvar *key_getsavbyseq(struct secashead *, u_int32_t);
#endif
-static int key_add __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_setident __P((struct secashead *, struct mbuf *,
- const struct sadb_msghdr *));
-static struct mbuf *key_getmsgbuf_x1 __P((struct mbuf *,
- const struct sadb_msghdr *));
-static int key_delete __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_get __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-
-static void key_getcomb_setlifetime __P((struct sadb_comb *));
+static int key_add(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_setident(struct secashead *, struct mbuf *,
+ const struct sadb_msghdr *);
+static struct mbuf *key_getmsgbuf_x1(struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_delete(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_get(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+
+static void key_getcomb_setlifetime(struct sadb_comb *);
#ifdef IPSEC_ESP
-static struct mbuf *key_getcomb_esp __P((void));
+static struct mbuf *key_getcomb_esp(void);
#endif
-static struct mbuf *key_getcomb_ah __P((void));
-static struct mbuf *key_getcomb_ipcomp __P((void));
-static struct mbuf *key_getprop __P((const struct secasindex *));
+static struct mbuf *key_getcomb_ah(void);
+static struct mbuf *key_getcomb_ipcomp(void);
+static struct mbuf *key_getprop(const struct secasindex *);
-static int key_acquire __P((struct secasindex *, struct secpolicy *));
+static int key_acquire(struct secasindex *, struct secpolicy *);
#ifndef IPSEC_NONBLOCK_ACQUIRE
-static struct secacq *key_newacq __P((struct secasindex *));
-static struct secacq *key_getacq __P((struct secasindex *));
-static struct secacq *key_getacqbyseq __P((u_int32_t));
+static struct secacq *key_newacq(struct secasindex *);
+static struct secacq *key_getacq(struct secasindex *);
+static struct secacq *key_getacqbyseq(u_int32_t);
#endif
-static struct secspacq *key_newspacq __P((struct secpolicyindex *));
-static struct secspacq *key_getspacq __P((struct secpolicyindex *));
-static int key_acquire2 __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_register __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_expire __P((struct secasvar *));
-static int key_flush __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_dump __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static struct mbuf *key_setdump __P((u_int8_t, int *));
-static int key_promisc __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_senderror __P((struct socket *, struct mbuf *, int));
-static int key_validate_ext __P((const struct sadb_ext *, int));
-static int key_align __P((struct mbuf *, struct sadb_msghdr *));
+static struct secspacq *key_newspacq(struct secpolicyindex *);
+static struct secspacq *key_getspacq(struct secpolicyindex *);
+static int key_acquire2(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_register(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_expire(struct secasvar *);
+static int key_flush(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_dump(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static struct mbuf *key_setdump(u_int8_t, int *);
+static int key_promisc(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_senderror(struct socket *, struct mbuf *, int);
+static int key_validate_ext(const struct sadb_ext *, int);
+static int key_align(struct mbuf *, struct sadb_msghdr *);
#if 0
-static const char *key_getfqdn __P((void));
-static const char *key_getuserfqdn __P((void));
+static const char *key_getfqdn(void);
+static const char *key_getuserfqdn(void);
#endif
-static void key_sa_chgstate __P((struct secasvar *, u_int8_t));
-static void key_sp_dead __P((struct secpolicy *));
-static void key_sp_unlink __P((struct secpolicy *));
-static struct mbuf *key_alloc_mbuf __P((int));
+static void key_sa_chgstate(struct secasvar *, u_int8_t);
+static void key_sp_dead(struct secpolicy *);
+static void key_sp_unlink(struct secpolicy *);
+static struct mbuf *key_alloc_mbuf(int);
struct callout key_timehandler_ch;
/* %%% IPsec policy management */
@@ -5833,8 +5833,8 @@ key_getmsgbuf_x1(m, mhp)
return n;
}
-static int key_delete_all __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *, u_int16_t));
+static int key_delete_all(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *, u_int16_t);
/*
* SADB_DELETE processing
@@ -7534,8 +7534,8 @@ key_promisc(so, m, mhp)
}
}
-static int (*key_typesw[]) __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *)) = {
+static int (*key_typesw[])(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *) = {
NULL, /* SADB_RESERVED */
key_getspi, /* SADB_GETSPI */
key_update, /* SADB_UPDATE */
diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index ebc0cebf0ce..858cefdfa1e 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.22 2007/03/04 06:03:34 christos Exp $ */
+/* $NetBSD: key.h,v 1.23 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key.h,v 1.32 2003/09/07 05:25:20 itojun Exp $ */
/*
@@ -55,41 +55,41 @@ struct socket;
struct sadb_msg;
struct sadb_x_policy;
-extern struct secpolicy *key_allocsp __P((u_int16_t, struct secpolicyindex *,
- u_int));
+extern struct secpolicy *key_allocsp(u_int16_t, struct secpolicyindex *,
+ u_int);
extern int key_checkrequest
- __P((struct ipsecrequest *isr, struct secasindex *));
+(struct ipsecrequest *isr, struct secasindex *);
extern struct secasvar *key_allocsa(u_int, const void *, const void *, u_int,
u_int32_t, u_int16_t, u_int16_t);
-extern struct secpolicy *key_getspbyid __P((u_int32_t));
-extern void key_freesp __P((struct secpolicy *));
-extern void key_freesav __P((struct secasvar *));
-extern struct secpolicy *key_newsp __P((u_int32_t));
-extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *,
- size_t, int *));
-extern struct mbuf *key_sp2msg __P((struct secpolicy *));
+extern struct secpolicy *key_getspbyid(u_int32_t);
+extern void key_freesp(struct secpolicy *);
+extern void key_freesav(struct secasvar *);
+extern struct secpolicy *key_newsp(u_int32_t);
+extern struct secpolicy *key_msg2sp(struct sadb_x_policy *,
+ size_t, int *);
+extern struct mbuf *key_sp2msg(struct secpolicy *);
extern int key_cmpspidx_exactly
- __P((struct secpolicyindex *, struct secpolicyindex *));
+(struct secpolicyindex *, struct secpolicyindex *);
extern int key_cmpspidx_withmask
- __P((struct secpolicyindex *, struct secpolicyindex *));
-extern int key_spdacquire __P((struct secpolicy *));
-extern struct mbuf *key_setdumpsp __P((struct secpolicy *,
- u_int8_t, u_int32_t, u_int32_t));
-extern void key_timehandler __P((void *));
-extern void key_randomfill __P((void *, size_t));
-extern void key_freereg __P((struct socket *));
-struct mbuf *key_setdumpsa_spi __P((u_int32_t));
-extern int key_parse __P((struct mbuf *, struct socket *));
-extern void key_init __P((void));
-extern int key_checktunnelsanity __P((struct secasvar *, u_int,
- void *, void *));
-extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
-extern void key_sa_routechange __P((struct sockaddr *));
-extern void key_sa_stir_iv __P((struct secasvar *));
+(struct secpolicyindex *, struct secpolicyindex *);
+extern int key_spdacquire(struct secpolicy *);
+extern struct mbuf *key_setdumpsp(struct secpolicy *,
+ u_int8_t, u_int32_t, u_int32_t);
+extern void key_timehandler(void *);
+extern void key_randomfill(void *, size_t);
+extern void key_freereg(struct socket *);
+struct mbuf *key_setdumpsa_spi(u_int32_t);
+extern int key_parse(struct mbuf *, struct socket *);
+extern void key_init(void);
+extern int key_checktunnelsanity(struct secasvar *, u_int,
+ void *, void *);
+extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
+extern void key_sa_routechange(struct sockaddr *);
+extern void key_sa_stir_iv(struct secasvar *);
-extern int key_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+extern int key_sysctl(int *, u_int, void *, size_t *, void *, size_t);
#ifdef IPSEC_NAT_T
-u_int16_t key_portfromsaddr __P((struct sockaddr *));
+u_int16_t key_portfromsaddr(struct sockaddr *);
#define KEY_PORTFROMSADDR(saddr) key_portfromsaddr((struct sockaddr *)(saddr))
#endif
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 1f61eeffee5..458fb231715 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.33 2007/03/04 06:03:34 christos Exp $ */
+/* $NetBSD: key_debug.c,v 1.34 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key_debug.c,v 1.36 2003/06/27 06:46:01 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.33 2007/03/04 06:03:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.34 2009/03/14 14:46:11 dsl Exp $");
#ifdef _KERNEL
#include "opt_inet.h"
@@ -64,23 +64,23 @@ struct typestr {
};
#define TYPESTR(x) { "SADB_" #x, SADB_ ## x }
-static const char *kdebug_typestr __P((u_int, const struct typestr *));
-static const char *kdebug_sadb_msg_typestr __P((u_int));
-static const char *kdebug_sadb_ext_typestr __P((u_int));
-static void kdebug_sadb_prop __P((struct sadb_ext *));
-static void kdebug_sadb_identity __P((struct sadb_ext *));
-static void kdebug_sadb_supported __P((struct sadb_ext *));
-static void kdebug_sadb_lifetime __P((struct sadb_ext *));
-static void kdebug_sadb_sa __P((struct sadb_ext *));
-static void kdebug_sadb_address __P((struct sadb_ext *));
-static void kdebug_sadb_key __P((struct sadb_ext *));
-static void kdebug_sadb_x_sa2 __P((struct sadb_ext *));
+static const char *kdebug_typestr(u_int, const struct typestr *);
+static const char *kdebug_sadb_msg_typestr(u_int);
+static const char *kdebug_sadb_ext_typestr(u_int);
+static void kdebug_sadb_prop(struct sadb_ext *);
+static void kdebug_sadb_identity(struct sadb_ext *);
+static void kdebug_sadb_supported(struct sadb_ext *);
+static void kdebug_sadb_lifetime(struct sadb_ext *);
+static void kdebug_sadb_sa(struct sadb_ext *);
+static void kdebug_sadb_address(struct sadb_ext *);
+static void kdebug_sadb_key(struct sadb_ext *);
+static void kdebug_sadb_x_sa2(struct sadb_ext *);
#ifdef SADB_X_EXT_TAG
-static void kdebug_sadb_x_tag __P((struct sadb_ext *));
+static void kdebug_sadb_x_tag(struct sadb_ext *);
#endif
#ifdef _KERNEL
-static void kdebug_secreplay __P((struct secreplay *));
+static void kdebug_secreplay(struct secreplay *);
#endif
#ifndef _KERNEL
diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h
index 164825c31a6..f8dee11be8a 100644
--- a/sys/netkey/key_debug.h
+++ b/sys/netkey/key_debug.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.h,v 1.11 2007/03/04 06:03:35 christos Exp $ */
+/* $NetBSD: key_debug.h,v 1.12 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $ */
/*
@@ -61,8 +61,8 @@ extern u_int32_t key_debug_level;
struct sadb_msg;
struct sadb_ext;
-extern void kdebug_sadb __P((struct sadb_msg *));
-extern void kdebug_sadb_x_policy __P((struct sadb_ext *));
+extern void kdebug_sadb(struct sadb_msg *);
+extern void kdebug_sadb_x_policy(struct sadb_ext *);
#ifdef _KERNEL
struct secpolicy;
@@ -71,18 +71,18 @@ struct secasindex;
struct secasvar;
struct secreplay;
struct mbuf;
-extern void kdebug_secpolicy __P((struct secpolicy *));
-extern void kdebug_secpolicyindex __P((struct secpolicyindex *));
-extern void kdebug_secasindex __P((struct secasindex *));
-extern void kdebug_secasv __P((struct secasvar *));
-extern void kdebug_mbufhdr __P((struct mbuf *));
-extern void kdebug_mbuf __P((struct mbuf *));
+extern void kdebug_secpolicy(struct secpolicy *);
+extern void kdebug_secpolicyindex(struct secpolicyindex *);
+extern void kdebug_secasindex(struct secasindex *);
+extern void kdebug_secasv(struct secasvar *);
+extern void kdebug_mbufhdr(struct mbuf *);
+extern void kdebug_mbuf(struct mbuf *);
#endif /*_KERNEL*/
struct sockaddr;
-extern void kdebug_sockaddr __P((struct sockaddr *));
+extern void kdebug_sockaddr(struct sockaddr *);
-extern void ipsec_hexdump __P((void *, int));
-extern void ipsec_bindump __P((void *, int));
+extern void ipsec_hexdump(void *, int);
+extern void ipsec_bindump(void *, int);
#endif /* !_NETKEY_KEY_DEBUG_H_ */
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index d551c7446fd..45f78142c9e 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.28 2007/05/02 20:40:29 dyoung Exp $ */
+/* $NetBSD: keydb.h,v 1.29 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keydb.h,v 1.23 2003/09/07 05:25:20 itojun Exp $ */
/*
@@ -157,23 +157,23 @@ struct key_cb {
/* secpolicy */
struct secpolicy;
struct secpolicyindex;
-extern struct secpolicy *keydb_newsecpolicy __P((void));
-extern u_int32_t keydb_newspid __P((void));
-extern void keydb_delsecpolicy __P((struct secpolicy *));
+extern struct secpolicy *keydb_newsecpolicy(void);
+extern u_int32_t keydb_newspid(void);
+extern void keydb_delsecpolicy(struct secpolicy *);
extern int keydb_setsecpolicyindex
- __P((struct secpolicy *, struct secpolicyindex *));
+(struct secpolicy *, struct secpolicyindex *);
/* secashead */
-extern struct secashead *keydb_newsecashead __P((void));
-extern void keydb_delsecashead __P((struct secashead *));
+extern struct secashead *keydb_newsecashead(void);
+extern void keydb_delsecashead(struct secashead *);
/* secasvar */
-extern struct secasvar *keydb_newsecasvar __P((void));
-extern void keydb_delsecasvar __P((struct secasvar *));
+extern struct secasvar *keydb_newsecasvar(void);
+extern void keydb_delsecasvar(struct secasvar *);
/* secreplay */
-extern struct secreplay *keydb_newsecreplay __P((size_t));
-extern void keydb_delsecreplay __P((struct secreplay *));
+extern struct secreplay *keydb_newsecreplay(size_t);
+extern void keydb_delsecreplay(struct secreplay *);
/* secreg */
-extern struct secreg *keydb_newsecreg __P((void));
-extern void keydb_delsecreg __P((struct secreg *));
+extern struct secreg *keydb_newsecreg(void);
+extern void keydb_delsecreg(struct secreg *);
#endif /* _KERNEL */
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index ca93a37664d..d9b628c8c9a 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $ */
+/* $NetBSD: keysock.c,v 1.49 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keysock.c,v 1.32 2003/08/22 05:45:08 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.49 2009/03/14 14:46:11 dsl Exp $");
#include "opt_inet.h"
@@ -65,10 +65,10 @@ __KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $");
struct sockaddr key_dst = { .sa_len = 2, .sa_family = PF_KEY, };
struct sockaddr key_src = { .sa_len = 2, .sa_family = PF_KEY, };
-static int key_receive __P((struct socket *, struct mbuf **, struct uio *,
- struct mbuf **, struct mbuf **, int *));
+static int key_receive(struct socket *, struct mbuf **, struct uio *,
+ struct mbuf **, struct mbuf **, int *);
-static int key_sendup0 __P((struct rawcb *, struct mbuf *, int, int));
+static int key_sendup0(struct rawcb *, struct mbuf *, int, int);
static int
key_receive(struct socket *so, struct mbuf **paddr, struct uio *uio,
diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h
index 43f5074fc34..6584e1f8a56 100644
--- a/sys/netkey/keysock.h
+++ b/sys/netkey/keysock.h
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.h,v 1.14 2008/04/23 07:29:47 thorpej Exp $ */
+/* $NetBSD: keysock.h,v 1.15 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*
@@ -73,16 +73,16 @@ struct keycb {
struct mbuf *kp_queue; /* queued mbufs, linked by m_nextpkt */
};
-extern int key_output __P((struct mbuf *, ...));
+extern int key_output(struct mbuf *, ...);
#ifndef __NetBSD__
-extern int key_usrreq __P((struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *));
+extern int key_usrreq(struct socket *,
+ int, struct mbuf *, struct mbuf *, struct mbuf *);
#else
-extern int key_usrreq __P((struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *));
+extern int key_usrreq(struct socket *,
+ int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
#endif
-extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
+extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
#endif /* _KERNEL */
#endif /* !_NETKEY_KEYSOCK_H_ */