1) Change the return type of IfrLibFreeUpdateData to VOID.

2) Remove some unused #include and library instance.

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

diff --git a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
index a10ebac6aa709efa4c4a0d61573cc313f1970216..feb27f1dc130251ba3c070ac83a0ec199e0e8e94 100644 (file)
--- a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
+++ b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h
@@ -63,11 +63,8 @@ IfrLibInitUpdateData (
 \r
   @param UpdateData      The adding data;\r
 \r
-  @retval EFI_SUCCESS            Resource in UpdateData is released.\r
-  @retval EFI_INVALID_PARAMETER  UpdateData is NULL.\r
-\r
 **/\r
-EFI_STATUS\r
+VOID\r
 IfrLibFreeUpdateData (\r
   IN EFI_HII_UPDATE_DATA       *UpdateData\r
   )\r

diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
index a3970ecf74e95217ed7c6edaee2c23725a383396..456d9d8fbcfa54e394bb7e18286edfd80f3e6f0e 100644 (file)
--- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
+++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c
@@ -1,5 +1,10 @@
 /** @file\r
-  HII Library implementation that uses DXE protocols and services.\r
+Library instance for ExtendedHiiLib.\r
+  \r
+This library instance implements the common HII routines which is\r
+related to HII but reference data structures that are not defined in \r
+UEFI specification, for example HII_VENDOR_DEVICE_PATH.\r
+\r
 \r
 Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
 All rights reserved. This program and the accompanying materials\r
@@ -14,10 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 #include <Uefi.h>\r
-\r
 #include <Protocol/DevicePath.h>\r
-\r
-#include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf
index f5a7fc2ca32dffd662bd7d60331521f6200352a5..4f3b6323760718611d2303bbf6db59b77503b1c7 100644 (file)
--- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf
+++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf
@@ -1,8 +1,10 @@
 #/** @file\r
 #  \r
-#    Library instance for HII common routines.\r
+#    Library instance for ExtendedHiiLib.\r
 #  \r
-#   This library instance implements the common HII routines.\r
+#   This library instance implements the common HII routines which is\r
+#   related to HII but reference data structures that are not defined in \r
+#   UEFI specification, for example HII_VENDOR_DEVICE_PATH.\r
 #  \r
 #  Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
 #  All rights reserved. This program and the accompanying materials\r
@@ -40,8 +42,6 @@
 [LibraryClasses]\r
   MemoryAllocationLib\r
   DebugLib\r
-  PcdLib\r
-  UefiRuntimeServicesTableLib\r
   DevicePathLib\r
   \r
 [Protocols]\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
index e0fea385e91d302a0e2918d58bb2a2095092fe44..f7bd39f15b5248abefcf95f8a6559b85e056e56b 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf
@@ -1,6 +1,9 @@
 #/** @file\r
-#  \r
-#    Component name for module UefiEfiIfrSupportLib\r
+#    Library instance for ExtendedIfrSupportLib.\r
+#\r
+#    This library instance implements the API which is\r
+#    related to IFR operations but reference data structures \r
+#    that are not defined in UEFI specification, for example EFI_IFR_GUID_LABEL.\r
 #  \r
 #  Copyright (c) 2007 - 2008, Intel Corporation. <BR>\r
 #  All rights reserved. This program and the accompanying materials\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
index 833b2f05da15eebd58874ad46defab7fee68757e..6e09117a57dc91a3c14af0dd4e361b1aef511ad5 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
@@ -307,25 +307,17 @@ IfrLibInitUpdateData (
 \r
   @param UpdateData      The adding data;\r
 \r
-  @retval EFI_SUCCESS            Resource in UpdateData is released.\r
-  @retval EFI_INVALID_PARAMETER  UpdateData is NULL.\r
-\r
 **/\r
-EFI_STATUS\r
+VOID\r
 IfrLibFreeUpdateData (\r
   IN EFI_HII_UPDATE_DATA       *UpdateData\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-\r
-  if (UpdateData == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  Status = gBS->FreePool (UpdateData->Data);\r
+  ASSERT (UpdateData != NULL);\r
+  \r
+  FreePool (UpdateData->Data);\r
   UpdateData->Data = NULL;\r
 \r
-  return Status;\r
 }\r
 \r
 /**\r