checkpatch reports a false positive when using token pasting argument multiple times in a macro. Fix it. Miscellanea: o Make the $tmp variable name used in the macro argument tests a bit more descriptive
Showing the changes to scripts/checkpatch.pl (1 of 1 file). Show all
Unified · Split
| @@ -4940,17 +4940,17 @@ sub process { · 4939 unmodified lines | ||
| 4940 | 4940 | foreach my $arg (@def_args) { |
| 4941 | 4941 | next if ($arg =~ /\.\.\./); |
| 4942 | 4942 | next if ($arg =~ /^type$/i); |
| 4943 | − my $tmp = $define_stmt; | |
| 4944 | − $tmp =~ s/\b(typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g; | |
| 4945 | − $tmp =~ s/\#+\s*$arg\b//g; | |
| 4946 | − $tmp =~ s/\b$arg\s*\#\#//g; | |
| 4947 | − my $use_cnt = $tmp =~ s/\b$arg\b//g; | |
| 4943 | + my $tmp_stmt = $define_stmt; | |
| 4944 | + $tmp_stmt =~ s/\b(typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g; | |
| 4945 | + $tmp_stmt =~ s/\#+\s*$arg\b//g; | |
| 4946 | + $tmp_stmt =~ s/\b$arg\s*\#\#//g; | |
| 4947 | + my $use_cnt = $tmp_stmt =~ s/\b$arg\b//g; | |
| 4948 | 4948 | if ($use_cnt > 1) { |
| 4949 | 4949 | CHK("MACRO_ARG_REUSE", |
| 4950 | 4950 | "Macro argument reuse '$arg' - possible side-effects?\n" . "$herectx"); |
| 4951 | 4951 | } |
| 4952 | 4952 | # check if any macro arguments may have other precedence issues |
| 4953 | − if ($define_stmt =~ m/($Operators)?\s*\b$arg\b\s*($Operators)?/m && | |
| 4953 | + if ($tmp_stmt =~ m/($Operators)?\s*\b$arg\b\s*($Operators)?/m && | |
| 4954 | 4954 | ((defined($1) && $1 ne ',') || |
| 4955 | 4955 | (defined($2) && $2 ne ','))) { |
| 4956 | 4956 | CHK("MACRO_ARG_PRECEDENCE", |