Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

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

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 57c67d67136672c518f5caac1fd84b78e42815e4..2fd9cab52398ca4b3f1b5f97503c6ff12a611979 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -1,7 +1,7 @@
 /** @file\r
 PCD DXE driver\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -525,12 +525,17 @@ DxePcdGetNextToken (
   )\r
 {\r
   EFI_STATUS          Status;\r
+  BOOLEAN             PeiExMapTableEmpty;\r
+  BOOLEAN             DxeExMapTableEmpty;\r
 \r
   if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   Status = EFI_NOT_FOUND;\r
+  PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
+  DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+\r
   //\r
   // Scan the local token space\r
   //\r
@@ -557,12 +562,12 @@ DxePcdGetNextToken (
     return EFI_SUCCESS;\r
   }\r
 \r
-  if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+  if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  if (!PEI_EXMAP_TABLE_EMPTY) {\r
+  if (!PeiExMapTableEmpty) {\r
     Status = ExGetNextTokeNumber (\r
                         Guid,\r
                         TokenNumber,\r
@@ -577,7 +582,7 @@ DxePcdGetNextToken (
     return Status;\r
   }\r
 \r
-  if (!DXE_EXMAP_TABLE_EMPTY) {\r
+  if (!DxeExMapTableEmpty) {\r
     Status = ExGetNextTokeNumber (\r
                         Guid,\r
                         TokenNumber,\r
@@ -591,7 +596,7 @@ DxePcdGetNextToken (
   return Status;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_GUID **\r
 GetDistinctTokenSpace (\r
   IN OUT    UINTN             *ExMapTableSize,\r
@@ -649,6 +654,8 @@ DxePcdGetNextTokenSpace (
   EFI_GUID            **PeiTokenSpaceTable;\r
   EFI_GUID            **DxeTokenSpaceTable;\r
   BOOLEAN             Match;\r
+  BOOLEAN             PeiExMapTableEmpty;\r
+  BOOLEAN             DxeExMapTableEmpty;\r
 \r
   if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
     return EFI_UNSUPPORTED;\r
@@ -656,7 +663,10 @@ DxePcdGetNextTokenSpace (
 \r
   ASSERT (Guid != NULL);\r
   \r
-  if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r
+  PeiExMapTableEmpty = PEI_EXMAP_TABLE_EMPTY;\r
+  DxeExMapTableEmpty = DXE_EXMAP_TABLE_EMPTY;\r
+\r
+  if (PeiExMapTableEmpty && DxeExMapTableEmpty) {\r
     if (*Guid != NULL) {\r
       return EFI_NOT_FOUND;\r
     } else {\r
@@ -668,7 +678,7 @@ DxePcdGetNextTokenSpace (
   if (TmpTokenSpaceBuffer[0] == NULL) {\r
     PeiTokenSpaceTableSize = 0;\r
 \r
-    if (!PEI_EXMAP_TABLE_EMPTY) {\r
+    if (!PeiExMapTableEmpty) {\r
       PeiTokenSpaceTableSize = PEI_EXMAPPING_TABLE_SIZE;\r
       PeiTokenSpaceTable = GetDistinctTokenSpace (&PeiTokenSpaceTableSize,\r
                             mPcdDatabase->PeiDb.Init.ExMapTable,\r
@@ -677,7 +687,7 @@ DxePcdGetNextTokenSpace (
       CopyMem (TmpTokenSpaceBuffer, PeiTokenSpaceTable, sizeof (EFI_GUID*) * PeiTokenSpaceTableSize);\r
     }\r
 \r
-    if (!DXE_EXMAP_TABLE_EMPTY) {\r
+    if (!DxeExMapTableEmpty) {\r
       DxeTokenSpaceTableSize = DXE_EXMAPPING_TABLE_SIZE;\r
       DxeTokenSpaceTable = GetDistinctTokenSpace (&DxeTokenSpaceTableSize,\r
                             mPcdDatabase->DxeDb.Init.ExMapTable,\r