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

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

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
index 466039f8dcb56e75d8a5c2258a506993f01530a3..ebf038581fe6876be4db7498f809da2efcf37b34 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c
@@ -215,7 +215,6 @@ ReadPassword (
   )\r
 {\r
   EFI_STATUS                  Status;\r
-  UINTN                       PasswordSize;\r
   UINTN                       ScreenSize;\r
   CHAR16                      NullCharacter;\r
   CHAR16                      Space[2];\r
@@ -234,12 +233,12 @@ ReadPassword (
   UINTN                       DimensionsWidth;\r
   UINTN                       DimensionsHeight;\r
   EFI_IFR_DATA_ENTRY          *DataEntry;\r
+  UINTN                       WidthOfString;\r
 \r
   DimensionsWidth       = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;\r
   DimensionsHeight      = gScreenDimensions.BottomRow - gScreenDimensions.TopRow;\r
 \r
   VariableDefinition    = NULL;\r
-  PasswordSize          = 0;\r
   NullCharacter         = CHAR_NULL;\r
   Space[0]              = L' ';\r
   Space[1]              = CHAR_NULL;\r
@@ -309,7 +308,8 @@ Error:
         // Upon error, we will likely receive a string to print out\r
         // Display error popup\r
         //\r
-        ScreenSize = EFI_MAX(GetStringWidth (Packet->String), GetStringWidth (gPressEnter)) / 2;\r
+        WidthOfString = GetStringWidth (Packet->String);\r
+        ScreenSize = EFI_MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
         CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
         gBS->FreePool (Packet);\r
 \r
@@ -318,9 +318,8 @@ Error:
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
       }\r
 \r
-      gBS->FreePool (TempString);\r
-      gBS->FreePool (TempString2);\r
-      return EFI_NOT_READY;\r
+      Status = EFI_NOT_READY;\r
+      goto Done;\r
     }\r
   }\r
 \r
@@ -418,10 +417,12 @@ Error:
           if (Confirmation) {\r
             if (EFI_ERROR (Status)) {\r
               if (Packet->String == NULL) {\r
-                ScreenSize = EFI_MAX (GetStringWidth (gConfirmError), GetStringWidth (gPressEnter)) / 2;\r
+                WidthOfString = GetStringWidth (gConfirmError);\r
+                ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
                 CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);\r
               } else {\r
-                ScreenSize = EFI_MAX (GetStringWidth (Packet->String), GetStringWidth (gPressEnter)) / 2;\r
+                WidthOfString = GetStringWidth (Packet->String);\r
+                ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
                 CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter);\r
                 gBS->FreePool (Packet);\r
               }\r
@@ -431,15 +432,13 @@ Error:
                 Status = WaitForKeyStroke (&Key);\r
 \r
                 if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-                  gBS->FreePool (TempString);\r
-                  gBS->FreePool (TempString2);\r
-                  return EFI_NOT_READY;\r
+                  Status = EFI_NOT_READY;\r
+                  goto Done;\r
                 }\r
               } while (1);\r
             } else {\r
-              gBS->FreePool (TempString);\r
-              gBS->FreePool (TempString2);\r
-              return EFI_NOT_READY;\r
+                Status = EFI_NOT_READY;\r
+                goto Done;\r
             }\r
           } else {\r
             //\r
@@ -451,9 +450,8 @@ Error:
             }\r
 \r
             if (PromptForPassword && EFI_ERROR (Status)) {\r
-              gBS->FreePool (TempString);\r
-              gBS->FreePool (TempString2);\r
-              return EFI_DEVICE_ERROR;\r
+              Status = EFI_DEVICE_ERROR;\r
+              goto Done;\r
             }\r
           }\r
         }\r
@@ -464,19 +462,18 @@ Error:
           // Otherwise, kick and error box, and return an error\r
           //\r
           if (StrCmp (TempString, TempString2) == 0) {\r
-            gBS->FreePool (TempString);\r
-            gBS->FreePool (TempString2);\r
-            return EFI_SUCCESS;\r
+            Status = EFI_SUCCESS;\r
+            goto Done;\r
           } else {\r
-            ScreenSize = EFI_MAX (GetStringWidth (gConfirmError), GetStringWidth (gPressEnter)) / 2;\r
+            WidthOfString = GetStringWidth (gConfirmError);\r
+            ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2;\r
             CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter);\r
             StringPtr[0] = CHAR_NULL;\r
             do {\r
               Status = WaitForKeyStroke (&Key);\r
               if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) {\r
-                gBS->FreePool (TempString);\r
-                gBS->FreePool (TempString2);\r
-                return EFI_DEVICE_ERROR;\r
+                Status = EFI_DEVICE_ERROR;\r
+                goto Done;\r
               }\r
             } while (1);\r
           }\r
@@ -486,9 +483,8 @@ Error:
           //\r
           // I was asked for a password, return it back in StringPtr\r
           //\r
-          gBS->FreePool (TempString);\r
-          gBS->FreePool (TempString2);\r
-          return EFI_SUCCESS;\r
+          Status = EFI_SUCCESS;\r
+          goto Done;\r
         } else {\r
           //\r
           // If the two passwords were not the same kick an error popup\r
@@ -575,6 +571,8 @@ Error:
     } while (!ConfirmationComplete);\r
 \r
   } while (1);\r
+\r
+Done:\r
   gBS->FreePool (TempString);\r
   gBS->FreePool (TempString2);\r
   return Status;\r
@@ -655,7 +653,6 @@ Returns:
   CHAR16                  NullCharacter;\r
   CHAR16                  *StringPtr;\r
   EFI_FILE_FORM_TAGS      *FileFormTags;\r
-  EFI_STATUS              Status;\r
   EFI_VARIABLE_DEFINITION *VariableDefinition;\r
   UINTN                   Loop;\r
 \r
@@ -689,7 +686,7 @@ Returns:
       goto TheKey2;\r
     }\r
 \r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
 \r
 TheKey2:\r
     switch (Key.UnicodeChar) {\r
@@ -879,7 +876,7 @@ EnterCarriageReturn:
           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
@@ -985,7 +982,6 @@ GetSelectionInputPopUp (
   OUT UINT16                      *KeyValue\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
   EFI_INPUT_KEY Key;\r
   UINTN         Index;\r
   UINTN         TempIndex;\r
@@ -1005,7 +1001,6 @@ GetSelectionInputPopUp (
   UINTN         MenuLinesInView;\r
   UINTN         PopUpWidth;\r
   CHAR16        Character;\r
-  UINTN         FirstOption;\r
   BOOLEAN       FirstOptionFoundFlag;\r
   INT32         SavedAttribute;\r
   EFI_TAG       TagBackup;\r
@@ -1017,10 +1012,8 @@ GetSelectionInputPopUp (
   BOOLEAN       ShowDownArrow;\r
   BOOLEAN       ShowUpArrow;\r
   UINTN         DimensionsWidth;\r
-  UINTN         DimensionsHeight;\r
 \r
   DimensionsWidth   = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn;\r
-  DimensionsHeight  = gScreenDimensions.BottomRow - gScreenDimensions.TopRow;\r
 \r
   TempValue         = 0;\r
   TempIndex         = 0;\r
@@ -1050,7 +1043,6 @@ GetSelectionInputPopUp (
   Count                 = 0;\r
   PopUpWidth            = 0;\r
 \r
-  FirstOption           = MenuOption->TagIndex;\r
   FirstOptionFoundFlag  = FALSE;\r
 \r
   StringPtr             = AllocateZeroPool ((gOptionBlockWidth + 1) * 2);\r
@@ -1066,7 +1058,6 @@ GetSelectionInputPopUp (
     if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP &&\r
         !MenuOption->Tags[Index].Suppress) {\r
       if (!FirstOptionFoundFlag) {\r
-        FirstOption           = Index;\r
         FirstOptionFoundFlag  = TRUE;\r
       }\r
 \r
@@ -1309,7 +1300,7 @@ GetSelectionInputPopUp (
       KeyInitialized = TRUE;\r
     }\r
 \r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
 \r
 TheKey:\r
     switch (Key.UnicodeChar) {\r
@@ -1553,14 +1544,14 @@ TheKey:
         *Value = TempValue;\r
       }\r
 \r
-      gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
-      return EFI_SUCCESS;\r
+      goto Done;\r
 \r
     default:\r
       break;\r
     }\r
   } while (1);\r
 \r
+Done:\r
   gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute);\r
   return EFI_SUCCESS;\r
 }\r