From owner-svn-src-all@freebsd.org Fri Jul 29 23:53:23 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22F94BA80AE; Fri, 29 Jul 2016 23:53:23 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail104.syd.optusnet.com.au (mail104.syd.optusnet.com.au [211.29.132.246]) by mx1.freebsd.org (Postfix) with ESMTP id E0C5E1CDD; Fri, 29 Jul 2016 23:53:22 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from c122-106-149-109.carlnfd1.nsw.optusnet.com.au (c122-106-149-109.carlnfd1.nsw.optusnet.com.au [122.106.149.109]) by mail104.syd.optusnet.com.au (Postfix) with ESMTPS id 1882142446C; Sat, 30 Jul 2016 09:25:14 +1000 (AEST) Date: Sat, 30 Jul 2016 09:25:14 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Piotr Stefaniak cc: "Pedro F. Giffuni" , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r303487 - head/usr.bin/indent In-Reply-To: Message-ID: <20160730091349.A1012@besplex.bde.org> References: <201607291628.u6TGSpKT064605@repo.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.1 cv=OtmysHLt c=1 sm=1 tr=0 a=R/f3m204ZbWUO/0rwPSMPw==:117 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=kj9zAlcOel0A:10 a=evFOgcVC4GT5ehYdxvcA:9 a=CjuIK1q_8ugA:10 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jul 2016 23:53:23 -0000 On Fri, 29 Jul 2016, Piotr Stefaniak wrote: > On 2016-07-29 18:28, Pedro F. Giffuni wrote: >> >> Log: >> indent(1): fix struct termination detection. >> >> Small style cleanup while here. > > Wrong commit message. Actually committed here is: Support "f" and "F" > floating constant suffixes. >> ... Also: Add large style bug in the fix. >> Modified: head/usr.bin/indent/lexi.c >> ============================================================================== >> --- head/usr.bin/indent/lexi.c Fri Jul 29 16:25:09 2016 >> (r303486) >> +++ head/usr.bin/indent/lexi.c Fri Jul 29 16:28:51 2016 >> (r303487) >> @@ -191,15 +191,13 @@ lexi(void) >> } >> } >> while (1) { >> - if (!(seensfx & 1) && >> - (*buf_ptr == 'U' || *buf_ptr == 'u')) { >> + if (!(seensfx & 1) && (*buf_ptr == 'U' || *buf_ptr == 'u')) { >> CHECK_SIZE_TOKEN; >> *e_token++ = *buf_ptr++; >> seensfx |= 1; >> continue; >> } >> - if (!(seensfx & 2) && >> - (*buf_ptr == 'L' || *buf_ptr == 'l')) { >> + if (!(seensfx & 2) && strchr("fFlL", *buf_ptr)) { indent's style is mostly bad, but this doesn't seem to involve using boolean tests for non-boolean str*() functions. indent didn't use strchr() before, but it always does explict comparisons with 0 for strcmp() and strncmp(). strstr() doesn't even return an integer, so an explicit comparison is even more needed for it. Except the "found" test doesn't require negative logic like !strcmp(). >> CHECK_SIZE_TOKEN; >> if (buf_ptr[1] == buf_ptr[0]) >> *e_token++ = *buf_ptr++; Bruce