SecurityPkg: Refine the local variable name to follow EDK2 coding style.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Yao Jiewen <Jiewen.Yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18335 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index cb2a65b47caf0772f0b423f3ca3b65787b4caad8..56a8613c59f1e6cc064d4fff3dc52a0aed5a53b5 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -406,11 +406,11 @@ DumpTcgEfiSpecIdEventStruct (
   IN TCG_EfiSpecIDEventStruct   *TcgEfiSpecIdEventStruct\r
   )\r
 {\r
-  TCG_EfiSpecIdEventAlgorithmSize  *digestSize;\r
+  TCG_EfiSpecIdEventAlgorithmSize  *DigestSize;\r
   UINTN                            Index;\r
-  UINT8                            *vendorInfoSize;\r
-  UINT8                            *vendorInfo;\r
-  UINT32                           numberOfAlgorithms;\r
+  UINT8                            *VendorInfoSize;\r
+  UINT8                            *VendorInfo;\r
+  UINT32                           NumberOfAlgorithms;\r
 \r
   DEBUG ((EFI_D_INFO, "  TCG_EfiSpecIDEventStruct:\n"));\r
   DEBUG ((EFI_D_INFO, "    signature          - '"));\r
@@ -422,21 +422,21 @@ DumpTcgEfiSpecIdEventStruct (
   DEBUG ((EFI_D_INFO, "    specVersion        - %d.%d%d\n", TcgEfiSpecIdEventStruct->specVersionMajor, TcgEfiSpecIdEventStruct->specVersionMinor, TcgEfiSpecIdEventStruct->specErrata));\r
   DEBUG ((EFI_D_INFO, "    uintnSize          - 0x%02x\n", TcgEfiSpecIdEventStruct->uintnSize));\r
 \r
-  CopyMem (&numberOfAlgorithms, TcgEfiSpecIdEventStruct + 1, sizeof(numberOfAlgorithms));\r
-  DEBUG ((EFI_D_INFO, "    numberOfAlgorithms - 0x%08x\n", numberOfAlgorithms));\r
+  CopyMem (&NumberOfAlgorithms, TcgEfiSpecIdEventStruct + 1, sizeof(NumberOfAlgorithms));\r
+  DEBUG ((EFI_D_INFO, "    NumberOfAlgorithms - 0x%08x\n", NumberOfAlgorithms));\r
 \r
-  digestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(numberOfAlgorithms));\r
-  for (Index = 0; Index < numberOfAlgorithms; Index++) {\r
+  DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));\r
+  for (Index = 0; Index < NumberOfAlgorithms; Index++) {\r
     DEBUG ((EFI_D_INFO, "    digest(%d)\n", Index));\r
-    DEBUG ((EFI_D_INFO, "      algorithmId      - 0x%04x\n", digestSize[Index].algorithmId));\r
-    DEBUG ((EFI_D_INFO, "      digestSize       - 0x%04x\n", digestSize[Index].digestSize));\r
+    DEBUG ((EFI_D_INFO, "      algorithmId      - 0x%04x\n", DigestSize[Index].algorithmId));\r
+    DEBUG ((EFI_D_INFO, "      digestSize       - 0x%04x\n", DigestSize[Index].digestSize));\r
   }\r
-  vendorInfoSize = (UINT8 *)&digestSize[numberOfAlgorithms];\r
-  DEBUG ((EFI_D_INFO, "    vendorInfoSize     - 0x%02x\n", *vendorInfoSize));\r
-  vendorInfo = vendorInfoSize + 1;\r
-  DEBUG ((EFI_D_INFO, "    vendorInfo         - "));\r
-  for (Index = 0; Index < *vendorInfoSize; Index++) {\r
-    DEBUG ((EFI_D_INFO, "%02x ", vendorInfo[Index]));\r
+  VendorInfoSize = (UINT8 *)&DigestSize[NumberOfAlgorithms];\r
+  DEBUG ((EFI_D_INFO, "    VendorInfoSize     - 0x%02x\n", *VendorInfoSize));\r
+  VendorInfo = VendorInfoSize + 1;\r
+  DEBUG ((EFI_D_INFO, "    VendorInfo         - "));\r
+  for (Index = 0; Index < *VendorInfoSize; Index++) {\r
+    DEBUG ((EFI_D_INFO, "%02x ", VendorInfo[Index]));\r
   }\r
   DEBUG ((EFI_D_INFO, "\n"));\r
 }\r
@@ -451,15 +451,15 @@ GetTcgEfiSpecIdEventStructSize (
   IN TCG_EfiSpecIDEventStruct   *TcgEfiSpecIdEventStruct\r
   )\r
 {\r
-  TCG_EfiSpecIdEventAlgorithmSize  *digestSize;\r
-  UINT8                            *vendorInfoSize;\r
-  UINT32                           numberOfAlgorithms;\r
+  TCG_EfiSpecIdEventAlgorithmSize  *DigestSize;\r
+  UINT8                            *VendorInfoSize;\r
+  UINT32                           NumberOfAlgorithms;\r
 \r
-  CopyMem (&numberOfAlgorithms, TcgEfiSpecIdEventStruct + 1, sizeof(numberOfAlgorithms));\r
+  CopyMem (&NumberOfAlgorithms, TcgEfiSpecIdEventStruct + 1, sizeof(NumberOfAlgorithms));\r
 \r
-  digestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(numberOfAlgorithms));\r
-  vendorInfoSize = (UINT8 *)&digestSize[numberOfAlgorithms];\r
-  return sizeof(TCG_EfiSpecIDEventStruct) + sizeof(UINT32) + (numberOfAlgorithms * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8) + (*vendorInfoSize);\r
+  DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));\r
+  VendorInfoSize = (UINT8 *)&DigestSize[NumberOfAlgorithms];\r
+  return sizeof(TCG_EfiSpecIDEventStruct) + sizeof(UINT32) + (NumberOfAlgorithms * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8) + (*VendorInfoSize);\r
 }\r
 \r
 /**\r
@@ -1455,9 +1455,9 @@ SetupEventLog (
   TCG_EfiSpecIDEventStruct        *TcgEfiSpecIdEventStruct;\r
   UINT8                           TempBuf[sizeof(TCG_EfiSpecIDEventStruct) + (HASH_COUNT * sizeof(TCG_EfiSpecIdEventAlgorithmSize)) + sizeof(UINT8)];\r
   TCG_PCR_EVENT_HDR               FirstPcrEvent;\r
-  TCG_EfiSpecIdEventAlgorithmSize *digestSize;\r
-  UINT8                           *vendorInfoSize;\r
-  UINT32                          numberOfAlgorithms;\r
+  TCG_EfiSpecIdEventAlgorithmSize *DigestSize;\r
+  UINT8                           *VendorInfoSize;\r
+  UINT32                          NumberOfAlgorithms;\r
 \r
   DEBUG ((EFI_D_INFO, "SetupEventLog\n"));\r
 \r
@@ -1498,36 +1498,36 @@ SetupEventLog (
         TcgEfiSpecIdEventStruct->specVersionMinor = TCG_EfiSpecIDEventStruct_SPEC_VERSION_MINOR_TPM2;\r
         TcgEfiSpecIdEventStruct->specErrata = TCG_EfiSpecIDEventStruct_SPEC_ERRATA_TPM2;\r
         TcgEfiSpecIdEventStruct->uintnSize = sizeof(UINTN)/sizeof(UINT32);\r
-        numberOfAlgorithms = 0;\r
-        digestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(numberOfAlgorithms));\r
+        NumberOfAlgorithms = 0;\r
+        DigestSize = (TCG_EfiSpecIdEventAlgorithmSize *)((UINT8 *)TcgEfiSpecIdEventStruct + sizeof(*TcgEfiSpecIdEventStruct) + sizeof(NumberOfAlgorithms));\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA1) != 0) {\r
-          digestSize[numberOfAlgorithms].algorithmId = TPM_ALG_SHA1;\r
-          digestSize[numberOfAlgorithms].digestSize = SHA1_DIGEST_SIZE;\r
-          numberOfAlgorithms++;\r
+          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA1;\r
+          DigestSize[NumberOfAlgorithms].digestSize = SHA1_DIGEST_SIZE;\r
+          NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA256) != 0) {\r
-          digestSize[numberOfAlgorithms].algorithmId = TPM_ALG_SHA256;\r
-          digestSize[numberOfAlgorithms].digestSize = SHA256_DIGEST_SIZE;\r
-          numberOfAlgorithms++;\r
+          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA256;\r
+          DigestSize[NumberOfAlgorithms].digestSize = SHA256_DIGEST_SIZE;\r
+          NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA384) != 0) {\r
-          digestSize[numberOfAlgorithms].algorithmId = TPM_ALG_SHA384;\r
-          digestSize[numberOfAlgorithms].digestSize = SHA384_DIGEST_SIZE;\r
-          numberOfAlgorithms++;\r
+          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA384;\r
+          DigestSize[NumberOfAlgorithms].digestSize = SHA384_DIGEST_SIZE;\r
+          NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SHA512) != 0) {\r
-          digestSize[numberOfAlgorithms].algorithmId = TPM_ALG_SHA512;\r
-          digestSize[numberOfAlgorithms].digestSize = SHA512_DIGEST_SIZE;\r
-          numberOfAlgorithms++;\r
+          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SHA512;\r
+          DigestSize[NumberOfAlgorithms].digestSize = SHA512_DIGEST_SIZE;\r
+          NumberOfAlgorithms++;\r
         }\r
         if ((mTcgDxeData.BsCap.ActivePcrBanks & EFI_TCG2_BOOT_HASH_ALG_SM3_256) != 0) {\r
-          digestSize[numberOfAlgorithms].algorithmId = TPM_ALG_SM3_256;\r
-          digestSize[numberOfAlgorithms].digestSize = SM3_256_DIGEST_SIZE;\r
-          numberOfAlgorithms++;\r
+          DigestSize[NumberOfAlgorithms].algorithmId = TPM_ALG_SM3_256;\r
+          DigestSize[NumberOfAlgorithms].digestSize = SM3_256_DIGEST_SIZE;\r
+          NumberOfAlgorithms++;\r
         }\r
-        CopyMem (TcgEfiSpecIdEventStruct + 1, &numberOfAlgorithms, sizeof(numberOfAlgorithms));\r
-        vendorInfoSize = (UINT8 *)&digestSize[numberOfAlgorithms];\r
-        *vendorInfoSize = 0;\r
+        CopyMem (TcgEfiSpecIdEventStruct + 1, &NumberOfAlgorithms, sizeof(NumberOfAlgorithms));\r
+        VendorInfoSize = (UINT8 *)&DigestSize[NumberOfAlgorithms];\r
+        *VendorInfoSize = 0;\r
 \r
         //\r
         // FirstPcrEvent\r