Revision: 19366
http://sourceforge.net/p/edk2/code/19366
Author: vanjeff
Date: 2015-12-18 06:07:50 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
DxeTpmMeasureBootLib: Change global variable name to avoid name conflict.
(Sync patch r19334 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19334
Modified Paths:
--------------
branches/UDK2015/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
Modified:
branches/UDK2015/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
===================================================================
---
branches/UDK2015/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
2015-12-18 05:59:10 UTC (rev 19365)
+++
branches/UDK2015/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c
2015-12-18 06:07:50 UTC (rev 19366)
@@ -53,7 +53,7 @@
BOOLEAN mMeasureGptTableFlag = FALSE;
UINTN mMeasureGptCount = 0;
VOID *mFileBuffer;
-UINTN mImageSize;
+UINTN mTpmImageSize;
//
// Measured FV handle cache
//
@@ -95,11 +95,11 @@
}
EndPosition = FileOffset + *ReadSize;
- if (EndPosition > mImageSize) {
- *ReadSize = (UINT32)(mImageSize - FileOffset);
+ if (EndPosition > mTpmImageSize) {
+ *ReadSize = (UINT32)(mTpmImageSize - FileOffset);
}
- if (FileOffset >= mImageSize) {
+ if (FileOffset >= mTpmImageSize) {
*ReadSize = 0;
}
@@ -908,7 +908,7 @@
goto Finish;
}
- mImageSize = FileSize;
+ mTpmImageSize = FileSize;
mFileBuffer = FileBuffer;
//
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
