From: Michal Zylowski <michal.zylowski@intel.com>
Date: Wed, 22 Aug 2018 04:58:08 +0000 (-0700)
Subject: checkpatch: check for space after "else" keyword
X-Git-Tag: for-linus-20180825~8^2~63
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6ad724e2a48fc24dd9788490d85a3490cb0117c1;p=linux-block.git

checkpatch: check for space after "else" keyword

Current checkpatch implementation permits notation like

	} else{

in kernel code.  It looks like oversight and inconsistency in checkpatch
rules (e.g.  instruction like 'do' is tested).

Add regex for checking space after 'else' keyword and trigger error if
space is not present.

Link: http://lkml.kernel.org/r/1533545753-8870-1-git-send-email-michal.zylowski@intel.com
Signed-off-by: Michal Zylowski <michal.zylowski@intel.com>
Acked-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index eced9b303995..f43d95a25712 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4531,11 +4531,11 @@ sub process {
 
 #need space before brace following if, while, etc
 		if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
-		    $line =~ /do\{/) {
+		    $line =~ /\b(?:else|do)\{/) {
 			if (ERROR("SPACING",
 				  "space required before the open brace '{'\n" . $herecurr) &&
 			    $fix) {
-				$fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
+				$fixed[$fixlinenr] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
 			}
 		}