summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-02-25 00:01:41 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-25 02:46:57 +0100
commite4c5babd32f974cf3db4b5bdb02f23132cc81afb (patch)
treed41c61a5d14983da808de3ac672d72abfecc27e8 /scripts
parentcheckpatch: add another old address for the FSF (diff)
downloadlinux-e4c5babd32f974cf3db4b5bdb02f23132cc81afb.tar.xz
linux-e4c5babd32f974cf3db4b5bdb02f23132cc81afb.zip
checkpatch: notice unbalanced else braces in a patch
Patches that add or modify code like } else <foo> or else { <bar> where one branch appears to have a brace and the other branch does not have a brace should emit a --strict style message. Link: http://lkml.kernel.org/r/c6be32747fc725cbc235802991746700a0f54fdc.1486754390.git.joe@perches.com Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 12db1483e6c2..7fb73d92801c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5104,6 +5104,12 @@ sub process {
}
}
+# check for single line unbalanced braces
+ if ($sline =~ /.\s*\}\s*else\s*$/ ||
+ $sline =~ /.\s*else\s*\{\s*$/) {
+ CHK("BRACES", "Unbalanced braces around else statement\n" . $herecurr);
+ }
+
# check for unnecessary blank lines around braces
if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
if (CHK("BRACES",