From f47d897f93f1f67d57ca0877daf3f1663823847a Mon Sep 17 00:00:00 2001 From: Phil Noh Date: Thu, 13 Mar 2025 11:13:52 -0500 Subject: [PATCH] UnitTestFrameworkPkg: Avoid duplicate library function names There are duplicate library function names between 2 Unit Test libraries (UnitTestPeiServicesTablePointerLib and UnitTestUefiBootServicesTableLib). There are 3 functions (UnitTestAllocatePages, UnitTestAllocatePool and UnitTestFreePage). This update avoids the duplication and prevents a build error when building a Unit Test application that links the libraries based on UnitTestFrameworkPkg. Signed-off-by: Phil Noh --- .../UnitTestPeiServicesTablePointerLib.c | 6 +++--- .../UnitTestPeiServicesTablePointerLib.h | 6 +++--- .../UnitTestPeiServicesTablePointerLibMisc.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.c b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.c index a1b982fbae..e560bbe23d 100644 --- a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.c +++ b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.c @@ -37,8 +37,8 @@ EFI_PEI_SERVICES mPeiServices = { UnitTestFfsFindSectionData, // FfsFindSectionData UnitTestInstallPeiMemory, // InstallPeiMemory - UnitTestAllocatePages, // AllocatePages - UnitTestAllocatePool, // AllocatePool + UnitTestPeiAllocatePages, // AllocatePages + UnitTestPeiAllocatePool, // AllocatePool (EFI_PEI_COPY_MEM)CopyMem, (EFI_PEI_SET_MEM)SetMem, @@ -55,7 +55,7 @@ EFI_PEI_SERVICES mPeiServices = { UnitTestFfsFindSectionData3, // FfsFindSectionData3 UnitTestFfsGetFileInfo2, // FfsGetFileInfo2 UnitTestResetSystem2, // ResetSystem2 - UnitTestFreePages, // FreePages + UnitTestPeiFreePages, // FreePages }; PEI_CORE_INSTANCE mPrivateData; diff --git a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.h b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.h index e411d08a86..3f41e4368a 100644 --- a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.h +++ b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLib.h @@ -430,7 +430,7 @@ UnitTestInstallPeiMemory ( **/ EFI_STATUS EFIAPI -UnitTestAllocatePages ( +UnitTestPeiAllocatePages ( IN CONST EFI_PEI_SERVICES **PeiServices, IN EFI_MEMORY_TYPE MemoryType, IN UINTN Pages, @@ -455,7 +455,7 @@ UnitTestAllocatePages ( **/ EFI_STATUS EFIAPI -UnitTestAllocatePool ( +UnitTestPeiAllocatePool ( IN CONST EFI_PEI_SERVICES **PeiServices, IN UINTN Size, OUT VOID **Buffer @@ -644,7 +644,7 @@ Frees memory pages. **/ EFI_STATUS EFIAPI -UnitTestFreePages ( +UnitTestPeiFreePages ( IN CONST EFI_PEI_SERVICES **PeiServices, IN EFI_PHYSICAL_ADDRESS Memory, IN UINTN Pages diff --git a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibMisc.c b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibMisc.c index 90955bf482..938998e805 100644 --- a/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibMisc.c +++ b/UnitTestFrameworkPkg/Library/UnitTestPeiServicesTablePointerLib/UnitTestPeiServicesTablePointerLibMisc.c @@ -176,7 +176,7 @@ UnitTestInstallPeiMemory ( **/ EFI_STATUS EFIAPI -UnitTestAllocatePages ( +UnitTestPeiAllocatePages ( IN CONST EFI_PEI_SERVICES **PeiServices, IN EFI_MEMORY_TYPE MemoryType, IN UINTN Pages, @@ -204,7 +204,7 @@ UnitTestAllocatePages ( **/ EFI_STATUS EFIAPI -UnitTestAllocatePool ( +UnitTestPeiAllocatePool ( IN CONST EFI_PEI_SERVICES **PeiServices, IN UINTN Size, OUT VOID **Buffer @@ -420,7 +420,7 @@ Frees memory pages. **/ EFI_STATUS EFIAPI -UnitTestFreePages ( +UnitTestPeiFreePages ( IN CONST EFI_PEI_SERVICES **PeiServices, IN EFI_PHYSICAL_ADDRESS Memory, IN UINTN Pages