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

[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 51e16624efcd51aa35eab70c9c34d12b98a84bfe..8ff45d38da5bb4068357b0dd376f383ea559f1c5 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -28,7 +28,6 @@ GetWorker (
   )\r
 {\r
   UINT32              *LocalTokenNumberTable;\r
   )\r
 {\r
   UINT32              *LocalTokenNumberTable;\r

-  UINT16              *SizeTable;\r

   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r
   EFI_GUID            *Guid;\r
   EFI_GUID            *GuidTable;\r
   UINT16              *StringTable;\r
   EFI_GUID            *Guid;\r


@@ -76,14 +75,11 @@ GetWorker (
   // EBC compiler is very choosy. It may report warning about comparison\r
   // between UINTN and 0 . So we add 1 in each size of the \r
   // comparison.\r
   // EBC compiler is very choosy. It may report warning about comparison\r
   // between UINTN and 0 . So we add 1 in each size of the \r
   // comparison.\r

-  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;\r
+  IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);\r

 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r

-  SizeTable              = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: \r
-                                     mPcdDatabase->DxeDb.Init.SizeTable;\r
-\r

   TokenNumber            = IsPeiDb ? TokenNumber :\r
                                      TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
 \r
   TokenNumber            = IsPeiDb ? TokenNumber :\r
                                      TokenNumber - PEI_LOCAL_TOKEN_NUMBER;\r
 \r


@@ -496,7 +492,7 @@ GetSkuEnabledTokenNumber (
 \r
 \r
 \r
 \r
 \r
 \r

-\r
+STATIC\r

 VOID\r
 InvokeCallbackOnSet (\r
   UINT32            ExTokenNumber,\r
 VOID\r
 InvokeCallbackOnSet (\r
   UINT32            ExTokenNumber,\r


@@ -597,7 +593,7 @@ SetWorker (
   // EBC compiler is very choosy. It may report warning about comparison\r
   // between UINTN and 0 . So we add 1 in each size of the \r
   // comparison.\r
   // EBC compiler is very choosy. It may report warning about comparison\r
   // between UINTN and 0 . So we add 1 in each size of the \r
   // comparison.\r

-  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;\r
+  IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);\r

 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r
 \r
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : \r
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;\r


@@ -895,7 +891,7 @@ GetExPcdTokenNumber (
 }\r
 \r
 \r
 }\r
 \r
 \r

-\r
+STATIC\r

 SKU_ID *\r
 GetSkuIdArray (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
 SKU_ID *\r
 GetSkuIdArray (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r


@@ -923,7 +919,7 @@ GetSkuIdArray (
 }\r
 \r
 \r
 }\r
 \r
 \r

-\r
+STATIC\r

 UINTN\r
 GetSizeTableIndexA (\r
   IN UINTN        LocalTokenNumberTableIdx,\r
 UINTN\r
 GetSizeTableIndexA (\r
   IN UINTN        LocalTokenNumberTableIdx,\r


@@ -980,7 +976,7 @@ GetSizeTableIndexA (
 \r
 \r
 \r
 \r
 \r
 \r

-\r
+STATIC\r

 UINTN\r
 GetSizeTableIndex (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r
 UINTN\r
 GetSizeTableIndex (\r
   IN    UINTN             LocalTokenNumberTableIdx,\r