From 38e497818e8775f16cfff12ca3226acbd2f30471 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Mon, 9 Mar 2020 14:42:40 +0100 Subject: [PATCH] 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) --- util/check-format.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.25.1