From a78d3a279b77627b902d88ea3dd3ec2536892186 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 15 Apr 2015 01:06:15 +0000 Subject: [PATCH] MdeModulePkg: PCD/Pei: eliminate unused but set variable - SVN r14866: MdePkg and MdeModulePkg Pcd: Add the new EFI_GET_PCD_INFO_PROTOCOL and EFI_GET_PCD_INFO_PPI support for PI 1.2.1 compliance. added the "DataBase" local variable to PcdPeimInit(), and both set it and used it. - SVN r14869: MdeModulePkg and Nt32Pkg Pcd: Add the new EFI_GET_PCD_INFO_PROTOCOL and EFI_GET_PCD_INFO_PPI support for PI 1.2.1 compliance. changed the PcdPeimInit() function, but "DataBase" remained both set and used. - SVN r17173: MdeModulePkg Pcd: Check the input SkuId in SetSku() changed the function again; and this time "DataBase" became set-but-unused. It triggers the following build error, when building ArmVirtualizationQemu.dsc with gcc-4.8: MdeModulePkg/Universal/PCD/Pei/Pcd.c:150:21: error: variable 'DataBase' set but not used [-Werror=unused-but-set-variable] PEI_PCD_DATABASE *DataBase; ^ cc1: all warnings being treated as errors Fix the error by removing the DataBase variable, restoring the pre-r14866 state locally, when the BuildPcdDatabase() function was called, but its return value was thrown away. Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Star Zeng git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17179 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/PCD/Pei/Pcd.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.c b/MdeModulePkg/Universal/PCD/Pei/Pcd.c index e6b1c15c44..15f1924f89 100644 --- a/MdeModulePkg/Universal/PCD/Pei/Pcd.c +++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.c @@ -146,10 +146,9 @@ PcdPeimInit ( IN CONST EFI_PEI_SERVICES **PeiServices ) { - EFI_STATUS Status; - PEI_PCD_DATABASE *DataBase; + EFI_STATUS Status; - DataBase = BuildPcdDatabase (FileHandle); + BuildPcdDatabase (FileHandle); // // Install PCD_PPI and EFI_PEI_PCD_PPI. -- 2.39.2