Module Name: src
Committed By: maxv
Date: Mon May 28 19:52:19 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/setkey: parse.y setkey.c token.l
Log Message:
fix -Wold-style-definition
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/crypto/dist/ipsec-tools/src/setkey/parse.y
cvs rdiff -u -r1.16 -r1.17 src/crypto/dist/ipsec-tools/src/setkey/setkey.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/dist/ipsec-tools/src/setkey/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/setkey/parse.y
diff -u src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.19 src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.20
--- src/crypto/dist/ipsec-tools/src/setkey/parse.y:1.19 Wed Jul 5 01:22:40 2017
+++ src/crypto/dist/ipsec-tools/src/setkey/parse.y Mon May 28 19:52:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.y,v 1.19 2017/07/05 01:22:40 ozaki-r Exp $ */
+/* $NetBSD: parse.y,v 1.20 2018/05/28 19:52:18 maxv Exp $ */
/* $KAME: parse.y,v 1.81 2003/07/01 04:01:48 itojun Exp $ */
@@ -939,11 +939,8 @@ exit_command
%%
int
-setkeymsg0(msg, type, satype, l)
- struct sadb_msg *msg;
- unsigned int type;
- unsigned int satype;
- size_t l;
+setkeymsg0(struct sadb_msg *msg, unsigned int type, unsigned int satype,
+ size_t l)
{
msg->sadb_msg_version = PF_KEY_V2;
@@ -959,14 +956,8 @@ setkeymsg0(msg, type, satype, l)
/* XXX NO BUFFER OVERRUN CHECK! BAD BAD! */
static int
-setkeymsg_spdaddr(type, upper, policy, srcs, splen, dsts, dplen)
- unsigned int type;
- unsigned int upper;
- vchar_t *policy;
- struct addrinfo *srcs;
- int splen;
- struct addrinfo *dsts;
- int dplen;
+setkeymsg_spdaddr(unsigned int type, unsigned int upper, vchar_t *policy,
+ struct addrinfo *srcs, int splen, struct addrinfo *dsts, int dplen)
{
struct sadb_msg *msg;
char buf[BUFSIZ];
@@ -1108,10 +1099,7 @@ setkeymsg_spdaddr(type, upper, policy, s
}
static int
-setkeymsg_spdaddr_tag(type, tag, policy)
- unsigned int type;
- char *tag;
- vchar_t *policy;
+setkeymsg_spdaddr_tag(unsigned int type, char *tag, vchar_t *policy)
{
struct sadb_msg *msg;
char buf[BUFSIZ];
@@ -1149,12 +1137,8 @@ setkeymsg_spdaddr_tag(type, tag, policy)
/* XXX NO BUFFER OVERRUN CHECK! BAD BAD! */
static int
-setkeymsg_addr(type, satype, srcs, dsts, no_spi)
- unsigned int type;
- unsigned int satype;
- struct addrinfo *srcs;
- struct addrinfo *dsts;
- int no_spi;
+setkeymsg_addr(unsigned int type, unsigned int satype, struct addrinfo *srcs,
+ struct addrinfo *dsts, int no_spi)
{
struct sadb_msg *msg;
char buf[BUFSIZ];
@@ -1295,11 +1279,8 @@ static u_int16_t get_port (struct addrin
/* XXX NO BUFFER OVERRUN CHECK! BAD BAD! */
static int
-setkeymsg_add(type, satype, srcs, dsts)
- unsigned int type;
- unsigned int satype;
- struct addrinfo *srcs;
- struct addrinfo *dsts;
+setkeymsg_add(unsigned int type, unsigned int satype, struct addrinfo *srcs,
+ struct addrinfo *dsts)
{
struct sadb_msg *msg;
char buf[BUFSIZ];
@@ -1577,9 +1558,7 @@ setkeymsg_add(type, satype, srcs, dsts)
}
static struct addrinfo *
-parse_addr(host, port)
- char *host;
- char *port;
+parse_addr(char *host, char *port)
{
struct addrinfo hints, *res = NULL;
int error;
@@ -1598,9 +1577,7 @@ parse_addr(host, port)
}
static int
-fix_portstr(ulproto, spec, sport, dport)
- int ulproto;
- vchar_t *spec, *sport, *dport;
+fix_portstr(int ulproto, vchar_t *spec, vchar_t *sport, vchar_t *dport)
{
char sp[16], dp[16];
int a, b, c, d;
@@ -1657,13 +1634,8 @@ fix_portstr(ulproto, spec, sport, dport)
}
static int
-setvarbuf(buf, off, ebuf, elen, vbuf, vlen)
- char *buf;
- int *off;
- struct sadb_ext *ebuf;
- int elen;
- const void *vbuf;
- int vlen;
+setvarbuf(char *buf, int *off, struct sadb_ext *ebuf, int elen,
+ const void *vbuf, int vlen)
{
memset(buf + *off, 0, PFKEY_UNUNIT64(ebuf->sadb_ext_len));
memcpy(buf + *off, (caddr_t)ebuf, elen);
@@ -1674,7 +1646,7 @@ setvarbuf(buf, off, ebuf, elen, vbuf, vl
}
void
-parse_init()
+parse_init(void)
{
p_spi = 0;
@@ -1705,7 +1677,7 @@ parse_init()
}
void
-free_buffer()
+free_buffer(void)
{
/* we got tons of memory leaks in the parser anyways, leave them */
Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.c
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.16 src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.17
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.c:1.16 Fri Jun 14 16:29:14 2013
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.c Mon May 28 19:52:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: setkey.c,v 1.16 2013/06/14 16:29:14 christos Exp $ */
+/* $NetBSD: setkey.c,v 1.17 2018/05/28 19:52:18 maxv Exp $ */
/* $KAME: setkey.c,v 1.36 2003/09/24 23:52:51 itojun Exp $ */
@@ -140,9 +140,7 @@ usage(int only_version)
}
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
FILE *fp = stdin;
int c;
@@ -286,7 +284,7 @@ main(argc, argv)
}
int
-get_supported()
+get_supported(void)
{
if (pfkey_send_register(so, SADB_SATYPE_UNSPEC) < 0)
@@ -299,7 +297,7 @@ get_supported()
}
void
-stdin_loop()
+stdin_loop(void)
{
char line[1024], *semicolon, *comment;
size_t linelen = 0;
@@ -361,8 +359,7 @@ stdin_loop()
}
void
-sendkeyshort(type)
- u_int type;
+sendkeyshort(u_int type)
{
struct sadb_msg msg;
@@ -381,7 +378,7 @@ sendkeyshort(type)
}
void
-promisc()
+promisc(void)
{
struct sadb_msg msg;
u_char rbuf[1024 * 32]; /* XXX: Enough ? Should I do MSG_PEEK ? */
@@ -452,11 +449,8 @@ promisc()
* On any error, set *num_spi to 0 and return NULL.
*/
u_int32_t *
-sendkeymsg_spigrep(satype, srcs, dsts, num_spi)
- unsigned int satype;
- struct addrinfo *srcs;
- struct addrinfo *dsts;
- int *num_spi;
+sendkeymsg_spigrep(unsigned int satype, struct addrinfo *srcs,
+ struct addrinfo *dsts, int *num_spi)
{
struct sadb_msg msg, *m;
char *buf;
@@ -608,9 +602,7 @@ sendkeymsg_spigrep(satype, srcs, dsts, n
}
int
-sendkeymsg(buf, len)
- char *buf;
- size_t len;
+sendkeymsg(char *buf, size_t len)
{
u_char rbuf[1024 * 32]; /* XXX: Enough ? Should I do MSG_PEEK ? */
ssize_t l;
@@ -686,9 +678,7 @@ end:
}
int
-postproc(msg, len)
- struct sadb_msg *msg;
- int len;
+postproc(struct sadb_msg *msg, int len)
{
#ifdef HAVE_PFKEY_POLICY_PRIORITY
static int priority_support_check = 0;
@@ -787,8 +777,7 @@ postproc(msg, len)
#ifdef HAVE_PFKEY_POLICY_PRIORITY
int
-verifypriority(m)
- struct sadb_msg *m;
+verifypriority(struct sadb_msg *m)
{
caddr_t mhp[SADB_EXT_MAX + 1];
struct sadb_x_policy *xpl;
@@ -819,8 +808,7 @@ verifypriority(m)
#endif
int
-fileproc(filename)
- const char *filename;
+fileproc(const char *filename)
{
int fd;
ssize_t len, l;
@@ -895,8 +883,7 @@ static const char *ipproto[] = {
(((x) < sizeof(tab)/sizeof(tab[0]) && tab[(x)]) ? tab[(x)] : numstr(x))
const char *
-numstr(x)
- int x;
+numstr(int x)
{
static char buf[20];
snprintf(buf, sizeof(buf), "#%d", x);
@@ -904,15 +891,14 @@ numstr(x)
}
void
-shortdump_hdr()
+shortdump_hdr(void)
{
printf("%-4s %-3s %-1s %-8s %-7s %s -> %s\n",
"time", "p", "s", "spi", "ltime", "src", "dst");
}
void
-shortdump(msg)
- struct sadb_msg *msg;
+shortdump(struct sadb_msg *msg)
{
caddr_t mhp[SADB_EXT_MAX + 1];
char buf[NI_MAXHOST], pbuf[NI_MAXSERV];
@@ -998,7 +984,7 @@ shortdump(msg)
* Print the timestamp
*/
static void
-printdate()
+printdate(void)
{
struct timeval tp;
int s;
Index: src/crypto/dist/ipsec-tools/src/setkey/token.l
diff -u src/crypto/dist/ipsec-tools/src/setkey/token.l:1.20 src/crypto/dist/ipsec-tools/src/setkey/token.l:1.21
--- src/crypto/dist/ipsec-tools/src/setkey/token.l:1.20 Wed Jul 5 01:22:40 2017
+++ src/crypto/dist/ipsec-tools/src/setkey/token.l Mon May 28 19:52:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: token.l,v 1.20 2017/07/05 01:22:40 ozaki-r Exp $ */
+/* $NetBSD: token.l,v 1.21 2018/05/28 19:52:18 maxv Exp $ */
/* $KAME: token.l,v 1.44 2003/10/21 07:20:58 itojun Exp $ */
@@ -326,23 +326,20 @@ any { return(ANY); }
%%
void
-yyfatal(s)
- const char *s;
+yyfatal(const char *s)
{
yyerror(s);
exit(1);
}
void
-yyerror(s)
- const char *s;
+yyerror(const char *s)
{
printf("line %d: %s at [%s]\n", lineno, s, yytext);
}
int
-parse(fp)
- FILE **fp;
+parse(FILE **fp)
{
yyin = *fp;
