Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Mar 2023 22:09:29 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Jessica Clarke <jrtc27@freebsd.org>, Elyes Haouas <ehaouas@noos.fr>
Cc:        Warner Losh <imp@freebsd.org>,  "src-committers@freebsd.org" <src-committers@freebsd.org>,  "dev-commits-src-all@freebsd.org" <dev-commits-src-all@freebsd.org>,  "dev-commits-src-main@freebsd.org" <dev-commits-src-main@freebsd.org>
Subject:   Re: git: 44357c18ccb9 - main - ppp: Remove trailing semicolon
Message-ID:  <CANCZdfoHsZrPJP-NmgPw1rtBc4M1FwPiBKhrLC-xiEW87=M39Q@mail.gmail.com>
In-Reply-To: <27233978-E3A2-46BD-A2A9-BA1854833129@freebsd.org>
References:  <202303150239.32F2dj2H060188@gitrepo.freebsd.org> <27233978-E3A2-46BD-A2A9-BA1854833129@freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

[-- Attachment #1 --]
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)
>
>

[-- Attachment #2 --]
<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Mar 14, 2023 at 9:45 PM Jessica Clarke &lt;<a href="mailto:jrtc27@freebsd.org">jrtc27@freebsd.org</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 15 Mar 2023, at 02:39, Warner Losh &lt;imp@FreeBSD.org&gt; wrote:<br>
&gt; <br>
&gt; The branch main has been updated by imp:<br>
&gt; <br>
&gt; URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=44357c18ccb9df24a925d43ccc467f65b9ed6bc6" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=44357c18ccb9df24a925d43ccc467f65b9ed6bc6</a><br>;
&gt; <br>
&gt; commit 44357c18ccb9df24a925d43ccc467f65b9ed6bc6<br>
&gt; Author:     Elyes Haouas &lt;<a href="mailto:ehaouas@noos.fr" target="_blank">ehaouas@noos.fr</a>&gt;<br>
&gt; AuthorDate: 2023-03-15 02:09:16 +0000<br>
&gt; Commit:     Warner Losh &lt;imp@FreeBSD.org&gt;<br>
&gt; CommitDate: 2023-03-15 02:39:34 +0000<br>
&gt; <br>
&gt;    ppp: Remove trailing semicolon<br>
&gt; <br>
&gt;    Signed-off-by: Elyes Haouas &lt;<a href="mailto:ehaouas@noos.fr" target="_blank">ehaouas@noos.fr</a>&gt;<br>
&gt;    Reviewed by: imp<br>
&gt;    Pull Request: <a href="https://github.com/freebsd/freebsd-src/pull/654" rel="noreferrer" target="_blank">https://github.com/freebsd/freebsd-src/pull/654</a><br>;
&gt; ---<br>
&gt; usr.sbin/ppp/ncp.h | 4 ++--<br>
&gt; 1 file changed, 2 insertions(+), 2 deletions(-)<br>
&gt; <br>
&gt; diff --git a/usr.sbin/ppp/ncp.h b/usr.sbin/ppp/ncp.h<br>
&gt; index 70b00a422310..806c943a891e 100644<br>
&gt; --- a/usr.sbin/ppp/ncp.h<br>
&gt; +++ b/usr.sbin/ppp/ncp.h<br>
&gt; @@ -96,8 +96,8 @@ extern void ncp2initial(struct ncp *);<br>
&gt;           ncp_ClearUrgentPorts(&amp;(ncp)-&gt;cfg.urgent.tcp)<br>
&gt; #define ncp_ClearUrgentUdpPorts(ncp) \<br>
&gt;           ncp_ClearUrgentPorts(&amp;(ncp)-&gt;cfg.urgent.udp)<br>
&gt; -#define ncp_ClearUrgentTOS(ncp) (ncp)-&gt;cfg.urgent.tos = 0;<br>
&gt; -#define ncp_SetUrgentTOS(ncp) (ncp)-&gt;cfg.urgent.tos = 1;<br>
&gt; +#define ncp_ClearUrgentTOS(ncp) (ncp)-&gt;cfg.urgent.tos = 0<br>
&gt; +#define ncp_SetUrgentTOS(ncp) (ncp)-&gt;cfg.urgent.tos = 1<br>
<br>
do { ... } while (0)?<br></blockquote><div><br></div><div>That would likely be better...  I&#39;ll leave that to the original submitter (cc&#39;d) to do as a refinement and submit a followup...</div><div>I&#39;m not sure how to code automatic detection of this into my script that checks for style(9) compliance</div><div>and I should have tweaked to this when I Was reviewing it...</div><div><br></div><div>Thanks</div><div><br></div><div>Warner<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Jess<br>
<br>
&gt; <br>
&gt; #ifndef NOINET6<br>
&gt; #define isncp(proto) ((proto) == PROTO_IPCP || (proto) == PROTO_IPV6CP)<br>
<br>
</blockquote></div></div>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfoHsZrPJP-NmgPw1rtBc4M1FwPiBKhrLC-xiEW87=M39Q>