From: Dr. David von Oheimb Date: Mon, 9 Mar 2020 13:42:40 +0000 (+0100) Subject: fix false positive of check-format.pl reporting '{1 stmt}' after multi-line 'if(expr)' X-Git-Tag: openssl-3.0.0-alpha1~244 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=38e497818e8775f16cfff12ca3226acbd2f30471;p=oweals%2Fopenssl.git fix false positive of check-format.pl reporting '{1 stmt}' after multi-line 'if(expr)' Reviewed-by: Richard Levitte Reviewed-by: David von Oheimb (Merged from https://github.com/openssl/openssl/pull/11285) --- diff --git a/util/check-format.pl b/util/check-format.pl index af77d20920..a0b493e600 100644 --- a/util/check-format.pl +++ b/util/check-format.pl @@ -868,7 +868,8 @@ while (<>) { # loop over all lines of all input files if ($paren_expr_start || $return_enum_start || $assignment_start) { my ($head, $mid, $tail) = ($1, $3, $4); - $keyword_opening_brace = $mid if $mid ne "=" && $tail =~ m/\{/; + $keyword_opening_brace = $mid if $mid ne "="; + # to cope with multi-line expressions, do this also if !($tail =~ m/\{/) push @in_if_hanging_offsets, $hanging_offset if $mid eq "if"; # already handle $head, i.e., anything before expression