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

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / SetupBrowser / Dxe / Boolean.c

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c
index 122da065a9723501f75c54376489d1c9a5ccef20..d3f77e09f59587bf9c3dd0fb7b43dc594714e544 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c
@@ -83,6 +83,7 @@ Returns:
   mBooleanEvaluationStackEnd  = NewStack + StackSizeInBoolean;\r
 }\r
 \r
+STATIC\r
 VOID\r
 InitializeBooleanEvaluator (\r
   VOID\r
@@ -176,6 +177,7 @@ Returns:
   return ReturnValue;\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 GrowBooleanExpression (\r
   IN      EFI_INCONSISTENCY_DATA  *InconsistentTags,\r
@@ -212,6 +214,7 @@ GrowBooleanExpression (
   return EFI_SUCCESS;\r
 }\r
 \r
+STATIC\r
 VOID\r
 CreateBooleanExpression (\r
   IN  EFI_FILE_FORM_TAGS    *FileFormTags,\r
@@ -311,6 +314,7 @@ NextEntry:
   GrowBooleanExpression (&FakeInconsistentTags, BooleanExpression, BooleanExpressionLength);\r
 }\r
 \r
+STATIC\r
 EFI_STATUS\r
 BooleanVariableWorker (\r
   IN     CHAR16                   *VariableName,\r
@@ -369,6 +373,7 @@ Returns:
   return Status;\r
 }\r
 \r
+STATIC\r
 UINT8\r
 PredicateIfrType (\r
   IN  EFI_INCONSISTENCY_DATA      *Iterator\r
@@ -416,6 +421,7 @@ Returns:
   return 0x2;\r
 }\r
 \r
+STATIC\r
 VOID\r
 PostOrderEvaluate (\r
   IN      EFI_FILE_FORM_TAGS          *FileFormTags,\r
@@ -616,7 +622,7 @@ Returns:
       break;\r
     case EFI_IFR_NOT_OP:\r
       Operator  = PopBool (StackPtr);\r
-      PushBool (StackPtr, !Operator);\r
+      PushBool (StackPtr, (BOOLEAN) (!Operator));\r
       break;\r
 \r
     case EFI_IFR_SUPPRESS_IF_OP:\r
@@ -1350,11 +1356,12 @@ Returns:
         return Operator;\r
       }\r
 \r
-      return FALSE;\r
+      goto Done;\r
     }\r
 \r
     Iterator++;\r
   }\r
 \r
+Done:\r
   return FALSE;\r
 }\r