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;
Message-ID: <58de45f3a0c7a4517110523edeccf19e6cec538c.camel@perches.com>
Subject: Re: [BUG] checkpatch: non-standard types cannot be declared after
 '}'
From:   Joe Perches <joe@perches.com>
To:     Jan Schlien <list.lkml@jan-o-sch.net>,
        Andy Whitcroft <apw@canonical.com>
Cc:     linux-kernel@vger.kernel.org
Date:   Wed, 30 Dec 2020 10:52:23 -0800
In-Reply-To: <d2314c57-30c5-2af9-11ef-6ae1c35a9bb5@jan-o-sch.net>
References: <d2314c57-30c5-2af9-11ef-6ae1c35a9bb5@jan-o-sch.net>
Content-Type: text/plain; charset="ISO-8859-1"
User-Agent: Evolution 3.38.1-1 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Wed, 2020-12-30 at 14:36 +0100, Jan Schlien wrote:
> Hi,
> 
> I found some odd behavior of checkpatch.pl, which I'm currently using
> for own projects outside the kernel, but I verified that kernel patches
> can be affected as well.

Hello Jan.

I've had this patch locally for awhile that I believe fixes this
and another issue ($stat blocks can start with a close brace).

I've been waiting for Andy to review it in case there's some other
parsing problem associated with it.
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 00085308ed9d..012c8dc6cb1a 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1555,7 +1555,7 @@ sub ctx_statement_block {
 
 		# Statement ends at the ';' or a close '}' at the
 		# outermost level.
-		if ($level == 0 && $c eq ';') {
+		if ($level == 0 && ($c eq ';' || $c eq '}')) {
 			last;
 		}