MdePkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the MdePkg 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>

10 files changed, 89 insertions, 75 deletions

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Arm/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/Arm/MemLibGuid.c
index f27b95c114..32d30cb7ce 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Arm/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Arm/MemLibGuid.c
@@ -116,20 +116,22 @@ ScanGuid (
   IN CONST GUID  *Guid

   )

 {

-  CONST GUID                        *GuidPtr;

+  CONST GUID  *GuidPtr;

 

   ASSERT (((UINTN)Buffer & (sizeof (Guid->Data1) - 1)) == 0);

   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

   ASSERT ((Length & (sizeof (*GuidPtr) - 1)) == 0);

 

-  GuidPtr = (GUID*)Buffer;

+  GuidPtr = (GUID *)Buffer;

   Buffer  = GuidPtr + Length / sizeof (*GuidPtr);

-  while (GuidPtr < (CONST GUID*)Buffer) {

+  while (GuidPtr < (CONST GUID *)Buffer) {

     if (InternalMemCompareGuid (GuidPtr, Guid)) {

-      return (VOID*)GuidPtr;

+      return (VOID *)GuidPtr;

     }

+

     GuidPtr++;

   }

+

   return NULL;

 }

 

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/Arm/ScanMemGeneric.c b/MdePkg/Library/BaseMemoryLibOptDxe/Arm/ScanMemGeneric.c
index e0b4f27079..173782ec3d 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/Arm/ScanMemGeneric.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/Arm/ScanMemGeneric.c
@@ -27,20 +27,22 @@
 CONST VOID *

 EFIAPI

 InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT16      Value

   )

 {

-  CONST UINT16                      *Pointer;

+  CONST UINT16  *Pointer;

 

-  Pointer = (CONST UINT16*)Buffer;

+  Pointer = (CONST UINT16 *)Buffer;

   do {

     if (*Pointer == Value) {

       return Pointer;

     }

+

     ++Pointer;

   } while (--Length != 0);

+

   return NULL;

 }

 

@@ -58,20 +60,22 @@ InternalMemScanMem16 (
 CONST VOID *

 EFIAPI

 InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT32      Value

   )

 {

-  CONST UINT32                      *Pointer;

+  CONST UINT32  *Pointer;

 

-  Pointer = (CONST UINT32*)Buffer;

+  Pointer = (CONST UINT32 *)Buffer;

   do {

     if (*Pointer == Value) {

       return Pointer;

     }

+

     ++Pointer;

   } while (--Length != 0);

+

   return NULL;

 }

 

@@ -89,20 +93,22 @@ InternalMemScanMem32 (
 CONST VOID *

 EFIAPI

 InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT64      Value

   )

 {

-  CONST UINT64                      *Pointer;

+  CONST UINT64  *Pointer;

 

-  Pointer = (CONST UINT64*)Buffer;

+  Pointer = (CONST UINT64 *)Buffer;

   do {

     if (*Pointer == Value) {

       return Pointer;

     }

+

     ++Pointer;

   } while (--Length != 0);

+

   return NULL;

 }

 

@@ -123,8 +129,8 @@ InternalMemIsZeroBuffer (
   IN UINTN       Length

   )

 {

-  CONST UINT8 *BufferData;

-  UINTN       Index;

+  CONST UINT8  *BufferData;

+  UINTN        Index;

 

   BufferData = Buffer;

   for (Index = 0; Index < Length; Index++) {

@@ -132,5 +138,6 @@ InternalMemIsZeroBuffer (
       return FALSE;

     }

   }

+

   return TRUE;

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
index 6c539a685e..5b65a1d264 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CompareMemWrapper.c
@@ -48,9 +48,10 @@ CompareMem (
   IN UINTN       Length

   )

 {

-  if (Length == 0 || DestinationBuffer == SourceBuffer) {

+  if ((Length == 0) || (DestinationBuffer == SourceBuffer)) {

     return 0;

   }

+

   ASSERT (DestinationBuffer != NULL);

   ASSERT (SourceBuffer != NULL);

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
index 438abf4e86..dc48904766 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/CopyMemWrapper.c
@@ -47,11 +47,13 @@ CopyMem (
   if (Length == 0) {

     return DestinationBuffer;

   }

+

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)DestinationBuffer));

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)SourceBuffer));

 

   if (DestinationBuffer == SourceBuffer) {

     return DestinationBuffer;

   }

+

   return InternalMemCopyMem (DestinationBuffer, SourceBuffer, Length);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
index 319487dda9..9ded5ca0f1 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c
@@ -42,12 +42,12 @@ CopyGuid (
   )

 {

   WriteUnaligned64 (

-    (UINT64*)DestinationGuid,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid)

+    (UINT64 *)DestinationGuid,

+    ReadUnaligned64 ((CONST UINT64 *)SourceGuid)

     );

   WriteUnaligned64 (

-    (UINT64*)DestinationGuid + 1,

-    ReadUnaligned64 ((CONST UINT64*)SourceGuid + 1)

+    (UINT64 *)DestinationGuid + 1,

+    ReadUnaligned64 ((CONST UINT64 *)SourceGuid + 1)

     );

   return DestinationGuid;

 }

@@ -80,12 +80,12 @@ CompareGuid (
   UINT64  HighPartOfGuid1;

   UINT64  HighPartOfGuid2;

 

-  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64*) Guid1);

-  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64*) Guid2);

-  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1);

-  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1);

+  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64 *)Guid1);

+  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64 *)Guid2);

+  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64 *)Guid1 + 1);

+  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64 *)Guid2 + 1);

 

-  return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);

+  return (BOOLEAN)(LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);

 }

 

 /**

@@ -118,20 +118,22 @@ ScanGuid (
   IN CONST GUID  *Guid

   )

 {

-  CONST GUID                        *GuidPtr;

+  CONST GUID  *GuidPtr;

 

   ASSERT (((UINTN)Buffer & (sizeof (Guid->Data1) - 1)) == 0);

   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));

   ASSERT ((Length & (sizeof (*GuidPtr) - 1)) == 0);

 

-  GuidPtr = (GUID*)Buffer;

+  GuidPtr = (GUID *)Buffer;

   Buffer  = GuidPtr + Length / sizeof (*GuidPtr);

-  while (GuidPtr < (CONST GUID*)Buffer) {

+  while (GuidPtr < (CONST GUID *)Buffer) {

     if (CompareGuid (GuidPtr, Guid)) {

-      return (VOID*)GuidPtr;

+      return (VOID *)GuidPtr;

     }

+

     GuidPtr++;

   }

+

   return NULL;

 }

 

@@ -158,8 +160,8 @@ IsZeroGuid (
   UINT64  LowPartOfGuid;

   UINT64  HighPartOfGuid;

 

-  LowPartOfGuid  = ReadUnaligned64 ((CONST UINT64*) Guid);

-  HighPartOfGuid = ReadUnaligned64 ((CONST UINT64*) Guid + 1);

+  LowPartOfGuid  = ReadUnaligned64 ((CONST UINT64 *)Guid);

+  HighPartOfGuid = ReadUnaligned64 ((CONST UINT64 *)Guid + 1);

 

-  return (BOOLEAN) (LowPartOfGuid == 0 && HighPartOfGuid == 0);

+  return (BOOLEAN)(LowPartOfGuid == 0 && HighPartOfGuid == 0);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
index bbd8b63cb8..0c8424c08c 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/MemLibInternals.h
@@ -35,9 +35,9 @@
 VOID *

 EFIAPI

 InternalMemCopyMem (

-  OUT     VOID                      *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

+  OUT     VOID        *DestinationBuffer,

+  IN      CONST VOID  *SourceBuffer,

+  IN      UINTN       Length

   );

 

 /**

@@ -53,9 +53,9 @@ InternalMemCopyMem (
 VOID *

 EFIAPI

 InternalMemSetMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

+  OUT     VOID   *Buffer,

+  IN      UINTN  Length,

+  IN      UINT8  Value

   );

 

 /**

@@ -71,9 +71,9 @@ InternalMemSetMem (
 VOID *

 EFIAPI

 InternalMemSetMem16 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

+  OUT     VOID    *Buffer,

+  IN      UINTN   Length,

+  IN      UINT16  Value

   );

 

 /**

@@ -89,9 +89,9 @@ InternalMemSetMem16 (
 VOID *

 EFIAPI

 InternalMemSetMem32 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

+  OUT     VOID    *Buffer,

+  IN      UINTN   Length,

+  IN      UINT32  Value

   );

 

 /**

@@ -107,9 +107,9 @@ InternalMemSetMem32 (
 VOID *

 EFIAPI

 InternalMemSetMem64 (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

+  OUT     VOID    *Buffer,

+  IN      UINTN   Length,

+  IN      UINT64  Value

   );

 

 /**

@@ -124,8 +124,8 @@ InternalMemSetMem64 (
 VOID *

 EFIAPI

 InternalMemZeroMem (

-  OUT     VOID                      *Buffer,

-  IN      UINTN                     Length

+  OUT     VOID   *Buffer,

+  IN      UINTN  Length

   );

 

 /**

@@ -144,9 +144,9 @@ InternalMemZeroMem (
 INTN

 EFIAPI

 InternalMemCompareMem (

-  IN      CONST VOID                *DestinationBuffer,

-  IN      CONST VOID                *SourceBuffer,

-  IN      UINTN                     Length

+  IN      CONST VOID  *DestinationBuffer,

+  IN      CONST VOID  *SourceBuffer,

+  IN      UINTN       Length

   );

 

 /**

@@ -163,9 +163,9 @@ InternalMemCompareMem (
 CONST VOID *

 EFIAPI

 InternalMemScanMem8 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT8                     Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT8       Value

   );

 

 /**

@@ -182,9 +182,9 @@ InternalMemScanMem8 (
 CONST VOID *

 EFIAPI

 InternalMemScanMem16 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT16                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT16      Value

   );

 

 /**

@@ -201,9 +201,9 @@ InternalMemScanMem16 (
 CONST VOID *

 EFIAPI

 InternalMemScanMem32 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT32                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT32      Value

   );

 

 /**

@@ -220,9 +220,9 @@ InternalMemScanMem32 (
 CONST VOID *

 EFIAPI

 InternalMemScanMem64 (

-  IN      CONST VOID                *Buffer,

-  IN      UINTN                     Length,

-  IN      UINT64                    Value

+  IN      CONST VOID  *Buffer,

+  IN      UINTN       Length,

+  IN      UINT64      Value

   );

 

 /**

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
index 8201313523..7eeb1a48be 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c
@@ -57,5 +57,5 @@ ScanMem16 (
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

   ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);

+  return (VOID *)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
index 22c0c79ff6..bdcee0e2eb 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c
@@ -56,5 +56,5 @@ ScanMem32 (
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

   ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);

+  return (VOID *)InternalMemScanMem32 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
index a617d870a0..eb75390d24 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c
@@ -57,5 +57,5 @@ ScanMem64 (
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

   ASSERT ((Length & (sizeof (Value) - 1)) == 0);

 

-  return (VOID*)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);

+  return (VOID *)InternalMemScanMem64 (Buffer, Length / sizeof (Value), Value);

 }

diff --git a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
index 6df99e22cb..c4b58cd262 100644
--- a/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c
@@ -49,10 +49,11 @@ ScanMem8 (
   if (Length == 0) {

     return NULL;

   }

+

   ASSERT (Buffer != NULL);

   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));

 

-  return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);

+  return (VOID *)InternalMemScanMem8 (Buffer, Length, Value);

 }

 

 /**

@@ -91,4 +92,3 @@ ScanMemN (
     return ScanMem32 (Buffer, Length, (UINT32)Value);

   }

 }

-