Re: git: 2582ae574018 - main - ipfilter: Adjust userland returns to conform to style(9)
Date: Tue, 04 Jan 2022 03:03:42 UTC
In message <15C99D06-58BE-4836-BAB3-6EE247276D8D@freebsd.org>, Jessica Clarke w rites: > On 4 Jan 2022, at 02:07, Cy Schubert <cy@FreeBSD.org> wrote: > > > > The branch main has been updated by cy: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=2582ae5740181e0d2bab10003d66ae > 91c9b56329 > > > > commit 2582ae5740181e0d2bab10003d66ae91c9b56329 > > Author: Cy Schubert <cy@FreeBSD.org> > > AuthorDate: 2021-12-22 02:37:19 +0000 > > Commit: Cy Schubert <cy@FreeBSD.org> > > CommitDate: 2022-01-04 02:06:43 +0000 > > > > ipfilter: Adjust userland returns to conform to style(9) > > > > Adjust ipfilter's userland return statements to conform to style(9). > > > > 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(-) > > > > diff --git a/sbin/ipf/common/genmask.c b/sbin/ipf/common/genmask.c > > index 75193e3ea398..581573463c4c 100644 > > --- a/sbin/ipf/common/genmask.c > > +++ b/sbin/ipf/common/genmask.c > > @@ -26,15 +26,15 @@ int genmask(family, msk, mskp) > > #ifdef USE_INET6 > > case AF_INET6 : > > if (inet_pton(AF_INET6, msk, &mskp->in4) != 1) > > - return -1; > > + return(-1); > > As with the kernel commit; needs a space. All these have been fixed and will be pushed soon. > > > [...] > > diff --git a/sbin/ipf/ipf/ipf.4 b/sbin/ipf/ipf/ipf.4 > > index 73a17a0cc8d3..559e48a3c6a5 100644 > > --- a/sbin/ipf/ipf/ipf.4 > > +++ b/sbin/ipf/ipf/ipf.4 > > @@ -91,7 +91,7 @@ typedef struct frentry { > > u_short fr_skip; /* # of rules to skip */ > > u_short fr_loglevel; /* syslog log facility + priority */ > > int (*fr_func)(int, ip_t *, fr_info_t *)); > > - char fr_icode; /* return ICMP code */ > > +( char fr_icode; /* return ICMP code */); > > Something’s gone horribly wrong throughout this file. Thanks. This was a mechanical conversion that shouldn't have touched this file. It's been fixed. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.