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

FmpDevicePkg: Apply uncrustify changes

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

Apply uncrustify changes to .c/.h files in the FmpDevicePkg 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:53:58 -08:00
committed by mergify[bot]
parent bcdcc4160d
commit 45ce0a67bb
22 changed files with 841 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
FmpDevicePkg/Library/FmpPayloadHeaderLibV1/FmpPayloadHeaderLib.c
View File

@@ -22,10 +22,10 @@
#pragma pack(1)
typedef struct {
UINT32 Signature;
UINT32 HeaderSize;
UINT32 FwVersion;
UINT32 LowestSupportedVersion;
UINT32 Signature;
UINT32 HeaderSize;
UINT32 FwVersion;
UINT32 LowestSupportedVersion;
} FMP_PAYLOAD_HEADER;
#pragma pack()
@@ -34,7 +34,7 @@ typedef struct {
/// Identifier is used to make sure the data in the header is for this structure
/// and version. If the structure changes update the last digit.
///
#define FMP_PAYLOAD_HEADER_SIGNATURE SIGNATURE_32 ('M', 'S', 'S', '1')
#define FMP_PAYLOAD_HEADER_SIGNATURE SIGNATURE_32 ('M', 'S', 'S', '1')
/**
Returns the FMP Payload Header size in bytes.
@@ -61,14 +61,15 @@ GetFmpPayloadHeaderSize (
FmpPayloadHeader = NULL;
if (Header == NULL || Size == NULL) {
if ((Header == NULL) || (Size == NULL)) {
return EFI_INVALID_PARAMETER;
}
FmpPayloadHeader = (FMP_PAYLOAD_HEADER *)Header;
if ((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader ||
(UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize ||
FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)) {
if (((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader) ||
((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize) ||
(FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)))
{
return EFI_INVALID_PARAMETER;
}
@@ -106,14 +107,15 @@ GetFmpPayloadHeaderVersion (
FmpPayloadHeader = NULL;
if (Header == NULL || Version == NULL) {
if ((Header == NULL) || (Version == NULL)) {
return EFI_INVALID_PARAMETER;
}
FmpPayloadHeader = (FMP_PAYLOAD_HEADER *)Header;
if ((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader ||
(UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize ||
FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)) {
if (((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader) ||
((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize) ||
(FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)))
{
return EFI_INVALID_PARAMETER;
}
@@ -142,23 +144,24 @@ GetFmpPayloadHeaderVersion (
EFI_STATUS
EFIAPI
GetFmpPayloadHeaderLowestSupportedVersion (
IN CONST VOID *Header,
IN CONST UINTN FmpPayloadSize,
OUT UINT32 *LowestSupportedVersion
IN CONST VOID *Header,
IN CONST UINTN FmpPayloadSize,
OUT UINT32 *LowestSupportedVersion
)
{
FMP_PAYLOAD_HEADER *FmpPayloadHeader;
FmpPayloadHeader = NULL;
if (Header == NULL || LowestSupportedVersion == NULL) {
if ((Header == NULL) || (LowestSupportedVersion == NULL)) {
return EFI_INVALID_PARAMETER;
}
FmpPayloadHeader = (FMP_PAYLOAD_HEADER *)Header;
if ((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader ||
(UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize ||
FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)) {
if (((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) < (UINTN)FmpPayloadHeader) ||
((UINTN)FmpPayloadHeader + sizeof (FMP_PAYLOAD_HEADER) >= (UINTN)FmpPayloadHeader + FmpPayloadSize) ||
(FmpPayloadHeader->HeaderSize < sizeof (FMP_PAYLOAD_HEADER)))
{
return EFI_INVALID_PARAMETER;
}