From nobody Tue Jan 04 02:33:09 2022 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 E6E321929AFE for ; Tue, 4 Jan 2022 02:33:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSc9R5k5zz3Mqj for ; Tue, 4 Jan 2022 02:33:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f41.google.com with SMTP id s1so73141761wra.6 for ; Mon, 03 Jan 2022 18:33:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=SBgMiL5WOqj38lDc83Q4n0jz3D7zG6Duw287gua4G/w=; b=c5VN3z+U11H3BWnD7uRR+AUb96fY6k04Vw0cxelYnMk8V612DwzOhI0aTYrjurcvwc 6t6BDDzm1zXgIfRpT8p+NZxsEIWpain6kTjdXZ9vM57Hxq24sTL9lcL3PFJxtCNpJknE 5PJ2djf2KEpoUlZJeJquyw5IpCJHHx7Lgwvg1N2QGNEzSZtI0i6rQteRDfKqt6jqG6Cd WV5bwJAvbNaTdOiUN5M3O25WvHYQMFfByVCfcukAbbVYApW6Rqu/gai6JikfsccNsM1r 6vj3LVxpyfLDipGRmr31fsXQpqHAxkObuFvzJLRuQM23qmWHkn68dwhnNUEw1wAQMzDX 0IMA== X-Gm-Message-State: AOAM5328KVjM9f22/L3NeiQ2LsBRFLJ/t4eoij62bQSM2bM4Pv5GIR2J MVT6m3XefeghUD5RHNcSUc7E658+64j+BQ== X-Google-Smtp-Source: ABdhPJy+E4NgvfEZqYvk7H0CMcPdYQNpOxRi9Xdl94nB9Z/UdbjdqbL+qj9j1UUgV5M1f8an0seK9w== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr42310140wrx.253.1641263589612; Mon, 03 Jan 2022 18:33:09 -0800 (PST) Received: from smtpclient.apple (global-5-141.nat-2.net.cam.ac.uk. [131.111.5.141]) by smtp.gmail.com with ESMTPSA id u14sm35795552wrf.39.2022.01.03.18.33.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Jan 2022 18:33:09 -0800 (PST) Content-Type: text/plain; charset=utf-8 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 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: git: 2582ae574018 - main - ipfilter: Adjust userland returns to conform to style(9) From: Jessica Clarke In-Reply-To: <202201040207.20427dG2042684@gitrepo.freebsd.org> Date: Tue, 4 Jan 2022 02:33:09 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8EC1D5AC-109D-4C9E-9188-7CC0EDCF3428@freebsd.org> References: <202201040207.20427dG2042684@gitrepo.freebsd.org> To: Cy Schubert X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Rspamd-Queue-Id: 4JSc9R5k5zz3Mqj X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On 4 Jan 2022, at 02:07, Cy Schubert wrote: >=20 > The branch main has been updated by cy: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2582ae5740181e0d2bab10003d66ae91= c9b56329 >=20 > commit 2582ae5740181e0d2bab10003d66ae91c9b56329 > Author: Cy Schubert > AuthorDate: 2021-12-22 02:37:19 +0000 > Commit: Cy Schubert > CommitDate: 2022-01-04 02:06:43 +0000 >=20 > ipfilter: Adjust userland returns to conform to style(9) >=20 > Adjust ipfilter's userland return statements to conform to = style(9). >=20 > MFC after: 1 month > --- > sbin/ipf/common/genmask.c | 14 +++--- > sbin/ipf/common/ipf_y.y | 62 ++++++++++++------------- > sbin/ipf/common/lexer.c | 34 +++++++------- > sbin/ipf/ipf/bpf_filter.c | 76 +++++++++++++++--------------- > sbin/ipf/ipf/ipf.4 | 8 ++-- > sbin/ipf/ipf/ipf.5 | 10 ++-- > sbin/ipf/ipf/ipf.c | 18 ++++---- > sbin/ipf/ipf/ipfcomp.c | 95 = ++++++++++++++++++++++---------------- > sbin/ipf/ipf/ipl.4 | 2 +- > sbin/ipf/ipfs/ipfs.c | 80 = ++++++++++++++++---------------- > sbin/ipf/ipfstat/ipfstat.c | 84 = ++++++++++++++++----------------- > sbin/ipf/ipftest/ip_fil.c | 88 = +++++++++++++++++------------------ > sbin/ipf/ipftest/ipftest.1 | 2 +- > sbin/ipf/ipftest/ipftest.c | 42 ++++++++--------- > sbin/ipf/iplang/iplang_l.l | 28 +++++------ > sbin/ipf/iplang/iplang_y.y | 18 ++++---- > sbin/ipf/ipmon/ipmon.c | 52 ++++++++++----------- > sbin/ipf/ipmon/ipmon_y.y | 36 +++++++-------- > sbin/ipf/ipnat/ipnat.5 | 4 +- > sbin/ipf/ipnat/ipnat.c | 6 +-- > sbin/ipf/ipnat/ipnat_y.y | 32 ++++++------- > sbin/ipf/ippool/ippool.c | 62 ++++++++++++------------- > sbin/ipf/ippool/ippool_y.y | 28 +++++------ > sbin/ipf/ipscan/ipscan_y.y | 14 +++--- > sbin/ipf/ipsend/44arp.c | 14 +++--- > sbin/ipf/ipsend/arp.c | 18 ++++---- > sbin/ipf/ipsend/dlcommon.c | 24 +++++----- > sbin/ipf/ipsend/ip.c | 28 +++++------ > sbin/ipf/ipsend/ipresend.c | 2 +- > sbin/ipf/ipsend/ipsend.c | 10 ++-- > sbin/ipf/ipsend/ipsopt.c | 12 ++--- > sbin/ipf/ipsend/iptest.c | 2 +- > sbin/ipf/ipsend/resend.c | 8 ++-- > sbin/ipf/ipsend/sbpf.c | 14 +++--- > sbin/ipf/ipsend/sdlpi.c | 8 ++-- > sbin/ipf/ipsend/snit.c | 10 ++-- > sbin/ipf/ipsend/sock.c | 38 +++++++-------- > sbin/ipf/ipsend/sockraw.c | 10 ++-- > sbin/ipf/libipf/addipopt.c | 4 +- > sbin/ipf/libipf/alist_new.c | 8 ++-- > sbin/ipf/libipf/allocmbt.c | 4 +- > sbin/ipf/libipf/bcopywrap.c | 2 +- > sbin/ipf/libipf/buildopts.c | 4 +- > sbin/ipf/libipf/checkrev.c | 8 ++-- > sbin/ipf/libipf/connecttcp.c | 10 ++-- > sbin/ipf/libipf/count4bits.c | 6 +-- > sbin/ipf/libipf/count6bits.c | 2 +- > sbin/ipf/libipf/dupmbt.c | 4 +- > sbin/ipf/libipf/facpri.c | 20 ++++---- > sbin/ipf/libipf/familyname.c | 6 +-- > sbin/ipf/libipf/findword.c | 4 +- > sbin/ipf/libipf/ftov.c | 8 ++-- > sbin/ipf/libipf/gethost.c | 10 ++-- > sbin/ipf/libipf/geticmptype.c | 8 ++-- > sbin/ipf/libipf/getifname.c | 20 ++++---- > sbin/ipf/libipf/getnattype.c | 4 +- > sbin/ipf/libipf/getport.c | 24 +++++----- > sbin/ipf/libipf/getportproto.c | 10 ++-- > sbin/ipf/libipf/getproto.c | 8 ++-- > sbin/ipf/libipf/getsumd.c | 2 +- > sbin/ipf/libipf/hostname.c | 12 ++--- > sbin/ipf/libipf/icmptypename.c | 8 ++-- > sbin/ipf/libipf/inet_addr.c | 22 ++++----- > sbin/ipf/libipf/interror.c | 12 ++--- > sbin/ipf/libipf/ipf_perror.c | 2 +- > sbin/ipf/libipf/ipft_hx.c | 14 +++--- > sbin/ipf/libipf/ipft_pc.c | 36 +++++++-------- > sbin/ipf/libipf/ipft_tx.c | 68 +++++++++++++-------------- > sbin/ipf/libipf/ipoptsec.c | 10 ++-- > sbin/ipf/libipf/kmem.c | 20 ++++---- > sbin/ipf/libipf/kmemcpywrap.c | 2 +- > sbin/ipf/libipf/kvatoname.c | 4 +- > sbin/ipf/libipf/load_dstlist.c | 14 +++--- > sbin/ipf/libipf/load_dstlistnode.c | 8 ++-- > sbin/ipf/libipf/load_file.c | 6 +-- > sbin/ipf/libipf/load_hash.c | 14 +++--- > sbin/ipf/libipf/load_hashnode.c | 6 +-- > sbin/ipf/libipf/load_http.c | 8 ++-- > sbin/ipf/libipf/load_pool.c | 12 ++--- > sbin/ipf/libipf/load_poolnode.c | 6 +-- > sbin/ipf/libipf/load_url.c | 2 +- > sbin/ipf/libipf/msgdsize.c | 2 +- > sbin/ipf/libipf/nametokva.c | 4 +- > sbin/ipf/libipf/ntomask.c | 10 ++-- > sbin/ipf/libipf/optname.c | 8 ++-- > sbin/ipf/libipf/optvalue.c | 8 ++-- > sbin/ipf/libipf/parsefields.c | 2 +- > sbin/ipf/libipf/parseipfexpr.c | 4 +- > sbin/ipf/libipf/parsewhoisline.c | 34 +++++++------- > sbin/ipf/libipf/poolio.c | 8 ++-- > sbin/ipf/libipf/portname.c | 6 +-- > sbin/ipf/libipf/prependmbt.c | 2 +- > sbin/ipf/libipf/printdstl_live.c | 8 ++-- > sbin/ipf/libipf/printdstlist.c | 8 ++-- > sbin/ipf/libipf/printdstlistnode.c | 8 ++-- > sbin/ipf/libipf/printhash.c | 8 ++-- > sbin/ipf/libipf/printhash_live.c | 4 +- > sbin/ipf/libipf/printhashnode.c | 4 +- > sbin/ipf/libipf/printpool.c | 6 +-- > sbin/ipf/libipf/printpool_live.c | 4 +- > sbin/ipf/libipf/printpoolnode.c | 2 +- > sbin/ipf/libipf/printstate.c | 4 +- > sbin/ipf/libipf/remove_hash.c | 8 ++-- > sbin/ipf/libipf/remove_hashnode.c | 8 ++-- > sbin/ipf/libipf/remove_pool.c | 8 ++-- > sbin/ipf/libipf/remove_poolnode.c | 8 ++-- > sbin/ipf/libipf/save_execute.c | 6 +-- > sbin/ipf/libipf/save_file.c | 14 +++--- > sbin/ipf/libipf/save_nothing.c | 4 +- > sbin/ipf/libipf/save_syslog.c | 10 ++-- > sbin/ipf/libipf/save_v1trap.c | 54 +++++++++++----------- > sbin/ipf/libipf/save_v2trap.c | 50 ++++++++++---------- > sbin/ipf/libipf/tcp_flags.c | 2 +- > sbin/ipf/libipf/tcpflags.c | 4 +- > sbin/ipf/libipf/v6optvalue.c | 8 ++-- > sbin/ipf/libipf/var.c | 22 ++++----- > sbin/ipf/libipf/vtof.c | 8 ++-- > 117 files changed, 965 insertions(+), 948 deletions(-) >=20 > [...] > diff --git a/sbin/ipf/ipf/ipfcomp.c b/sbin/ipf/ipf/ipfcomp.c > index 105ff2b852e8..19a61c8bb0e0 100644 > --- a/sbin/ipf/ipf/ipfcomp.c > +++ b/sbin/ipf/ipf/ipfcomp.c > @@ -62,8 +62,8 @@ static FILE *cfile =3D NULL; > * This is called once per filter rule being loaded to emit data = structures > * required. > */ > -void > -printc(frentry_t *fr) > +void printc(fr) > + frentry_t *fr; > { > u_long *ulp; > char *and; > @@ -162,8 +162,9 @@ printc(frentry_t *fr) > static frgroup_t *groups =3D NULL; >=20 >=20 > -static void > -addrule(FILE *fp, frentry_t *fr) > +static void addrule(fp, fr) > + FILE *fp; > + frentry_t *fr; > { Oh and you=E2=80=99ve managed to de-ANSIfy things... Jess