Re: [PATCH V2 01/10] EmbeddedPkg: Fix a build error in FwVol.c in X64 arch


Abner Chang
 

Reviewed-by: Abner Chang <abner.chang@...>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Min Xu
Sent: Tuesday, January 25, 2022 2:33 PM
To: devel@edk2.groups.io
Cc: Min Xu <min.m.xu@...>; Leif Lindholm <leif@...>; Ard
Biesheuvel <ardb+tianocore@...>; Chang, Abner (HPS SW/FW
Technologist) <abner.chang@...>; Schaefer, Daniel (ROM Janitor)
<daniel.schaefer@...>
Subject: [edk2-devel] [PATCH V2 01/10] EmbeddedPkg: Fix a build error in
FwVol.c in X64 arch

RFC:
INVALID URI REMOVED
d=3429__;!!NpxR!xMRxJim2LXdgV0CClUrT7jWBUouLzrVwMc5fB_wt1PT17W
WWyZKgREYswYM1Tz0$

CompressedDataLength is declared as UINTN which is UINT64 in X64 arch.
But the second parameter of UefiDecompressGetInfo() is declared as
UINT32. So a build error is triggered. To declare CompressedDataLength
as UINT32 to fix the build error.

Cc: Leif Lindholm <leif@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Abner Chang <abner.chang@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
Signed-off-by: Min Xu <min.m.xu@...>
---
EmbeddedPkg/Library/PrePiLib/FwVol.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/EmbeddedPkg/Library/PrePiLib/FwVol.c
b/EmbeddedPkg/Library/PrePiLib/FwVol.c
index 92ae68f0d382..0a6d6925b7ea 100644
--- a/EmbeddedPkg/Library/PrePiLib/FwVol.c
+++ b/EmbeddedPkg/Library/PrePiLib/FwVol.c
@@ -291,7 +291,7 @@ FfsProcessSection (
UINT16 SectionAttribute;
UINT32 AuthenticationStatus;
CHAR8 *CompressedData;
- UINTN CompressedDataLength;
+ UINT32 CompressedDataLength;

*OutputBuffer = NULL;
ParsedLength = 0;
@@ -320,7 +320,7 @@ FfsProcessSection (
}

CompressedData = (CHAR8 *)((EFI_COMPRESSION_SECTION2
*)Section + 1);
- CompressedDataLength = (UINT32)SectionLength - sizeof
(EFI_COMPRESSION_SECTION2);
+ CompressedDataLength = SectionLength - sizeof
(EFI_COMPRESSION_SECTION2);
} else {
CompressionSection = (EFI_COMPRESSION_SECTION *)Section;
SectionLength = SECTION_SIZE (Section);
@@ -330,7 +330,7 @@ FfsProcessSection (
}

CompressedData = (CHAR8 *)((EFI_COMPRESSION_SECTION
*)Section + 1);
- CompressedDataLength = (UINT32)SectionLength - sizeof
(EFI_COMPRESSION_SECTION);
+ CompressedDataLength = SectionLength - sizeof
(EFI_COMPRESSION_SECTION);
}

Status = UefiDecompressGetInfo (
--
2.29.2.windows.2




Join devel@edk2.groups.io to automatically receive all group messages.