Re: git: 44357c18ccb9 - main - ppp: Remove trailing semicolon

On Tue, Mar 14, 2023 at 9:45 PM Jessica Clarke <jrtc27@freebsd.org> wrote:

> On 15 Mar 2023, at 02:39, Warner Losh <imp@FreeBSD.org> wrote:
> >
> > The branch main has been updated by imp:
> >
> > URL:
> https://cgit.FreeBSD.org/src/commit/?id=44357c18ccb9df24a925d43ccc467f65b9ed6bc6
> >
> > commit 44357c18ccb9df24a925d43ccc467f65b9ed6bc6
> > Author:     Elyes Haouas <ehaouas@noos.fr>
> > AuthorDate: 2023-03-15 02:09:16 +0000
> > Commit:     Warner Losh <imp@FreeBSD.org>
> > CommitDate: 2023-03-15 02:39:34 +0000
> >
> >    ppp: Remove trailing semicolon
> >
> >    Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
> >    Reviewed by: imp
> >    Pull Request: https://github.com/freebsd/freebsd-src/pull/654
> > ---
> > usr.sbin/ppp/ncp.h | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h
> > index 70b00a422310..806c943a891e 100644
> > --- a/usr.sbin/ppp/ncp.h
> > +++ b/usr.sbin/ppp/ncp.h
> > @@ -96,8 +96,8 @@ extern void ncp2initial(struct ncp *);
> >           ncp_ClearUrgentPorts(&(ncp)->cfg.urgent.tcp)
> > #define ncp_ClearUrgentUdpPorts(ncp) \
> >           ncp_ClearUrgentPorts(&(ncp)->cfg.urgent.udp)
> > -#define ncp_ClearUrgentTOS(ncp) (ncp)->cfg.urgent.tos = 0;
> > -#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos = 1;
> > +#define ncp_ClearUrgentTOS(ncp) (ncp)->cfg.urgent.tos = 0
> > +#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos = 1
>
> do { ... } while (0)?
>

That would likely be better...  I'll leave that to the original submitter
(cc'd) to do as a refinement and submit a followup...
I'm not sure how to code automatic detection of this into my script that
checks for style(9) compliance
and I should have tweaked to this when I Was reviewing it...

Thanks

Warner


> Jess
>
> >
> > #ifndef NOINET6
> > #define isncp(proto) ((proto) == PROTO_IPCP || (proto) == PROTO_IPV6CP)
>
>