From nobody Tue Apr 18 18:39:09 2023 X-Original-To: dev-commits-src-all@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 4Q1CPY6DLJz45Vfr; Tue, 18 Apr 2023 18:39:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1CPY44Yrz4JNC; Tue, 18 Apr 2023 18:39:13 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id ojqTpBMa6uZMSoqERpfvhO; Tue, 18 Apr 2023 18:39:11 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id oqEQpIrbCyAOeoqERpohzC; Tue, 18 Apr 2023 18:39:11 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=643ee3cf a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=dKHAf1wccvYA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=kMQAOnq65MIs5Sg7qTkA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id B0E3B949; Tue, 18 Apr 2023 11:39:09 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 8522B309; Tue, 18 Apr 2023 11:39:09 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2ac057dd33e8 - main - ipf: Use C89 function definitions. In-reply-to: <202304181831.33IIVUT0027481@gitrepo.freebsd.org> References: <202304181831.33IIVUT0027481@gitrepo.freebsd.org> Comments: In-reply-to John Baldwin message dated "Tue, 18 Apr 2023 18:31:30 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 18 Apr 2023 11:39:09 -0700 Message-Id: <20230418183909.8522B309@slippy.cwsent.com> X-CMAE-Envelope: MS4xfHtUdEI36gaNsx34SD+Z0iCXrIajzwtk0sbFHmFar7s34+n75x7uVXeFv5SCI25tMoWh7BowJ72seB+skcMLqqTrcK5+Xur1MLN2tXOmnneC8/JdfSnJ PKHJpNIjFJQkETAStv6SfGYXV4PUZkIrfVQ07Tex8pDURHDYvFCdnkO5YnJVT2pbaM1Fmu607akJEq84sHCoUSLSBDL3mGjvgRsfu9VnnAOKQcMUK4t17Dzh vo0L2+KuvNifPtUd5j/5Bsl/KPI1fHastMcoQviC9SNcXclIQpcnxzEsIe4n6x4LQESOzfgetIf0/rjWNsKcldbOpLsi6K6aNMhOnGIAxGk= X-Rspamd-Queue-Id: 4Q1CPY44Yrz4JNC X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202304181831.33IIVUT0027481@gitrepo.freebsd.org>, John Baldwin writ es: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ac057dd33e85e3e4ca1095f80bdc009 > 74a1132c > > commit 2ac057dd33e85e3e4ca1095f80bdc00974a1132c > Author: John Baldwin > AuthorDate: 2023-04-18 18:22:28 +0000 > Commit: John Baldwin > CommitDate: 2023-04-18 18:22:28 +0000 > > ipf: Use C89 function definitions. > > Reviewed by: zlei > Differential Revision: https://reviews.freebsd.org/D39523 > --- > sbin/ipf/common/genmask.c | 6 ++---- > sbin/ipf/common/lexer.c | 3 +-- > sbin/ipf/ipf/bpf_filter.c | 18 ++++-------------- > sbin/ipf/ipfstat/ipfstat.c | 3 +-- > sbin/ipf/ipmon/ipmon.c | 5 +---- > sbin/ipf/libipf/mutex_emul.c | 5 +---- > sbin/ipf/libipf/poolio.c | 5 +---- > sbin/ipf/libipf/var.c | 3 +-- > 8 files changed, 12 insertions(+), 36 deletions(-) > > diff --git a/sbin/ipf/common/genmask.c b/sbin/ipf/common/genmask.c > index 5b715cf4c901..a3b912b67ef3 100644 > --- a/sbin/ipf/common/genmask.c > +++ b/sbin/ipf/common/genmask.c > @@ -9,10 +9,8 @@ > #include "ipf.h" > > > -int genmask(family, msk, mskp) > - int family; > - char *msk; > - i6addr_t *mskp; > +int > +genmask(int family, char *msk, i6addr_t *mskp) > { > char *endptr = 0L; > u_32_t addr; > diff --git a/sbin/ipf/common/lexer.c b/sbin/ipf/common/lexer.c > index 16fbb2272034..12ec3c825dd4 100644 > --- a/sbin/ipf/common/lexer.c > +++ b/sbin/ipf/common/lexer.c > @@ -603,8 +603,7 @@ done: > } > > > -static wordtab_t *yyfindkey(key) > - char *key; > +static wordtab_t *yyfindkey(char *key) > { > wordtab_t *w; > > diff --git a/sbin/ipf/ipf/bpf_filter.c b/sbin/ipf/ipf/bpf_filter.c > index fbb0138f51d8..64d416feaf36 100644 > --- a/sbin/ipf/ipf/bpf_filter.c > +++ b/sbin/ipf/ipf/bpf_filter.c > @@ -117,9 +117,7 @@ static int m_xhalf(mb_t *, int, int *); > } > > static int > -m_xword(m, k, err) > - register mb_t *m; > - register int k, *err; > +m_xword(mb_t *m, int k, int *err) > { > register int len; > register u_char *cp, *np; > @@ -153,9 +151,7 @@ m_xword(m, k, err) > } > > static int > -m_xhalf(m, k, err) > - register mb_t *m; > - register int k, *err; > +m_xhalf(mb_t *m, int k, int *err) > { > register int len; > register u_char *cp; > @@ -185,11 +181,7 @@ m_xhalf(m, k, err) > * in all other cases, p is a pointer to a buffer and buflen is its size. > */ > u_int > -bpf_filter(pc, p, wirelen, buflen) > - register struct bpf_insn *pc; > - register u_char *p; > - u_int wirelen; > - register u_int buflen; > +bpf_filter(struct bpf_insn *pc, u_char *p, u_int wirelen, u_int buflen) > { > register u_int32 A, X; > register int k; > @@ -478,9 +470,7 @@ bpf_filter(pc, p, wirelen, buflen) > * Otherwise, a bogus program could easily crash the system. > */ > int > -bpf_validate(f, len) > - struct bpf_insn *f; > - int len; > +bpf_validate(struct bpf_insn *f, int len) > { > u_int i, from; > const struct bpf_insn *p; > diff --git a/sbin/ipf/ipfstat/ipfstat.c b/sbin/ipf/ipfstat/ipfstat.c > index 11b3043f919c..55c876724d4a 100644 > --- a/sbin/ipf/ipfstat/ipfstat.c > +++ b/sbin/ipf/ipfstat/ipfstat.c > @@ -162,8 +162,7 @@ static int sort_dstpt(const void *, const void *); > #endif > > > -static void usage(name) > - char *name; > +static void usage(char *name) > { > #ifdef USE_INET6 > fprintf(stderr, "Usage: %s [-46aAdfghIilnoRsv]\n", name); > diff --git a/sbin/ipf/ipmon/ipmon.c b/sbin/ipf/ipmon/ipmon.c > index f71a33b1034e..4f07dda27e62 100644 > --- a/sbin/ipf/ipmon/ipmon.c > +++ b/sbin/ipf/ipmon/ipmon.c > @@ -470,10 +470,7 @@ read_log(int fd, int *lenp, char *buf, int bufsize) > > > char * > -portlocalname(res, proto, port) > - int res; > - char *proto; > - u_int port; > +portlocalname(int res, char *proto, u_int port) > { > static char pname[8]; > char *s; > diff --git a/sbin/ipf/libipf/mutex_emul.c b/sbin/ipf/libipf/mutex_emul.c > index 3152d2e47013..a7e1c1389901 100644 > --- a/sbin/ipf/libipf/mutex_emul.c > +++ b/sbin/ipf/libipf/mutex_emul.c > @@ -85,10 +85,7 @@ eMmutex_init(eMmutex_t *mtx, char *who, char *file, int li > ne) > > > void > -eMmutex_destroy(mtx, file, line) > - eMmutex_t *mtx; > - char *file; > - int line; > +eMmutex_destroy(eMmutex_t *mtx, char *file, int line) > { > if (mutex_debug & 1) > fprintf(mutex_file, > diff --git a/sbin/ipf/libipf/poolio.c b/sbin/ipf/libipf/poolio.c > index 765d37fae350..f12120fd5467 100644 > --- a/sbin/ipf/libipf/poolio.c > +++ b/sbin/ipf/libipf/poolio.c > @@ -28,10 +28,7 @@ pool_open(void) > } > > int > -pool_ioctl(iocfunc, cmd, ptr) > - ioctlfunc_t iocfunc; > - ioctlcmd_t cmd; > - void *ptr; > +pool_ioctl(ioctlfunc_t iocfunc, ioctlcmd_t cmd, void *ptr) > { > return (*iocfunc)(poolfd, cmd, ptr); > } > diff --git a/sbin/ipf/libipf/var.c b/sbin/ipf/libipf/var.c > index d3a03b6e46d7..47eb5d1595df 100644 > --- a/sbin/ipf/libipf/var.c > +++ b/sbin/ipf/libipf/var.c > @@ -24,8 +24,7 @@ static variable_t *find_var(char *); > static char *expand_string(char *, int); > > > -static variable_t *find_var(name) > - char *name; > +static variable_t *find_var(char *name) > { > variable_t *v; > > Thanks. Looks like I missed some. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0