From 667d510dabd5644c2191b3c828c6d50d8417c9cc Mon Sep 17 00:00:00 2001 From: Spencer Oliver Date: Fri, 16 Dec 2011 10:48:53 +0000 Subject: [PATCH] checkpatch: fix false indent trigger we have changed the indent to 4 to match OpenOCD coding style. Change-Id: I4870a3410eb20fc2f6df6a3e5891d4d4e598131a Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/285 Tested-by: jenkins --- tools/scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 703fa06c..50fffc17 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -1965,7 +1965,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 || + if ($check && (($sindent % 4) != 0 || ($sindent <= $indent && $s ne ''))) { WARN("SUSPECT_CODE_INDENT", "suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n"); -- 2.39.5