1) Cleanup HiiLib, IfrSupportLib.

[mirror_edk2.git] / IntelFrameworkPkg / Library / FrameworkHiiLib / HiiLib.c

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
index 1b4c0dd79a2f33e42e7596640ac0bb69c989a3cc..9f572624a145e64cc70de47a8c0f4df2f852a8ca 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
@@ -128,7 +128,7 @@ PreparePackages (
 \r
 EFI_STATUS\r
 EFIAPI\r
-HiiLibAddPackagesToHiiDatabase (\r
+HiiLibAddPackages (\r
   IN       UINTN               NumberOfPackages,\r
   IN CONST EFI_GUID            *GuidId,\r
   IN       EFI_HANDLE          DriverHandle, OPTIONAL\r
@@ -186,7 +186,7 @@ HiiLibAddFontPackageToHiiDatabase (
   //\r
   // Register our Fonts into the global database\r
   //\r
-  Status = HiiLibAddPackagesToHiiDatabase (1, NULL, HiiHandle, NULL, FontPack);\r
+  Status = HiiLibAddPackages (1, NULL, HiiHandle, NULL, FontPack);\r
   //\r
   // Free the font database\r
   //\r
@@ -195,13 +195,16 @@ HiiLibAddFontPackageToHiiDatabase (
   return Status;  \r
 }\r
 \r
-EFI_STATUS\r
+VOID\r
 EFIAPI\r
-HiiLibRemovePackagesFromHiiDatabase (\r
+HiiLibRemovePackages (\r
   IN      EFI_HII_HANDLE      HiiHandle\r
   )\r
 {\r
-  return mHii->RemovePack (mHii, (FRAMEWORK_EFI_HII_HANDLE) (UINTN) HiiHandle);\r
+  EFI_STATUS Status;\r
+  \r
+  Status = mHii->RemovePack (mHii, (FRAMEWORK_EFI_HII_HANDLE) (UINTN) HiiHandle);\r
+  ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
 \r
@@ -223,7 +226,7 @@ HiiLibRemovePackagesFromHiiDatabase (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
-HiiLibCreateString (\r
+HiiLibNewString (\r
   IN  EFI_HII_HANDLE                  PackageList,\r
   OUT EFI_STRING_ID                   *StringId,\r
   IN  CONST EFI_STRING                String\r
@@ -273,7 +276,7 @@ HiiLibUpdateString (
 //\r
 EFI_STATUS\r
 EFIAPI\r
-HiiLibGetStringFromGuidId (\r
+HiiLibGetStringFromToken (\r
   IN  EFI_GUID                        *ProducerGuid,\r
   IN  EFI_STRING_ID                   StringId,\r
   OUT EFI_STRING                      *String\r