---

yaml --- r: 114752 b: refs/heads/master c: 1bdab9e h: refs/heads/master v: v3
git-mirror · Oct 16, 2008 · 09add42 · 09add42
1 parent 02a2391
commit 09add42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14b111c158116f02c1c862397075e28ac12d65d6
+refs/heads/master: 1bdab9e5881fde3bf66528db5b91477ce4b35b3b
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
@@ -1295,7 +1295,11 @@ sub process {
 			}
 		}
 		if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
-		    $line !~ /\G(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$/g) {
+		    $line !~ /\G(?:
+			(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+			\s*return\s+
+		    )/xg)
+		{
 			ERROR("trailing statements should be on next line\n" . $herecurr);
 		}