Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1080bf8 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: case/default checks should only check changed lines 



We should only be checking changes lines for the trailing statement check
on case/default statements.

Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dea79cd3

scripts/checkpatch.pl

+9 −8
Original line number Diff line number Diff line
@@ -1363,14 +1363,6 @@ sub process { 
				ERROR("switch and case should be at the same indent\n$hereline$err");

			}

		}

		if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&

		    $line !~ /\G(?:

			(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|

			\s*return\s+

		    )/xg)

		{

			ERROR("trailing statements should be on next line\n" . $herecurr);

		}



# 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
@@ -1986,6 +1978,15 @@ sub process { 
				ERROR("trailing statements should be on next line\n" . $herecurr);

			}

		}

# 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*return\s+

		    )/xg)

		{

			ERROR("trailing statements should be on next line\n" . $herecurr);

		}



		# Check for }<nl>else {, these must be at the same

		# indent level to be relevant to each other.