On 05/14/15 09:47, Ard Biesheuvel wrote:
> Remove the unused DevicePathSize variable from EnumerateAllKeywords().
> Due to our use of -Werror=unused-but-set-variable when building under
> GCC, the presence of DevicePathSize is breaking the build.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
> ---
> MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
> b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
> index c3cd064074a8..1756c15ce86e 100644
> --- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
> +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigKeywordHandler.c
> @@ -2565,7 +2565,6 @@ EnumerateAllKeywords (
> UINT8 *DevicePathPkg;
> UINT8 *DevicePath;
> HII_DATABASE_RECORD *DataBaseRecord;
> - UINTN DevicePathSize;
> HII_DATABASE_PACKAGE_LIST_INSTANCE *PackageListNode;
> HII_STRING_PACKAGE_INSTANCE *StringPackage;
> CHAR8 *LocalNameSpace;
> @@ -2580,7 +2579,6 @@ EnumerateAllKeywords (
> BOOLEAN ReadOnly;
>
> DataBaseRecord = NULL;
> - DevicePathSize = 0;
> Status = EFI_SUCCESS;
> MultiKeywordResp = NULL;
> DevicePath = NULL;
> @@ -2600,7 +2598,6 @@ EnumerateAllKeywords (
> DataBaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry,
> HII_DATABASE_RECORD_SIGNATURE);
> if ((DevicePathPkg = DataBaseRecord->PackageList->DevicePathPkg) !=
> NULL) {
> DevicePath = DevicePathPkg + sizeof (EFI_HII_PACKAGE_HEADER);
> - DevicePathSize = GetDevicePathSize ((EFI_DEVICE_PATH_PROTOCOL *)
> DevicePath);
> }
> PackageListNode = DataBaseRecord->PackageList;
>
>
Indeed, I just cross-built ArmVirtualizationQemu.dsc for AARCH64, and
this issue was triggered. (Not visible when building the same code
natively for X64 or IA32 as part of OVMF.)
Also, GetDevicePathSize() doesn't seem to have side effects, so it's
safe to remove the call.
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
Thanks
Laszlo
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
