Add PcdDxe and PcdPEIM to all-arch for EdkModulePkg-All-Archs.fpd

[mirror_edk2.git] / MdePkg / Library / DxePcdLib / DxePcdLib.c

diff --git a/MdePkg/Library/DxePcdLib/DxePcdLib.c b/MdePkg/Library/DxePcdLib/DxePcdLib.c
index fe7ae4247c9045334e3ffc984526fbb4be2170ea..b746614d5be64fd4d8c6b51ca25dadb1b27408aa 100644 (file)
--- a/MdePkg/Library/DxePcdLib/DxePcdLib.c
+++ b/MdePkg/Library/DxePcdLib/DxePcdLib.c
@@ -57,6 +57,8 @@ LibPcdSetSku (
   IN UINTN  SkuId\r
   )\r
 {\r
+  ASSERT (SkuId < 0x100);\r
+\r
   mPcd->SetSku (SkuId);\r
 \r
   return SkuId;\r
@@ -513,8 +515,10 @@ LibPcdSetPtr (
 {\r
   EFI_STATUS Status;\r
   UINTN      Size;\r
-  \r
-  ASSERT ((*SizeOfBuffer > 0) && Buffer == NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
 \r
   Size = LibPcdGetSize (TokenNumber);\r
   \r
@@ -727,7 +731,13 @@ LibPcdSetExPtr (
   UINTN       Size;\r
 \r
   ASSERT (Guid != NULL);\r
-  ASSERT (Buffer != NULL);\r
+\r
+  ASSERT (SizeOfBuffer != NULL);\r
+\r
+  if (*SizeOfBuffer > 0) {\r
+    ASSERT (Buffer != NULL);\r
+  }\r
+\r
 \r
   Size = LibPcdGetExSize (Guid, TokenNumber);\r
   if (*SizeOfBuffer > Size) {\r
@@ -898,7 +908,7 @@ LibPcdGetNextToken (
   @retval CONST GUID *  The next valid token namespace.\r
 \r
 **/\r
-CONST GUID*           \r
+GUID *           \r
 EFIAPI\r
 LibPcdGetNextTokenSpace (\r
   IN CONST GUID  *Guid\r
@@ -910,6 +920,6 @@ LibPcdGetNextTokenSpace (
 \r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  return Guid;\r
+  return (GUID *) Guid;\r
 }\r
 \r