sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdePkg: Apply uncrustify changes

Browse Source 
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>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:05 -08:00
committed by mergify[bot]
parent 1436aea4d5
commit 2f88bd3a12
975 changed files with 55681 additions and 57790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MdePkg/Library/UefiMemoryLib/CompareMemWrapper.c
View File

@@ -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));

2
MdePkg/Library/UefiMemoryLib/CopyMemWrapper.c
View File

@@ -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);
}

14
MdePkg/Library/UefiMemoryLib/MemLib.c
View File

@@ -23,12 +23,12 @@
VOID *
EFIAPI
InternalMemCopyMem (
OUT VOID *Destination,
IN CONST VOID *Source,
IN UINTN Length
OUT VOID *Destination,
IN CONST VOID *Source,
IN UINTN Length
)
{
gBS->CopyMem (Destination, (VOID*)Source, Length);
gBS->CopyMem (Destination, (VOID *)Source, Length);
return Destination;
}
@@ -47,9 +47,9 @@ InternalMemCopyMem (
VOID *
EFIAPI
InternalMemSetMem (
OUT VOID *Buffer,
IN UINTN Size,
IN UINT8 Value
OUT VOID *Buffer,
IN UINTN Size,
IN UINT8 Value
)
{
gBS->SetMem (Buffer, Size, Value);

102
MdePkg/Library/UefiMemoryLib/MemLibGeneric.c
View File

@@ -26,14 +26,15 @@
VOID *
EFIAPI
InternalMemSetMem16 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT16 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT16 Value
)
{
for (; Length != 0; Length--) {
((UINT16*)Buffer)[Length - 1] = Value;
for ( ; Length != 0; Length--) {
((UINT16 *)Buffer)[Length - 1] = Value;
}
return Buffer;
}
@@ -50,14 +51,15 @@ InternalMemSetMem16 (
VOID *
EFIAPI
InternalMemSetMem32 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT32 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT32 Value
)
{
for (; Length != 0; Length--) {
((UINT32*)Buffer)[Length - 1] = Value;
for ( ; Length != 0; Length--) {
((UINT32 *)Buffer)[Length - 1] = Value;
}
return Buffer;
}
@@ -74,14 +76,15 @@ InternalMemSetMem32 (
VOID *
EFIAPI
InternalMemSetMem64 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT64 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT64 Value
)
{
for (; Length != 0; Length--) {
((UINT64*)Buffer)[Length - 1] = Value;
for ( ; Length != 0; Length--) {
((UINT64 *)Buffer)[Length - 1] = Value;
}
return Buffer;
}
@@ -97,8 +100,8 @@ InternalMemSetMem64 (
VOID *
EFIAPI
InternalMemZeroMem (
OUT VOID *Buffer,
IN UINTN Length
OUT VOID *Buffer,
IN UINTN Length
)
{
return InternalMemSetMem (Buffer, Length, 0);
@@ -120,17 +123,19 @@ 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
)
{
while ((--Length != 0) &&
(*(INT8*)DestinationBuffer == *(INT8*)SourceBuffer)) {
DestinationBuffer = (INT8*)DestinationBuffer + 1;
SourceBuffer = (INT8*)SourceBuffer + 1;
(*(INT8 *)DestinationBuffer == *(INT8 *)SourceBuffer))
{
DestinationBuffer = (INT8 *)DestinationBuffer + 1;
SourceBuffer = (INT8 *)SourceBuffer + 1;
}
return (INTN)*(UINT8*)DestinationBuffer - (INTN)*(UINT8*)SourceBuffer;
return (INTN)*(UINT8 *)DestinationBuffer - (INTN)*(UINT8 *)SourceBuffer;
}
/**
@@ -147,19 +152,20 @@ 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
)
{
CONST UINT8 *Pointer;
CONST UINT8 *Pointer;
Pointer = (CONST UINT8*)Buffer;
Pointer = (CONST UINT8 *)Buffer;
do {
if (*(Pointer++) == Value) {
return --Pointer;
}
} while (--Length != 0);
return NULL;
}
@@ -177,19 +183,20 @@ 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
)
{
CONST UINT16 *Pointer;
CONST UINT16 *Pointer;
Pointer = (CONST UINT16*)Buffer;
Pointer = (CONST UINT16 *)Buffer;
do {
if (*(Pointer++) == Value) {
return --Pointer;
}
} while (--Length != 0);
return NULL;
}
@@ -207,19 +214,20 @@ 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;
}
} while (--Length != 0);
return NULL;
}
@@ -237,19 +245,20 @@ 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;
}
} while (--Length != 0);
return NULL;
}
@@ -270,8 +279,8 @@ InternalMemIsZeroBuffer (
IN UINTN Length
)
{
CONST UINT8 *BufferData;
UINTN Index;
CONST UINT8 *BufferData;
UINTN Index;
BufferData = Buffer;
for (Index = 0; Index < Length; Index++) {
@@ -279,5 +288,6 @@ InternalMemIsZeroBuffer (
return FALSE;
}
}
return TRUE;
}

34
MdePkg/Library/UefiMemoryLib/MemLibGuid.c
View File

@@ -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);
}

64
MdePkg/Library/UefiMemoryLib/MemLibInternals.h
View File

@@ -31,9 +31,9 @@
VOID *
EFIAPI
InternalMemCopyMem (
OUT VOID *Destination,
IN CONST VOID *Source,
IN UINTN Length
OUT VOID *Destination,
IN CONST VOID *Source,
IN UINTN Length
);
/**
@@ -51,9 +51,9 @@ InternalMemCopyMem (
VOID *
EFIAPI
InternalMemSetMem (
OUT VOID *Buffer,
IN UINTN Size,
IN UINT8 Value
OUT VOID *Buffer,
IN UINTN Size,
IN UINT8 Value
);
/**
@@ -69,9 +69,9 @@ InternalMemSetMem (
VOID *
EFIAPI
InternalMemSetMem16 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT16 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT16 Value
);
/**
@@ -87,9 +87,9 @@ InternalMemSetMem16 (
VOID *
EFIAPI
InternalMemSetMem32 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT32 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT32 Value
);
/**
@@ -105,9 +105,9 @@ InternalMemSetMem32 (
VOID *
EFIAPI
InternalMemSetMem64 (
OUT VOID *Buffer,
IN UINTN Length,
IN UINT64 Value
OUT VOID *Buffer,
IN UINTN Length,
IN UINT64 Value
);
/**
@@ -122,8 +122,8 @@ InternalMemSetMem64 (
VOID *
EFIAPI
InternalMemZeroMem (
OUT VOID *Buffer,
IN UINTN Length
OUT VOID *Buffer,
IN UINTN Length
);
/**
@@ -142,9 +142,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
);
/**
@@ -161,9 +161,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
);
/**
@@ -180,9 +180,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
);
/**
@@ -199,9 +199,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
);
/**
@@ -218,9 +218,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
);
/**

2
MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c
View File

@@ -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);
}

2
MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c
View File

@@ -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);
}

2
MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c
View File

@@ -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);
}

4
MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c
View File

@@ -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);
}
}