Explorar o código

checkpatch: report the correct lines for single statement blocks

Report the correct lines for single statement blocks.  Currently we are
reporting the right number of lines, but not skipping the negative lines.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andy Whitcroft %!s(int64=16) %!d(string=hai) anos
pai
achega
f055663c58
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      scripts/checkpatch.pl

+ 3 - 3
scripts/checkpatch.pl

@@ -2214,10 +2214,10 @@ sub process {
 			}
 			}
 			if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
 			if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
 				my $herectx = $here . "\n";;
 				my $herectx = $here . "\n";;
-				my $end = $linenr + statement_rawlines($block) - 1;
+				my $cnt = statement_rawlines($block);
 
 
-				for (my $ln = $linenr - 1; $ln < $end; $ln++) {
-					$herectx .= $rawlines[$ln] . "\n";;
+				for (my $n = 0; $n < $cnt; $n++) {
+					$herectx .= raw_line($linenr, $n) . "\n";;
 				}
 				}
 
 
 				WARN("braces {} are not necessary for single statement blocks\n" . $herectx);
 				WARN("braces {} are not necessary for single statement blocks\n" . $herectx);