On Mon, 2018-08-06 at 10:55 +0200, Michal Zylowski wrote:
> 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.
>
> Signed-off-by: Michal Zylowski <michal.zylow...@intel.com>
Acked-by: Joe Perches <j...@perches.com>
> ---
> scripts/checkpatch.pl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 447857f..f7e135a 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4483,11 +4483,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 {/;
> }
> }
>
