Commit ac8e97f8 authored Aug 21, 2012 by Joe Perches Committed by Linus Torvalds Aug 21, 2012

checkpatch: add control statement test to SINGLE_STATEMENT_DO_WHILE_MACRO



Commit b13edf7f ("checkpatch: add checks for do {} while (0) macro
misuses") added a test that is overly simplistic for single statement
macros.

Macros that start with control tests should be enclosed in a do {} while
(0) loop.

Add the necessary control tests to the check.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Tested-by: Franz Schrober <franzschrober@yahoo.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent eb48c071

scripts/checkpatch.pl

+2 −1

Original line number	Diff line number	Diff line
		@@ -3016,7 +3016,8 @@ sub process {
		$herectx .= raw_line($linenr, $n) . "\n";
		}

		if (($stmts =~ tr/;/;/) == 1) {
		if (($stmts =~ tr/;/;/) == 1 &&
		$stmts !~ /^\s*(if\|while\|for\|switch)\b/) {
		WARN("SINGLE_STATEMENT_DO_WHILE_MACRO",
		"Single statement macros should not use a do {} while (0) loop\n" . "$herectx");
		}

Admin message