Fix VfrCompiler bug to create varstore name by varstore name field not structure...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8968 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Source/C/VfrCompile/VfrSyntax.g b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
index 2aee307781ea47ea1bc232fe4ee932678f4bc2ff..f91a2c3ceaf88c9dfaa4ce2f59754e0681ff38c4 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrSyntax.g
+++ b/BaseTools/Source/C/VfrCompile/VfrSyntax.g
@@ -623,14 +623,12 @@ vfrStatementVarStoreLinear :
                                                                                   TypeName,\r
                                                                                   VarStoreId\r
                                                                                   ), LineNum);\r
-                                                    >>\r
-                                                    <<\r
                                                        VSObj.SetGuid (&Guid);\r
                                                        _PCATCH(mCVfrDataStorage.GetVarStoreId(StoreName, &VarStoreId), SN);\r
                                                        VSObj.SetVarStoreId (VarStoreId);\r
                                                        _PCATCH(gCVfrVarDataTypeDB.GetDataTypeSize(TypeName, &Size), LineNum);\r
                                                        VSObj.SetSize (Size);\r
-                                                       VSObj.SetName (StoreName);\r
+                                                       VSObj.SetName (SN->getText());\r
                                                     >>\r
   ";"\r
   ;\r

diff --git a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
index df179225d9466bea997207902f25d4041f0f8963..e59fbb7743dacdbc94928eef66dc6d8d670fd44c 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
+++ b/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
@@ -1669,21 +1669,21 @@ CVfrDataStorage::GetVarStoreType (
   }\r
 \r
   for (pNode = mBufferVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {\r
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
       VarStoreType = pNode->mVarStoreType;\r
       return VFR_RETURN_SUCCESS;\r
     }\r
   }\r
 \r
   for (pNode = mEfiVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {\r
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
       VarStoreType = pNode->mVarStoreType;\r
       return VFR_RETURN_SUCCESS;\r
     }\r
   }\r
 \r
   for (pNode = mNameVarStoreList; pNode != NULL; pNode = pNode->mNext) {\r
-    if (strcmp (pNode->mVarStoreName, StoreName) == NULL) {\r
+    if (strcmp (pNode->mVarStoreName, StoreName) == 0) {\r
       VarStoreType = pNode->mVarStoreType;\r
       return VFR_RETURN_SUCCESS;\r
     }\r