Some static tool reports "the condition in 'if' statement is constant".

This patch updates the code to use local variable to store test key
digest size. It can pass the static tool's check.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 FmpDevicePkg/FmpDxe/DetectTestKey.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FmpDevicePkg/FmpDxe/DetectTestKey.c b/FmpDevicePkg/FmpDxe/DetectTestKey.c
index 0a6e37ededae..dcf316262d21 100644
--- a/FmpDevicePkg/FmpDxe/DetectTestKey.c
+++ b/FmpDevicePkg/FmpDxe/DetectTestKey.c
@@ -53,12 +53,14 @@ DetectTestKey (
   UINT8    *PublicKeyDataXdrEnd;
   VOID     *HashContext;
   UINT8    Digest[SHA256_DIGEST_SIZE];
+  UINTN    TestKeyDigestSize;
 
   //
   // If PcdFmpDeviceTestKeySha256Digest is not exacty SHA256_DIGEST_SIZE bytes,
   // then skip the test key detection.
   //
-  if (PcdGetSize (PcdFmpDeviceTestKeySha256Digest) != SHA256_DIGEST_SIZE) {
+  TestKeyDigestSize = PcdGetSize (PcdFmpDeviceTestKeySha256Digest);
+  if (TestKeyDigestSize != SHA256_DIGEST_SIZE) {
     return;
   }
 
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

Mike

> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, July 30, 2018 7:27 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: [staging/FmpDevicePkg-master][PATCH]
> FmpDevicePkg FmpDxe: Use local variable to store test
> key digest size
> 
> Some static tool reports "the condition in 'if'
> statement is constant".
> 
> This patch updates the code to use local variable to
> store test key
> digest size. It can pass the static tool's check.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  FmpDevicePkg/FmpDxe/DetectTestKey.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/FmpDevicePkg/FmpDxe/DetectTestKey.c
> b/FmpDevicePkg/FmpDxe/DetectTestKey.c
> index 0a6e37ededae..dcf316262d21 100644
> --- a/FmpDevicePkg/FmpDxe/DetectTestKey.c
> +++ b/FmpDevicePkg/FmpDxe/DetectTestKey.c
> @@ -53,12 +53,14 @@ DetectTestKey (
>    UINT8    *PublicKeyDataXdrEnd;
>    VOID     *HashContext;
>    UINT8    Digest[SHA256_DIGEST_SIZE];
> +  UINTN    TestKeyDigestSize;
> 
>    //
>    // If PcdFmpDeviceTestKeySha256Digest is not exacty
> SHA256_DIGEST_SIZE bytes,
>    // then skip the test key detection.
>    //
> -  if (PcdGetSize (PcdFmpDeviceTestKeySha256Digest) !=
> SHA256_DIGEST_SIZE) {
> +  TestKeyDigestSize = PcdGetSize
> (PcdFmpDeviceTestKeySha256Digest);
> +  if (TestKeyDigestSize != SHA256_DIGEST_SIZE) {
>      return;
>    }
> 
> --
> 2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel