iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkpatch: move test for space before semicolon after operator spacing

Browse Source 
Moving this test allows the --fix option to work better.

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>
This commit is contained in:
Joe Perches 2013-07-03 15:05:32 -07:00 committed by Linus Torvalds
parent 3705ce5bcc
commit 786b632622
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/checkpatch.pl
View File

@ -2646,16 +2646,6 @@ sub process {
} }
} }
# check for whitespace before a non-naked semicolon
if ($line =~ /^\+.*\S\s+;/) {
if (WARN("SPACING",
"space prohibited before semicolon\n" . $herecurr) &&
$fix) {
$fixed[$linenr - 1] =~
s/^(\+.*\S)\s+;/$1;/;
}
}
# Check operator spacing. # Check operator spacing.
if (!($line=~/\#\s*include/)) { if (!($line=~/\#\s*include/)) {
my $fixed_line = ""; my $fixed_line = "";
@ -2920,6 +2910,16 @@ sub process {
} }
# check for whitespace before a non-naked semicolon
if ($line =~ /^\+.*\S\s+;/) {
if (WARN("SPACING",
"space prohibited before semicolon\n" . $herecurr) &&
$fix) {
1 while $fixed[$linenr - 1] =~
s/^(\+.*\S)\s+;/$1;/;
}
}
# check for multiple assignments # check for multiple assignments
if ($line =~ /^.\s*$Lval\s*=\s*$Lval\s*=(?!=)/) { if ($line =~ /^.\s*$Lval\s*=\s*$Lval\s*=(?!=)/) {
CHK("MULTIPLE_ASSIGNMENTS", CHK("MULTIPLE_ASSIGNMENTS",