Refine some internal functions of PCD Driver.

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Pei / Pcd.c

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 031259b22a6e694ecf68a1319a7d88186c363187..70b229e3a931c19a7fb168f981434f8f39a1f739 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -255,11 +255,7 @@ PeiPcdGetSizeEx (
   IN PCD_TOKEN_NUMBER                  ExTokenNumber\r
   )\r
 {\r
-  EX_PCD_ENTRY_ATTRIBUTE      Attr;\r
-\r
-  GetExPcdTokenAttributes (Guid, ExTokenNumber, &Attr);\r
-  \r
-  return Attr.Size;\r
+  return PeiPcdGetSize (GetExPcdTokenNumber (Guid, ExTokenNumber));\r
 }\r
 \r
 \r
@@ -500,13 +496,13 @@ PeiPcdGetNextToken (
     (*TokenNumber)++;\r
 \r
     if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER) {\r
-      *TokenNumber = 0;\r
+      *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     }\r
     \r
   } else {\r
 \r
     if (PEI_EXMAP_TABLE_EMPTY) {\r
-      *TokenNumber = (UINTN) PCD_INVALID_TOKEN_NUMBER;\r
+      *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
       return EFI_NOT_FOUND;\r
     }\r
     \r