summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Zylowski <michal.zylowski@intel.com>2018-08-21 21:58:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-22 10:52:49 -0700
commit6ad724e2a48fc24dd9788490d85a3490cb0117c1 (patch)
tree01ad0efaeb18b10fae8e0af5df84d2acd0d70d2b
parent56294112791ac11c6fcdc6544f1381f9272202db (diff)
downloadlinux-stable-6ad724e2a48fc24dd9788490d85a3490cb0117c1.tar.gz
linux-stable-6ad724e2a48fc24dd9788490d85a3490cb0117c1.tar.bz2
linux-stable-6ad724e2a48fc24dd9788490d85a3490cb0117c1.zip
checkpatch: check for space after "else" keyword
Current checkpatch implementation permits notation like } else{ in kernel code. It looks like oversight and inconsistency in checkpatch rules (e.g. instruction like 'do' is tested). Add regex for checking space after 'else' keyword and trigger error if space is not present. Link: http://lkml.kernel.org/r/1533545753-8870-1-git-send-email-michal.zylowski@intel.com Signed-off-by: Michal Zylowski <michal.zylowski@intel.com> Acked-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rwxr-xr-xscripts/checkpatch.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index eced9b303995..f43d95a25712 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4531,11 +4531,11 @@ sub process {
#need space before brace following if, while, etc
if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
- $line =~ /do\{/) {
+ $line =~ /\b(?:else|do)\{/) {
if (ERROR("SPACING",
"space required before the open brace '{'\n" . $herecurr) &&
$fix) {
- $fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
+ $fixed[$fixlinenr] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
}
}