2 files changed, 48 insertions, 64 deletions

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 87aeb947ae..4ef64428bb 100644
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -998,13 +998,12 @@ ValidateQuestionFromVfr (
   IN CHAR16                        *RequestElement,

   IN EFI_HII_HANDLE                HiiHandle,

   IN BOOLEAN                       NameValueType

-  )

-{

-  IFR_BLOCK_DATA               VarBlockData;

-  UINT8                        *TmpBuffer;

-  UINT16                       Offset;

-  UINT16                       Width;

-  UINT64                       VarValue;

+  )
+{
+  IFR_BLOCK_DATA               VarBlockData;
+  UINT16                       Offset;
+  UINT16                       Width;
+  UINT64                       VarValue;
   EFI_IFR_TYPE_VALUE           TmpValue;

   EFI_STATUS                   Status;

   EFI_HII_PACKAGE_HEADER       PacakgeHeader;

@@ -1029,13 +1028,12 @@ ValidateQuestionFromVfr (
   //

   // Initialize the local variables.

   //

-  Index             = 0;

-  VarStoreName      = NULL;

-  Status            = EFI_SUCCESS;

-  TmpBuffer         = NULL;

-  VarValue          = 0;

-  IfrVarStore       = NULL;

-  IfrNameValueStore = NULL;

+  Index             = 0;
+  VarStoreName      = NULL;
+  Status            = EFI_SUCCESS;
+  VarValue          = 0;
+  IfrVarStore       = NULL;
+  IfrNameValueStore = NULL;
   IfrEfiVarStore    = NULL;

   ZeroMem (&VarStoreData, sizeof (IFR_VARSTORAGE_DATA));

   ZeroMem (&VarBlockData, sizeof (VarBlockData));

@@ -1583,22 +1581,18 @@ GetBlockDataInfo (
   UINT8                        *TmpBuffer;

   UINT16                       Offset;

   UINT16                       Width;

-  LIST_ENTRY                   *Link;

-  UINTN                        MaxBufferSize;

-  EFI_STATUS                   Status;

-  CHAR8                        *VarStoreName;

-  UINTN                        Index;

-  IFR_BLOCK_DATA               *BlockArray;

-  UINT8                        *DataBuffer;

-  

-  //

-  // Initialize the local variables.

-  //

-  Index         = 0;

-  VarStoreName  = NULL;

-  Status        = EFI_SUCCESS;

-  BlockData     = NULL;

-  NewBlockData  = NULL;

+  LIST_ENTRY                   *Link;
+  UINTN                        MaxBufferSize;
+  EFI_STATUS                   Status;
+  IFR_BLOCK_DATA               *BlockArray;
+  UINT8                        *DataBuffer;
+  
+  //
+  // Initialize the local variables.
+  //
+  Status        = EFI_SUCCESS;
+  BlockData     = NULL;
+  NewBlockData  = NULL;
   TmpBuffer     = NULL;

   BlockArray    = NULL;

   MaxBufferSize = HII_LIB_DEFAULT_VARSTORE_SIZE;

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index a83a2ff777..95ca8d4777 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1430,26 +1430,18 @@ ParseIfrData (
   IFR_DEFAULT_DATA         DefaultData;

   IFR_DEFAULT_DATA         *DefaultDataPtr;

   IFR_BLOCK_DATA           *BlockData;

-  CHAR16                   *VarStoreName;

-  UINT16                   VarWidth;

-  UINT16                   VarDefaultId;

-  EFI_STRING               GuidStr;

-  EFI_STRING               NameStr;

-  EFI_STRING               TempStr;

-  UINTN                    LengthString;

-  BOOLEAN                  FirstOneOfOption;

-  LIST_ENTRY               *LinkData;

-  LIST_ENTRY               *LinkDefault;

-  EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;

-

-  LengthString     = 0;

-  Status           = EFI_SUCCESS;

-  GuidStr          = NULL;

-  NameStr          = NULL;

-  TempStr          = NULL;

-  BlockData        = NULL;

-  DefaultDataPtr   = NULL;

-  FirstOneOfOption = FALSE;

+  CHAR16                   *VarStoreName;
+  UINT16                   VarWidth;
+  UINT16                   VarDefaultId;
+  BOOLEAN                  FirstOneOfOption;
+  LIST_ENTRY               *LinkData;
+  LIST_ENTRY               *LinkDefault;
+  EFI_IFR_VARSTORE_NAME_VALUE *IfrNameValueVarStore;
+
+  Status           = EFI_SUCCESS;
+  BlockData        = NULL;
+  DefaultDataPtr   = NULL;
+  FirstOneOfOption = FALSE;
   ZeroMem (&DefaultData, sizeof (IFR_DEFAULT_DATA));

 

   //

@@ -2872,13 +2864,12 @@ GetFullStringFromHiiFormPackages (
   IFR_DEFAULT_DATA             *DefaultIdArray;

   IFR_VARSTORAGE_DATA          *VarStorageData;

   EFI_STRING                   DefaultAltCfgResp;

-  EFI_STRING                   ConfigHdr;

-  EFI_STRING                   StringPtr;

-  EFI_STRING                   Progress;

-  BOOLEAN                      DataExist;

-

-  if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {

-    return EFI_INVALID_PARAMETER;

+  EFI_STRING                   ConfigHdr;
+  EFI_STRING                   StringPtr;
+  EFI_STRING                   Progress;
+
+  if (DataBaseRecord == NULL || DevicePath == NULL || Request == NULL || AltCfgResp == NULL) {
+    return EFI_INVALID_PARAMETER;
   }

 

   //

@@ -2888,13 +2879,12 @@ GetFullStringFromHiiFormPackages (
   DefaultIdArray    = NULL;

   VarStorageData    = NULL;

   DefaultAltCfgResp = NULL;

-  ConfigHdr         = NULL;

-  HiiFormPackage    = NULL;

-  PackageSize       = 0;

-  DataExist         = FALSE;

-  Progress          = *Request;

-

-  Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);

+  ConfigHdr         = NULL;
+  HiiFormPackage    = NULL;
+  PackageSize       = 0;
+  Progress          = *Request;
+
+  Status = GetFormPackageData (DataBaseRecord, &HiiFormPackage, &PackageSize);
   if (EFI_ERROR (Status)) {

     return Status;

   }