MdeModulePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

3 files changed, 347 insertions, 341 deletions

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
index b262cf714f..ef949267fc 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c
@@ -6,17 +6,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #include "FileExplorer.h"

 

-EFI_GUID FileExplorerGuid       = EFI_FILE_EXPLORE_FORMSET_GUID;

+EFI_GUID  FileExplorerGuid = EFI_FILE_EXPLORE_FORMSET_GUID;

 

 ///

 /// File system selection menu

 ///

-MENU_OPTION      mFsOptionMenu = {

+MENU_OPTION  mFsOptionMenu = {

   MENU_OPTION_SIGNATURE,

-  {NULL},

+  { NULL },

   0,

   FALSE

 };

@@ -43,34 +42,35 @@ HII_VENDOR_DEVICE_PATH  FeHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,

       HW_VENDOR_DP,

       {

-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),

-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),

+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

     //

     // Will be replace with gEfiCallerIdGuid in code.

     //

-    { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }

+    { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }

+    }

   },

   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

     {

-      (UINT8) (END_DEVICE_PATH_LENGTH),

-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)

+      (UINT8)(END_DEVICE_PATH_LENGTH),

+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)

     }

   }

 };

 

 VOID                *mLibStartOpCodeHandle = NULL;

-VOID                *mLibEndOpCodeHandle = NULL;

-EFI_IFR_GUID_LABEL  *mLibStartLabel = NULL;

-EFI_IFR_GUID_LABEL  *mLibEndLabel = NULL;

+VOID                *mLibEndOpCodeHandle   = NULL;

+EFI_IFR_GUID_LABEL  *mLibStartLabel        = NULL;

+EFI_IFR_GUID_LABEL  *mLibEndLabel          = NULL;

 UINT16              mQuestionIdUpdate;

-CHAR16  mNewFileName[MAX_FILE_NAME_LEN];

-CHAR16  mNewFolderName[MAX_FOLDER_NAME_LEN];

-UINTN  mNewFileQuestionId    = NEW_FILE_QUESTION_ID_BASE;

-UINTN  mNewFolderQuestionId  = NEW_FOLDER_QUESTION_ID_BASE;

+CHAR16              mNewFileName[MAX_FILE_NAME_LEN];

+CHAR16              mNewFolderName[MAX_FOLDER_NAME_LEN];

+UINTN               mNewFileQuestionId   = NEW_FILE_QUESTION_ID_BASE;

+UINTN               mNewFolderQuestionId = NEW_FOLDER_QUESTION_ID_BASE;

 

 /**

   Create a new file or folder in current directory.

@@ -82,8 +82,8 @@ UINTN  mNewFolderQuestionId  = NEW_FOLDER_QUESTION_ID_BASE;
 **/

 EFI_STATUS

 LibCreateNewFile (

-  IN CHAR16     *FileName,

-  IN BOOLEAN    CreateFile

+  IN CHAR16   *FileName,

+  IN BOOLEAN  CreateFile

   );

 

 /**

@@ -109,13 +109,13 @@ LibCreateNewFile (
 EFI_STATUS

 EFIAPI

 LibExtractConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Request,

-  OUT EFI_STRING                             *Progress,

-  OUT EFI_STRING                             *Results

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Request,

+  OUT EFI_STRING                            *Progress,

+  OUT EFI_STRING                            *Results

   )

 {

-  if (Progress == NULL || Results == NULL) {

+  if ((Progress == NULL) || (Results == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -141,12 +141,12 @@ LibExtractConfig (
 EFI_STATUS

 EFIAPI

 LibRouteConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Configuration,

-  OUT EFI_STRING                             *Progress

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Configuration,

+  OUT EFI_STRING                            *Progress

   )

 {

-  if (Configuration == NULL || Progress == NULL) {

+  if ((Configuration == NULL) || (Progress == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -177,24 +177,24 @@ LibRouteConfig (
 EFI_STATUS

 EFIAPI

 LibCallback (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  EFI_BROWSER_ACTION                    Action,

+  IN  EFI_QUESTION_ID                       QuestionId,

+  IN  UINT8                                 Type,

+  IN  EFI_IFR_TYPE_VALUE                    *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest

   )

 {

-  EFI_STATUS    Status;

-  BOOLEAN       NeedExit;

-  CHAR16        *NewFileName;

-  CHAR16        *NewFolderName;

+  EFI_STATUS  Status;

+  BOOLEAN     NeedExit;

+  CHAR16      *NewFileName;

+  CHAR16      *NewFolderName;

 

-  NeedExit = TRUE;

+  NeedExit      = TRUE;

   NewFileName   = NULL;

   NewFolderName = NULL;

 

-  if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED) {

+  if ((Action != EFI_BROWSER_ACTION_CHANGING) && (Action != EFI_BROWSER_ACTION_CHANGED)) {

     //

     // Do nothing for other UEFI Action. Only do call back when data is changed.

     //

@@ -209,13 +209,13 @@ LibCallback (
     if (QuestionId == KEY_VALUE_CREATE_FILE_AND_EXIT) {

       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

       if (!IsZeroBuffer (mNewFileName, sizeof (mNewFileName))) {

-        Status = LibCreateNewFile (mNewFileName,TRUE);

-        ZeroMem (mNewFileName,sizeof (mNewFileName));

+        Status = LibCreateNewFile (mNewFileName, TRUE);

+        ZeroMem (mNewFileName, sizeof (mNewFileName));

       }

     }

 

     if (QuestionId == KEY_VALUE_NO_CREATE_FILE_AND_EXIT) {

-      ZeroMem (mNewFileName,sizeof (mNewFileName));

+      ZeroMem (mNewFileName, sizeof (mNewFileName));

       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

     }

 

@@ -223,12 +223,12 @@ LibCallback (
       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

       if (!IsZeroBuffer (mNewFolderName, sizeof (mNewFolderName))) {

         Status = LibCreateNewFile (mNewFolderName, FALSE);

-        ZeroMem (mNewFolderName,sizeof (mNewFolderName));

+        ZeroMem (mNewFolderName, sizeof (mNewFolderName));

       }

     }

 

     if (QuestionId == KEY_VALUE_NO_CREATE_FOLDER_AND_EXIT) {

-      ZeroMem (mNewFolderName,sizeof (mNewFolderName));

+      ZeroMem (mNewFolderName, sizeof (mNewFolderName));

       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

     }

 

@@ -255,7 +255,7 @@ LibCallback (
     }

 

     if (QuestionId >= FILE_OPTION_OFFSET) {

-      LibGetDevicePath(QuestionId);

+      LibGetDevicePath (QuestionId);

 

       //

       // Process the extra action.

@@ -272,8 +272,9 @@ LibCallback (
     if (Value == NULL) {

       return EFI_INVALID_PARAMETER;

     }

+

     if (QuestionId >= FILE_OPTION_OFFSET) {

-      LibGetDevicePath(QuestionId);

+      LibGetDevicePath (QuestionId);

       Status = LibUpdateFileExplorer (QuestionId);

       if (EFI_ERROR (Status)) {

         return Status;

@@ -296,7 +297,7 @@ LibCreateMenuEntry (
   VOID

   )

 {

-  MENU_ENTRY *MenuEntry;

+  MENU_ENTRY  *MenuEntry;

 

   //

   // Create new menu entry

@@ -312,11 +313,10 @@ LibCreateMenuEntry (
     return NULL;

   }

 

-  MenuEntry->Signature        = MENU_ENTRY_SIGNATURE;

+  MenuEntry->Signature = MENU_ENTRY_SIGNATURE;

   return MenuEntry;

 }

 

-

 /**

   Get the Menu Entry from the list in Menu Entry List.

 

@@ -331,13 +331,13 @@ LibCreateMenuEntry (
 **/

 MENU_ENTRY *

 LibGetMenuEntry (

-  MENU_OPTION         *MenuOption,

-  UINTN               MenuNumber

+  MENU_OPTION  *MenuOption,

+  UINTN        MenuNumber

   )

 {

-  MENU_ENTRY      *NewMenuEntry;

-  UINTN           Index;

-  LIST_ENTRY      *List;

+  MENU_ENTRY  *NewMenuEntry;

+  UINTN       Index;

+  LIST_ENTRY  *List;

 

   ASSERT (MenuNumber < MenuOption->MenuNumber);

 

@@ -359,12 +359,12 @@ LibGetMenuEntry (
 **/

 VOID

 LibDestroyMenuEntry (

-  MENU_ENTRY         *MenuEntry

+  MENU_ENTRY  *MenuEntry

   )

 {

-  FILE_CONTEXT           *FileContext;

+  FILE_CONTEXT  *FileContext;

 

-  FileContext = (FILE_CONTEXT *) MenuEntry->VariableContext;

+  FileContext = (FILE_CONTEXT *)MenuEntry->VariableContext;

 

   if (!FileContext->IsRoot) {

     if (FileContext->DevicePath != NULL) {

@@ -385,6 +385,7 @@ LibDestroyMenuEntry (
   if (MenuEntry->DisplayString != NULL) {

     FreePool (MenuEntry->DisplayString);

   }

+

   if (MenuEntry->HelpString != NULL) {

     FreePool (MenuEntry->HelpString);

   }

@@ -392,7 +393,6 @@ LibDestroyMenuEntry (
   FreePool (MenuEntry);

 }

 

-

 /**

   Free resources allocated in Allocate Rountine.

 

@@ -400,10 +400,11 @@ LibDestroyMenuEntry (
 **/

 VOID

 LibFreeMenu (

-  MENU_OPTION        *FreeMenu

+  MENU_OPTION  *FreeMenu

   )

 {

-  MENU_ENTRY *MenuEntry;

+  MENU_ENTRY  *MenuEntry;

+

   while (!IsListEmpty (&FreeMenu->Head)) {

     MenuEntry = CR (

                   FreeMenu->Head.ForwardLink,

@@ -414,6 +415,7 @@ LibFreeMenu (
     RemoveEntryList (&MenuEntry->Link);

     LibDestroyMenuEntry (MenuEntry);

   }

+

   FreeMenu->MenuNumber = 0;

 }

 

@@ -428,12 +430,12 @@ LibFreeMenu (
 **/

 EFI_FILE_HANDLE

 LibOpenRoot (

-  IN EFI_HANDLE                   DeviceHandle

+  IN EFI_HANDLE  DeviceHandle

   )

 {

-  EFI_STATUS                      Status;

-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *Volume;

-  EFI_FILE_HANDLE                 File;

+  EFI_STATUS                       Status;

+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Volume;

+  EFI_FILE_HANDLE                  File;

 

   File = NULL;

 

@@ -443,7 +445,7 @@ LibOpenRoot (
   Status = gBS->HandleProtocol (

                   DeviceHandle,

                   &gEfiSimpleFileSystemProtocolGuid,

-                  (VOID *) &Volume

+                  (VOID *)&Volume

                   );

 

   //

@@ -451,10 +453,11 @@ LibOpenRoot (
   //

   if (!EFI_ERROR (Status)) {

     Status = Volume->OpenVolume (

-                      Volume,

-                      &File

-                      );

+                       Volume,

+                       &File

+                       );

   }

+

   //

   // Done

   //

@@ -471,12 +474,12 @@ LibOpenRoot (
 **/

 CHAR16 *

 LibDevicePathToStr (

-  IN EFI_DEVICE_PATH_PROTOCOL     *DevPath

+  IN EFI_DEVICE_PATH_PROTOCOL  *DevPath

   )

 {

-  EFI_STATUS                       Status;

-  CHAR16                           *ToText;

-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;

+  EFI_STATUS                        Status;

+  CHAR16                            *ToText;

+  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;

 

   if (DevPath == NULL) {

     return NULL;

@@ -485,7 +488,7 @@ LibDevicePathToStr (
   Status = gBS->LocateProtocol (

                   &gEfiDevicePathToTextProtocolGuid,

                   NULL,

-                  (VOID **) &DevPathToText

+                  (VOID **)&DevPathToText

                   );

   ASSERT_EFI_ERROR (Status);

   ToText = DevPathToText->ConvertDevicePathToText (

@@ -509,14 +512,14 @@ LibDevicePathToStr (
 **/

 CHAR16 *

 LibStrDuplicate (

-  IN CHAR16   *Src

+  IN CHAR16  *Src

   )

 {

   CHAR16  *Dest;

   UINTN   Size;

 

-  Size  = StrSize (Src);

-  Dest  = AllocateZeroPool (Size);

+  Size = StrSize (Src);

+  Dest = AllocateZeroPool (Size);

   ASSERT (Dest != NULL);

   if (Dest != NULL) {

     CopyMem (Dest, Src, Size);

@@ -538,16 +541,16 @@ LibStrDuplicate (
 **/

 VOID *

 LibFileInfo (

-  IN EFI_FILE_HANDLE      FHand,

-  IN EFI_GUID             *InfoType

+  IN EFI_FILE_HANDLE  FHand,

+  IN EFI_GUID         *InfoType

   )

 {

-  EFI_STATUS    Status;

-  EFI_FILE_INFO *Buffer;

-  UINTN         BufferSize;

+  EFI_STATUS     Status;

+  EFI_FILE_INFO  *Buffer;

+  UINTN          BufferSize;

 

-  Buffer      = NULL;

-  BufferSize  = 0;

+  Buffer     = NULL;

+  BufferSize = 0;

 

   Status = FHand->GetInfo (

                     FHand,

@@ -580,12 +583,12 @@ LibFileInfo (
   @retval the file type string.

 

 **/

-CHAR16*

+CHAR16 *

 LibGetTypeFromName (

-  IN CHAR16   *FileName

+  IN CHAR16  *FileName

   )

 {

-  UINTN    Index;

+  UINTN  Index;

 

   Index = StrLen (FileName) - 1;

   while ((FileName[Index] != L'.') && (Index != 0)) {

@@ -607,11 +610,11 @@ LibToLowerString (
   IN CHAR16  *String

   )

 {

-  CHAR16      *TmpStr;

+  CHAR16  *TmpStr;

 

   for (TmpStr = String; *TmpStr != L'\0'; TmpStr++) {

-    if (*TmpStr >= L'A' && *TmpStr <= L'Z') {

-      *TmpStr = (CHAR16) (*TmpStr - L'A' + L'a');

+    if ((*TmpStr >= L'A') && (*TmpStr <= L'Z')) {

+      *TmpStr = (CHAR16)(*TmpStr - L'A' + L'a');

     }

   }

 }

@@ -632,9 +635,9 @@ LibIsSupportedFileType (
   IN UINT16  *FileName

   )

 {

-  CHAR16     *InputFileType;

-  CHAR16     *TmpStr;

-  BOOLEAN    IsSupported;

+  CHAR16   *InputFileType;

+  CHAR16   *TmpStr;

+  BOOLEAN  IsSupported;

 

   if (gFileExplorerPrivate.FileType == NULL) {

     return TRUE;

@@ -649,8 +652,8 @@ LibIsSupportedFileType (
   }

 

   TmpStr = AllocateCopyPool (StrSize (InputFileType), InputFileType);

-  ASSERT(TmpStr != NULL);

-  LibToLowerString(TmpStr);

+  ASSERT (TmpStr != NULL);

+  LibToLowerString (TmpStr);

 

   IsSupported = (StrStr (gFileExplorerPrivate.FileType, TmpStr) == NULL ? FALSE : TRUE);

 

@@ -689,12 +692,12 @@ LibAppendFileName (
   //

   // Check overflow

   //

-  if (((MAX_UINTN - Size1) < Size2) || ((MAX_UINTN - Size1 - Size2) < sizeof(CHAR16))) {

+  if (((MAX_UINTN - Size1) < Size2) || ((MAX_UINTN - Size1 - Size2) < sizeof (CHAR16))) {

     return NULL;

   }

 

   MaxLen = (Size1 + Size2 + sizeof (CHAR16))/ sizeof (CHAR16);

-  Str   = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));

+  Str    = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));

   ASSERT (Str != NULL);

 

   TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));

@@ -710,7 +713,7 @@ LibAppendFileName (
   Ptr       = Str;

   LastSlash = Str;

   while (*Ptr != 0) {

-    if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '.' && *(Ptr + 3) == L'\\') {

+    if ((*Ptr == '\\') && (*(Ptr + 1) == '.') && (*(Ptr + 2) == '.') && (*(Ptr + 3) == L'\\')) {

       //

       // Convert "\Name\..\" to "\"

       // DO NOT convert the .. if it is at the end of the string. This will

@@ -722,9 +725,9 @@ LibAppendFileName (
       // that overlap.

       //

       StrCpyS (TmpStr, MaxLen, Ptr + 3);

-      StrCpyS (LastSlash, MaxLen - ((UINTN) LastSlash - (UINTN) Str) / sizeof (CHAR16), TmpStr);

+      StrCpyS (LastSlash, MaxLen - ((UINTN)LastSlash - (UINTN)Str) / sizeof (CHAR16), TmpStr);

       Ptr = LastSlash;

-    } else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {

+    } else if ((*Ptr == '\\') && (*(Ptr + 1) == '.') && (*(Ptr + 2) == '\\')) {

       //

       // Convert a "\.\" to a "\"

       //

@@ -734,7 +737,7 @@ LibAppendFileName (
       // that overlap.

       //

       StrCpyS (TmpStr, MaxLen, Ptr + 2);

-      StrCpyS (Ptr, MaxLen - ((UINTN) Ptr - (UINTN) Str) / sizeof (CHAR16), TmpStr);

+      StrCpyS (Ptr, MaxLen - ((UINTN)Ptr - (UINTN)Str) / sizeof (CHAR16), TmpStr);

       Ptr = LastSlash;

     } else if (*Ptr == '\\') {

       LastSlash = Ptr;

@@ -763,15 +766,15 @@ LibFindFileSystem (
   VOID

   )

 {

-  UINTN                        NoSimpleFsHandles;

-  EFI_HANDLE                   *SimpleFsHandle;

-  UINT16                       *VolumeLabel;

-  UINTN                        Index;

-  EFI_STATUS                   Status;

-  MENU_ENTRY                   *MenuEntry;

-  FILE_CONTEXT                 *FileContext;

-  UINTN                        OptionNumber;

-  EFI_FILE_SYSTEM_VOLUME_LABEL *Info;

+  UINTN                         NoSimpleFsHandles;

+  EFI_HANDLE                    *SimpleFsHandle;

+  UINT16                        *VolumeLabel;

+  UINTN                         Index;

+  EFI_STATUS                    Status;

+  MENU_ENTRY                    *MenuEntry;

+  FILE_CONTEXT                  *FileContext;

+  UINTN                         OptionNumber;

+  EFI_FILE_SYSTEM_VOLUME_LABEL  *Info;

 

   NoSimpleFsHandles = 0;

   OptionNumber      = 0;

@@ -800,24 +803,24 @@ LibFindFileSystem (
         return EFI_OUT_OF_RESOURCES;

       }

 

-      FileContext = (FILE_CONTEXT *) MenuEntry->VariableContext;

+      FileContext               = (FILE_CONTEXT *)MenuEntry->VariableContext;

       FileContext->DeviceHandle = SimpleFsHandle[Index];

-      FileContext->FileHandle = LibOpenRoot (FileContext->DeviceHandle);

+      FileContext->FileHandle   = LibOpenRoot (FileContext->DeviceHandle);

       if (FileContext->FileHandle == NULL) {

         LibDestroyMenuEntry (MenuEntry);

         continue;

       }

 

-      MenuEntry->HelpString = LibDevicePathToStr (DevicePathFromHandle (FileContext->DeviceHandle));

-      FileContext->FileName = LibStrDuplicate (L"\\");

+      MenuEntry->HelpString   = LibDevicePathToStr (DevicePathFromHandle (FileContext->DeviceHandle));

+      FileContext->FileName   = LibStrDuplicate (L"\\");

       FileContext->DevicePath = FileDevicePath (FileContext->DeviceHandle, FileContext->FileName);

-      FileContext->IsDir = TRUE;

-      FileContext->IsRoot = TRUE;

+      FileContext->IsDir      = TRUE;

+      FileContext->IsRoot     = TRUE;

 

       //

       // Get current file system's Volume Label

       //

-      Info = (EFI_FILE_SYSTEM_VOLUME_LABEL *) LibFileInfo (FileContext->FileHandle, &gEfiFileSystemVolumeLabelInfoIdGuid);

+      Info = (EFI_FILE_SYSTEM_VOLUME_LABEL *)LibFileInfo (FileContext->FileHandle, &gEfiFileSystemVolumeLabelInfoIdGuid);

       if (Info == NULL) {

         VolumeLabel = L"NO FILE SYSTEM INFO";

       } else {

@@ -826,7 +829,8 @@ LibFindFileSystem (
           VolumeLabel = L"NO VOLUME LABEL";

         }

       }

-      MenuEntry->DisplayString  = AllocateZeroPool (MAX_CHAR);

+

+      MenuEntry->DisplayString = AllocateZeroPool (MAX_CHAR);

       ASSERT (MenuEntry->DisplayString != NULL);

       UnicodeSPrint (

         MenuEntry->DisplayString,

@@ -836,14 +840,15 @@ LibFindFileSystem (
         MenuEntry->HelpString

         );

       MenuEntry->DisplayStringToken = HiiSetString (

-                                             gFileExplorerPrivate.FeHiiHandle,

-                                             0,

-                                             MenuEntry->DisplayString,

-                                             NULL

-                                             );

+                                        gFileExplorerPrivate.FeHiiHandle,

+                                        0,

+                                        MenuEntry->DisplayString,

+                                        NULL

+                                        );

 

-      if (Info != NULL)

+      if (Info != NULL) {

         FreePool (Info);

+      }

 

       OptionNumber++;

       InsertTailList (&gFileExplorerPrivate.FsOptionMenu->Head, &MenuEntry->Link);

@@ -870,17 +875,17 @@ LibFindFileSystem (
 **/

 EFI_STATUS

 LibGetFileHandleFromMenu (

-  IN  MENU_ENTRY                *MenuEntry,

-  OUT EFI_FILE_HANDLE           *RetFileHandle

+  IN  MENU_ENTRY       *MenuEntry,

+  OUT EFI_FILE_HANDLE  *RetFileHandle

   )

 {

-  EFI_FILE_HANDLE Dir;

-  EFI_FILE_HANDLE NewDir;

-  FILE_CONTEXT    *FileContext;

-  EFI_STATUS      Status;

+  EFI_FILE_HANDLE  Dir;

+  EFI_FILE_HANDLE  NewDir;

+  FILE_CONTEXT     *FileContext;

+  EFI_STATUS       Status;

 

-  FileContext   = (FILE_CONTEXT *) MenuEntry->VariableContext;

-  Dir           = FileContext->FileHandle;

+  FileContext = (FILE_CONTEXT *)MenuEntry->VariableContext;

+  Dir         = FileContext->FileHandle;

 

   //

   // Open current directory to get files from it

@@ -924,14 +929,14 @@ LibGetFileHandleFromDevicePath (
   OUT EFI_HANDLE                *DeviceHandle

   )

 {

-  EFI_DEVICE_PATH_PROTOCOL          *DevicePathNode;

-  EFI_DEVICE_PATH_PROTOCOL          *TempDevicePathNode;

-  EFI_STATUS                        Status;

-  EFI_HANDLE                        Handle;

-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL   *Volume;

-  EFI_FILE_HANDLE                   FileHandle;

-  EFI_FILE_HANDLE                   LastHandle;

-  CHAR16                            *TempPath;

+  EFI_DEVICE_PATH_PROTOCOL         *DevicePathNode;

+  EFI_DEVICE_PATH_PROTOCOL         *TempDevicePathNode;

+  EFI_STATUS                       Status;

+  EFI_HANDLE                       Handle;

+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Volume;

+  EFI_FILE_HANDLE                  FileHandle;

+  EFI_FILE_HANDLE                  LastHandle;

+  CHAR16                           *TempPath;

 

   *ParentFileName = NULL;

 

@@ -939,12 +944,12 @@ LibGetFileHandleFromDevicePath (
   // Attempt to access the file via a file system interface

   //

   DevicePathNode = RootDirectory;

-  Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &DevicePathNode, &Handle);

+  Status         = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &DevicePathNode, &Handle);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&Volume);

+  Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID **)&Volume);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -959,9 +964,9 @@ LibGetFileHandleFromDevicePath (
 

   *DeviceHandle = Handle;

 

-  if (IsDevicePathEnd(DevicePathNode)) {

+  if (IsDevicePathEnd (DevicePathNode)) {

     *ParentFileName = AllocateCopyPool (StrSize (L"\\"), L"\\");

-    *RetFileHandle = FileHandle;

+    *RetFileHandle  = FileHandle;

     return EFI_SUCCESS;

   }

 

@@ -972,7 +977,6 @@ LibGetFileHandleFromDevicePath (
   //

   TempDevicePathNode = DuplicateDevicePath (DevicePathNode);

   if (TempDevicePathNode == NULL) {

-

     //

     // Setting Status to an EFI_ERROR value will cause the rest of

     // the file system support below to be skipped.

@@ -988,8 +992,9 @@ LibGetFileHandleFromDevicePath (
   //

   DevicePathNode = TempDevicePathNode;

   while (!EFI_ERROR (Status) && !IsDevicePathEnd (DevicePathNode)) {

-    if (DevicePathType (DevicePathNode) != MEDIA_DEVICE_PATH ||

-        DevicePathSubType (DevicePathNode) != MEDIA_FILEPATH_DP) {

+    if ((DevicePathType (DevicePathNode) != MEDIA_DEVICE_PATH) ||

+        (DevicePathSubType (DevicePathNode) != MEDIA_FILEPATH_DP))

+    {

       Status = EFI_UNSUPPORTED;

       goto Done;

     }

@@ -998,21 +1003,22 @@ LibGetFileHandleFromDevicePath (
     FileHandle = NULL;

 

     Status = LastHandle->Open (

-                          LastHandle,

-                          &FileHandle,

-                          ((FILEPATH_DEVICE_PATH *) DevicePathNode)->PathName,

-                          EFI_FILE_MODE_READ,

-                          0

-                          );

+                           LastHandle,

+                           &FileHandle,

+                           ((FILEPATH_DEVICE_PATH *)DevicePathNode)->PathName,

+                           EFI_FILE_MODE_READ,

+                           0

+                           );

     if (*ParentFileName == NULL) {

-      *ParentFileName = AllocateCopyPool (StrSize (((FILEPATH_DEVICE_PATH *) DevicePathNode)->PathName), ((FILEPATH_DEVICE_PATH *) DevicePathNode)->PathName);

+      *ParentFileName = AllocateCopyPool (StrSize (((FILEPATH_DEVICE_PATH *)DevicePathNode)->PathName), ((FILEPATH_DEVICE_PATH *)DevicePathNode)->PathName);

     } else {

-      TempPath = LibAppendFileName (*ParentFileName, ((FILEPATH_DEVICE_PATH *) DevicePathNode)->PathName);

+      TempPath = LibAppendFileName (*ParentFileName, ((FILEPATH_DEVICE_PATH *)DevicePathNode)->PathName);

       if (TempPath == NULL) {

         LastHandle->Close (LastHandle);

         Status = EFI_OUT_OF_RESOURCES;

         goto Done;

       }

+

       FreePool (*ParentFileName);

       *ParentFileName = TempPath;

     }

@@ -1055,45 +1061,46 @@ Done:
 **/

 EFI_STATUS

 LibCreateNewFile (

-  IN CHAR16     *FileName,

-  IN BOOLEAN    CreateFile

+  IN CHAR16   *FileName,

+  IN BOOLEAN  CreateFile

   )

 {

-  EFI_FILE_HANDLE      FileHandle;

-  EFI_FILE_HANDLE      NewHandle;

-  EFI_HANDLE           DeviceHandle;

-  EFI_STATUS           Status;

-  CHAR16               *ParentName;

-  CHAR16               *FullFileName;

-

-  NewHandle = NULL;

+  EFI_FILE_HANDLE  FileHandle;

+  EFI_FILE_HANDLE  NewHandle;

+  EFI_HANDLE       DeviceHandle;

+  EFI_STATUS       Status;

+  CHAR16           *ParentName;

+  CHAR16           *FullFileName;

+

+  NewHandle    = NULL;

   FullFileName = NULL;

 

-  LibGetFileHandleFromDevicePath(gFileExplorerPrivate.RetDevicePath, &FileHandle, &ParentName, &DeviceHandle);

+  LibGetFileHandleFromDevicePath (gFileExplorerPrivate.RetDevicePath, &FileHandle, &ParentName, &DeviceHandle);

   FullFileName = LibAppendFileName (ParentName, FileName);

   if (FullFileName == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

+

   if (CreateFile) {

-    Status = FileHandle->Open(

-                          FileHandle,

-                          &NewHandle,

-                          FullFileName,

-                          EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,

-                          0

-                          );

+    Status = FileHandle->Open (

+                           FileHandle,

+                           &NewHandle,

+                           FullFileName,

+                           EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,

+                           0

+                           );

     if (EFI_ERROR (Status)) {

       FileHandle->Close (FileHandle);

       return Status;

     }

   } else {

-    Status = FileHandle->Open(

-                          FileHandle,

-                          &NewHandle,

-                          FullFileName,

-                          EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,

-                          EFI_FILE_DIRECTORY

-                          );

+    Status = FileHandle->Open (

+                           FileHandle,

+                           &NewHandle,

+                           FullFileName,

+                           EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE| EFI_FILE_MODE_CREATE,

+                           EFI_FILE_DIRECTORY

+                           );

     if (EFI_ERROR (Status)) {

       FileHandle->Close (FileHandle);

       return Status;

@@ -1108,7 +1115,6 @@ LibCreateNewFile (
   gFileExplorerPrivate.RetDevicePath = FileDevicePath (DeviceHandle, FullFileName);

 

   return EFI_SUCCESS;

-

 }

 

 /**

@@ -1127,19 +1133,19 @@ LibCreateNewFile (
 **/

 EFI_STATUS

 LibFindFiles (

-  IN EFI_FILE_HANDLE           FileHandle,

-  IN UINT16                    *FileName,

-  IN EFI_HANDLE                DeviceHandle

+  IN EFI_FILE_HANDLE  FileHandle,

+  IN UINT16           *FileName,

+  IN EFI_HANDLE       DeviceHandle

   )

 {

-  EFI_FILE_INFO   *DirInfo;

-  UINTN           BufferSize;

-  UINTN           DirBufferSize;

-  MENU_ENTRY      *NewMenuEntry;

-  FILE_CONTEXT    *NewFileContext;

-  UINTN           Pass;

-  EFI_STATUS      Status;

-  UINTN           OptionNumber;

+  EFI_FILE_INFO  *DirInfo;

+  UINTN          BufferSize;

+  UINTN          DirBufferSize;

+  MENU_ENTRY     *NewMenuEntry;

+  FILE_CONTEXT   *NewFileContext;

+  UINTN          Pass;

+  EFI_STATUS     Status;

+  UINTN          OptionNumber;

 

   OptionNumber = 0;

 

@@ -1157,17 +1163,18 @@ LibFindFiles (
   Status = EFI_SUCCESS;

   for (Pass = 1; Pass <= 2; Pass++) {

     FileHandle->SetPosition (FileHandle, 0);

-    for (;;) {

-      BufferSize  = DirBufferSize;

-      Status      = FileHandle->Read (FileHandle, &BufferSize, DirInfo);

-      if (EFI_ERROR (Status) || BufferSize == 0) {

+    for ( ; ;) {

+      BufferSize = DirBufferSize;

+      Status     = FileHandle->Read (FileHandle, &BufferSize, DirInfo);

+      if (EFI_ERROR (Status) || (BufferSize == 0)) {

         Status = EFI_SUCCESS;

         break;

       }

 

-      if (((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0 && Pass == 2) ||

-          ((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0 && Pass == 1)

-          ) {

+      if ((((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0) && (Pass == 2)) ||

+          (((DirInfo->Attribute & EFI_FILE_DIRECTORY) == 0) && (Pass == 1))

+          )

+      {

         //

         // Pass 1 is for Directories

         // Pass 2 is for file names

@@ -1175,7 +1182,7 @@ LibFindFiles (
         continue;

       }

 

-      if (!((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0 || LibIsSupportedFileType (DirInfo->FileName))) {

+      if (!(((DirInfo->Attribute & EFI_FILE_DIRECTORY) != 0) || LibIsSupportedFileType (DirInfo->FileName))) {

         //

         // Slip file unless it is a directory entry or a .EFI file

         //

@@ -1188,21 +1195,22 @@ LibFindFiles (
         goto Done;

       }

 

-      NewFileContext = (FILE_CONTEXT *) NewMenuEntry->VariableContext;

+      NewFileContext               = (FILE_CONTEXT *)NewMenuEntry->VariableContext;

       NewFileContext->DeviceHandle = DeviceHandle;

-      NewFileContext->FileName = LibAppendFileName (FileName, DirInfo->FileName);

-      if  (NewFileContext->FileName == NULL) {

+      NewFileContext->FileName     = LibAppendFileName (FileName, DirInfo->FileName);

+      if (NewFileContext->FileName == NULL) {

         LibDestroyMenuEntry (NewMenuEntry);

         Status = EFI_OUT_OF_RESOURCES;

         goto Done;

       }

+

       NewFileContext->FileHandle = FileHandle;

       NewFileContext->DevicePath = FileDevicePath (NewFileContext->DeviceHandle, NewFileContext->FileName);

-      NewMenuEntry->HelpString = NULL;

-      NewFileContext->IsDir = (BOOLEAN) ((DirInfo->Attribute & EFI_FILE_DIRECTORY) == EFI_FILE_DIRECTORY);

+      NewMenuEntry->HelpString   = NULL;

+      NewFileContext->IsDir      = (BOOLEAN)((DirInfo->Attribute & EFI_FILE_DIRECTORY) == EFI_FILE_DIRECTORY);

 

       if (NewFileContext->IsDir) {

-        BufferSize = StrLen (DirInfo->FileName) * 2 + 6;

+        BufferSize                  = StrLen (DirInfo->FileName) * 2 + 6;

         NewMenuEntry->DisplayString = AllocateZeroPool (BufferSize);

         UnicodeSPrint (

           NewMenuEntry->DisplayString,

@@ -1221,7 +1229,7 @@ LibFindFiles (
                                            NULL

                                            );

 

-      NewFileContext->IsRoot            = FALSE;

+      NewFileContext->IsRoot = FALSE;

 

       OptionNumber++;

       InsertTailList (&gFileExplorerPrivate.FsOptionMenu->Head, &NewMenuEntry->Link);

@@ -1252,6 +1260,7 @@ LibRefreshUpdateData (
   if (mLibStartOpCodeHandle != NULL) {

     HiiFreeOpCodeHandle (mLibStartOpCodeHandle);

   }

+

   if (mLibEndOpCodeHandle != NULL) {

     HiiFreeOpCodeHandle (mLibEndOpCodeHandle);

   }

@@ -1260,17 +1269,17 @@ LibRefreshUpdateData (
   // Create new OpCode Handle

   //

   mLibStartOpCodeHandle = HiiAllocateOpCodeHandle ();

-  mLibEndOpCodeHandle = HiiAllocateOpCodeHandle ();

+  mLibEndOpCodeHandle   = HiiAllocateOpCodeHandle ();

 

   //

   // Create Hii Extend Label OpCode as the start opcode

   //

-  mLibStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (

-                                         mLibStartOpCodeHandle,

-                                         &gEfiIfrTianoGuid,

-                                         NULL,

-                                         sizeof (EFI_IFR_GUID_LABEL)

-                                         );

+  mLibStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (

+                                           mLibStartOpCodeHandle,

+                                           &gEfiIfrTianoGuid,

+                                           NULL,

+                                           sizeof (EFI_IFR_GUID_LABEL)

+                                           );

   mLibStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

 

   mLibStartLabel->Number = FORM_FILE_EXPLORER_ID;

@@ -1278,7 +1287,7 @@ LibRefreshUpdateData (
   //

   // Create Hii Extend Label OpCode as the start opcode

   //

-  mLibEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (

+  mLibEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (

                                          mLibEndOpCodeHandle,

                                          &gEfiIfrTianoGuid,

                                          NULL,

@@ -1299,15 +1308,15 @@ LibUpdateFileExplorePage (
   VOID

   )

 {

-  UINTN           Index;

-  MENU_ENTRY      *NewMenuEntry;

-  FILE_CONTEXT    *NewFileContext;

-  MENU_OPTION     *MenuOption;

-  BOOLEAN         CreateNewFile;

+  UINTN         Index;

+  MENU_ENTRY    *NewMenuEntry;

+  FILE_CONTEXT  *NewFileContext;

+  MENU_OPTION   *MenuOption;

+  BOOLEAN       CreateNewFile;

 

-  NewMenuEntry    = NULL;

-  NewFileContext  = NULL;

-  CreateNewFile   = FALSE;

+  NewMenuEntry   = NULL;

+  NewFileContext = NULL;

+  CreateNewFile  = FALSE;

 

   LibRefreshUpdateData ();

   MenuOption = gFileExplorerPrivate.FsOptionMenu;

@@ -1315,8 +1324,8 @@ LibUpdateFileExplorePage (
   mQuestionIdUpdate += QUESTION_ID_UPDATE_STEP;

 

   for (Index = 0; Index < MenuOption->MenuNumber; Index++) {

-    NewMenuEntry    = LibGetMenuEntry (MenuOption, Index);

-    NewFileContext  = (FILE_CONTEXT *) NewMenuEntry->VariableContext;

+    NewMenuEntry   = LibGetMenuEntry (MenuOption, Index);

+    NewFileContext = (FILE_CONTEXT *)NewMenuEntry->VariableContext;

 

     if (!NewFileContext->IsRoot && !CreateNewFile) {

       HiiCreateGotoOpCode (

@@ -1325,7 +1334,7 @@ LibUpdateFileExplorePage (
         STRING_TOKEN (STR_NEW_FILE),

         STRING_TOKEN (STR_NEW_FILE_HELP),

         EFI_IFR_FLAG_CALLBACK,

-        (UINT16) (mNewFileQuestionId++)

+        (UINT16)(mNewFileQuestionId++)

         );

       HiiCreateGotoOpCode (

         mLibStartOpCodeHandle,

@@ -1333,9 +1342,9 @@ LibUpdateFileExplorePage (
         STRING_TOKEN (STR_NEW_FOLDER),

         STRING_TOKEN (STR_NEW_FOLDER_HELP),

         EFI_IFR_FLAG_CALLBACK,

-        (UINT16) (mNewFolderQuestionId++)

+        (UINT16)(mNewFolderQuestionId++)

         );

-      HiiCreateTextOpCode(

+      HiiCreateTextOpCode (

         mLibStartOpCodeHandle,

         STRING_TOKEN (STR_NULL_STRING),

         STRING_TOKEN (STR_NULL_STRING),

@@ -1350,7 +1359,7 @@ LibUpdateFileExplorePage (
       //

       HiiCreateActionOpCode (

         mLibStartOpCodeHandle,

-        (UINT16) (FILE_OPTION_OFFSET + Index + mQuestionIdUpdate),

+        (UINT16)(FILE_OPTION_OFFSET + Index + mQuestionIdUpdate),

         NewMenuEntry->DisplayStringToken,

         STRING_TOKEN (STR_NULL_STRING),

         EFI_IFR_FLAG_CALLBACK,

@@ -1366,7 +1375,7 @@ LibUpdateFileExplorePage (
         NewMenuEntry->DisplayStringToken,

         STRING_TOKEN (STR_NULL_STRING),

         EFI_IFR_FLAG_CALLBACK,

-        (UINT16) (FILE_OPTION_OFFSET + Index + mQuestionIdUpdate)

+        (UINT16)(FILE_OPTION_OFFSET + Index + mQuestionIdUpdate)

         );

     }

   }

@@ -1391,19 +1400,19 @@ LibUpdateFileExplorePage (
 **/

 EFI_STATUS

 LibUpdateFileExplorer (

-  IN UINT16                       KeyValue

+  IN UINT16  KeyValue

   )

 {

-  UINT16          FileOptionMask;

-  MENU_ENTRY      *NewMenuEntry;

-  FILE_CONTEXT    *NewFileContext;

-  EFI_STATUS      Status;

-  EFI_FILE_HANDLE FileHandle;

-

-  Status = EFI_SUCCESS;

-  FileOptionMask = (UINT16) (FILE_OPTION_MASK & KeyValue) - mQuestionIdUpdate;

+  UINT16           FileOptionMask;

+  MENU_ENTRY       *NewMenuEntry;

+  FILE_CONTEXT     *NewFileContext;

+  EFI_STATUS       Status;

+  EFI_FILE_HANDLE  FileHandle;

+

+  Status         = EFI_SUCCESS;

+  FileOptionMask = (UINT16)(FILE_OPTION_MASK & KeyValue) - mQuestionIdUpdate;

   NewMenuEntry   = LibGetMenuEntry (gFileExplorerPrivate.FsOptionMenu, FileOptionMask);

-  NewFileContext = (FILE_CONTEXT *) NewMenuEntry->VariableContext;

+  NewFileContext = (FILE_CONTEXT *)NewMenuEntry->VariableContext;

 

   if (NewFileContext->IsDir) {

     RemoveEntryList (&NewMenuEntry->Link);

@@ -1417,6 +1426,7 @@ LibUpdateFileExplorer (
         LibFreeMenu (gFileExplorerPrivate.FsOptionMenu);

       }

     }

+

     LibDestroyMenuEntry (NewMenuEntry);

   }

 

@@ -1431,22 +1441,23 @@ LibUpdateFileExplorer (
 **/

 VOID

 LibGetDevicePath (

-  IN UINT16                       KeyValue

+  IN UINT16  KeyValue

   )

 {

-  UINT16          FileOptionMask;

-  MENU_ENTRY      *NewMenuEntry;

-  FILE_CONTEXT    *NewFileContext;

+  UINT16        FileOptionMask;

+  MENU_ENTRY    *NewMenuEntry;

+  FILE_CONTEXT  *NewFileContext;

 

-  FileOptionMask    = (UINT16) (FILE_OPTION_MASK & KeyValue) - mQuestionIdUpdate;

+  FileOptionMask = (UINT16)(FILE_OPTION_MASK & KeyValue) - mQuestionIdUpdate;

 

   NewMenuEntry = LibGetMenuEntry (gFileExplorerPrivate.FsOptionMenu, FileOptionMask);

 

-  NewFileContext = (FILE_CONTEXT *) NewMenuEntry->VariableContext;

+  NewFileContext = (FILE_CONTEXT *)NewMenuEntry->VariableContext;

 

   if (gFileExplorerPrivate.RetDevicePath != NULL) {

     FreePool (gFileExplorerPrivate.RetDevicePath);

   }

+

   gFileExplorerPrivate.RetDevicePath = DuplicateDevicePath (NewFileContext->DevicePath);

 }

 

@@ -1478,57 +1489,58 @@ ChooseFile (
   OUT EFI_DEVICE_PATH_PROTOCOL  **File  OPTIONAL

   )

 {

-  EFI_FILE_HANDLE                   FileHandle;

-  EFI_STATUS                        Status;

-  UINT16                            *FileName;

-  EFI_HANDLE                        DeviceHandle;

+  EFI_FILE_HANDLE  FileHandle;

+  EFI_STATUS       Status;

+  UINT16           *FileName;

+  EFI_HANDLE       DeviceHandle;

 

   if ((ChooseHandler == NULL) && (File == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

   mQuestionIdUpdate = 0;

-  FileName = NULL;

+  FileName          = NULL;

 

   gFileExplorerPrivate.RetDevicePath = NULL;

   gFileExplorerPrivate.ChooseHandler = ChooseHandler;

   if (FileType != NULL) {

     gFileExplorerPrivate.FileType = AllocateCopyPool (StrSize (FileType), FileType);

-    ASSERT(gFileExplorerPrivate.FileType != NULL);

-    LibToLowerString(gFileExplorerPrivate.FileType);

+    ASSERT (gFileExplorerPrivate.FileType != NULL);

+    LibToLowerString (gFileExplorerPrivate.FileType);

   } else {

     gFileExplorerPrivate.FileType = NULL;

   }

 

   if (RootDirectory == NULL) {

-    Status = LibFindFileSystem();

+    Status = LibFindFileSystem ();

   } else {

-    Status = LibGetFileHandleFromDevicePath(RootDirectory, &FileHandle, &FileName, &DeviceHandle);

+    Status = LibGetFileHandleFromDevicePath (RootDirectory, &FileHandle, &FileName, &DeviceHandle);

     if (EFI_ERROR (Status)) {

       goto Done;

     }

 

     Status = LibFindFiles (FileHandle, FileName, DeviceHandle);

   }

+

   if (EFI_ERROR (Status)) {

     goto Done;

   }

 

-  LibUpdateFileExplorePage();

+  LibUpdateFileExplorePage ();

 

   gFileExplorerPrivate.FormBrowser2->SendForm (

-                         gFileExplorerPrivate.FormBrowser2,

-                         &gFileExplorerPrivate.FeHiiHandle,

-                         1,

-                         &FileExplorerGuid,

-                         0,

-                         NULL,

-                         NULL

-                         );

+                                       gFileExplorerPrivate.FormBrowser2,

+                                       &gFileExplorerPrivate.FeHiiHandle,

+                                       1,

+                                       &FileExplorerGuid,

+                                       0,

+                                       NULL,

+                                       NULL

+                                       );

 

 Done:

   if ((Status == EFI_SUCCESS) && (File != NULL)) {

-    *File  = gFileExplorerPrivate.RetDevicePath;

+    *File = gFileExplorerPrivate.RetDevicePath;

   } else if (gFileExplorerPrivate.RetDevicePath != NULL) {

     FreePool (gFileExplorerPrivate.RetDevicePath);

   }

@@ -1559,13 +1571,13 @@ Done:
 EFI_STATUS

 EFIAPI

 FileExplorerLibConstructor (

-  IN EFI_HANDLE                            ImageHandle,

-  IN EFI_SYSTEM_TABLE                      *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                     Status;

+  EFI_STATUS  Status;

 

-  gHiiVendorDevicePath = (HII_VENDOR_DEVICE_PATH*) DuplicateDevicePath ((EFI_DEVICE_PATH_PROTOCOL*)&FeHiiVendorDevicePath);

+  gHiiVendorDevicePath = (HII_VENDOR_DEVICE_PATH *)DuplicateDevicePath ((EFI_DEVICE_PATH_PROTOCOL *)&FeHiiVendorDevicePath);

   ASSERT (gHiiVendorDevicePath != NULL);

   CopyGuid (&gHiiVendorDevicePath->VendorDevicePath.Guid, &gEfiCallerIdGuid);

 

@@ -1583,6 +1595,7 @@ FileExplorerLibConstructor (
   if (Status == EFI_ALREADY_STARTED) {

     return EFI_SUCCESS;

   }

+

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -1591,18 +1604,18 @@ FileExplorerLibConstructor (
   // Post our File Explorer VFR binary to the HII database.

   //

   gFileExplorerPrivate.FeHiiHandle = HiiAddPackages (

-                                   &FileExplorerGuid,

-                                   gFileExplorerPrivate.FeDriverHandle,

-                                   FileExplorerVfrBin,

-                                   FileExplorerLibStrings,

-                                   NULL

-                                   );

+                                       &FileExplorerGuid,

+                                       gFileExplorerPrivate.FeDriverHandle,

+                                       FileExplorerVfrBin,

+                                       FileExplorerLibStrings,

+                                       NULL

+                                       );

   ASSERT (gFileExplorerPrivate.FeHiiHandle != NULL);

 

   //

   // Locate Formbrowser2 protocol

   //

-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &gFileExplorerPrivate.FormBrowser2);

+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **)&gFileExplorerPrivate.FormBrowser2);

   ASSERT_EFI_ERROR (Status);

 

   InitializeListHead (&gFileExplorerPrivate.FsOptionMenu->Head);

@@ -1621,11 +1634,11 @@ FileExplorerLibConstructor (
 EFI_STATUS

 EFIAPI

 FileExplorerLibDestructor (

-  IN EFI_HANDLE                            ImageHandle,

-  IN EFI_SYSTEM_TABLE                      *SystemTable

+  IN EFI_HANDLE        ImageHandle,

+  IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS    Status;

+  EFI_STATUS  Status;

 

   ASSERT (gHiiVendorDevicePath != NULL);

 

diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
index cc84c2a654..c7587c166b 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
+++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.h
@@ -32,8 +32,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 #include "FormGuid.h"

 

-#define FILE_EXPLORER_CALLBACK_DATA_SIGNATURE     SIGNATURE_32 ('f', 'e', 'c', 'k')

-

+#define FILE_EXPLORER_CALLBACK_DATA_SIGNATURE  SIGNATURE_32 ('f', 'e', 'c', 'k')

 

 #pragma pack(1)

 

@@ -41,77 +40,76 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// HII specific Vendor Device Path definition.

 ///

 typedef struct {

-  VENDOR_DEVICE_PATH             VendorDevicePath;

-  EFI_DEVICE_PATH_PROTOCOL       End;

+  VENDOR_DEVICE_PATH          VendorDevicePath;

+  EFI_DEVICE_PATH_PROTOCOL    End;

 } HII_VENDOR_DEVICE_PATH;

 

 #pragma pack()

 

 typedef struct {

-  EFI_HANDLE                        DeviceHandle;

-  EFI_DEVICE_PATH_PROTOCOL          *DevicePath;

-  EFI_FILE_HANDLE                   FileHandle;

-  UINT16                            *FileName;

+  EFI_HANDLE                  DeviceHandle;

+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;

+  EFI_FILE_HANDLE             FileHandle;

+  UINT16                      *FileName;

 

-  BOOLEAN                           IsRoot;

-  BOOLEAN                           IsDir;

+  BOOLEAN                     IsRoot;

+  BOOLEAN                     IsDir;

 } FILE_CONTEXT;

 

 typedef struct {

-  UINTN           Signature;

-  LIST_ENTRY      Link;

-  UINT16          *DisplayString;

-  UINT16          *HelpString;

-  EFI_STRING_ID   DisplayStringToken;

-  EFI_STRING_ID   HelpStringToken;

-  VOID            *VariableContext;

+  UINTN            Signature;

+  LIST_ENTRY       Link;

+  UINT16           *DisplayString;

+  UINT16           *HelpString;

+  EFI_STRING_ID    DisplayStringToken;

+  EFI_STRING_ID    HelpStringToken;

+  VOID             *VariableContext;

 } MENU_ENTRY;

 

 typedef struct {

-  UINTN           Signature;

-  LIST_ENTRY      Head;

-  UINTN           MenuNumber;

-  BOOLEAN         Used;

+  UINTN         Signature;

+  LIST_ENTRY    Head;

+  UINTN         MenuNumber;

+  BOOLEAN       Used;

 } MENU_OPTION;

 

 typedef struct {

   //

   // Shared callback data.

   //

-  UINTN                          Signature;

+  UINTN                             Signature;

 

   //

   // File explorer formset callback data.

   //

-  EFI_HII_HANDLE                 FeHiiHandle;

-  EFI_HANDLE                     FeDriverHandle;

-  EFI_HII_CONFIG_ACCESS_PROTOCOL FeConfigAccess;

-  EFI_FORM_BROWSER2_PROTOCOL     *FormBrowser2;

-  MENU_OPTION                    *FsOptionMenu;

-  CHAR16                         *FileType;

-  CHOOSE_HANDLER                 ChooseHandler;

-  EFI_DEVICE_PATH_PROTOCOL       *RetDevicePath;

-

+  EFI_HII_HANDLE                    FeHiiHandle;

+  EFI_HANDLE                        FeDriverHandle;

+  EFI_HII_CONFIG_ACCESS_PROTOCOL    FeConfigAccess;

+  EFI_FORM_BROWSER2_PROTOCOL        *FormBrowser2;

+  MENU_OPTION                       *FsOptionMenu;

+  CHAR16                            *FileType;

+  CHOOSE_HANDLER                    ChooseHandler;

+  EFI_DEVICE_PATH_PROTOCOL          *RetDevicePath;

 } FILE_EXPLORER_CALLBACK_DATA;

 

 #define FILE_EXPLORER_PRIVATE_FROM_THIS(a)  CR (a, FILE_EXPLORER_CALLBACK_DATA, FeConfigAccess, FILE_EXPLORER_CALLBACK_DATA_SIGNATURE)

 

-extern UINT8    FileExplorerVfrBin[];

+extern UINT8  FileExplorerVfrBin[];

 

-#define MENU_OPTION_SIGNATURE      SIGNATURE_32 ('m', 'e', 'n', 'u')

-#define MENU_ENTRY_SIGNATURE       SIGNATURE_32 ('e', 'n', 't', 'r')

+#define MENU_OPTION_SIGNATURE  SIGNATURE_32 ('m', 'e', 'n', 'u')

+#define MENU_ENTRY_SIGNATURE   SIGNATURE_32 ('e', 'n', 't', 'r')

 

 ///

 /// Define the maximum characters that will be accepted.

 ///

-#define MAX_CHAR                480

-#define FILE_OPTION_OFFSET      0x8000

-#define FILE_OPTION_MASK        0x7FFF

-#define QUESTION_ID_UPDATE_STEP 200

-#define MAX_FILE_NAME_LEN       20

-#define MAX_FOLDER_NAME_LEN     20

-#define NEW_FILE_QUESTION_ID_BASE   0x5000;

-#define NEW_FOLDER_QUESTION_ID_BASE 0x6000;

+#define MAX_CHAR                     480

+#define FILE_OPTION_OFFSET           0x8000

+#define FILE_OPTION_MASK             0x7FFF

+#define QUESTION_ID_UPDATE_STEP      200

+#define MAX_FILE_NAME_LEN            20

+#define MAX_FOLDER_NAME_LEN          20

+#define NEW_FILE_QUESTION_ID_BASE    0x5000;

+#define NEW_FOLDER_QUESTION_ID_BASE  0x6000;

 

 /**

   This function processes the results of changes in configuration.

@@ -143,15 +141,14 @@ extern UINT8    FileExplorerVfrBin[];
 EFI_STATUS

 EFIAPI

 LibCallback (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  EFI_BROWSER_ACTION                    Action,

+  IN  EFI_QUESTION_ID                       QuestionId,

+  IN  UINT8                                 Type,

+  IN  EFI_IFR_TYPE_VALUE                    *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest

   );

 

-

 /**

   This function allows a caller to extract the current configuration for one

   or more named elements from the target driver.

@@ -177,10 +174,10 @@ LibCallback (
 EFI_STATUS

 EFIAPI

 LibExtractConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Request,

-  OUT EFI_STRING                             *Progress,

-  OUT EFI_STRING                             *Results

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Request,

+  OUT EFI_STRING                            *Progress,

+  OUT EFI_STRING                            *Results

   );

 

 /**

@@ -202,9 +199,9 @@ LibExtractConfig (
 EFI_STATUS

 EFIAPI

 LibRouteConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Configuration,

-  OUT EFI_STRING                             *Progress

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Configuration,

+  OUT EFI_STRING                            *Progress

   );

 

 /**

@@ -218,10 +215,9 @@ LibRouteConfig (
 **/

 EFI_STATUS

 LibUpdateFileExplorer (

-  IN UINT16                       KeyValue

+  IN UINT16  KeyValue

   );

 

-

 /**

   Get the device path info saved in the menu structure.

 

@@ -230,7 +226,7 @@ LibUpdateFileExplorer (
 **/

 VOID

 LibGetDevicePath (

-  IN UINT16                       KeyValue

+  IN UINT16  KeyValue

   );

 

 #endif

diff --git a/MdeModulePkg/Library/FileExplorerLib/FormGuid.h b/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
index a084a50b3b..52a34dc283 100644
--- a/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
+++ b/MdeModulePkg/Library/FileExplorerLib/FormGuid.h
@@ -6,11 +6,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef _FILE_EXPLORER_FORM_GUID_H_

 #define _FILE_EXPLORER_FORM_GUID_H_

 

-

 #define EFI_FILE_EXPLORE_FORMSET_GUID \

   { \

   0xfe561596, 0xe6bf, 0x41a6, {0x83, 0x76, 0xc7, 0x2b, 0x71, 0x98, 0x74, 0xd0} \

@@ -26,7 +24,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define KEY_VALUE_CREATE_FOLDER_AND_EXIT     0x3002

 #define KEY_VALUE_NO_CREATE_FOLDER_AND_EXIT  0x3003

 

-#define LABEL_END                            0xffff

+#define LABEL_END  0xffff

 

 #endif

-