PrmPkg/DxePrmContextBufferLib: Fix unit test GCC compilation errors

https://bugzilla.tianocore.org/show_bug.cgi?id=3905

Fixes GCC compilation errors in DxePrmContextBufferLibUnitTest.c.

Cc: Michael Kubacki <mikuback@linux.microsoft.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ankit Sinha <ankit.sinha@intel.com>

diff --git a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
index e244e7b095755078c355b269532d0400a33b0c66..fdc32993b82d2bc22b5745d17353e77365e2a433 100644 (file)
--- a/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
+++ b/PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTest.c
@@ -237,17 +237,17 @@ NullPointerArgumentsShouldFailGracefully (
   PRM_MODULE_CONTEXT_BUFFERS  *ModuleContextBuffersPtr;\r
 \r
   UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, NULL, NULL), EFI_INVALID_PARAMETER);\r
-  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, &ModuleContextBuffers, &ContextBufferPtr), EFI_INVALID_PARAMETER);\r
-  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, NULL, &ContextBufferPtr), EFI_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (NULL, &ModuleContextBuffers, (CONST PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, NULL, (CONST PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PARAMETER);\r
   UT_ASSERT_EQUAL (FindContextBufferInModuleBuffers (&Guid, &ModuleContextBuffers, NULL), EFI_INVALID_PARAMETER);\r
 \r
   UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, NULL), EFI_INVALID_PARAMETER);\r
-  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, &ModuleContextBuffersPtr), EFI_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, NULL, (CONST PRM_MODULE_CONTEXT_BUFFERS **)&ModuleContextBuffersPtr), EFI_INVALID_PARAMETER);\r
   UT_ASSERT_EQUAL (GetModuleContextBuffers (ByModuleGuid, &Guid, NULL), EFI_INVALID_PARAMETER);\r
 \r
   UT_ASSERT_EQUAL (GetContextBuffer (NULL, NULL, NULL), EFI_INVALID_PARAMETER);\r
-  UT_ASSERT_EQUAL (GetContextBuffer (NULL, &ModuleContextBuffers, &ContextBufferPtr), EFI_INVALID_PARAMETER);\r
-  UT_ASSERT_EQUAL (GetContextBuffer (&Guid, NULL, &ContextBufferPtr), EFI_NOT_FOUND);\r
+  UT_ASSERT_EQUAL (GetContextBuffer (NULL, &ModuleContextBuffers, (CONST PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (GetContextBuffer (&Guid, NULL, (CONST PRM_CONTEXT_BUFFER **)&ContextBufferPtr), EFI_NOT_FOUND);\r
   UT_ASSERT_EQUAL (GetContextBuffer (&Guid, &ModuleContextBuffers, NULL), EFI_INVALID_PARAMETER);\r
 \r
   return UNIT_TEST_PASSED;\r
@@ -322,7 +322,7 @@ InitializeFunctionalCorrectness (
 \r
 **/\r
 STATIC\r
-UNIT_TEST_STATUS\r
+VOID\r
 EFIAPI\r
 DeInitializeFunctionalCorrectness (\r
   IN  UNIT_TEST_CONTEXT  Context\r
@@ -332,7 +332,6 @@ DeInitializeFunctionalCorrectness (
   PRM_CONFIG_PROTOCOL               *PrmConfigProtocol;\r
   PRM_CONTEXT_BUFFERS_TEST_CONTEXT  *TestContext;\r
 \r
-  UT_ASSERT_NOT_NULL (Context);\r
   TestContext = (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;\r
 \r
   Status = gBS->HandleProtocol (\r
@@ -340,7 +339,6 @@ DeInitializeFunctionalCorrectness (
                   &gPrmConfigProtocolGuid,\r
                   (VOID **)&PrmConfigProtocol\r
                   );\r
-  UT_ASSERT_NOT_EFI_ERROR (Status);\r
 \r
   if (!EFI_ERROR (Status)) {\r
     Status =  gBS->UninstallProtocolInterface (\r
@@ -348,13 +346,10 @@ DeInitializeFunctionalCorrectness (
                      &gPrmConfigProtocolGuid,\r
                      PrmConfigProtocol\r
                      );\r
-    UT_ASSERT_NOT_EFI_ERROR (Status);\r
     if (!EFI_ERROR (Status)) {\r
       FreePool (PrmConfigProtocol);\r
     }\r
   }\r
-\r
-  return UNIT_TEST_PASSED;\r
 }\r
 \r
 /**\r
@@ -382,7 +377,7 @@ VerifyGetModuleContextBuffers (
   ContextBuffers = NULL;\r
   TestContext    = (PRM_CONTEXT_BUFFERS_TEST_CONTEXT *)Context;\r
 \r
-  Status = GetModuleContextBuffers (TestContext->GuidSearchType, TestContext->Guid, &ContextBuffers);\r
+  Status = GetModuleContextBuffers (TestContext->GuidSearchType, TestContext->Guid, (CONST PRM_MODULE_CONTEXT_BUFFERS **)&ContextBuffers);\r
   UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);\r
 \r
   if (!EFI_ERROR (TestContext->ExpectedStatus)) {\r
@@ -419,14 +414,12 @@ VerifyFindContextBufferInModuleBuffers (
 {\r
   EFI_STATUS                       Status;\r
   PRM_CONTEXT_BUFFER               *FoundContextBuffer;\r
-  PRM_MODULE_CONTEXT_BUFFERS       *ContextBuffers;\r
   PRM_CONTEXT_BUFFER_TEST_CONTEXT  *TestContext;\r
 \r
-  ContextBuffers     = NULL;\r
   FoundContextBuffer = NULL;\r
   TestContext        = (PRM_CONTEXT_BUFFER_TEST_CONTEXT *)Context;\r
 \r
-  Status = FindContextBufferInModuleBuffers (TestContext->HandlerGuid, TestContext->ContextBuffers, &FoundContextBuffer);\r
+  Status = FindContextBufferInModuleBuffers (TestContext->HandlerGuid, TestContext->ContextBuffers, (CONST PRM_CONTEXT_BUFFER **)&FoundContextBuffer);\r
   UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);\r
 \r
   if (!EFI_ERROR (TestContext->ExpectedStatus)) {\r
@@ -465,14 +458,13 @@ VerifyGetContextBuffer (
 {\r
   EFI_STATUS                       Status;\r
   PRM_CONTEXT_BUFFER               *FoundContextBuffer;\r
-  PRM_MODULE_CONTEXT_BUFFERS       *ContextBuffers;\r
   PRM_CONTEXT_BUFFER_TEST_CONTEXT  *TestContext;\r
 \r
-  ContextBuffers     = NULL;\r
   FoundContextBuffer = NULL;\r
   TestContext        = (PRM_CONTEXT_BUFFER_TEST_CONTEXT *)Context;\r
 \r
-  Status = GetContextBuffer (TestContext->HandlerGuid, TestContext->ContextBuffers, &FoundContextBuffer);\r
+  Status = GetContextBuffer (TestContext->HandlerGuid, TestContext->ContextBuffers, (CONST PRM_CONTEXT_BUFFER **)&FoundContextBuffer);\r
+\r
   UT_ASSERT_STATUS_EQUAL (Status, TestContext->ExpectedStatus);\r
 \r
   if (!EFI_ERROR (TestContext->ExpectedStatus)) {\r