diff options
| author | Joe Perches | 2013-07-04 00:05:29 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-07-04 01:07:44 +0200 |
| commit | 77b9a53a627491df83a75361440485629c35aa91 (patch) | |
| tree | 8a3176a5cc00a3e8173e03b73b8459f21c8cdf3b /scripts/checkpatch.pl | |
| parent | checkpatch: add a placeholder to check blank lines before declarations (diff) | |
| download | kernel-qcow2-linux-77b9a53a627491df83a75361440485629c35aa91.tar.gz kernel-qcow2-linux-77b9a53a627491df83a75361440485629c35aa91.tar.xz kernel-qcow2-linux-77b9a53a627491df83a75361440485629c35aa91.zip | |
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/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
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); } |