From f875a4f16eef839c9ec2cd35bf3f555556c169bc Mon Sep 17 00:00:00 2001 From: qwang12 Date: Thu, 27 Nov 2008 02:34:39 +0000 Subject: [PATCH] 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 --- .../Include/Library/ExtendedIfrSupportLib.h | 5 +---- .../Library/ExtendedHiiLib/ExtendedHiiLib.c | 10 ++++++---- .../Library/ExtendedHiiLib/ExtendedHiiLib.inf | 8 ++++---- .../ExtendedIfrSupportLib.inf | 7 +++++-- .../Library/ExtendedIfrSupportLib/Form.c | 16 ++++------------ 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h index a10ebac6aa..feb27f1dc1 100644 --- a/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h +++ b/MdeModulePkg/Include/Library/ExtendedIfrSupportLib.h @@ -63,11 +63,8 @@ IfrLibInitUpdateData ( @param UpdateData The adding data; - @retval EFI_SUCCESS Resource in UpdateData is released. - @retval EFI_INVALID_PARAMETER UpdateData is NULL. - **/ -EFI_STATUS +VOID IfrLibFreeUpdateData ( IN EFI_HII_UPDATE_DATA *UpdateData ) diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c index a3970ecf74..456d9d8fbc 100644 --- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c +++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.c @@ -1,5 +1,10 @@ /** @file - HII Library implementation that uses DXE protocols and services. +Library instance for ExtendedHiiLib. + +This library instance implements the common HII routines which is +related to HII but reference data structures that are not defined in +UEFI specification, for example HII_VENDOR_DEVICE_PATH. + Copyright (c) 2006 - 2008, Intel Corporation.
All rights reserved. This program and the accompanying materials @@ -14,10 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include - #include - -#include #include #include #include diff --git a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf index f5a7fc2ca3..4f3b632376 100644 --- a/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf +++ b/MdeModulePkg/Library/ExtendedHiiLib/ExtendedHiiLib.inf @@ -1,8 +1,10 @@ #/** @file # -# Library instance for HII common routines. +# Library instance for ExtendedHiiLib. # -# This library instance implements the common HII routines. +# This library instance implements the common HII routines which is +# related to HII but reference data structures that are not defined in +# UEFI specification, for example HII_VENDOR_DEVICE_PATH. # # Copyright (c) 2006 - 2008, Intel Corporation.
# All rights reserved. This program and the accompanying materials @@ -40,8 +42,6 @@ [LibraryClasses] MemoryAllocationLib DebugLib - PcdLib - UefiRuntimeServicesTableLib DevicePathLib [Protocols] diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf index e0fea385e9..f7bd39f15b 100644 --- a/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf +++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/ExtendedIfrSupportLib.inf @@ -1,6 +1,9 @@ #/** @file -# -# Component name for module UefiEfiIfrSupportLib +# Library instance for ExtendedIfrSupportLib. +# +# This library instance implements the API which is +# related to IFR operations but reference data structures +# that are not defined in UEFI specification, for example EFI_IFR_GUID_LABEL. # # Copyright (c) 2007 - 2008, Intel Corporation.
# All rights reserved. This program and the accompanying materials diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c index 833b2f05da..6e09117a57 100644 --- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c +++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c @@ -307,25 +307,17 @@ IfrLibInitUpdateData ( @param UpdateData The adding data; - @retval EFI_SUCCESS Resource in UpdateData is released. - @retval EFI_INVALID_PARAMETER UpdateData is NULL. - **/ -EFI_STATUS +VOID IfrLibFreeUpdateData ( IN EFI_HII_UPDATE_DATA *UpdateData ) { - EFI_STATUS Status; - - if (UpdateData == NULL) { - return EFI_INVALID_PARAMETER; - } - - Status = gBS->FreePool (UpdateData->Data); + ASSERT (UpdateData != NULL); + + FreePool (UpdateData->Data); UpdateData->Data = NULL; - return Status; } /**