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>

1 files changed, 46 insertions, 57 deletions

diff --git a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
index 199c7f821b..17e599cc15 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/Ffs.c
@@ -6,11 +6,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #include "DxeMain.h"

 #include "FwVolDriver.h"

 

-

 /**

   Get the FFS file state by checking the highest bit set in the header's state field.

 

@@ -26,13 +24,13 @@ GetFileState (
   IN EFI_FFS_FILE_HEADER  *FfsHeader

   )

 {

-  EFI_FFS_FILE_STATE      FileState;

-  UINT8                   HighestBit;

+  EFI_FFS_FILE_STATE  FileState;

+  UINT8               HighestBit;

 

   FileState = FfsHeader->State;

 

   if (ErasePolarity != 0) {

-    FileState = (EFI_FFS_FILE_STATE)~FileState;

+    FileState = (EFI_FFS_FILE_STATE) ~FileState;

   }

 

   HighestBit = 0x80;

@@ -40,11 +38,9 @@ GetFileState (
     HighestBit >>= 1;

   }

 

-  return (EFI_FFS_FILE_STATE) HighestBit;

+  return (EFI_FFS_FILE_STATE)HighestBit;

 }

 

-

-

 /**

   Check if a block of buffer is erased.

 

@@ -58,16 +54,16 @@ GetFileState (
 **/

 BOOLEAN

 IsBufferErased (

-  IN UINT8    ErasePolarity,

-  IN VOID     *InBuffer,

-  IN UINTN    BufferSize

+  IN UINT8  ErasePolarity,

+  IN VOID   *InBuffer,

+  IN UINTN  BufferSize

   )

 {

-  UINTN   Count;

-  UINT8   EraseByte;

-  UINT8   *Buffer;

+  UINTN  Count;

+  UINT8  EraseByte;

+  UINT8  *Buffer;

 

-  if(ErasePolarity == 1) {

+  if (ErasePolarity == 1) {

     EraseByte = 0xFF;

   } else {

     EraseByte = 0;

@@ -83,8 +79,6 @@ IsBufferErased (
   return TRUE;

 }

 

-

-

 /**

   Verify checksum of the firmware volume header.

 

@@ -96,12 +90,12 @@ IsBufferErased (
 **/

 BOOLEAN

 VerifyFvHeaderChecksum (

-  IN EFI_FIRMWARE_VOLUME_HEADER *FvHeader

+  IN EFI_FIRMWARE_VOLUME_HEADER  *FvHeader

   )

 {

   UINT16  Checksum;

 

-  Checksum = CalculateSum16 ((UINT16 *) FvHeader, FvHeader->HeaderLength);

+  Checksum = CalculateSum16 ((UINT16 *)FvHeader, FvHeader->HeaderLength);

 

   if (Checksum == 0) {

     return TRUE;

@@ -110,7 +104,6 @@ VerifyFvHeaderChecksum (
   }

 }

 

-

 /**

   Verify checksum of the FFS file header.

 

@@ -125,14 +118,15 @@ VerifyHeaderChecksum (
   IN EFI_FFS_FILE_HEADER  *FfsHeader

   )

 {

-  UINT8 HeaderChecksum;

+  UINT8  HeaderChecksum;

 

   if (IS_FFS_FILE2 (FfsHeader)) {

-    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER2));

+    HeaderChecksum = CalculateSum8 ((UINT8 *)FfsHeader, sizeof (EFI_FFS_FILE_HEADER2));

   } else {

-    HeaderChecksum = CalculateSum8 ((UINT8 *) FfsHeader, sizeof (EFI_FFS_FILE_HEADER));

+    HeaderChecksum = CalculateSum8 ((UINT8 *)FfsHeader, sizeof (EFI_FFS_FILE_HEADER));

   }

-  HeaderChecksum = (UINT8) (HeaderChecksum - FfsHeader->State - FfsHeader->IntegrityCheck.Checksum.File);

+

+  HeaderChecksum = (UINT8)(HeaderChecksum - FfsHeader->State - FfsHeader->IntegrityCheck.Checksum.File);

 

   if (HeaderChecksum == 0) {

     return TRUE;

@@ -141,8 +135,6 @@ VerifyHeaderChecksum (
   }

 }

 

-

-

 /**

   Check if it's a valid FFS file header.

 

@@ -164,23 +156,22 @@ IsValidFfsHeader (
   *FileState = GetFileState (ErasePolarity, FfsHeader);

 

   switch (*FileState) {

-  case EFI_FILE_HEADER_VALID:

-  case EFI_FILE_DATA_VALID:

-  case EFI_FILE_MARKED_FOR_UPDATE:

-  case EFI_FILE_DELETED:

-    //

-    // Here we need to verify header checksum

-    //

-    return VerifyHeaderChecksum (FfsHeader);

-

-  case EFI_FILE_HEADER_CONSTRUCTION:

-  case EFI_FILE_HEADER_INVALID:

-  default:

-    return FALSE;

+    case EFI_FILE_HEADER_VALID:

+    case EFI_FILE_DATA_VALID:

+    case EFI_FILE_MARKED_FOR_UPDATE:

+    case EFI_FILE_DELETED:

+      //

+      // Here we need to verify header checksum

+      //

+      return VerifyHeaderChecksum (FfsHeader);

+

+    case EFI_FILE_HEADER_CONSTRUCTION:

+    case EFI_FILE_HEADER_INVALID:

+    default:

+      return FALSE;

   }

 }

 

-

 /**

   Check if it's a valid FFS file.

   Here we are sure that it has a valid FFS file header since we must call IsValidFfsHeader() first.

@@ -203,25 +194,23 @@ IsValidFfsFile (
 

   FileState = GetFileState (ErasePolarity, FfsHeader);

   switch (FileState) {

+    case EFI_FILE_DELETED:

+    case EFI_FILE_DATA_VALID:

+    case EFI_FILE_MARKED_FOR_UPDATE:

+      DataCheckSum = FFS_FIXED_CHECKSUM;

+      if ((FfsHeader->Attributes & FFS_ATTRIB_CHECKSUM) == FFS_ATTRIB_CHECKSUM) {

+        if (IS_FFS_FILE2 (FfsHeader)) {

+          DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *)FfsHeader + sizeof (EFI_FFS_FILE_HEADER2), FFS_FILE2_SIZE (FfsHeader) - sizeof (EFI_FFS_FILE_HEADER2));

+        } else {

+          DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *)FfsHeader + sizeof (EFI_FFS_FILE_HEADER), FFS_FILE_SIZE (FfsHeader) - sizeof (EFI_FFS_FILE_HEADER));

+        }

+      }

 

-  case EFI_FILE_DELETED:

-  case EFI_FILE_DATA_VALID:

-  case EFI_FILE_MARKED_FOR_UPDATE:

-    DataCheckSum = FFS_FIXED_CHECKSUM;

-    if ((FfsHeader->Attributes & FFS_ATTRIB_CHECKSUM) == FFS_ATTRIB_CHECKSUM) {

-      if (IS_FFS_FILE2 (FfsHeader)) {

-        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER2), FFS_FILE2_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER2));

-      } else {

-        DataCheckSum = CalculateCheckSum8 ((CONST UINT8 *) FfsHeader + sizeof (EFI_FFS_FILE_HEADER), FFS_FILE_SIZE (FfsHeader) - sizeof(EFI_FFS_FILE_HEADER));

+      if (FfsHeader->IntegrityCheck.Checksum.File == DataCheckSum) {

+        return TRUE;

       }

-    }

-    if (FfsHeader->IntegrityCheck.Checksum.File == DataCheckSum) {

-      return TRUE;

-    }

 

-  default:

-    return FALSE;

+    default:

+      return FALSE;

   }

 }

-

-