Sanitise the lines that contain c99 comments so that the error doesn't get emitted.
Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all
Unified · Split
| @@ -55,6 +55,7 @@ my $spelling_file = "$D/spelling.txt"; · 54 unmodified lines | |||
| 55 | my $codespell = 0; | 55 | my $codespell = 0; |
| 56 | my $codespellfile = "/usr/share/codespell/dictionary.txt"; | 56 | my $codespellfile = "/usr/share/codespell/dictionary.txt"; |
| 57 | my $color = 1; | 57 | my $color = 1; |
| 58 | my $allow_c99_comments = 1; | ||
| 58 | 59 | ||
| 59 | sub help { | 60 | sub help { |
| 60 | my ($exitcode) = @_; | 61 | my ($exitcode) = @_; |
| @@ -1144,6 +1145,11 @@ sub sanitise_line { · 1083 unmodified lines | |||
| 1144 | $res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@; | 1145 | $res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@; |
| 1145 | } | 1146 | } |
| 1146 | 1147 | ||
| 1148 | if ($allow_c99_comments && $res =~ m@(//.*$)@) { | ||
| 1149 | my $match = $1; | ||
| 1150 | $res =~ s/\Q$match\E/"$;" x length($match)/e; | ||
| 1151 | } | ||
| 1152 | |||
| 1147 | return $res; | 1153 | return $res; |
| 1148 | } | 1154 | } |
| 1149 | 1155 | ||