From owner-dev-commits-src-all@freebsd.org Sat May 15 19:58:30 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3128F64E53A; Sat, 15 May 2021 19:58:30 +0000 (UTC) (envelope-from lutz@iks-jena.de) Received: from annwfn.iks-jena.de (annwfn.iks-jena.de [IPv6:2001:4bd8::19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FjGRT6V41z3kh6; Sat, 15 May 2021 19:58:29 +0000 (UTC) (envelope-from lutz@iks-jena.de) X-SMTP-Sender: IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f Received: from belenus.iks-jena.de (belenus.iks-jena.de [IPv6:2001:4bd8:0:666:248:54ff:fe12:ee3f]) by annwfn.iks-jena.de (8.15.2/8.15.2) with ESMTPS id 14FJwC15008462 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 15 May 2021 21:58:12 +0200 X-MSA-Host: belenus.iks-jena.de Received: (from lutz@localhost) by belenus.iks-jena.de (8.14.3/8.14.1/Submit) id 14FJwChK018571; Sat, 15 May 2021 21:58:12 +0200 Date: Sat, 15 May 2021 21:58:12 +0200 From: Lutz Donnerhacke To: Konstantin Belousov Cc: Lutz Donnerhacke , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: effc8e57fbf0 - main - libalias: Style cleanup Message-ID: <20210515195812.GB17734@belenus.iks-jena.de> References: <202105150701.14F717lf084359@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-message-flag: Please send plain text messages only. Thank you. User-Agent: Mutt/1.5.17 (2007-11-01) X-Rspamd-Queue-Id: 4FjGRT6V41z3kh6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 May 2021 19:58:30 -0000 On Sat, May 15, 2021 at 10:41:53PM +0300, Konstantin Belousov wrote: > On Sat, May 15, 2021 at 07:01:07AM +0000, Lutz Donnerhacke wrote: > > @@ -285,21 +283,20 @@ static int UdpAliasOut(struct libalias *, struct ip *, int, int create); > > static int TcpAliasIn(struct libalias *, struct ip *); > > static int TcpAliasOut(struct libalias *, struct ip *, int, int create); > > > > -static int > > -IcmpAliasIn1(struct libalias *la, struct ip *pip) > > -{ > > - > > - LIBALIAS_LOCK_ASSERT(la); > > /* > > De-alias incoming echo and timestamp replies. > > Alias incoming echo and timestamp requests. > > */ > > +static int > > +IcmpAliasIn1(struct libalias *la, struct ip *pip) > > +{ > > + LIBALIAS_LOCK_ASSERT(la); > > struct alias_link *lnk; > > struct icmp *ic; > And this is not in style. Declarations must precede executable statements, > even asserts. Of course it was a style commit. + /* + De-alias incoming echo and timestamp replies. + Alias incoming echo and timestamp requests. + */ static int IcmpAliasIn1(struct libalias *la, struct ip *pip) { - LIBALIAS_LOCK_ASSERT(la); - /* - De-alias incoming echo and timestamp replies. - Alias incoming echo and timestamp requests. - */ struct alias_link *lnk;