From nobody Wed Mar 15 04:09:29 2023 X-Original-To: dev-commits-src-main@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 4Pbxjy1td6z3xxXd for ; Wed, 15 Mar 2023 04:09:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 4Pbxjx6924z3Lxf for ; Wed, 15 Mar 2023 04:09:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x529.google.com with SMTP id x13so23162787edd.1 for ; Tue, 14 Mar 2023 21:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; t=1678853379; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=0UITSQWB1m4lZcD6ozi/zgRG+fyKHfLi258meNTg2iQ=; b=PR8R1iuRmbLvWDUN9vd/dX+FaPOYeRUKSJXSbzNwGTXbvLIJI6hufGyNwzgkUZLEIv wcgxW22rHGp+nPcMUR2mxB/kSNemZqUYqZoGJ9CGbI7QlSVUCDdEMj3kkPMoOu3NRmMC +EwJsrklwQ85wAFatT7XvQ3iZ+wOLzdYLfclDZTlZMdmYcnXNLzr/iY+lfbR3oWnPMZ4 R0RNobEaGflh+S/hRzBzt3tuexAJa/v2v8wRM1mNNL4/GF0f7YegoweK8vM9TSdE1yVh DoTn8SXf2vHpa9RRTjP8Q8I7Us6FIsvZxFK1rfI39xh6+P5RVcpP8iJ3MJgthQJUXTlI 5cIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678853379; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0UITSQWB1m4lZcD6ozi/zgRG+fyKHfLi258meNTg2iQ=; b=h1Ad3TeogvGoqRKgw6cmgwsHpFsYqmIhlkM8Eb/zO222IeaxzCzeHT0gs5WIGEXWQV NZReCIFAoWdPzB+AYJugWJxfEVHiMkjZZqXGRWQeU1kjM/JnRnHQhZyJHUf3Orxl9yZD 2Fb6WeYCI1DhthjIVhGMFScgeG4KVoQ++jMgRhawIYK78Y2Pu43M+szqCefH0Fztl+Cx uzEjhQRrc2qg82tqFaxW4OEVvNyrAmDyWjVh9KV2mUIjAIW3ULjBI8B7dhaHf48zRHeZ nTHH6wg/+8TLKWbtuAlKcgI1mJy1CvQvUTXwWt/fAJNKtF1nc1UAOp0APvPUEOBNiWgW nl/g== X-Gm-Message-State: AO0yUKXsEP+CdpOfAUzPQGKgtMGDrl0EZo9MHPoYcfsb/XM4YV2V1uV/ zcOho5UCM0a+ihD1JQ06ODWqOo8J7baIInup3HBfDQ== X-Google-Smtp-Source: AK7set9tkhVypinb1iciAis19NtvE51b/BLkZQ+K7RW8XR47lW3RnU+O+oYFzxZOeuKn6W2mSbgdErIT5H4rzcTF62M= X-Received: by 2002:a50:d08d:0:b0:4fb:80cf:898b with SMTP id v13-20020a50d08d000000b004fb80cf898bmr639429edd.7.1678853379214; Tue, 14 Mar 2023 21:09:39 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202303150239.32F2dj2H060188@gitrepo.freebsd.org> <27233978-E3A2-46BD-A2A9-BA1854833129@freebsd.org> In-Reply-To: <27233978-E3A2-46BD-A2A9-BA1854833129@freebsd.org> From: Warner Losh Date: Tue, 14 Mar 2023 22:09:29 -0600 Message-ID: Subject: Re: git: 44357c18ccb9 - main - ppp: Remove trailing semicolon To: Jessica Clarke , Elyes Haouas Cc: Warner Losh , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="0000000000004c630c05f6e8833b" X-Rspamd-Queue-Id: 4Pbxjx6924z3Lxf X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000004c630c05f6e8833b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Mar 14, 2023 at 9:45=E2=80=AFPM Jessica Clarke = wrote: > On 15 Mar 2023, at 02:39, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D44357c18ccb9df24a925d43ccc467f6= 5b9ed6bc6 > > > > commit 44357c18ccb9df24a925d43ccc467f65b9ed6bc6 > > Author: Elyes Haouas > > AuthorDate: 2023-03-15 02:09:16 +0000 > > Commit: Warner Losh > > CommitDate: 2023-03-15 02:39:34 +0000 > > > > ppp: Remove trailing semicolon > > > > Signed-off-by: Elyes Haouas > > 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 =3D 0; > > -#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 1; > > +#define ncp_ClearUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 0 > > +#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 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) =3D=3D PROTO_IPCP || (proto) =3D=3D PROTO= _IPV6CP) > > --0000000000004c630c05f6e8833b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Mar 14, 2023 at 9:45=E2=80=AF= 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=3D44357c18ccb9df24a925d43ccc467f65b9ed6bc6<= /a>
>
> commit 44357c18ccb9df24a925d43ccc467f65b9ed6bc6
> Author:=C2=A0 =C2=A0 =C2=A0Elyes Haouas <
ehaouas@noos.fr>
> AuthorDate: 2023-03-15 02:09:16 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-03-15 02:39:34 +0000
>
>=C2=A0 =C2=A0 ppp: Remove trailing semicolon
>
>=C2=A0 =C2=A0 Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
>=C2=A0 =C2=A0 Reviewed by: imp
>=C2=A0 =C2=A0 Pull Request: https://github.com/fr= eebsd/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 *);
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ncp_ClearUrgentPorts(&(ncp= )->cfg.urgent.tcp)
> #define ncp_ClearUrgentUdpPorts(ncp) \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ncp_ClearUrgentPorts(&(ncp= )->cfg.urgent.udp)
> -#define ncp_ClearUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 0;
> -#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 1;
> +#define ncp_ClearUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 0
> +#define ncp_SetUrgentTOS(ncp) (ncp)->cfg.urgent.tos =3D 1

do { ... } while (0)?

That would likely= be better...=C2=A0 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 sty= le(9) compliance
and I should have tweaked to this when I Was rev= iewing it...

Thanks

Warne= r
=C2=A0
Jess

>
> #ifndef NOINET6
> #define isncp(proto) ((proto) =3D=3D PROTO_IPCP || (proto) =3D=3D PROT= O_IPV6CP)

--0000000000004c630c05f6e8833b--