From 2f88bd3a1296c522317f1c21377876de63de5be7 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:05 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Liming Gao --- .../Library/BaseMemoryLibSse2/CompareMemWrapper.c | 3 +- MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c | 2 + MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c | 34 ++++++------ MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h | 64 +++++++++++----------- .../Library/BaseMemoryLibSse2/ScanMem16Wrapper.c | 2 +- .../Library/BaseMemoryLibSse2/ScanMem32Wrapper.c | 2 +- .../Library/BaseMemoryLibSse2/ScanMem64Wrapper.c | 2 +- MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c | 4 +- 8 files changed, 59 insertions(+), 54 deletions(-) (limited to 'MdePkg/Library/BaseMemoryLibSse2') diff --git a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c index 6c539a685e..5b65a1d264 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/CompareMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/CopyMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c index 438abf4e86..dc48904766 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/CopyMemWrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c index 319487dda9..9ded5ca0f1 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/MemLibInternals.h b/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h index ce376afda9..20131d147a 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/MemLibInternals.h +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c index 8201313523..7eeb1a48be 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/ScanMem32Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c index 22c0c79ff6..bdcee0e2eb 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/ScanMem64Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c index a617d870a0..eb75390d24 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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/BaseMemoryLibSse2/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c index f2bf7d6f68..aa0de6442f 100644 --- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c +++ b/MdePkg/Library/BaseMemoryLibSse2/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); } /** @@ -90,4 +91,3 @@ ScanMemN ( return ScanMem32 (Buffer, Length, (UINT32)Value); } } - -- cgit v1.2.3