DxeTpmMeasureBootLib: Change global variable name to avoid name conflict.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19334 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
index cd48a1a9773a66251b524f6ce07a549f706716d2..25788b854937fc8c3dc0bad92c157c057f7cf873 100644 (file)
--- a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
+++ b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
@@ -53,7 +53,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 BOOLEAN                           mMeasureGptTableFlag = FALSE;\r
 UINTN                             mMeasureGptCount = 0;\r
 VOID                              *mFileBuffer;\r
 BOOLEAN                           mMeasureGptTableFlag = FALSE;\r
 UINTN                             mMeasureGptCount = 0;\r
 VOID                              *mFileBuffer;\r

-UINTN                             mImageSize;\r
+UINTN                             mTpmImageSize;\r

 //\r
 // Measured FV handle cache\r
 //\r
 //\r
 // Measured FV handle cache\r
 //\r


@@ -95,11 +95,11 @@ DxeTpmMeasureBootLibImageRead (
   }\r
 \r
   EndPosition = FileOffset + *ReadSize;\r
   }\r
 \r
   EndPosition = FileOffset + *ReadSize;\r

-  if (EndPosition > mImageSize) {\r
-    *ReadSize = (UINT32)(mImageSize - FileOffset);\r
+  if (EndPosition > mTpmImageSize) {\r
+    *ReadSize = (UINT32)(mTpmImageSize - FileOffset);\r

   }\r
 \r
   }\r
 \r

-  if (FileOffset >= mImageSize) {\r
+  if (FileOffset >= mTpmImageSize) {\r

     *ReadSize = 0;\r
   }\r
 \r
     *ReadSize = 0;\r
   }\r
 \r


@@ -908,7 +908,7 @@ DxeTpmMeasureBootHandler (
     goto Finish;\r
   }\r
 \r
     goto Finish;\r
   }\r
 \r

-  mImageSize  = FileSize;\r
+  mTpmImageSize  = FileSize;\r

   mFileBuffer = FileBuffer;\r
 \r
   //\r
   mFileBuffer = FileBuffer;\r
 \r
   //\r