scripts: checkpatch.pl: Add exceptions for FOR_EACH_NONEMPTY_TERM macro (e90d69f9) · Commits · Wenxi XU / zephyr

scripts/checkpatch.pl

+2 −2

Original line number	Diff line number	Diff line
		@@ -3739,7 +3739,7 @@ sub process {

		# if/while/etc brace do not go on next line, unless defining a do while loop,
		# or if that brace on the next line is for something else
		if ($line =~ /(.)\b((?:if\|while\|for\|switch\|(?:[A-Z_]+\|)FOR_EACH[A-Z_]+)\s\(\|do\b\|else\b)/ && $line !~ /^.\s*\#/) {
		if ($line =~ /(.)\b((?:if\|while\|for\|switch\|(?:[A-Z_]+\|)FOR_EACH(?!_NONEMPTY_TERM)[A-Z_]+)\s\(\|do\b\|else\b)/ && $line !~ /^.\s*\#/) {
		my $pre_ctx = "$1$2";

		my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
		@@ -3785,7 +3785,7 @@ sub process {
		}

		# Check relative indent for conditionals and blocks.
		if ($line =~ /\b(?:(?:if\|while\|for\|(?:[A-Z_]+\|)FOR_EACH[A-Z_]+)\s\(\|(?:do\|else)\b)/ && $line !~ /^.\s#/ && $line !~ /\}\swhile\s/) {
		if ($line =~ /\b(?:(?:if\|while\|for\|(?:[A-Z_]+\|)FOR_EACH(?!_NONEMPTY_TERM\|_IDX\|_FIXED_ARG\|_IDX_FIXED_ARG)[A-Z_]+)\s\(\|(?:do\|else)\b)/ && $line !~ /^.\s#/ && $line !~ /\}\swhile\s/) {
		($stat, $cond, $line_nr_next, $remain_next, $off_next) =
		ctx_statement_block($linenr, $realcnt, 0)
		if (!defined $stat);