Module Name: src
Committed By: maxv
Date: Mon May 28 19:22:40 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/libipsec: ipsec_dump_policy.c
ipsec_get_policylen.c key_debug.c pfkey.c pfkey_dump.c
policy_parse.y policy_token.l
Log Message:
fix -Wunused and -Wold-style-definition
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c \
src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.9 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.10
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c:1.9 Fri Dec 3 15:01:11 2010
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_dump_policy.c Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_dump_policy.c,v 1.9 2010/12/03 15:01:11 tteras Exp $ */
+/* $NetBSD: ipsec_dump_policy.c,v 1.10 2018/05/28 19:22:40 maxv Exp $ */
/* Id: ipsec_dump_policy.c,v 1.10 2005/06/29 09:12:37 manubsd Exp */
@@ -76,26 +76,19 @@ static char *set_address __P((char *, si
* When delimiter == NULL, alternatively ' '(space) is applied.
*/
char *
-ipsec_dump_policy(policy, delimiter)
- ipsec_policy_t policy;
- __ipsec_const char *delimiter;
+ipsec_dump_policy(ipsec_policy_t policy, __ipsec_const char *delimiter)
{
return ipsec_dump_policy1(policy, delimiter, 0);
}
char *
-ipsec_dump_policy_withports(policy, delimiter)
- void *policy;
- const char *delimiter;
+ipsec_dump_policy_withports(void *policy, const char *delimiter)
{
return ipsec_dump_policy1(policy, delimiter, 1);
}
static char *
-ipsec_dump_policy1(policy, delimiter, withports)
- void *policy;
- const char *delimiter;
- int withports;
+ipsec_dump_policy1(void *policy, const char *delimiter, int withports)
{
struct sadb_x_policy *xpl = policy;
struct sadb_x_ipsecrequest *xisr;
@@ -276,12 +269,8 @@ ipsec_dump_policy1(policy, delimiter, wi
}
static char *
-ipsec_dump_ipsecrequest(buf, len, xisr, bound, withports)
- char *buf;
- size_t len;
- struct sadb_x_ipsecrequest *xisr;
- size_t bound; /* boundary */
- int withports;
+ipsec_dump_ipsecrequest(char *buf, size_t len, struct sadb_x_ipsecrequest *xisr,
+ size_t bound /* boundary */, int withports)
{
const char *proto, *mode, *level;
char abuf[NI_MAXHOST * 2 + 2];
@@ -376,12 +365,8 @@ ipsec_dump_ipsecrequest(buf, len, xisr,
}
static int
-set_addresses(buf, len, sa1, sa2, withports)
- char *buf;
- size_t len;
- struct sockaddr *sa1;
- struct sockaddr *sa2;
- int withports;
+set_addresses(char *buf, size_t len, struct sockaddr *sa1, struct sockaddr *sa2,
+ int withports)
{
char tmp1[NI_MAXHOST], tmp2[NI_MAXHOST];
@@ -395,11 +380,7 @@ set_addresses(buf, len, sa1, sa2, withpo
}
static char *
-set_address(buf, len, sa, withports)
- char *buf;
- size_t len;
- struct sockaddr *sa;
- int withports;
+set_address(char *buf, size_t len, struct sockaddr *sa, int withports)
{
const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
char host[NI_MAXHOST];
Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c:1.7 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c:1.8
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c:1.7 Wed Jul 18 12:07:50 2007
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_get_policylen.c Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_get_policylen.c,v 1.7 2007/07/18 12:07:50 vanhu Exp $ */
+/* $NetBSD: ipsec_get_policylen.c,v 1.8 2018/05/28 19:22:40 maxv Exp $ */
/* $KAME: ipsec_get_policylen.c,v 1.5 2000/05/07 05:25:03 itojun Exp $ */
@@ -47,8 +47,7 @@
#include "ipsec_strerror.h"
int
-ipsec_get_policylen(policy)
- ipsec_policy_t policy;
+ipsec_get_policylen(ipsec_policy_t policy)
{
return policy ? PFKEY_EXTLEN(policy) : -1;
}
Index: src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.11 src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.12
--- src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c:1.11 Wed Apr 26 03:16:06 2017
+++ src/crypto/dist/ipsec-tools/src/libipsec/key_debug.c Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.11 2017/04/26 03:16:06 ozaki-r Exp $ */
+/* $NetBSD: key_debug.c,v 1.12 2018/05/28 19:22:40 maxv Exp $ */
/* $KAME: key_debug.c,v 1.29 2001/08/16 14:25:41 itojun Exp $ */
@@ -111,8 +111,7 @@ static void kdebug_secreplay __P((struct
/* %%%: about struct sadb_msg */
void
-kdebug_sadb(base)
- struct sadb_msg *base;
+kdebug_sadb(struct sadb_msg *base)
{
struct sadb_ext *ext;
int tlen, extlen;
@@ -226,8 +225,7 @@ kdebug_sadb(base)
}
static void
-kdebug_sadb_prop(ext)
- struct sadb_ext *ext;
+kdebug_sadb_prop(struct sadb_ext *ext)
{
struct sadb_prop *prop = (void *)ext;
struct sadb_comb *comb;
@@ -276,8 +274,7 @@ kdebug_sadb_prop(ext)
}
static void
-kdebug_sadb_identity(ext)
- struct sadb_ext *ext;
+kdebug_sadb_identity(struct sadb_ext *ext)
{
struct sadb_ident *id = (void *)ext;
int len;
@@ -319,8 +316,7 @@ kdebug_sadb_identity(ext)
}
static void
-kdebug_sadb_supported(ext)
- struct sadb_ext *ext;
+kdebug_sadb_supported(struct sadb_ext *ext)
{
struct sadb_supported *sup = (void *)ext;
struct sadb_alg *alg;
@@ -346,8 +342,7 @@ kdebug_sadb_supported(ext)
}
static void
-kdebug_sadb_lifetime(ext)
- struct sadb_ext *ext;
+kdebug_sadb_lifetime(struct sadb_ext *ext)
{
struct sadb_lifetime *lft = (void *)ext;
@@ -366,8 +361,7 @@ kdebug_sadb_lifetime(ext)
}
static void
-kdebug_sadb_sa(ext)
- struct sadb_ext *ext;
+kdebug_sadb_sa(struct sadb_ext *ext)
{
struct sadb_sa *sa = (void *)ext;
@@ -385,8 +379,7 @@ kdebug_sadb_sa(ext)
}
static void
-kdebug_sadb_address(ext)
- struct sadb_ext *ext;
+kdebug_sadb_address(struct sadb_ext *ext)
{
struct sadb_address *addr = (void *)ext;
@@ -405,8 +398,7 @@ kdebug_sadb_address(ext)
}
static void
-kdebug_sadb_key(ext)
- struct sadb_ext *ext;
+kdebug_sadb_key(struct sadb_ext *ext)
{
struct sadb_key *key = (void *)ext;
@@ -433,8 +425,7 @@ kdebug_sadb_key(ext)
}
static void
-kdebug_sadb_x_sa2(ext)
- struct sadb_ext *ext;
+kdebug_sadb_x_sa2(struct sadb_ext *ext)
{
struct sadb_x_sa2 *sa2 = (void *)ext;
@@ -452,8 +443,7 @@ kdebug_sadb_x_sa2(ext)
}
void
-kdebug_sadb_x_policy(ext)
- struct sadb_ext *ext;
+kdebug_sadb_x_policy(struct sadb_ext *ext)
{
struct sadb_x_policy *xpl = (void *)ext;
struct sockaddr *addr;
@@ -569,8 +559,7 @@ static void kdebug_sadb_x_nat_t_frag (st
#ifdef SADB_X_EXT_PACKET
static void
-kdebug_sadb_x_packet(ext)
- struct sadb_ext *ext;
+kdebug_sadb_x_packet(struct sadb_ext *ext)
{
struct sadb_x_packet *pkt = (struct sadb_x_packet *)ext;
@@ -589,8 +578,7 @@ kdebug_sadb_x_packet(ext)
#ifdef SADB_X_EXT_KMADDRESS
static void
-kdebug_sadb_x_kmaddress(ext)
- struct sadb_ext *ext;
+kdebug_sadb_x_kmaddress(struct sadb_ext *ext)
{
struct sadb_x_kmaddress *kma = (struct sadb_x_kmaddress *)ext;
struct sockaddr * sa;
@@ -633,8 +621,7 @@ kdebug_sadb_x_kmaddress(ext)
#ifdef _KERNEL
/* %%%: about SPD and SAD */
void
-kdebug_secpolicy(sp)
- struct secpolicy *sp;
+kdebug_secpolicy(struct secpolicy *sp)
{
/* sanity check */
if (sp == NULL)
@@ -682,8 +669,7 @@ kdebug_secpolicy(sp)
}
void
-kdebug_secpolicyindex(spidx)
- struct secpolicyindex *spidx;
+kdebug_secpolicyindex(struct secpolicyindex *spidx)
{
/* sanity check */
if (spidx == NULL)
@@ -703,8 +689,7 @@ kdebug_secpolicyindex(spidx)
}
void
-kdebug_secasindex(saidx)
- struct secasindex *saidx;
+kdebug_secasindex(struct secasindex *saidx)
{
/* sanity check */
if (saidx == NULL)
@@ -724,8 +709,7 @@ kdebug_secasindex(saidx)
}
void
-kdebug_secasv(sav)
- struct secasvar *sav;
+kdebug_secasv(struct secasvar *sav)
{
/* sanity check */
if (sav == NULL)
@@ -766,8 +750,7 @@ kdebug_secasv(sav)
}
static void
-kdebug_secreplay(rpl)
- struct secreplay *rpl;
+kdebug_secreplay(struct secreplay *rpl)
{
int len, l;
@@ -795,8 +778,7 @@ kdebug_secreplay(rpl)
}
void
-kdebug_mbufhdr(m)
- struct mbuf *m;
+kdebug_mbufhdr(struct mbuf *m)
{
/* sanity check */
if (m == NULL)
@@ -825,8 +807,7 @@ kdebug_mbufhdr(m)
}
void
-kdebug_mbuf(m0)
- struct mbuf *m0;
+kdebug_mbuf(struct mbuf *m0)
{
struct mbuf *m = m0;
int i, j;
@@ -850,8 +831,7 @@ kdebug_mbuf(m0)
#endif /* _KERNEL */
static void
-kdebug_sockaddr(addr)
- struct sockaddr *addr;
+kdebug_sockaddr(struct sockaddr *addr)
{
struct sockaddr_in *sin4;
#ifdef INET6
@@ -888,9 +868,7 @@ kdebug_sockaddr(addr)
}
void
-ipsec_bindump(buf, len)
- caddr_t buf;
- int len;
+ipsec_bindump(caddr_t buf, int len)
{
int i;
@@ -902,9 +880,7 @@ ipsec_bindump(buf, len)
void
-ipsec_hexdump(buf, len)
- const void *buf;
- int len;
+ipsec_hexdump(const void *buf, int len)
{
int i;
Index: src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y
diff -u src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.11 src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.12
--- src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y:1.11 Mon Feb 16 18:36:21 2009
+++ src/crypto/dist/ipsec-tools/src/libipsec/policy_parse.y Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: policy_parse.y,v 1.11 2009/02/16 18:36:21 tteras Exp $ */
+/* $NetBSD: policy_parse.y,v 1.12 2018/05/28 19:22:40 maxv Exp $ */
/* $KAME: policy_parse.y,v 1.21 2003/12/12 08:01:26 itojun Exp $ */
@@ -362,8 +362,7 @@ addresses
%%
void
-yyerror(msg)
- char *msg;
+yyerror(char *msg)
{
fprintf(stderr, "libipsec: %s while parsing \"%s\"\n",
msg, __libipsectext);
@@ -372,9 +371,7 @@ yyerror(msg)
}
static struct sockaddr *
-parse_sockaddr(addrbuf, portbuf)
- struct _val *addrbuf;
- struct _val *portbuf;
+parse_sockaddr(struct _val *addrbuf, struct _val *portbuf)
{
struct addrinfo hints, *res;
char *addr;
@@ -438,7 +435,7 @@ parse_sockaddr(addrbuf, portbuf)
}
static int
-rule_check()
+rule_check(void)
{
if (p_type == IPSEC_POLICY_IPSEC) {
if (p_protocol == IPPROTO_IP) {
@@ -469,7 +466,7 @@ rule_check()
}
static int
-init_x_policy()
+init_x_policy(void)
{
struct sadb_x_policy *p;
@@ -510,8 +507,7 @@ init_x_policy()
}
static int
-set_x_request(src, dst)
- struct sockaddr *src, *dst;
+set_x_request(struct sockaddr *src, struct sockaddr *dst)
{
struct sadb_x_ipsecrequest *p;
int reqlen;
@@ -545,8 +541,7 @@ set_x_request(src, dst)
}
static int
-set_sockaddr(addr)
- struct sockaddr *addr;
+set_sockaddr(struct sockaddr *addr)
{
if (addr == NULL) {
__ipsec_errcode = EIPSEC_NO_ERROR;
@@ -564,7 +559,7 @@ set_sockaddr(addr)
}
static void
-policy_parse_request_init()
+policy_parse_request_init(void)
{
p_protocol = IPPROTO_IP;
p_mode = IPSEC_MODE_ANY;
@@ -583,9 +578,7 @@ policy_parse_request_init()
}
static void *
-policy_parse(msg, msglen)
- const char *msg;
- int msglen;
+policy_parse(const char *msg, int msglen)
{
int error;
@@ -616,9 +609,7 @@ policy_parse(msg, msglen)
}
ipsec_policy_t
-ipsec_set_policy(msg, msglen)
- __ipsec_const char *msg;
- int msglen;
+ipsec_set_policy(__ipsec_const char *msg, int msglen)
{
caddr_t policy;
Index: src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.24 src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.25
--- src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c:1.24 Mon Feb 13 13:03:06 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/pfkey.c Mon May 28 19:22:40 2018
@@ -1,5 +1,4 @@
-/* $NetBSD: pfkey.c,v 1.24 2012/02/13 13:03:06 wiz Exp $ */
-
+/* $NetBSD: pfkey.c,v 1.25 2018/05/28 19:22:40 maxv Exp $ */
/* $KAME: pfkey.c,v 1.47 2003/10/02 19:52:12 itojun Exp $ */
/*
@@ -126,8 +125,7 @@ static int supported_map[] = {
};
static int
-findsupportedmap(satype)
- int satype;
+findsupportedmap(int satype)
{
int i;
@@ -138,8 +136,7 @@ findsupportedmap(satype)
}
static struct sadb_alg *
-findsupportedalg(satype, alg_id)
- u_int satype, alg_id;
+findsupportedalg(u_int satype, u_int alg_id)
{
int algno;
int tlen;
@@ -176,8 +173,7 @@ findsupportedalg(satype, alg_id)
}
static int
-setsupportedmap(sup)
- struct sadb_supported *sup;
+setsupportedmap(struct sadb_supported *sup)
{
struct sadb_supported **ipsup;
@@ -216,10 +212,7 @@ setsupportedmap(sup)
* 0: valid.
*/
int
-ipsec_check_keylen(supported, alg_id, keylen)
- u_int supported;
- u_int alg_id;
- u_int keylen;
+ipsec_check_keylen(u_int supported, u_int alg_id, u_int keylen)
{
u_int satype;
@@ -248,10 +241,7 @@ ipsec_check_keylen(supported, alg_id, ke
* 0: valid.
*/
int
-ipsec_check_keylen2(satype, alg_id, keylen)
- u_int satype;
- u_int alg_id;
- u_int keylen;
+ipsec_check_keylen2(u_int satype, u_int alg_id, u_int keylen)
{
struct sadb_alg *alg;
@@ -279,9 +269,7 @@ ipsec_check_keylen2(satype, alg_id, keyl
* 0: valid.
*/
int
-ipsec_get_keylen(supported, alg_id, alg0)
- u_int supported, alg_id;
- struct sadb_alg *alg0;
+ipsec_get_keylen(u_int supported, u_int alg_id, struct sadb_alg *alg0)
{
struct sadb_alg *alg;
u_int satype;
@@ -324,8 +312,7 @@ static u_int soft_lifetime_addtime_rate
static u_int soft_lifetime_usetime_rate = PFKEY_SOFT_LIFETIME_RATE;
u_int
-pfkey_set_softrate(type, rate)
- u_int type, rate;
+pfkey_set_softrate(u_int type, u_int rate)
{
__ipsec_errcode = EIPSEC_NO_ERROR;
@@ -356,8 +343,7 @@ pfkey_set_softrate(type, rate)
* ATTENTION: ~0 is returned if invalid type was passed.
*/
u_int
-pfkey_get_softrate(type)
- u_int type;
+pfkey_get_softrate(u_int type)
{
switch (type) {
case SADB_X_LIFETIME_ALLOCATIONS:
@@ -1826,7 +1812,6 @@ pfkey_open(void)
int
pfkey_set_buffer_size(int so, int size)
{
- int newsize;
int actual_bufsiz;
socklen_t sizebufsiz;
int desired_bufsiz;
Index: src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c
diff -u src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.21 src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.22
--- src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c:1.21 Wed Apr 26 03:19:49 2017
+++ src/crypto/dist/ipsec-tools/src/libipsec/pfkey_dump.c Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pfkey_dump.c,v 1.21 2017/04/26 03:19:49 ozaki-r Exp $ */
+/* $NetBSD: pfkey_dump.c,v 1.22 2018/05/28 19:22:40 maxv Exp $ */
/* $KAME: pfkey_dump.c,v 1.45 2003/09/08 10:14:56 itojun Exp $ */
@@ -222,23 +222,19 @@ static struct val2str str_alg_comp[] = {
*/
void
-pfkey_sadump(m)
- struct sadb_msg *m;
+pfkey_sadump(struct sadb_msg *m)
{
pfkey_sadump1(m, 0);
}
void
-pfkey_sadump_withports(m)
- struct sadb_msg *m;
+pfkey_sadump_withports(struct sadb_msg *m)
{
pfkey_sadump1(m, 1);
}
void
-pfkey_sadump1(m, withports)
- struct sadb_msg *m;
- int withports;
+pfkey_sadump1(struct sadb_msg *m, int withports)
{
caddr_t mhp[SADB_EXT_MAX + 1];
struct sadb_sa *m_sa;
@@ -484,23 +480,19 @@ pfkey_sadump1(m, withports)
}
void
-pfkey_spdump(m)
- struct sadb_msg *m;
+pfkey_spdump(struct sadb_msg *m)
{
pfkey_spdump1(m, 0);
}
void
-pfkey_spdump_withports(m)
- struct sadb_msg *m;
+pfkey_spdump_withports(struct sadb_msg *m)
{
pfkey_spdump1(m, 1);
}
static void
-pfkey_spdump1(m, withports)
- struct sadb_msg *m;
- int withports;
+pfkey_spdump1(struct sadb_msg *m, int withports)
{
char pbuf[NI_MAXSERV];
caddr_t mhp[SADB_EXT_MAX + 1];
@@ -670,8 +662,7 @@ pfkey_spdump1(m, withports)
* set "ipaddress" to buffer.
*/
static char *
-str_ipaddr(sa)
- struct sockaddr *sa;
+str_ipaddr(struct sockaddr *sa)
{
static char buf[NI_MAXHOST];
const int niflag = NI_NUMERICHOST;
@@ -689,8 +680,7 @@ str_ipaddr(sa)
* set "port" to buffer.
*/
static char *
-str_ipport(sa)
- struct sockaddr *sa;
+str_ipport(struct sockaddr *sa)
{
static char buf[NI_MAXHOST];
const int niflag = NI_NUMERICSERV;
@@ -709,8 +699,7 @@ str_ipport(sa)
* set "/prefix[port number]" to buffer.
*/
static char *
-str_prefport(family, pref, port, ulp)
- u_int family, pref, port, ulp;
+str_prefport(u_int family, u_int pref, u_int port, u_int ulp)
{
static char buf[128];
char prefbuf[128];
@@ -754,8 +743,7 @@ str_prefport(family, pref, port, ulp)
}
static void
-str_upperspec(ulp, p1, p2)
- u_int ulp, p1, p2;
+str_upperspec(u_int ulp, u_int p1, u_int p2)
{
struct protoent *ent;
@@ -784,8 +772,7 @@ str_upperspec(ulp, p1, p2)
* set "Mon Day Time Year" to buffer
*/
static char *
-str_time(t)
- time_t t;
+str_time(time_t t)
{
static char buf[128];
@@ -806,9 +793,7 @@ str_time(t)
}
static void
-str_lifetime_byte(x, str)
- struct sadb_lifetime *x;
- char *str;
+str_lifetime_byte(struct sadb_lifetime *x, char *str)
{
double y;
char *unit;
Index: src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l
diff -u src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.8 src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.9
--- src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l:1.8 Wed Jan 4 15:55:35 2012
+++ src/crypto/dist/ipsec-tools/src/libipsec/policy_token.l Mon May 28 19:22:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: policy_token.l,v 1.8 2012/01/04 15:55:35 drochner Exp $ */
+/* $NetBSD: policy_token.l,v 1.9 2018/05/28 19:22:40 maxv Exp $ */
/* Id: policy_token.l,v 1.12 2005/05/05 12:32:18 manubsd Exp */
@@ -173,8 +173,7 @@ void __policy__strbuffer__free__ __P((vo
static YY_BUFFER_STATE strbuffer;
void
-__policy__strbuffer__init__(msg)
- char *msg;
+__policy__strbuffer__init__(char *msg)
{
if (YY_CURRENT_BUFFER)
yy_delete_buffer(YY_CURRENT_BUFFER);
@@ -185,7 +184,7 @@ __policy__strbuffer__init__(msg)
}
void
-__policy__strbuffer__free__()
+__policy__strbuffer__free__(void)
{
yy_delete_buffer(strbuffer);
