From nobody Mon Jun 05 08:35:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZRlK5l88z4bLyM; Mon, 5 Jun 2023 08:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZRlK3SLhz3wlK; Mon, 5 Jun 2023 08:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voGp3eFqDNHdjMF6REm/acFfNQGHkgwI85PJsKZn01U=; b=GC7jk3gSECclLk8rfFgN4QDaYY63/irnvnMBLoWDzkWWGC1dnSE/wP15kO/UWTGyNuJkQn mAUgzEOaqzXMDn9Mfy1T5Dq3eCzP01v3GbAzEIpoTtKvdERpS3gwEel8E/C9MiMFvze3mc TQJq9AqD3xKXPonJTZJ4nRaRbR7EplDPI+QAbdYw7Wl+U1bVvfx94CgKQ88AopQ2hB1/IX Q9iDzmdo5fHKisJS/Jv54EKoVPUpoMsvWRZpjnzBo1UFiPfbtTRclIYwlM0bU9gGAaG/7m Oa1D253SYmE6BTzWZayaHHQwIp8uXlU1/K8fp7FWhPGgZ4GrvUFypEbyWdwGtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685954157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=voGp3eFqDNHdjMF6REm/acFfNQGHkgwI85PJsKZn01U=; b=S237YuaC8a8eVzsoxwWTwQsqyyxa1/18uVHCjeodhlhrLciECaebGJgWuwE0fh7YXk388z wkZiIJ+5kaHERquCYMS0O/HAWMGc0X407mSb/a4fcrunhiaSvH0oFclsNDYf77Nns2t5Qa YqCjYwGmBgA1VapYsb2/taariPhir8a2MNXbKw8n4KmH2d3DjptgqVqRm2Vw2tPKajjNMU ypbjGtCnk8Sk3KsPPtsHkOB/UjrYTgKtMLrJKQhU2N4Ycf3O6uOD5RFP9bp5s4xlQ1baNj Ne6GyykDm/OpOsFFrf3hSuH6RHgGVGJ/eCuSVyIQTAN3ZddL7aW5O+inksz2Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685954157; a=rsa-sha256; cv=none; b=K44iORFGh17XFPisG6N1FOi3W5XZqdrYS79PHm0zvqbOj3/nYGbQ5PRBFg2TAW3zDkRWWi w3G3SQk7CU/WKtiFWjAIYiiVbQwKVG047olKsHoBvixa7mSAhbOHLurCbKf75t1MQkj/P/ kl9X6/ZC8bhYPuAiVH/UP+XzT2szndZT1wEM5eho9dTlUr+X44KQn0b77CCNL0rCro445T 5wTlofd1lvEJC+Tim0n+f+QdAuaNKmAtSNoheFbyOj1965J9OvHMO3o+sXrSDlPJ5jEUT/ gKuzMqJ9jRCQIDh/MDNM/GQ3R2lI3Xqp8FwIT7jPC+nXlBJyMYDX1nA9zs5B3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZRlK26FyzgVD; Mon, 5 Jun 2023 08:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3558Zv6P024268; Mon, 5 Jun 2023 08:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3558ZvnQ024267; Mon, 5 Jun 2023 08:35:57 GMT (envelope-from git) Date: Mon, 5 Jun 2023 08:35:57 GMT Message-Id: <202306050835.3558ZvnQ024267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0957619bf5f0 - stable/13 - setkey(8): ansify parser List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0957619bf5f0933b572a726200dad96ac9ecb96e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0957619bf5f0933b572a726200dad96ac9ecb96e commit 0957619bf5f0933b572a726200dad96ac9ecb96e Author: Konstantin Belousov AuthorDate: 2023-04-03 02:00:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-05 08:35:00 +0000 setkey(8): ansify parser (cherry picked from commit bef81bc0aef9dd4cd772b292d81bcc0ff7151d9f) --- sbin/setkey/parse.y | 51 +++++++++++++-------------------------------------- sbin/setkey/token.l | 9 +++------ 2 files changed, 16 insertions(+), 44 deletions(-) diff --git a/sbin/setkey/parse.y b/sbin/setkey/parse.y index 0d8605c3409a..3d3ed123d4f0 100644 --- a/sbin/setkey/parse.y +++ b/sbin/setkey/parse.y @@ -773,11 +773,7 @@ policy_requests %% 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 type, unsigned satype, size_t l) { msg->sadb_msg_version = PF_KEY_V2; @@ -793,14 +789,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 type, unsigned upper, vchar_t *policy, + struct addrinfo *srcs, int splen, struct addrinfo *dsts, int dplen) { struct sadb_msg *msg; char buf[BUFSIZ]; @@ -892,12 +882,8 @@ setkeymsg_spdaddr(type, upper, policy, srcs, splen, dsts, dplen) /* 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 type, unsigned satype, struct addrinfo *srcs, + struct addrinfo *dsts, int no_spi) { struct sadb_msg *msg; char buf[BUFSIZ]; @@ -1023,11 +1009,8 @@ setkeymsg_addr(type, satype, srcs, dsts, no_spi) /* 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 type, unsigned satype, struct addrinfo *srcs, + struct addrinfo *dsts) { struct sadb_msg *msg; char buf[BUFSIZ]; @@ -1211,9 +1194,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; @@ -1232,8 +1213,7 @@ parse_addr(host, port) } static int -fix_portstr(spec, sport, dport) - vchar_t *spec, *sport, *dport; +fix_portstr(vchar_t *spec, vchar_t *sport, vchar_t *dport) { char *p, *p2; u_int l; @@ -1273,13 +1253,8 @@ fix_portstr(spec, sport, dport) } static int -setvarbuf(buf, off, ebuf, elen, vbuf, vlen) - char *buf; - int *off; - struct sadb_ext *ebuf; - int elen; - caddr_t vbuf; - int vlen; +setvarbuf(char *buf, int *off, struct sadb_ext *ebuf, int elen, caddr_t vbuf, + int vlen) { memset(buf + *off, 0, PFKEY_UNUNIT64(ebuf->sadb_ext_len)); memcpy(buf + *off, (caddr_t)ebuf, elen); @@ -1290,7 +1265,7 @@ setvarbuf(buf, off, ebuf, elen, vbuf, vlen) } void -parse_init() +parse_init(void) { p_spi = 0; @@ -1309,7 +1284,7 @@ parse_init() } void -free_buffer() +free_buffer(void) { /* we got tons of memory leaks in the parser anyways, leave them */ } diff --git a/sbin/setkey/token.l b/sbin/setkey/token.l index 9a0cc9ea1915..180493d76b05 100644 --- a/sbin/setkey/token.l +++ b/sbin/setkey/token.l @@ -251,23 +251,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;