aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-07-03 15:05:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:44 -0700
commit77b9a53a627491df83a75361440485629c35aa91 (patch)
tree8a3176a5cc00a3e8173e03b73b8459f21c8cdf3b /scripts
parentc4a62ef9102bfa39f3bb89be2ae1ae11a23ebe28 (diff)
downloadlinux-linaro-stable-77b9a53a627491df83a75361440485629c35aa91.tar.gz
checkpatch: don't warn on blank lines before/after braces as often
Check to make sure the blank lines aren't comment lines like: bool foo(bool bar) { /* Don't warn on a leading comment */ return !bar; /* Don't warn on a trailing comment either */ } 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.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4ad40523b419..c43be815cc71 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3258,11 +3258,11 @@ sub process {
}
# check for unnecessary blank lines around braces
- if (($line =~ /^.\s*}\s*$/ && $prevline =~ /^.\s*$/)) {
+ if (($line =~ /^.\s*}\s*$/ && $prevrawline =~ /^.\s*$/)) {
CHK("BRACES",
"Blank lines aren't necessary before a close brace '}'\n" . $hereprev);
}
- if (($line =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
+ if (($rawline =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) {
CHK("BRACES",
"Blank lines aren't necessary after an open brace '{'\n" . $hereprev);
}