Fixes the GCC build 'Unused variable' warning (raised an error when warnings are...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14474 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 87aeb947ae50134543b879e34b7516d3c58d4a3c..f48f42fcdb0050ec0410c27af77ff6f9554af89b 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1001,7 +1001,6 @@ ValidateQuestionFromVfr (
   )\r
 {\r
   IFR_BLOCK_DATA               VarBlockData;\r
   )\r
 {\r
   IFR_BLOCK_DATA               VarBlockData;\r

-  UINT8                        *TmpBuffer;\r

   UINT16                       Offset;\r
   UINT16                       Width;\r
   UINT64                       VarValue;\r
   UINT16                       Offset;\r
   UINT16                       Width;\r
   UINT64                       VarValue;\r


@@ -1032,7 +1031,6 @@ ValidateQuestionFromVfr (
   Index             = 0;\r
   VarStoreName      = NULL;\r
   Status            = EFI_SUCCESS;\r
   Index             = 0;\r
   VarStoreName      = NULL;\r
   Status            = EFI_SUCCESS;\r

-  TmpBuffer         = NULL;\r

   VarValue          = 0;\r
   IfrVarStore       = NULL;\r
   IfrNameValueStore = NULL;\r
   VarValue          = 0;\r
   IfrVarStore       = NULL;\r
   IfrNameValueStore = NULL;\r


@@ -1586,16 +1584,12 @@ GetBlockDataInfo (
   LIST_ENTRY                   *Link;\r
   UINTN                        MaxBufferSize;\r
   EFI_STATUS                   Status;\r
   LIST_ENTRY                   *Link;\r
   UINTN                        MaxBufferSize;\r
   EFI_STATUS                   Status;\r

-  CHAR8                        *VarStoreName;\r
-  UINTN                        Index;\r

   IFR_BLOCK_DATA               *BlockArray;\r
   UINT8                        *DataBuffer;\r
   \r
   //\r
   // Initialize the local variables.\r
   //\r
   IFR_BLOCK_DATA               *BlockArray;\r
   UINT8                        *DataBuffer;\r
   \r
   //\r
   // Initialize the local variables.\r
   //\r

-  Index         = 0;\r
-  VarStoreName  = NULL;\r

   Status        = EFI_SUCCESS;\r
   BlockData     = NULL;\r
   NewBlockData  = NULL;\r
   Status        = EFI_SUCCESS;\r
   BlockData     = NULL;\r
   NewBlockData  = NULL;\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index a83a2ff77779dfebfc39f24776a838ef2019e7a4..51ff210d185563d03d7d4e693e5d68f5ed3a6c5c 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1433,20 +1433,12 @@ ParseIfrData (
   CHAR16                   *VarStoreName;\r
   UINT16                   VarWidth;\r
   UINT16                   VarDefaultId;\r
   CHAR16                   *VarStoreName;\r
   UINT16                   VarWidth;\r
   UINT16                   VarDefaultId;\r

-  EFI_STRING               GuidStr;\r
-  EFI_STRING               NameStr;\r
-  EFI_STRING               TempStr;\r
-  UINTN                    LengthString;\r

   BOOLEAN                  FirstOneOfOption;\r
   LIST_ENTRY               *LinkData;\r
   LIST_ENTRY               *LinkDefault;\r
   EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;\r
 \r
   BOOLEAN                  FirstOneOfOption;\r
   LIST_ENTRY               *LinkData;\r
   LIST_ENTRY               *LinkDefault;\r
   EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;\r
 \r

-  LengthString     = 0;\r

   Status           = EFI_SUCCESS;\r
   Status           = EFI_SUCCESS;\r

-  GuidStr          = NULL;\r
-  NameStr          = NULL;\r
-  TempStr          = NULL;\r

   BlockData        = NULL;\r
   DefaultDataPtr   = NULL;\r
   FirstOneOfOption = FALSE;\r
   BlockData        = NULL;\r
   DefaultDataPtr   = NULL;\r
   FirstOneOfOption = FALSE;\r


@@ -2875,7 +2867,6 @@ GetFullStringFromHiiFormPackages (
   EFI_STRING                   ConfigHdr;\r
   EFI_STRING                   StringPtr;\r
   EFI_STRING                   Progress;\r
   EFI_STRING                   ConfigHdr;\r
   EFI_STRING                   StringPtr;\r
   EFI_STRING                   Progress;\r

-  BOOLEAN                      DataExist;\r

 \r
   if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
 \r
   if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {\r
     return EFI_INVALID_PARAMETER;\r


@@ -2891,7 +2882,6 @@ GetFullStringFromHiiFormPackages (
   ConfigHdr         = NULL;\r
   HiiFormPackage    = NULL;\r
   PackageSize       = 0;\r
   ConfigHdr         = NULL;\r
   HiiFormPackage    = NULL;\r
   PackageSize       = 0;\r

-  DataExist         = FALSE;\r

   Progress          = *Request;\r
 \r
   Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);\r
   Progress          = *Request;\r
 \r
   Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);\r