diff options
| author | Eric Dong <eric.dong@intel.com> | 2015-12-18 06:07:50 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-18 06:07:50 +0000 |
| commit | 36f30d41c5ade03206d9f1d5fdb652a382322dac (patch) | |
| tree | 7581c1ee8c1647374881ed3e5dd6acd44f48133d /SecurityPkg | |
| parent | e5cdee8d1de3af6e939b40ab372f946d6161dbb3 (diff) | |
| download | edk2-platforms-36f30d41c5ade03206d9f1d5fdb652a382322dac.tar.xz | |
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 <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19366 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'SecurityPkg')
| -rw-r--r-- | SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c b/SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.c index cd48a1a977..25788b8549 100644 --- 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;
UINTN mMeasureGptCount = 0;
VOID *mFileBuffer;
-UINTN mImageSize;
+UINTN mTpmImageSize;
//
// Measured FV handle cache
//
@@ -95,11 +95,11 @@ DxeTpmMeasureBootLibImageRead ( }
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 @@ DxeTpmMeasureBootHandler ( goto Finish;
}
- mImageSize = FileSize;
+ mTpmImageSize = FileSize;
mFileBuffer = FileBuffer;
//
|