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

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

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
index 369d2b4911b6c8831492a728eb905427e061b5d8..854d023f8e4a29b2a2e946a6219b2cea88fbd852 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
@@ -211,6 +211,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 UpdateDateAndTime (\r
   VOID\r
@@ -492,7 +493,6 @@ Returns:
   UINTN         Start;\r
   UINTN         Top;\r
   UINTN         Index;\r
-  EFI_STATUS    Status;\r
   BOOLEAN       SelectionComplete;\r
   UINTN         InputOffset;\r
   UINTN         CurrentAttribute;\r
@@ -570,12 +570,12 @@ Returns:
   // Take the first key typed and report it back?\r
   //\r
   if (HotKey) {\r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
     CopyMem (KeyValue, &Key, sizeof (EFI_INPUT_KEY));\r
 \r
   } else {\r
     do {\r
-      Status = WaitForKeyStroke (&Key);\r
+      WaitForKeyStroke (&Key);\r
 \r
       switch (Key.UnicodeChar) {\r
       case CHAR_NULL:\r
@@ -1046,6 +1046,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 SelectionsAreValid (\r
   IN  UI_MENU_OPTION               *MenuOption,\r
@@ -1068,7 +1069,6 @@ Returns:
   EFI_FILE_FORM_TAGS      *FileFormTags;\r
   CHAR16                  *StringPtr;\r
   CHAR16                  NullCharacter;\r
-  EFI_STATUS              Status;\r
   UINTN                   Index;\r
   UINT16                  *NvRamMap;\r
   STRING_REF              PopUp;\r
@@ -1103,7 +1103,7 @@ Returns:
           CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter);\r
 \r
           do {\r
-            Status = WaitForKeyStroke (&Key);\r
+            WaitForKeyStroke (&Key);\r
 \r
             switch (Key.UnicodeChar) {\r
 \r
@@ -1284,6 +1284,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 UpdateOptionSkipLines (\r
   IN EFI_IFR_DATA_ARRAY           *PageData,\r