[openssl] master update

dev at ddvo.net dev at ddvo.net
Tue Jan 4 14:26:20 UTC 2022


The branch master has been updated
       via  2e6afe1079c6993868c5d8a813605d16980e8e10 (commit)
      from  068549f8db6d792a88bb888118001c4582f79074 (commit)


- Log -----------------------------------------------------------------
commit 2e6afe1079c6993868c5d8a813605d16980e8e10
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Fri Nov 12 12:14:45 2021 +0100

    check-format.pl: Fix report on constant on LHS of comparison or assignment
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17396)

-----------------------------------------------------------------------

Summary of changes:
 util/check-format.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/check-format.pl b/util/check-format.pl
index 62471e3c68..09bd6b6270 100755
--- a/util/check-format.pl
+++ b/util/check-format.pl
@@ -858,7 +858,7 @@ 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 '$2'")
+    report("constant on LHS of '$3'")
         if (m/(['"]|([\+\-\*\/\/%\&\|\^<>]\s*)?\W[0-9]+L?|NULL)\s*([\!<>=]=|[<=>][^<>])/ && $2 eq "");
 
     # TODO report #if 0 and #if 1


More information about the openssl-commits mailing list