2014-07-18 19:41:04

by Gregory Fong

Subject: [PATCH 1/1] checkpatch.pl: 1-tab relative indent for conditionals/blocks

The following would incorrectly pass checkpatch:

void foo(void)
{
if (a) {
something;
somethingelse;
} else {
messed_up_indentation;
}
}

Assume single-tab indentation of blocks to catch this.
Also add "else" to the list to check.

Signed-off-by: Gregory Fong <[email protected]>
---
scripts/checkpatch.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 182be0f..f94c364 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2523,7 +2523,8 @@ sub process {
}

# Check relative indent for conditionals and blocks.
- if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+ if ($line =~ /\b(?:(?:if|while|for)\s*\(|do|else\b)/ &&
+ $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
($stat, $cond, $line_nr_next, $remain_next, $off_next) =
ctx_statement_block($linenr, $realcnt, 0)
if (!defined $stat);
@@ -2606,6 +2607,7 @@ sub process {
#print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";

if ($check && (($sindent % 8) != 0 ||
+ ((($sindent - $indent) / 8) > 1) ||
($sindent <= $indent && $s ne ''))) {
WARN("SUSPECT_CODE_INDENT",
"suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
--
1.8.3.2

2014-07-18 20:39:36

by Joe Perches

Subject: Re: [PATCH 1/1] checkpatch.pl: 1-tab relative indent for conditionals/blocks

On Fri, 2014-07-18 at 12:40 -0700, Gregory Fong wrote:
> The following would incorrectly pass checkpatch:
>
> void foo(void)
> {
> if (a) {
> something;
> somethingelse;
> } else {
> messed_up_indentation;
> }
> }
[]
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -2606,6 +2607,7 @@ sub process {
> #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
>
> if ($check && (($sindent % 8) != 0 ||
> + ((($sindent - $indent) / 8) > 1) ||
> ($sindent <= $indent && $s ne ''))) {
> WARN("SUSPECT_CODE_INDENT",
> "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");

This might be better testing only tab indented lines like:

if ($check &&
length($prevtabindent) + 1 != length($tabindent))

It'd also be useful to check non-conditional, non-blank
after decommenting code lines so that a block like:

static bool func(void)
{
bool b;
/* comment about something */
int a[2] = foo();

b = a[0] == a[1];

/* ready to return */
return b;
}

emits a couple of "suspect code indent" warnings.
One on int a[2], another on return b.