diff options
| author | Joe Perches <joe@perches.com> | 2012-12-17 19:01:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:19 -0500 |
| commit | 0979ae66464bd9793c6701861bccb21f9f118a52 (patch) | |
| tree | e2e7a6f513aba1c433dbad1ccbb24adb834ca406 /scripts | |
| parent | 481eb486a88c9b068f0168ac4c21291802720933 (diff) | |
checkpatch: Add --strict messages for blank lines around braces
Blank lines around braces are not unnecessary. Emit a message on the use
of these blank lines only when using --strict.
int foo(int bar)
{
something or other....
}
is generally written in the kernel as:
int foo(int bar)
{
something or other...
}
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Andy Whitcroft <apw@canonical.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-x | scripts/checkpatch.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3e9fee60642c..e0a674f471ee 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -3189,6 +3189,16 @@ sub process { | |||
| 3189 | } | 3189 | } |
| 3190 | } | 3190 | } |
| 3191 | 3191 | ||
| 3192 | # check for unnecessary blank lines around braces | ||
| 3193 | if (($line =~ /^..*}\s*$/ && $prevline =~ /^.\s*$/)) { | ||
| 3194 | CHK("BRACES", | ||
| 3195 | "Blank lines aren't necessary before a close brace '}'\n" . $hereprev); | ||
| 3196 | } | ||
| 3197 | if (($line =~ /^.\s*$/ && $prevline =~ /^..*{\s*$/)) { | ||
| 3198 | CHK("BRACES", | ||
| 3199 | "Blank lines aren't necessary after an open brace '{'\n" . $hereprev); | ||
| 3200 | } | ||
| 3201 | |||
| 3192 | # no volatiles please | 3202 | # no volatiles please |
| 3193 | my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; | 3203 | my $asm_volatile = qr{\b(__asm__|asm)\s+(__volatile__|volatile)\b}; |
| 3194 | if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) { | 3204 | if ($line =~ /\bvolatile\b/ && $line !~ /$asm_volatile/) { |
