Fix up type and cast spacing checks such that all occurences on a line are examined and reported. For example the line below has a valid cast and a bad type, but currently we check the cast first which is good and stop: u16* bar = (u16 *)baz; We will also only report one of the errors in this example: u16* bar = (u16*)bad; Move to iterating across all casts and all types, reporting any failure. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Andy Whitcroft <apw@canonical.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all
Unified · Split
| @@ -2209,8 +2209,9 @@ sub process { · 2208 unmodified lines | |||
| 2209 | 2209 | ||
| 2210 | # * goes on variable not on type | 2210 | # * goes on variable not on type |
| 2211 | # (char*[ const]) | 2211 | # (char*[ const]) |
| 2212 | if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) { | 2212 | while ($line =~ m{(\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\))}g) { |
| 2213 | my ($from, $to) = ($1, $1); | 2213 | #print "AA<$1>\n"; |
| 2214 | my ($from, $to) = ($2, $2); | ||
| 2214 | 2215 | ||
| 2215 | # Should start with a space. | 2216 | # Should start with a space. |
| 2216 | $to =~ s/^(\S)/ $1/; | 2217 | $to =~ s/^(\S)/ $1/; |
| @@ -2225,8 +2226,10 @@ sub process { · 8 unmodified lines | |||
| 2225 | ERROR("POINTER_LOCATION", | 2226 | ERROR("POINTER_LOCATION", |
| 2226 | "\"(foo$from)\" should be \"(foo$to)\"\n" . $herecurr); | 2227 | "\"(foo$from)\" should be \"(foo$to)\"\n" . $herecurr); |
| 2227 | } | 2228 | } |
| 2228 | } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) { | 2229 | } |
| 2229 | my ($from, $to, $ident) = ($1, $1, $2); | 2230 | while ($line =~ m{(\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident))}g) { |
| 2231 | #print "BB<$1>\n"; | ||
| 2232 | my ($from, $to, $ident) = ($2, $2, $3); | ||
| 2230 | 2233 | ||
| 2231 | # Should start with a space. | 2234 | # Should start with a space. |
| 2232 | $to =~ s/^(\S)/ $1/; | 2235 | $to =~ s/^(\S)/ $1/; |