Commit 77b9a53a authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4a62ef9
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment