From: Tiffany Yang <ynaffit@google.com>
To: linux-kernel@vger.kernel.org
Cc: kernel-team@android.com, Andy Whitcroft <apw@canonical.com>,
Joe Perches <joe@perches.com>,
Dwaipayan Ray <dwaipayanray1@gmail.com>,
Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [PATCH 2/3] checkpatch: check indentation on case without space
Date: Fri, 14 Nov 2025 15:31:52 -0800 [thread overview]
Message-ID: <20251114233150.396974-5-ynaffit@google.com> (raw)
In-Reply-To: <20251114233150.396974-4-ynaffit@google.com>
The script was not catching switch statement indentation errors when
'case' isn't followed by a space.
For example, checkpatch is silent for this change:
+switch (foo) {
+case(1):
+ break;
+ case(2):
+ break;
+}
But reports an error for the following:
+switch (foo) {
+case 1:
+ break;
+ case 2:
+ break;
+}
ERROR: switch and case should be at the same indent
#39: FILE: kernel/checkpatch_case_fix/test_cases.c:21:
+switch (foo) {
[...]
+ case 2:
Update the check so that the error is reported for both.
Signed-off-by: Tiffany Yang <ynaffit@google.com>
---
scripts/checkpatch.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b026b1235079..f9d14115c416 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4311,7 +4311,7 @@ sub process {
shift(@ctx);
for my $ctx (@ctx) {
my ($clen, $cindent) = line_stats($ctx);
- if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
+ if ($ctx =~ /^\+\s*(case\b\s*|default:)/ &&
$indent != $cindent) {
$err .= "$sep$ctx\n";
$sep = '';
--
2.52.0.rc1.455.g30608eb744-goog
next prev parent reply other threads:[~2025-11-14 23:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-14 23:31 [PATCH 1/3] checkpatch: handle variables that begin with 'case' Tiffany Yang
2025-11-14 23:31 ` Tiffany Yang [this message]
2025-11-14 23:31 ` [PATCH] checkpatch: Allow bare SHA-1 hashes in checkpatch commits Tiffany Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251114233150.396974-5-ynaffit@google.com \
--to=ynaffit@google.com \
--cc=apw@canonical.com \
--cc=dwaipayanray1@gmail.com \
--cc=joe@perches.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas.bulwahn@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox