Clean up ExtendedIfrSupportLib.

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

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
index 65acd0c37e1604e9288a69223c455371607466e1..2b639c9bb8f5ff59c859fd6858816af6adaa63d5 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Common.c
@@ -53,7 +53,7 @@ ExtendedIfrSupportLibConstructor (
 \r
 \r
 \r
-STATIC EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;\r
 \r
 /**\r
   Extract formset class for given HII handle.\r
@@ -170,7 +170,7 @@ IfrLibExtractClassFromHiiHandle (
     Offset += PackageHeader.Length;\r
   }\r
 \r
-  gBS->FreePool (HiiPackageList);\r
+  FreePool (HiiPackageList);\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
index ea9079ea0f082128fe9cc2fe330d60382dcfdb4b..ae8956afdbe0fa3af3f95a47fbfb037ce625147f 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
@@ -264,7 +264,7 @@ UpdateFormPackageData (
 \r
 Fail:\r
   if (!Updated) {\r
-    gBS->FreePool (*TempBuffer);\r
+    FreePool (*TempBuffer);\r
     *TempBufferSize = 0;\r
     return EFI_NOT_FOUND;\r
   }\r
@@ -335,7 +335,7 @@ IfrLibUpdateForm (
 \r
     Status = HiiDatabase->ExportPackageLists (HiiDatabase, Handle, &BufferSize, HiiPackageList);\r
     if (EFI_ERROR (Status)) {\r
-      gBS->FreePool (HiiPackageList);\r
+      FreePool (HiiPackageList);\r
       return Status;\r
     }\r
   }\r
@@ -370,7 +370,7 @@ IfrLibUpdateForm (
           }\r
           CopyMem (UpdateBufferPos, TempBuffer, TempBufferSize);\r
           UpdateBufferPos += TempBufferSize;\r
-          gBS->FreePool (TempBuffer);\r
+          FreePool (TempBuffer);\r
           continue;\r
         }\r
       }\r
@@ -380,7 +380,7 @@ IfrLibUpdateForm (
     } else if (Status == EFI_NOT_FOUND) {\r
       break;\r
     } else {\r
-      gBS->FreePool (HiiPackageList);\r
+      FreePool (HiiPackageList);\r
       return Status;\r
     }\r
   }\r
@@ -391,7 +391,7 @@ IfrLibUpdateForm (
   BufferSize = UpdateBufferPos - (UINT8 *) UpdateBuffer;\r
   CopyMem (&UpdateBuffer->PackageLength, &BufferSize, sizeof (UINT32));\r
 \r
-  gBS->FreePool (HiiPackageList);\r
+  FreePool (HiiPackageList);\r
 \r
   return HiiDatabase->UpdatePackageList (HiiDatabase, Handle, UpdateBuffer);\r
 }\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
index 1a9926e23bff1ab248904912164b77f815f6e8a1..43297743301f03e655052fb63430d35ef3577e4c 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/IfrOpCodeCreation.c
@@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "LibraryInternal.h"\r
 \r
-STATIC EFI_GUID mIfrVendorGuid = EFI_IFR_TIANO_GUID;\r
-\r
 /**\r
   Create GUIDed opcode for banner. Banner opcode\r
   EFI_IFR_EXTEND_OP_BANNER is extended opcode specific\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
index 2ec3f5e4a9053f2204fd305dc26525438a6d6cbc..bbc3a9023a5b7fae672353d50d18e677c4d6b40c 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/LibraryInternal.h
@@ -33,4 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <MdeModuleHii.h>\r
 \r
+extern EFI_GUID mIfrVendorGuid;\r
+\r
 #endif\r