Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH v2] checkpatch: Fix regex for do without braces
To:     Dwaipayan Ray <dwaipayanray1@gmail.com>, joe@perches.com,
        apw@canonical.com
Cc:     lukas.bulwahn@gmail.com, linux-kernel@vger.kernel.org
References: <20210627184909.6000-1-dwaipayanray1@gmail.com>
From:   "Alejandro Colomar (man-pages)" <alx.manpages@gmail.com>
Message-ID: <dfc6106b-81cd-a78f-a002-2a4b4c04155e@gmail.com>
Date:   Mon, 28 Jun 2021 09:52:11 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <20210627184909.6000-1-dwaipayanray1@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 6/27/21 8:49 PM, Dwaipayan Ray wrote:
> The regular expression for detecting do without braces
> also passes when checkpatch encounters the "double"
> keyword. This causes wrong recalculation of $stat in
> checkpatch which can cause false positives.
> 
> Fix the regex to avoid the above. Also update the comments
> for the check.
> 
> Reported-by: Alejandro Colomar <alx.manpages@gmail.com>
> Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com>
Reviewed-by: Alejandro Colomar <alx.manpages@gmail.com>
Tested-by: Alejandro Colomar <alx.manpages@gmail.com>
(is Acked-by/Reviewed-by implied by Tested-by?)
> ---
> 
> Changes in v2:
> - Check word boundary on both sides of do
> 
>   scripts/checkpatch.pl | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 8d19beca3538..64036e7eff71 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -5488,9 +5488,8 @@ sub process {
>   			}
>   		}
>   
> -# Check for illegal assignment in if conditional -- and check for trailing
> -# statements after the conditional.
> -		if ($line =~ /do\s*(?!{)/) {
> +# If we have sufficient context detect and handle do without braces ({).

s/context detect/context, detect/

> +		if ($line =~ /\bdo\b\s*(?!{)/) {
>   			($stat, $cond, $line_nr_next, $remain_next, $off_next) =
>   				ctx_statement_block($linenr, $realcnt, 0)
>   					if (!defined $stat);
> @@ -5511,6 +5510,9 @@ sub process {
>   								$offset} = 1;
>   			}
>   		}
> +
> +# Check for illegal assignment in if conditional -- and check for trailing
> +# statements after the conditional.
>   		if (!defined $suppress_whiletrailers{$linenr} &&
>   		    defined($stat) && defined($cond) &&
>   		    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
> 


-- 
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/