Added Wordpad recommendation for editor, change ACTIVE_PLATFORM from REQUIRED to...

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Service.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index f175b14db238635ddad4aca521671305c90a4cd4..613d8c84d1528aa5e20a14613b5bfc6d7b372f6e 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -252,14 +252,14 @@ DxeUnRegisterCallBackWorker (
 \r
 \r
 \r
-UINTN           \r
+EFI_STATUS\r
 ExGetNextTokeNumber (\r
-  IN CONST EFI_GUID         *Guid,\r
-  IN UINTN                  TokenNumber,\r
-  IN EFI_GUID               *GuidTable,\r
-  IN UINTN                  SizeOfGuidTable,\r
-  IN DYNAMICEX_MAPPING      *ExMapTable,\r
-  IN UINTN                  SizeOfExMapTable\r
+  IN      CONST EFI_GUID         *Guid,\r
+  IN OUT  UINTN                  *TokenNumber,\r
+  IN      EFI_GUID               *GuidTable,\r
+  IN      UINTN                  SizeOfGuidTable,\r
+  IN      DYNAMICEX_MAPPING      *ExMapTable,\r
+  IN      UINTN                  SizeOfExMapTable\r
   )\r
 {\r
   EFI_GUID         *MatchGuid;\r
@@ -269,7 +269,7 @@ ExGetNextTokeNumber (
 \r
   MatchGuid = ScanGuid (GuidTable, SizeOfGuidTable, Guid);\r
   if (MatchGuid == NULL) {\r
-    return PCD_INVALID_TOKEN_NUMBER;\r
+    return EFI_NOT_FOUND;\r
   }\r
 \r
   Found = FALSE;\r
@@ -282,35 +282,39 @@ ExGetNextTokeNumber (
   }\r
 \r
   if (Found) {\r
-    if (TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
-      return ExMapTable[Idx].ExTokenNumber;\r
+    if (*TokenNumber == PCD_INVALID_TOKEN_NUMBER) {\r
+      *TokenNumber = ExMapTable[Idx].ExTokenNumber;\r
+      return EFI_SUCCESS;\r
     }\r
 \r
     for ( ; Idx < SizeOfExMapTable; Idx++) {\r
-      if (ExMapTable[Idx].ExTokenNumber == TokenNumber) {\r
+      if (ExMapTable[Idx].ExTokenNumber == *TokenNumber) {\r
         Idx++;\r
         if (Idx == SizeOfExMapTable) {\r
           //\r
           // Exceed the length of ExMap Table\r
           //\r
-          return PCD_INVALID_TOKEN_NUMBER;\r
+          *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+          return EFI_SUCCESS;\r
         } else if (ExMapTable[Idx].ExGuidIndex == GuidTableIdx) {\r
           //\r
           // Found the next match\r
           //\r
-          return ExMapTable[Idx].ExTokenNumber;\r
+          *TokenNumber = ExMapTable[Idx].ExTokenNumber;\r
+          return EFI_SUCCESS;\r
         } else {\r
           //\r
           // Guid has been changed. It is the next Token Space Guid.\r
           // We should flag no more TokenNumber.\r
           //\r
-          return PCD_INVALID_TOKEN_NUMBER;\r
+          *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
+          return EFI_SUCCESS;\r
         }\r
       }\r
     }\r
   }\r
   \r
-  return PCD_INVALID_TOKEN_NUMBER;\r
+  return EFI_NOT_FOUND;\r
 }\r
   \r
 \r
@@ -375,13 +379,13 @@ EFI_STATUS
 GetHiiVariable (\r
   IN  EFI_GUID      *VariableGuid,\r
   IN  UINT16        *VariableName,\r
-  OUT VOID          **VariableData,\r
+  OUT UINT8         **VariableData,\r
   OUT UINTN         *VariableSize\r
   )\r
 {\r
   UINTN      Size;\r
   EFI_STATUS Status;\r
-  VOID       *Buffer;\r
+  UINT8      *Buffer;\r
 \r
   Size = 0;\r
   Buffer = NULL;\r
@@ -395,7 +399,7 @@ GetHiiVariable (
     );\r
   \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    Buffer = AllocatePool (Size);\r
+    Buffer = (UINT8 *) AllocatePool (Size);\r
 \r
     ASSERT (Buffer != NULL);\r
 \r