Correct typo in comments, clean IfrSupportLib.h

[mirror_edk2.git] / MdeModulePkg / Universal / PCD / Dxe / Pcd.c

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
index af846c53028d9f95fc7cb8d383eb556a2e23a134..0c44a64077cf0882c5619929b683bef2b6c3259c 100644 (file)
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -11,9 +11,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-\r
-Module Name: Pcd.c\r
-\r
 **/\r
 \r
 #include "Service.h"\r
@@ -23,7 +20,7 @@ Module Name: Pcd.c
 // host all distinct TokenSpace guid in both\r
 // PEI ExMap and DXE ExMap.\r
 //\r
-STATIC EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };\r
+EFI_GUID *TmpTokenSpaceBuffer[PEI_EXMAPPING_TABLE_SIZE + DXE_EXMAPPING_TABLE_SIZE] = { 0 };\r
 \r
 ///\r
 /// PCD database lock.\r
@@ -73,7 +70,7 @@ PCD_PROTOCOL mPcdInstance = {
 //\r
 // Static global to reduce the code size\r
 //\r
-STATIC EFI_HANDLE mNewHandle = NULL;\r
+EFI_HANDLE mNewHandle = NULL;\r
 \r
 /**\r
   Main entry for PCD DXE driver.\r
@@ -136,8 +133,6 @@ PcdDxeInit (
   @param[in]  SkuId The SKU value that will be used when the PCD service will retrieve and \r
               set values associated with a PCD token.\r
 \r
-  @retval VOID\r
-\r
 **/\r
 VOID\r
 EFIAPI\r
@@ -871,8 +866,9 @@ DxeRegisterCallBackOnSet (
 {\r
   EFI_STATUS Status;\r
   \r
-  ASSERT (CallBackFunction != NULL);\r
-  \r
+  if (CallBackFunction == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
   //\r
   // Aquire lock to prevent reentrance from TPL_CALLBACK level\r
   //\r
@@ -907,7 +903,9 @@ DxeUnRegisterCallBackOnSet (
 {\r
   EFI_STATUS Status;\r
   \r
-  ASSERT (CallBackFunction != NULL);\r
+  if (CallBackFunction == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
   //\r
   // Aquire lock to prevent reentrance from TPL_CALLBACK level\r