[src/trunk]: src/crypto/dist/ipsec-tools/src/libipsec drop __P, suggested by ...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/28f4a542cefc
branches:  trunk
changeset: 319395:28f4a542cefc
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon May 28 20:45:38 2018 +0000

description:
drop __P, suggested by sevan

diffstat:

 crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c |   14 +-
 crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h    |    4 +-
 crypto/dist/ipsec-tools/src/libipsec/key_debug.c         |   34 +-
 crypto/dist/ipsec-tools/src/libipsec/libpfkey.h          |  136 +++++++-------
 crypto/dist/ipsec-tools/src/libipsec/pfkey.c             |   56 +++---
 crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c        |   14 +-
 crypto/dist/ipsec-tools/src/libipsec/policy_parse.y      |   28 +-
 crypto/dist/ipsec-tools/src/libipsec/policy_token.l      |    8 +-
 8 files changed, 147 insertions(+), 147 deletions(-)

diffs (truncated from 478 to 300 lines):

diff -r 7f43af699f93 -r 28f4a542cefc crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c  Mon May 28 20:34:45 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c  Mon May 28 20:45:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_dump_policy.c,v 1.10 2018/05/28 19:22:40 maxv Exp $      */
+/*     $NetBSD: ipsec_dump_policy.c,v 1.11 2018/05/28 20:45:38 maxv Exp $      */
 
 /* Id: ipsec_dump_policy.c,v 1.10 2005/06/29 09:12:37 manubsd Exp */
 
@@ -63,12 +63,12 @@
        "discard", "none", "ipsec", "entrust", "bypass",
 };
 
-static char *ipsec_dump_ipsecrequest __P((char *, size_t,
-       struct sadb_x_ipsecrequest *, size_t, int));
-static char *ipsec_dump_policy1 __P((void *, const char *, int));
-static int set_addresses __P((char *, size_t, struct sockaddr *,
-       struct sockaddr *, int));
-static char *set_address __P((char *, size_t, struct sockaddr *, int));
+static char *ipsec_dump_ipsecrequest(char *, size_t,
+       struct sadb_x_ipsecrequest *, size_t, int);
+static char *ipsec_dump_policy1(void *, const char *, int);
+static int set_addresses(char *, size_t, struct sockaddr *,
+       struct sockaddr *, int);
+static char *set_address(char *, size_t, struct sockaddr *, int);
 
 /*
  * policy is sadb_x_policy buffer.
diff -r 7f43af699f93 -r 28f4a542cefc crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h
--- a/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h     Mon May 28 20:34:45 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.h     Mon May 28 20:45:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_strerror.h,v 1.4 2006/09/09 16:22:09 manu Exp $  */
+/*     $NetBSD: ipsec_strerror.h,v 1.5 2018/05/28 20:45:38 maxv Exp $  */
 
 /* Id: ipsec_strerror.h,v 1.4 2004/06/07 09:18:46 ludvigm Exp */
 
@@ -35,7 +35,7 @@
 #define _IPSEC_STRERROR_H
 
 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 -r 7f43af699f93 -r 28f4a542cefc crypto/dist/ipsec-tools/src/libipsec/key_debug.c
--- a/crypto/dist/ipsec-tools/src/libipsec/key_debug.c  Mon May 28 20:34:45 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/key_debug.c  Mon May 28 20:45:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_debug.c,v 1.13 2018/05/28 19:39:21 maxv Exp $      */
+/*     $NetBSD: key_debug.c,v 1.14 2018/05/28 20:45:38 maxv Exp $      */
 
 /*     $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $      */
 
@@ -71,35 +71,35 @@
 #include "config.h"
 #include "libpfkey.h"
 
-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 void kdebug_sadb_x_policy __P((struct sadb_ext *ext));
-static void kdebug_sockaddr __P((struct sockaddr *addr));
+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 *);
+static void kdebug_sadb_x_policy(struct sadb_ext *ext);
+static void kdebug_sockaddr(struct sockaddr *addr);
 
 #ifdef SADB_X_EXT_NAT_T_TYPE
-static void kdebug_sadb_x_nat_t_type __P((struct sadb_ext *ext));
-static void kdebug_sadb_x_nat_t_port __P((struct sadb_ext *ext));
+static void kdebug_sadb_x_nat_t_type(struct sadb_ext *ext);
+static void kdebug_sadb_x_nat_t_port(struct sadb_ext *ext);
 #ifdef SADB_X_EXT_NAT_T_FRAG
-static void kdebug_sadb_x_nat_t_frag __P((struct sadb_ext *ext));
+static void kdebug_sadb_x_nat_t_frag(struct sadb_ext *ext);
 #endif
 #endif
 
 #ifdef SADB_X_EXT_PACKET
-static void kdebug_sadb_x_packet __P((struct sadb_ext *));
+static void kdebug_sadb_x_packet(struct sadb_ext *);
 #endif
 
 #ifdef SADB_X_EXT_KMADDRESS
-static void kdebug_sadb_x_kmaddress __P((struct sadb_ext *));
+static void kdebug_sadb_x_kmaddress(struct sadb_ext *);
 #endif
 
 #ifdef _KERNEL
-static void kdebug_secreplay __P((struct secreplay *));
+static void kdebug_secreplay(struct secreplay *);
 #endif
 
 #ifndef _KERNEL
diff -r 7f43af699f93 -r 28f4a542cefc crypto/dist/ipsec-tools/src/libipsec/libpfkey.h
--- a/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h   Mon May 28 20:34:45 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h   Mon May 28 20:45:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libpfkey.h,v 1.19 2012/01/04 15:55:35 drochner Exp $   */
+/*     $NetBSD: libpfkey.h,v 1.20 2018/05/28 20:45:38 maxv Exp $       */
 
 /* Id: libpfkey.h,v 1.13 2005/12/04 20:26:43 manubsd Exp */
 
@@ -45,10 +45,10 @@
 #define PRIORITY_OFFSET_NEGATIVE_MAX   0x40000000
 
 struct sadb_msg;
-extern void pfkey_sadump __P((struct sadb_msg *));
-extern void pfkey_sadump_withports __P((struct sadb_msg *));
-extern void pfkey_spdump __P((struct sadb_msg *));
-extern void pfkey_spdump_withports __P((struct sadb_msg *));
+extern void pfkey_sadump(struct sadb_msg *);
+extern void pfkey_sadump_withports(struct sadb_msg *);
+extern void pfkey_spdump(struct sadb_msg *);
+extern void pfkey_spdump_withports(struct sadb_msg *);
 
 struct sockaddr;
 struct sadb_alg;
@@ -104,63 +104,63 @@
 
 /* IPsec Library Routines */
 
-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 *));
-char *ipsec_dump_policy_withports __P((void *, const char *));
-void ipsec_hexdump __P((const void *, int));
-const char *ipsec_strerror __P((void));
-void kdebug_sadb __P((struct sadb_msg *));
-ipsec_policy_t ipsec_set_policy __P((__ipsec_const char *, int));
-int  ipsec_get_policylen __P((ipsec_policy_t));
-char *ipsec_dump_policy __P((ipsec_policy_t, __ipsec_const char *));
+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 *);
+char *ipsec_dump_policy_withports(void *, const char *);
+void ipsec_hexdump(const void *, int);
+const char *ipsec_strerror(void);
+void kdebug_sadb(struct sadb_msg *);
+ipsec_policy_t ipsec_set_policy(__ipsec_const char *, int);
+int  ipsec_get_policylen(ipsec_policy_t);
+char *ipsec_dump_policy(ipsec_policy_t, __ipsec_const char *);
 
 /* PFKey Routines */
 
-u_int pfkey_set_softrate __P((u_int, u_int));
-u_int pfkey_get_softrate __P((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_getspi_nat __P((int, u_int, u_int,
+u_int pfkey_set_softrate(u_int, u_int);
+u_int pfkey_get_softrate(u_int);
+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_getspi_nat(int, u_int, u_int,
        struct sockaddr *, struct sockaddr *, u_int8_t, u_int16_t, u_int16_t,
-       u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+       u_int32_t, u_int32_t, u_int32_t, u_int32_t);
 
-int pfkey_send_update2 __P((struct pfkey_send_sa_args *));
-int pfkey_send_add2 __P((struct pfkey_send_sa_args *)); 
-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_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_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,
+int pfkey_send_update2(struct pfkey_send_sa_args *);
+int pfkey_send_add2(struct pfkey_send_sa_args *); 
+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(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 __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,
+       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 __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_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));
+       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(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);
 #ifdef SADB_X_MIGRATE
-int pfkey_send_migrate __P((int, struct sockaddr *, struct sockaddr *,
+int pfkey_send_migrate(int, struct sockaddr *, struct sockaddr *,
         struct sockaddr *, u_int, struct sockaddr *, u_int, u_int,
-        caddr_t, int, u_int32_t));
+        caddr_t, int, u_int32_t);
 #endif
 
 /* XXX should be somewhere else !!!
@@ -171,36 +171,36 @@
 #endif
 
 
-int pfkey_open __P((void));
-void pfkey_close __P((int));
-int pfkey_set_buffer_size __P((int, 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);
+int pfkey_set_buffer_size(int, 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 *);
 
 /* 
  * Deprecated, available for backward compatibility with third party 
  * libipsec users. Please use pfkey_send_update2 and pfkey_send_add2 instead
  */
-int pfkey_send_update __P((int, u_int, u_int, struct sockaddr *,
+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_update_nat __P((int, u_int, u_int, struct sockaddr *,
+       u_int64_t, u_int64_t, u_int32_t);
+int pfkey_send_update_nat(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,
-       u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
-int pfkey_send_add __P((int, u_int, u_int, struct sockaddr *,
+       u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_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_add_nat __P((int, u_int, u_int, struct sockaddr *,
+       u_int64_t, u_int64_t, u_int32_t);
+int pfkey_send_add_nat(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,
-       u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t));
+       u_int8_t, u_int16_t, u_int16_t, struct sockaddr *, u_int16_t);
 
 #ifndef __SYSDEP_SA_LEN__
 #define __SYSDEP_SA_LEN__
diff -r 7f43af699f93 -r 28f4a542cefc crypto/dist/ipsec-tools/src/libipsec/pfkey.c
--- a/crypto/dist/ipsec-tools/src/libipsec/pfkey.c      Mon May 28 20:34:45 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/pfkey.c      Mon May 28 20:45:38 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pfkey.c,v 1.25 2018/05/28 19:22:40 maxv Exp $  */