From 15ae69fa7bc0f367edded19bc48e6d9a5ce8d547 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Thu, 6 Jan 2022 22:05:22 +0100 Subject: check-format.pl: Fix report on constant on LHS of comparison/assignment Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17434) --- util/check-format.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util/check-format.pl') diff --git a/util/check-format.pl b/util/check-format.pl index aa2566e28e..8861b2bd8a 100755 --- a/util/check-format.pl +++ b/util/check-format.pl @@ -886,7 +886,8 @@ while (<>) { # loop over all lines of all input files report("single-letter name '$2'") if (m/(^|.*\W)([IO])(\W.*|$)/); # single-letter name 'I' or 'O' # maybe re-add 'l'? # constant on LHS of comparison or assignment, e.g., NULL != x or 'a' < c, but not a + 1 == b report("constant on LHS of '$3'") - if (m/(['"]|([\+\-\*\/\/%\&\|\^<>]\s*)?\W[0-9]+L?|NULL)\s*([\!<>=]=|[<=>][^<>])/ && $2 eq ""); + if (m/(['"]|([\+\-\*\/\/%\&\|\^<>]\s*)?\W[0-9]+L?|\WNULL)\s*([\!<>=]=|[<=>])([<>]?)/ && + $2 eq "" && (($3 ne "<" && $3 ne "='" && $3 ne ">") || $4 eq "")); # TODO report #if 0 and #if 1 -- cgit v1.2.3