[src/trunk]: src/crypto/dist/ipsec-tools/src/libipsec ANSIfy

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

details:   https://anonhg.NetBSD.org/src/rev/b580740ee769
branches:  trunk
changeset: 759391:b580740ee769
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Dec 08 01:55:12 2010 +0000

description:
ANSIfy

diffstat:

 crypto/dist/ipsec-tools/src/libipsec/pfkey.c |  379 +++++++-------------------
 1 files changed, 105 insertions(+), 274 deletions(-)

diffs (truncated from 753 to 300 lines):

diff -r 3d69b290c5d5 -r b580740ee769 crypto/dist/ipsec-tools/src/libipsec/pfkey.c
--- a/crypto/dist/ipsec-tools/src/libipsec/pfkey.c      Wed Dec 08 01:54:21 2010 +0000
+++ b/crypto/dist/ipsec-tools/src/libipsec/pfkey.c      Wed Dec 08 01:55:12 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pfkey.c,v 1.19 2009/07/03 06:40:10 tteras Exp $        */
+/*     $NetBSD: pfkey.c,v 1.20 2010/12/08 01:55:12 joerg Exp $ */
 
 /*     $KAME: pfkey.c,v 1.47 2003/10/02 19:52:12 itojun Exp $  */
 
@@ -380,13 +380,10 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_getspi_nat(so, satype, mode, src, dst, natt_type, sport, dport, min, max, reqid, seq)
-       int so;
-       u_int satype, mode;
-       struct sockaddr *src, *dst;
-       u_int8_t natt_type;
-       u_int16_t sport, dport;
-       u_int32_t min, max, reqid, seq;
+pfkey_send_getspi_nat(int so, u_int satype, u_int mode, struct sockaddr *src,
+    struct sockaddr *dst, u_int8_t natt_type, u_int16_t sport,
+    u_int16_t dport, u_int32_t min, u_int32_t max, u_int32_t reqid,
+    u_int32_t seq)
 {
        struct sadb_msg *newmsg;
        caddr_t ep;
@@ -538,11 +535,9 @@
 }
 
 int
-pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq)
-       int so;
-       u_int satype, mode;
-       struct sockaddr *src, *dst;
-       u_int32_t min, max, reqid, seq;
+pfkey_send_getspi(int so, u_int satype, u_int mode, struct sockaddr *src,
+    struct sockaddr *dst, u_int32_t min, u_int32_t max, u_int32_t reqid,
+    u_int32_t seq)
 {
        return pfkey_send_getspi_nat(so, satype, mode, src, dst, 0, 0, 0,
                min, max, reqid, seq);
@@ -556,12 +551,10 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_update2(sa_parms)
-       struct pfkey_send_sa_args *sa_parms;
+pfkey_send_update2(struct pfkey_send_sa_args *sa_parms)
 {
        int len;
 
-       
        sa_parms->type = SADB_UPDATE;
        if ((len = pfkey_send_x1(sa_parms)) < 0)
                return -1;
@@ -577,8 +570,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_add2(sa_parms)
-       struct pfkey_send_sa_args *sa_parms;
+pfkey_send_add2(struct pfkey_send_sa_args *sa_parms)
 {
        int len;
        
@@ -596,11 +588,8 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_delete(so, satype, mode, src, dst, spi)
-       int so;
-       u_int satype, mode;
-       struct sockaddr *src, *dst;
-       u_int32_t spi;
+pfkey_send_delete(int so, u_int satype, u_int mode, struct sockaddr *src,
+    struct sockaddr *dst, u_int32_t spi)
 {
        int len;
        if ((len = pfkey_send_x2(so, SADB_DELETE, satype, mode, src, dst, spi)) < 0)
@@ -620,10 +609,8 @@
  */
 /*ARGSUSED*/
 int
-pfkey_send_delete_all(so, satype, mode, src, dst)
-       int so;
-       u_int satype, mode;
-       struct sockaddr *src, *dst;
+pfkey_send_delete_all(int so, u_int satype, u_int mode, struct sockaddr *src,
+    struct sockaddr *dst)
 {
        struct sadb_msg *newmsg;
        int len;
@@ -702,11 +689,8 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_get(so, satype, mode, src, dst, spi)
-       int so;
-       u_int satype, mode;
-       struct sockaddr *src, *dst;
-       u_int32_t spi;
+pfkey_send_get(int so, u_int satype, u_int mode, struct sockaddr *src,
+    struct sockaddr *dst, u_int32_t spi)
 {
        int len;
        if ((len = pfkey_send_x2(so, SADB_GET, satype, mode, src, dst, spi)) < 0)
@@ -722,9 +706,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_register(so, satype)
-       int so;
-       u_int satype;
+pfkey_send_register(int so, u_int satype)
 {
        int len, algno;
 
@@ -764,8 +746,7 @@
  *     -1: error occured, and set errno.
  */
 int
-pfkey_recv_register(so)
-       int so;
+pfkey_recv_register(int so)
 {
        pid_t pid = getpid();
        struct sadb_msg *newmsg;
@@ -804,9 +785,7 @@
  *     -1: error occured, and set errno.
  */
 int
-pfkey_set_supported(msg, tlen)
-       struct sadb_msg *msg;
-       int tlen;
+pfkey_set_supported(struct sadb_msg *msg, int tlen)
 {
        struct sadb_supported *sup;
        caddr_t p;
@@ -868,9 +847,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_flush(so, satype)
-       int so;
-       u_int satype;
+pfkey_send_flush(int so, u_int satype)
 {
        int len;
 
@@ -887,9 +864,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_dump(so, satype)
-       int so;
-       u_int satype;
+pfkey_send_dump(int so, u_int satype)
 {
        int len;
 
@@ -912,9 +887,7 @@
  *             algorithms is.
  */
 int
-pfkey_send_promisc_toggle(so, flag)
-       int so;
-       int flag;
+pfkey_send_promisc_toggle(int so, int flag)
 {
        int len;
 
@@ -932,13 +905,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spdadd(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, caddr_t policy,
+    int policylen, u_int32_t seq)
 {
        int len;
 
@@ -958,15 +927,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime,
-               policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       u_int64_t ltime, vtime;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spdadd2(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, u_int64_t ltime,
+    u_int64_t vtime, caddr_t policy, int policylen, u_int32_t seq)
 {
        int len;
 
@@ -986,13 +949,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spdupdate(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, caddr_t policy,
+    int policylen, u_int32_t seq)
 {
        int len;
 
@@ -1012,15 +971,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime,
-               policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       u_int64_t ltime, vtime;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spdupdate2(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, u_int64_t ltime,
+    u_int64_t vtime, caddr_t policy, int policylen, u_int32_t seq)
 {
        int len;
 
@@ -1040,13 +993,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spddelete(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, caddr_t policy,
+    int policylen, u_int32_t seq)
 {
        int len;
 
@@ -1071,9 +1020,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spddelete2(so, spid)
-       int so;
-       u_int32_t spid;
+pfkey_send_spddelete2(int so, u_int32_t spid)
 {
        int len;
 
@@ -1090,9 +1037,7 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdget(so, spid)
-       int so;
-       u_int32_t spid;
+pfkey_send_spdget(int so, u_int32_t spid)
 {
        int len;
 
@@ -1109,13 +1054,9 @@
  *     -1      : error occured, and set errno.
  */
 int
-pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq)
-       int so;
-       struct sockaddr *src, *dst;
-       u_int prefs, prefd, proto;
-       caddr_t policy;
-       int policylen;
-       u_int32_t seq;
+pfkey_send_spdsetidx(int so, struct sockaddr *src, u_int prefs,
+    struct sockaddr *dst, u_int prefd, u_int proto, caddr_t policy,
+    int policylen, u_int32_t seq)
 {
        int len;