]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
checkpatch: allow for comments either side of a brace on case
authorAndy Whitcroft <apw@shadowen.org>
Thu, 16 Oct 2008 05:02:36 +0000 (22:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Oct 2008 18:21:37 +0000 (11:21 -0700)
When specifying case we may have comments and/or braces at the end without
actually having a 'statement'.  Allow for these to occur in any order.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
scripts/checkpatch.pl

index 862e8e0e86ae40b10a1668e501ab3bac6d024e17..ada27c44da023a9c13bca0fbd54a4e6282a3e11e 100755 (executable)
@@ -2043,7 +2043,7 @@ sub process {
 # case and default should not have general statements after them
                if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
                    $line !~ /\G(?:
-                       (?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+                       (?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
                        \s*return\s+
                    )/xg)
                {