From 2f13e3d23d9acd448b1e1e2cad419b4c118c43e4 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 25 Apr 2018 21:53:27 +0200 Subject: checksrc: force indentation of lines after an else This extends the INDENTATION case to also handle 'else' statements and require proper indentation on the following line. Also fixes the offending cases found in the codebase. Closes #2532 --- lib/checksrc.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/checksrc.pl') diff --git a/lib/checksrc.pl b/lib/checksrc.pl index 1a695ba2c..c90e245ee 100755 --- a/lib/checksrc.pl +++ b/lib/checksrc.pl @@ -499,9 +499,9 @@ sub scanfile { } # if the previous line starts with if/while/for AND ends with an open - # brace, check that this line is indented $indent more steps, if not - # a cpp line - if($prevl =~ /^( *)(if|while|for)\(.*\{\z/) { + # brace, or an else statement, check that this line is indented $indent + # more steps, if not a cpp line + if($prevl =~ /^( *)((if|while|for)\(.*\{|else)\z/) { my $first = length($1); # this line has some character besides spaces @@ -511,7 +511,7 @@ sub scanfile { if($expect != $second) { my $diff = $second - $first; checkwarn("INDENTATION", $line, length($1), $file, $ol, - "not indented $indent steps, uses $diff)"); + "not indented $indent steps (uses $diff)"); } } -- cgit v1.2.3