Message-ID: <1513609970.31581.62.camel@perches.com>
Subject: Re: [PATCH] checkpatch: fix for stripping brackets from macros.
From: Joe Perches <joe@perches.com>
To: Jeremy Sowden <jeremy@azazel.net>, linux-kernel@vger.kernel.org,
        apw@canonical.com
Date: Mon, 18 Dec 2017 07:12:50 -0800
In-Reply-To: <20171218141716.26227-1-jeremy@azazel.net>
References: <20171218141716.26227-1-jeremy@azazel.net>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1044
Lines: 34

On Mon, 2017-12-18 at 14:17 +0000, Jeremy Sowden wrote:
> When checking macros, checkpatch.pl strips parentheses, square brackets
> and braces.  However, the search-and-replace expression was not correct,
> and instead of replacing the brackets and their contents with just the
> contents, it was replacing them with literal 1's.

Jeremy:

What is the effect on the rest of the block that
uses this substituted
$dstat?  Why should this be
done?

Andy:

I believe this is intentional as it simplifies
the macro analysis and has no other effect on the
rest of the block.  Correct?

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -4874,9 +4874,9 @@ sub process {
>  			$dstat =~ s/\s*$//s;
>  
>  			# Flatten any parentheses and braces
> -			while ($dstat =~ s/\([^\(\)]*\)/1/ ||
> -			       $dstat =~ s/\{[^\{\}]*\}/1/ ||
> -			       $dstat =~ s/.\[[^\[\]]*\]/1/)
> +			while ($dstat =~ s/\(([^\(\)]*)\)/$1/ ||
> +			       $dstat =~ s/\{([^\{\}]*)\}/$1/ ||
> +			       $dstat =~ s/.\[([^\[\]]*)\]/$1/)
>  			{
>  			}