From df1780f8bf5e726a1ddf0e7459d462cf06bfa672 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 17 Jul 2009 11:11:56 +0000
Subject: [PATCH] Fix VfrCompiler bug to create varstore name by varstore name
 field not structure field for framework Vfr.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8968 6f19259b-4bc3-4df7-8a09-765794883524
---
 BaseTools/Source/C/VfrCompile/VfrSyntax.g       | 4 +---
 BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 2aee307781..f91a2c3cea 100644
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -623,14 +623,12 @@ vfrStatementVarStoreLinear :
                                                                                   TypeName,
                                                                                   VarStoreId
                                                                                   ), LineNum);
-                                                    >>
-                                                    <<
                                                        VSObj.SetGuid (&Guid);
                                                        _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN);
                                                        VSObj.SetVarStoreId (VarStoreId);
                                                        _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum);
                                                        VSObj.SetSize (Size);
-                                                       VSObj.SetName (StoreName);
+                                                       VSObj.SetName (SN->getText());
                                                     >>
   ";"
   ;
diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
index df179225d9..e59fbb7743 100644
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
@@ -1669,21 +1669,21 @@ CVfrDataStorage::GetVarStoreType (
   }
 
   for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
       VarStoreType = pNode->mVarStoreType;
       return VFR_RETURN_SUCCESS;
     }
   }
 
   for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
       VarStoreType = pNode->mVarStoreType;
       return VFR_RETURN_SUCCESS;
     }
   }
 
   for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {
       VarStoreType = pNode->mVarStoreType;
       return VFR_RETURN_SUCCESS;
     }
-- 
2.39.2