From owner-dev-commits-src-all@freebsd.org Thu Jul 8 14:00:59 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3604669F26; Thu, 8 Jul 2021 14:00:59 +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 4GLHy35Dm0z3JY8; Thu, 8 Jul 2021 14:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9BDD122383; Thu, 8 Jul 2021 14:00:59 +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 168E0xnU088313; Thu, 8 Jul 2021 14:00:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 168E0xrO088312; Thu, 8 Jul 2021 14:00:59 GMT (envelope-from git) Date: Thu, 8 Jul 2021 14:00:59 GMT Message-Id: <202107081400.168E0xrO088312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: e0c0612d9ba4 - main - setkey: ansify MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0c0612d9ba4b56e51ebca483f1f82d70d64f0f8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2021 14:01:00 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c0612d9ba4b56e51ebca483f1f82d70d64f0f8 commit e0c0612d9ba4b56e51ebca483f1f82d70d64f0f8 Author: Mateusz Guzik AuthorDate: 2021-07-08 11:28:34 +0000 Commit: Mateusz Guzik CommitDate: 2021-07-08 14:00:55 +0000 setkey: ansify --- sbin/setkey/setkey.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/sbin/setkey/setkey.c b/sbin/setkey/setkey.c index 1d66a92e0100..d011fd44a40a 100644 --- a/sbin/setkey/setkey.c +++ b/sbin/setkey/setkey.c @@ -91,7 +91,7 @@ extern int lineno; extern int parse(FILE **); void -usage() +usage(void) { printf("usage: setkey [-v] -c\n"); @@ -103,9 +103,7 @@ usage() } int -main(ac, av) - int ac; - char **av; +main(int ac, char **av) { FILE *fp = stdin; int c; @@ -202,7 +200,7 @@ main(ac, av) } int -get_supported() +get_supported(void) { if (pfkey_send_register(so, SADB_SATYPE_UNSPEC) < 0) @@ -234,7 +232,7 @@ sendkeyshort(u_int type, uint8_t satype) } void -promisc() +promisc(void) { struct sadb_msg msg; u_char rbuf[1024 * 32]; /* XXX: Enough ? Should I do MSG_PEEK ? */ @@ -300,9 +298,7 @@ promisc() } 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; @@ -374,9 +370,7 @@ end: } int -postproc(msg, len) - struct sadb_msg *msg; - int len; +postproc(struct sadb_msg *msg, int len) { if (msg->sadb_msg_errno != 0) { @@ -482,8 +476,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); @@ -491,15 +484,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]; @@ -585,7 +577,7 @@ shortdump(msg) * Print the timestamp */ static void -printdate() +printdate(void) { struct timeval tp; int s;