scripts/checkpatch.pl: Fix whitespace errors

Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr>

SVN-Revision: 37864
This commit is contained in:
Vasilis Tsiligiannis 2013-08-31 11:16:49 +00:00
parent 957c2576cc
commit e532d65373

View File

@ -2311,11 +2311,11 @@ sub process {
} }
# # no BUG() or BUG_ON() # # no BUG() or BUG_ON()
# if ($line =~ /\b(BUG|BUG_ON)\b/) { # if ($line =~ /\b(BUG|BUG_ON)\b/) {
# print "Try to use WARN_ON & Recovery code rather than BUG() or BUG_ON()\n"; # print "Try to use WARN_ON & Recovery code rather than BUG() or BUG_ON()\n";
# print "$herecurr"; # print "$herecurr";
# $clean = 0; # $clean = 0;
# } # }
if ($line =~ /\bLINUX_VERSION_CODE\b/) { if ($line =~ /\bLINUX_VERSION_CODE\b/) {
WARN("LINUX_VERSION_CODE", WARN("LINUX_VERSION_CODE",
@ -2582,13 +2582,13 @@ sub process {
($op eq '>' && ($op eq '>' &&
$ca =~ /<\S+\@\S+$/)) $ca =~ /<\S+\@\S+$/))
{ {
$ok = 1; $ok = 1;
} }
# Ignore ?: # Ignore ?:
if (($opv eq ':O' && $ca =~ /\?$/) || if (($opv eq ':O' && $ca =~ /\?$/) ||
($op eq '?' && $cc =~ /^:/)) { ($op eq '?' && $cc =~ /^:/)) {
$ok = 1; $ok = 1;
} }
if ($ok == 0) { if ($ok == 0) {
@ -2608,19 +2608,19 @@ sub process {
## # check for multiple declarations, allowing for a function declaration ## # check for multiple declarations, allowing for a function declaration
## # continuation. ## # continuation.
## if ($line =~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Ident.*/ && ## if ($line =~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Ident.*/ &&
## $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) { ## $line !~ /^.\s*$Type\s+$Ident(?:\s*=[^,{]*)?\s*,\s*$Type\s*$Ident.*/) {
## ##
## # Remove any bracketed sections to ensure we do not ## # Remove any bracketed sections to ensure we do not
## # falsly report the parameters of functions. ## # falsly report the parameters of functions.
## my $ln = $line; ## my $ln = $line;
## while ($ln =~ s/\([^\(\)]*\)//g) { ## while ($ln =~ s/\([^\(\)]*\)//g) {
## } ## }
## if ($ln =~ /,/) { ## if ($ln =~ /,/) {
## WARN("MULTIPLE_DECLARATION", ## WARN("MULTIPLE_DECLARATION",
## "declaring multiple variables together should be avoided\n" . $herecurr); ## "declaring multiple variables together should be avoided\n" . $herecurr);
## } ## }
## } ## }
#need space before brace following if, while, etc #need space before brace following if, while, etc
if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
@ -2740,7 +2740,7 @@ sub process {
# conditional. # conditional.
substr($s, 0, length($c), ''); substr($s, 0, length($c), '');
$s =~ s/\n.*//g; $s =~ s/\n.*//g;
$s =~ s/$;//g; # Remove any comments $s =~ s/$;//g; # Remove any comments
if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ && if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
$c !~ /}\s*while\s*/) $c !~ /}\s*while\s*/)
{ {
@ -2779,7 +2779,7 @@ sub process {
# if and else should not have general statements after it # if and else should not have general statements after it
if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) { if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
my $s = $1; my $s = $1;
$s =~ s/$;//g; # Remove any comments $s =~ s/$;//g; # Remove any comments
if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) { if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
ERROR("TRAILING_STATEMENTS", ERROR("TRAILING_STATEMENTS",
"trailing statements should be on next line\n" . $herecurr); "trailing statements should be on next line\n" . $herecurr);