]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdePkg/Library/DxeServicesLib/DxeServicesLib.c
MdePkg: Apply uncrustify changes
[mirror_edk2.git] / MdePkg / Library / DxeServicesLib / DxeServicesLib.c
index 3e3bbf6055335b37a7e9fe833ea96715509dbe36..8f5a15dedc9f2fb13e0dff30ec8d340a07518cb7 100644 (file)
 **/\r
 EFI_HANDLE\r
 InternalImageHandleToFvHandle (\r
-  EFI_HANDLE ImageHandle\r
+  EFI_HANDLE  ImageHandle\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_LOADED_IMAGE_PROTOCOL     *LoadedImage;\r
+  EFI_STATUS                 Status;\r
+  EFI_LOADED_IMAGE_PROTOCOL  *LoadedImage;\r
 \r
   ASSERT (ImageHandle != NULL);\r
 \r
   Status = gBS->HandleProtocol (\r
-             ImageHandle,\r
-             &gEfiLoadedImageProtocolGuid,\r
-             (VOID **) &LoadedImage\r
-             );\r
+                  ImageHandle,\r
+                  &gEfiLoadedImageProtocolGuid,\r
+                  (VOID **)&LoadedImage\r
+                  );\r
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -63,7 +63,6 @@ InternalImageHandleToFvHandle (
   // protocol is installed.\r
   //\r
   return LoadedImage->DeviceHandle;\r
-\r
 }\r
 \r
 /**\r
@@ -111,17 +110,17 @@ InternalImageHandleToFvHandle (
 **/\r
 EFI_STATUS\r
 InternalGetSectionFromFv (\r
-  IN  EFI_HANDLE                    FvHandle,\r
-  IN  CONST EFI_GUID                *NameGuid,\r
-  IN  EFI_SECTION_TYPE              SectionType,\r
-  IN  UINTN                         SectionInstance,\r
-  OUT VOID                          **Buffer,\r
-  OUT UINTN                         *Size\r
+  IN  EFI_HANDLE        FvHandle,\r
+  IN  CONST EFI_GUID    *NameGuid,\r
+  IN  EFI_SECTION_TYPE  SectionType,\r
+  IN  UINTN             SectionInstance,\r
+  OUT VOID              **Buffer,\r
+  OUT UINTN             *Size\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
-  UINT32                        AuthenticationStatus;\r
+  EFI_STATUS                     Status;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;\r
+  UINT32                         AuthenticationStatus;\r
 \r
   ASSERT (NameGuid != NULL);\r
   ASSERT (Buffer != NULL);\r
@@ -137,7 +136,7 @@ InternalGetSectionFromFv (
   Status = gBS->HandleProtocol (\r
                   FvHandle,\r
                   &gEfiFirmwareVolume2ProtocolGuid,\r
-                  (VOID **) &Fv\r
+                  (VOID **)&Fv\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return EFI_NOT_FOUND;\r
@@ -146,17 +145,17 @@ InternalGetSectionFromFv (
   //\r
   // Read desired section content in NameGuid file\r
   //\r
-  *Buffer     = NULL;\r
-  *Size       = 0;\r
-  Status      = Fv->ReadSection (\r
-                      Fv,\r
-                      NameGuid,\r
-                      SectionType,\r
-                      SectionInstance,\r
-                      Buffer,\r
-                      Size,\r
-                      &AuthenticationStatus\r
-                      );\r
+  *Buffer = NULL;\r
+  *Size   = 0;\r
+  Status  = Fv->ReadSection (\r
+                  Fv,\r
+                  NameGuid,\r
+                  SectionType,\r
+                  SectionInstance,\r
+                  Buffer,\r
+                  Size,\r
+                  &AuthenticationStatus\r
+                  );\r
 \r
   if (EFI_ERROR (Status) && (SectionType == EFI_SECTION_TE)) {\r
     //\r
@@ -229,23 +228,23 @@ InternalGetSectionFromFv (
 EFI_STATUS\r
 EFIAPI\r
 GetSectionFromAnyFvByFileType  (\r
-  IN  EFI_FV_FILETYPE               FileType,\r
-  IN  UINTN                         FileInstance,\r
-  IN  EFI_SECTION_TYPE              SectionType,\r
-  IN  UINTN                         SectionInstance,\r
-  OUT VOID                          **Buffer,\r
-  OUT UINTN                         *Size\r
+  IN  EFI_FV_FILETYPE   FileType,\r
+  IN  UINTN             FileInstance,\r
+  IN  EFI_SECTION_TYPE  SectionType,\r
+  IN  UINTN             SectionInstance,\r
+  OUT VOID              **Buffer,\r
+  OUT UINTN             *Size\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HANDLE                    *HandleBuffer;\r
-  UINTN                         HandleCount;\r
-  UINTN                         IndexFv;\r
-  UINTN                         IndexFile;\r
-  UINTN                         Key;\r
-  EFI_GUID                      NameGuid;\r
-  EFI_FV_FILE_ATTRIBUTES        Attributes;\r
-  EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;\r
+  EFI_STATUS                     Status;\r
+  EFI_HANDLE                     *HandleBuffer;\r
+  UINTN                          HandleCount;\r
+  UINTN                          IndexFv;\r
+  UINTN                          IndexFile;\r
+  UINTN                          Key;\r
+  EFI_GUID                       NameGuid;\r
+  EFI_FV_FILE_ATTRIBUTES         Attributes;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL  *Fv;\r
 \r
   ASSERT (Buffer != NULL);\r
   ASSERT (Size != NULL);\r
@@ -254,13 +253,13 @@ GetSectionFromAnyFvByFileType  (
   // Locate all available FVs.\r
   //\r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiFirmwareVolume2ProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        &gEfiFirmwareVolume2ProtocolGuid,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -282,13 +281,14 @@ GetSectionFromAnyFvByFileType  (
     // Use Firmware Volume 2 Protocol to search for a file of type FileType in all FVs.\r
     //\r
     IndexFile = FileInstance + 1;\r
-    Key = 0;\r
+    Key       = 0;\r
     do {\r
       Status = Fv->GetNextFile (Fv, &Key, &FileType, &NameGuid, &Attributes, Size);\r
       if (EFI_ERROR (Status)) {\r
         break;\r
       }\r
-      IndexFile --;\r
+\r
+      IndexFile--;\r
     } while (IndexFile > 0);\r
 \r
     //\r
@@ -320,7 +320,7 @@ GetSectionFromAnyFvByFileType  (
 \r
 Done:\r
   if (HandleBuffer != NULL) {\r
-    FreePool(HandleBuffer);\r
+    FreePool (HandleBuffer);\r
   }\r
 \r
   return Status;\r
@@ -372,18 +372,18 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 GetSectionFromAnyFv  (\r
-  IN CONST  EFI_GUID           *NameGuid,\r
-  IN        EFI_SECTION_TYPE   SectionType,\r
-  IN        UINTN              SectionInstance,\r
-  OUT       VOID               **Buffer,\r
-  OUT       UINTN              *Size\r
+  IN CONST  EFI_GUID          *NameGuid,\r
+  IN        EFI_SECTION_TYPE  SectionType,\r
+  IN        UINTN             SectionInstance,\r
+  OUT       VOID              **Buffer,\r
+  OUT       UINTN             *Size\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  EFI_HANDLE                    *HandleBuffer;\r
-  UINTN                         HandleCount;\r
-  UINTN                         Index;\r
-  EFI_HANDLE                    FvHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  *HandleBuffer;\r
+  UINTN       HandleCount;\r
+  UINTN       Index;\r
+  EFI_HANDLE  FvHandle;\r
 \r
   //\r
   // Search the FV that contain the caller's FFS first.\r
@@ -392,26 +392,26 @@ GetSectionFromAnyFv  (
   // will locate the FFS faster.\r
   //\r
   FvHandle = InternalImageHandleToFvHandle (gImageHandle);\r
-  Status = InternalGetSectionFromFv (\r
-             FvHandle,\r
-             NameGuid,\r
-             SectionType,\r
-             SectionInstance,\r
-             Buffer,\r
-             Size\r
-             );\r
+  Status   = InternalGetSectionFromFv (\r
+               FvHandle,\r
+               NameGuid,\r
+               SectionType,\r
+               SectionInstance,\r
+               Buffer,\r
+               Size\r
+               );\r
   if (!EFI_ERROR (Status)) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   HandleBuffer = NULL;\r
-  Status = gBS->LocateHandleBuffer (\r
-                  ByProtocol,\r
-                  &gEfiFirmwareVolume2ProtocolGuid,\r
-                  NULL,\r
-                  &HandleCount,\r
-                  &HandleBuffer\r
-                  );\r
+  Status       = gBS->LocateHandleBuffer (\r
+                        ByProtocol,\r
+                        &gEfiFirmwareVolume2ProtocolGuid,\r
+                        NULL,\r
+                        &HandleCount,\r
+                        &HandleBuffer\r
+                        );\r
   if (EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -434,7 +434,6 @@ GetSectionFromAnyFv  (
         goto Done;\r
       }\r
     }\r
-\r
   }\r
 \r
   if (Index == HandleCount) {\r
@@ -444,10 +443,10 @@ GetSectionFromAnyFv  (
 Done:\r
 \r
   if (HandleBuffer != NULL) {\r
-    FreePool(HandleBuffer);\r
+    FreePool (HandleBuffer);\r
   }\r
-  return Status;\r
 \r
+  return Status;\r
 }\r
 \r
 /**\r
@@ -498,15 +497,15 @@ Done:
 EFI_STATUS\r
 EFIAPI\r
 GetSectionFromFv (\r
-  IN  CONST EFI_GUID                *NameGuid,\r
-  IN  EFI_SECTION_TYPE              SectionType,\r
-  IN  UINTN                         SectionInstance,\r
-  OUT VOID                          **Buffer,\r
-  OUT UINTN                         *Size\r
-    )\r
+  IN  CONST EFI_GUID    *NameGuid,\r
+  IN  EFI_SECTION_TYPE  SectionType,\r
+  IN  UINTN             SectionInstance,\r
+  OUT VOID              **Buffer,\r
+  OUT UINTN             *Size\r
+  )\r
 {\r
   return InternalGetSectionFromFv (\r
-           InternalImageHandleToFvHandle(gImageHandle),\r
+           InternalImageHandleToFvHandle (gImageHandle),\r
            NameGuid,\r
            SectionType,\r
            SectionInstance,\r
@@ -515,7 +514,6 @@ GetSectionFromFv (
            );\r
 }\r
 \r
-\r
 /**\r
   Searches the FFS file the currently executing module was loaded from and returns the first matching FFS section.\r
 \r
@@ -561,14 +559,14 @@ GetSectionFromFv (
 EFI_STATUS\r
 EFIAPI\r
 GetSectionFromFfs (\r
-  IN  EFI_SECTION_TYPE              SectionType,\r
-  IN  UINTN                         SectionInstance,\r
-  OUT VOID                          **Buffer,\r
-  OUT UINTN                         *Size\r
-    )\r
+  IN  EFI_SECTION_TYPE  SectionType,\r
+  IN  UINTN             SectionInstance,\r
+  OUT VOID              **Buffer,\r
+  OUT UINTN             *Size\r
+  )\r
 {\r
-  return InternalGetSectionFromFv(\r
-           InternalImageHandleToFvHandle(gImageHandle),\r
+  return InternalGetSectionFromFv (\r
+           InternalImageHandleToFvHandle (gImageHandle),\r
            &gEfiCallerIdGuid,\r
            SectionType,\r
            SectionInstance,\r
@@ -577,7 +575,6 @@ GetSectionFromFfs (
            );\r
 }\r
 \r
-\r
 /**\r
   Get the image file buffer data and buffer size by its device path.\r
 \r
@@ -608,48 +605,48 @@ GetSectionFromFfs (
 VOID *\r
 EFIAPI\r
 GetFileBufferByFilePath (\r
-  IN BOOLEAN                           BootPolicy,\r
-  IN CONST EFI_DEVICE_PATH_PROTOCOL    *FilePath,\r
-  OUT      UINTN                       *FileSize,\r
-  OUT UINT32                           *AuthenticationStatus\r
+  IN BOOLEAN                         BootPolicy,\r
+  IN CONST EFI_DEVICE_PATH_PROTOCOL  *FilePath,\r
+  OUT      UINTN                     *FileSize,\r
+  OUT UINT32                         *AuthenticationStatus\r
   )\r
 {\r
-  EFI_DEVICE_PATH_PROTOCOL          *DevicePathNode;\r
-  EFI_DEVICE_PATH_PROTOCOL          *OrigDevicePathNode;\r
-  EFI_DEVICE_PATH_PROTOCOL          *TempDevicePathNode;\r
-  EFI_HANDLE                        Handle;\r
-  EFI_GUID                          *FvNameGuid;\r
-  EFI_FIRMWARE_VOLUME2_PROTOCOL     *FwVol;\r
-  EFI_SECTION_TYPE                  SectionType;\r
-  UINT8                             *ImageBuffer;\r
-  UINTN                             ImageBufferSize;\r
-  EFI_FV_FILETYPE                   Type;\r
-  EFI_FV_FILE_ATTRIBUTES            Attrib;\r
-  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL   *Volume;\r
-  EFI_FILE_HANDLE                   FileHandle;\r
-  EFI_FILE_HANDLE                   LastHandle;\r
-  EFI_FILE_INFO                     *FileInfo;\r
-  UINTN                             FileInfoSize;\r
-  EFI_LOAD_FILE_PROTOCOL            *LoadFile;\r
-  EFI_LOAD_FILE2_PROTOCOL           *LoadFile2;\r
-  EFI_STATUS                        Status;\r
+  EFI_DEVICE_PATH_PROTOCOL         *DevicePathNode;\r
+  EFI_DEVICE_PATH_PROTOCOL         *OrigDevicePathNode;\r
+  EFI_DEVICE_PATH_PROTOCOL         *TempDevicePathNode;\r
+  EFI_HANDLE                       Handle;\r
+  EFI_GUID                         *FvNameGuid;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL    *FwVol;\r
+  EFI_SECTION_TYPE                 SectionType;\r
+  UINT8                            *ImageBuffer;\r
+  UINTN                            ImageBufferSize;\r
+  EFI_FV_FILETYPE                  Type;\r
+  EFI_FV_FILE_ATTRIBUTES           Attrib;\r
+  EFI_SIMPLE_FILE_SYSTEM_PROTOCOL  *Volume;\r
+  EFI_FILE_HANDLE                  FileHandle;\r
+  EFI_FILE_HANDLE                  LastHandle;\r
+  EFI_FILE_INFO                    *FileInfo;\r
+  UINTN                            FileInfoSize;\r
+  EFI_LOAD_FILE_PROTOCOL           *LoadFile;\r
+  EFI_LOAD_FILE2_PROTOCOL          *LoadFile2;\r
+  EFI_STATUS                       Status;\r
 \r
   //\r
   // Check input File device path.\r
   //\r
-  if (FilePath == NULL || FileSize == NULL || AuthenticationStatus == NULL) {\r
+  if ((FilePath == NULL) || (FileSize == NULL) || (AuthenticationStatus == NULL)) {\r
     return NULL;\r
   }\r
 \r
   //\r
   // Init local variable\r
   //\r
-  TempDevicePathNode  = NULL;\r
-  FvNameGuid          = NULL;\r
-  FileInfo            = NULL;\r
-  FileHandle          = NULL;\r
-  ImageBuffer         = NULL;\r
-  ImageBufferSize     = 0;\r
+  TempDevicePathNode    = NULL;\r
+  FvNameGuid            = NULL;\r
+  FileInfo              = NULL;\r
+  FileHandle            = NULL;\r
+  ImageBuffer           = NULL;\r
+  ImageBufferSize       = 0;\r
   *AuthenticationStatus = 0;\r
 \r
   //\r
@@ -665,31 +662,31 @@ GetFileBufferByFilePath (
   // Is so, this device path may contain a Image.\r
   //\r
   DevicePathNode = OrigDevicePathNode;\r
-  Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid, &DevicePathNode, &Handle);\r
+  Status         = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid, &DevicePathNode, &Handle);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // For FwVol File system there is only a single file name that is a GUID.\r
     //\r
-    FvNameGuid = EfiGetNameGuidFromFwVolDevicePathNode ((CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) DevicePathNode);\r
+    FvNameGuid = EfiGetNameGuidFromFwVolDevicePathNode ((CONST MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)DevicePathNode);\r
     if (FvNameGuid == NULL) {\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
       //\r
       // Read image from the firmware file\r
       //\r
-      Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolume2ProtocolGuid, (VOID**)&FwVol);\r
+      Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolume2ProtocolGuid, (VOID **)&FwVol);\r
       if (!EFI_ERROR (Status)) {\r
         SectionType = EFI_SECTION_PE32;\r
         ImageBuffer = NULL;\r
-        Status = FwVol->ReadSection (\r
-                          FwVol,\r
-                          FvNameGuid,\r
-                          SectionType,\r
-                          0,\r
-                          (VOID **)&ImageBuffer,\r
-                          &ImageBufferSize,\r
-                          AuthenticationStatus\r
-                          );\r
+        Status      = FwVol->ReadSection (\r
+                               FwVol,\r
+                               FvNameGuid,\r
+                               SectionType,\r
+                               0,\r
+                               (VOID **)&ImageBuffer,\r
+                               &ImageBufferSize,\r
+                               AuthenticationStatus\r
+                               );\r
         if (EFI_ERROR (Status)) {\r
           //\r
           // Try a raw file, since a PE32 SECTION does not exist\r
@@ -698,19 +695,21 @@ GetFileBufferByFilePath (
             FreePool (ImageBuffer);\r
             *AuthenticationStatus = 0;\r
           }\r
+\r
           ImageBuffer = NULL;\r
-          Status = FwVol->ReadFile (\r
-                            FwVol,\r
-                            FvNameGuid,\r
-                            (VOID **)&ImageBuffer,\r
-                            &ImageBufferSize,\r
-                            &Type,\r
-                            &Attrib,\r
-                            AuthenticationStatus\r
-                            );\r
+          Status      = FwVol->ReadFile (\r
+                                 FwVol,\r
+                                 FvNameGuid,\r
+                                 (VOID **)&ImageBuffer,\r
+                                 &ImageBufferSize,\r
+                                 &Type,\r
+                                 &Attrib,\r
+                                 AuthenticationStatus\r
+                                 );\r
         }\r
       }\r
     }\r
+\r
     if (!EFI_ERROR (Status)) {\r
       goto Finish;\r
     }\r
@@ -720,9 +719,9 @@ GetFileBufferByFilePath (
   // Attempt to access the file via a file system interface\r
   //\r
   DevicePathNode = OrigDevicePathNode;\r
-  Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &DevicePathNode, &Handle);\r
+  Status         = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &DevicePathNode, &Handle);\r
   if (!EFI_ERROR (Status)) {\r
-    Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID**)&Volume);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiSimpleFileSystemProtocolGuid, (VOID **)&Volume);\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Open the Volume to get the File System handle\r
@@ -743,6 +742,7 @@ GetFileBufferByFilePath (
           //\r
           Status = EFI_OUT_OF_RESOURCES;\r
         }\r
+\r
         //\r
         // Parse each MEDIA_FILEPATH_DP node. There may be more than one, since the\r
         // directory information and filename can be separate. The goal is to inch\r
@@ -750,8 +750,9 @@ GetFileBufferByFilePath (
         //\r
         DevicePathNode = TempDevicePathNode;\r
         while (!EFI_ERROR (Status) && !IsDevicePathEnd (DevicePathNode)) {\r
-          if (DevicePathType (DevicePathNode) != MEDIA_DEVICE_PATH ||\r
-              DevicePathSubType (DevicePathNode) != MEDIA_FILEPATH_DP) {\r
+          if ((DevicePathType (DevicePathNode) != MEDIA_DEVICE_PATH) ||\r
+              (DevicePathSubType (DevicePathNode) != MEDIA_FILEPATH_DP))\r
+          {\r
             Status = EFI_UNSUPPORTED;\r
             break;\r
           }\r
@@ -760,12 +761,12 @@ GetFileBufferByFilePath (
           FileHandle = NULL;\r
 \r
           Status = LastHandle->Open (\r
-                                LastHandle,\r
-                                &FileHandle,\r
-                                ((FILEPATH_DEVICE_PATH *) DevicePathNode)->PathName,\r
-                                EFI_FILE_MODE_READ,\r
-                                0\r
-                                );\r
+                                 LastHandle,\r
+                                 &FileHandle,\r
+                                 ((FILEPATH_DEVICE_PATH *)DevicePathNode)->PathName,\r
+                                 EFI_FILE_MODE_READ,\r
+                                 0\r
+                                 );\r
 \r
           //\r
           // Close the previous node\r
@@ -780,14 +781,14 @@ GetFileBufferByFilePath (
           // We have found the file. Now we need to read it. Before we can read the file we need to\r
           // figure out how big the file is.\r
           //\r
-          FileInfo = NULL;\r
+          FileInfo     = NULL;\r
           FileInfoSize = 0;\r
-          Status = FileHandle->GetInfo (\r
-                                FileHandle,\r
-                                &gEfiFileInfoGuid,\r
-                                &FileInfoSize,\r
-                                FileInfo\r
-                                );\r
+          Status       = FileHandle->GetInfo (\r
+                                       FileHandle,\r
+                                       &gEfiFileInfoGuid,\r
+                                       &FileInfoSize,\r
+                                       FileInfo\r
+                                       );\r
 \r
           if (Status == EFI_BUFFER_TOO_SMALL) {\r
             FileInfo = AllocatePool (FileInfoSize);\r
@@ -795,11 +796,11 @@ GetFileBufferByFilePath (
               Status = EFI_OUT_OF_RESOURCES;\r
             } else {\r
               Status = FileHandle->GetInfo (\r
-                                    FileHandle,\r
-                                    &gEfiFileInfoGuid,\r
-                                    &FileInfoSize,\r
-                                    FileInfo\r
-                                    );\r
+                                     FileHandle,\r
+                                     &gEfiFileInfoGuid,\r
+                                     &FileInfoSize,\r
+                                     FileInfo\r
+                                     );\r
             }\r
           }\r
 \r
@@ -821,20 +822,24 @@ GetFileBufferByFilePath (
             }\r
           }\r
         }\r
+\r
         //\r
         // Close the file and Free FileInfo and TempDevicePathNode since we are done\r
         //\r
         if (FileInfo != NULL) {\r
           FreePool (FileInfo);\r
         }\r
+\r
         if (FileHandle != NULL) {\r
           FileHandle->Close (FileHandle);\r
         }\r
+\r
         if (TempDevicePathNode != NULL) {\r
           FreePool (TempDevicePathNode);\r
         }\r
       }\r
     }\r
+\r
     if (!EFI_ERROR (Status)) {\r
       goto Finish;\r
     }\r
@@ -845,37 +850,38 @@ GetFileBufferByFilePath (
   //\r
   if (!BootPolicy) {\r
     DevicePathNode = OrigDevicePathNode;\r
-    Status = gBS->LocateDevicePath (&gEfiLoadFile2ProtocolGuid, &DevicePathNode, &Handle);\r
+    Status         = gBS->LocateDevicePath (&gEfiLoadFile2ProtocolGuid, &DevicePathNode, &Handle);\r
     if (!EFI_ERROR (Status)) {\r
-      Status = gBS->HandleProtocol (Handle, &gEfiLoadFile2ProtocolGuid, (VOID**)&LoadFile2);\r
+      Status = gBS->HandleProtocol (Handle, &gEfiLoadFile2ProtocolGuid, (VOID **)&LoadFile2);\r
       if (!EFI_ERROR (Status)) {\r
         //\r
         // Call LoadFile2 with the correct buffer size\r
         //\r
         ImageBufferSize = 0;\r
         ImageBuffer     = NULL;\r
-        Status = LoadFile2->LoadFile (\r
-                             LoadFile2,\r
-                             DevicePathNode,\r
-                             FALSE,\r
-                             &ImageBufferSize,\r
-                             ImageBuffer\r
-                             );\r
+        Status          = LoadFile2->LoadFile (\r
+                                       LoadFile2,\r
+                                       DevicePathNode,\r
+                                       FALSE,\r
+                                       &ImageBufferSize,\r
+                                       ImageBuffer\r
+                                       );\r
         if (Status == EFI_BUFFER_TOO_SMALL) {\r
           ImageBuffer = AllocatePool (ImageBufferSize);\r
           if (ImageBuffer == NULL) {\r
             Status = EFI_OUT_OF_RESOURCES;\r
           } else {\r
             Status = LoadFile2->LoadFile (\r
-                                 LoadFile2,\r
-                                 DevicePathNode,\r
-                                 FALSE,\r
-                                 &ImageBufferSize,\r
-                                 ImageBuffer\r
-                                 );\r
+                                  LoadFile2,\r
+                                  DevicePathNode,\r
+                                  FALSE,\r
+                                  &ImageBufferSize,\r
+                                  ImageBuffer\r
+                                  );\r
           }\r
         }\r
       }\r
+\r
       if (!EFI_ERROR (Status)) {\r
         goto Finish;\r
       }\r
@@ -886,22 +892,22 @@ GetFileBufferByFilePath (
   // Attempt to access the file via LoadFile interface\r
   //\r
   DevicePathNode = OrigDevicePathNode;\r
-  Status = gBS->LocateDevicePath (&gEfiLoadFileProtocolGuid, &DevicePathNode, &Handle);\r
+  Status         = gBS->LocateDevicePath (&gEfiLoadFileProtocolGuid, &DevicePathNode, &Handle);\r
   if (!EFI_ERROR (Status)) {\r
-    Status = gBS->HandleProtocol (Handle, &gEfiLoadFileProtocolGuid, (VOID**)&LoadFile);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiLoadFileProtocolGuid, (VOID **)&LoadFile);\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Call LoadFile with the correct buffer size\r
       //\r
       ImageBufferSize = 0;\r
       ImageBuffer     = NULL;\r
-      Status = LoadFile->LoadFile (\r
-                           LoadFile,\r
-                           DevicePathNode,\r
-                           BootPolicy,\r
-                           &ImageBufferSize,\r
-                           ImageBuffer\r
-                           );\r
+      Status          = LoadFile->LoadFile (\r
+                                    LoadFile,\r
+                                    DevicePathNode,\r
+                                    BootPolicy,\r
+                                    &ImageBufferSize,\r
+                                    ImageBuffer\r
+                                    );\r
       if (Status == EFI_BUFFER_TOO_SMALL) {\r
         ImageBuffer = AllocatePool (ImageBufferSize);\r
         if (ImageBuffer == NULL) {\r
@@ -926,6 +932,7 @@ Finish:
       FreePool (ImageBuffer);\r
       ImageBuffer = NULL;\r
     }\r
+\r
     *FileSize = 0;\r
   } else {\r
     *FileSize = ImageBufferSize;\r
@@ -978,15 +985,15 @@ GetFileDevicePathFromAnyFv (
   OUT       EFI_DEVICE_PATH_PROTOCOL  **FvFileDevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  EFI_HANDLE                        *HandleBuffer;\r
-  UINTN                             HandleCount;\r
-  UINTN                             Index;\r
-  EFI_HANDLE                        FvHandle;\r
-  EFI_DEVICE_PATH_PROTOCOL          *FvDevicePath;\r
-  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *TempFvFileDevicePath;\r
-  VOID                              *Buffer;\r
-  UINTN                             Size;\r
+  EFI_STATUS                         Status;\r
+  EFI_HANDLE                         *HandleBuffer;\r
+  UINTN                              HandleCount;\r
+  UINTN                              Index;\r
+  EFI_HANDLE                         FvHandle;\r
+  EFI_DEVICE_PATH_PROTOCOL           *FvDevicePath;\r
+  MEDIA_FW_VOL_FILEPATH_DEVICE_PATH  *TempFvFileDevicePath;\r
+  VOID                               *Buffer;\r
+  UINTN                              Size;\r
 \r
   if (FvFileDevicePath == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1005,14 +1012,14 @@ GetFileDevicePathFromAnyFv (
   // will locate the FFS faster.\r
   //\r
   FvHandle = InternalImageHandleToFvHandle (gImageHandle);\r
-  Status = InternalGetSectionFromFv (\r
-             FvHandle,\r
-             NameGuid,\r
-             SectionType,\r
-             SectionInstance,\r
-             &Buffer,\r
-             &Size\r
-             );\r
+  Status   = InternalGetSectionFromFv (\r
+               FvHandle,\r
+               NameGuid,\r
+               SectionType,\r
+               SectionInstance,\r
+               &Buffer,\r
+               &Size\r
+               );\r
   if (!EFI_ERROR (Status)) {\r
     goto Done;\r
   }\r
@@ -1070,7 +1077,8 @@ Done:
         *FvFileDevicePath = NULL;\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
-      EfiInitializeFwVolDevicepathNode ((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH*)TempFvFileDevicePath, NameGuid);\r
+\r
+      EfiInitializeFwVolDevicepathNode ((MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)TempFvFileDevicePath, NameGuid);\r
       SetDevicePathEndNode (NextDevicePathNode (TempFvFileDevicePath));\r
       *FvFileDevicePath = AppendDevicePath (\r
                             FvDevicePath,\r