checkpatch: trivial fix for trailing statements check
PATCH 1/1 checkpatch: trivial fix for trailing statements check
In case if the statement and the conditional are in one line, the line appears in the report doubly.
And items of this check have no blank line before the next item.
This patch fixes these trivial problems, to improve readability of the report.
[sample.c]
Quoted 5 lines
if (cond1
&& cond2 && cond3) func_foo();if (cond4)
func_bar();
Before:
Quoted 10 lines
ERROR: trailing statements should be on next line
#1: FILE: sample.c:1:(quoted diff) +2
-0+if (cond1 + && cond3) func_foo();ERROR: trailing statements should be on next line
#5: FILE: sample.c:5:(quoted diff) +2
-0+if (cond4) func_bar(); +if (cond4) func_bar();total: 2 errors, 0 warnings, 5 lines checked
After:
Quoted 11 lines
ERROR: trailing statements should be on next line
#1: FILE: sample.c:1:(quoted diff) +2
-0+if (cond1 + && cond3) func_foo();ERROR: trailing statements should be on next line
#5: FILE: sample.c:5:
+if (cond4)func_bar();total: 2 errors, 0 warnings, 5 lines checked
--- scripts/checkpatch.pl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
scripts/checkpatch.pl +3 -1
@@ -2144,8 +2144,10 @@ sub process { # Find out how long the conditional actually is. my @newlines = ($c =~ /\n/gs); my $cond_lines = 1 + $#newlines; + my $stat_real = ''; - my $stat_real = raw_line($linenr, $cond_lines); + $stat_real = raw_line($linenr, $cond_lines) + . "\n" if ($cond_lines); if (defined($stat_real) && $cond_lines > 1) { $stat_real = "[...]\n$stat_real"; }
Signature · 1 line
1.6.4.4