Removes some unused assigned variables.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16189 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
index 92f3a43a7784d460b2cee1de1d64b24b28a0edd8..f442f7d3d999d0d06423eb08b11dda622d1ac400 100644 (file)
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
@@ -135,7 +135,6 @@ RefreshKeyHelp (
 {\r
   UINTN                  SecCol;\r
   UINTN                  ThdCol;\r
-  UINTN                  LeftColumnOfHelp;\r
   UINTN                  RightColumnOfHelp;\r
   UINTN                  TopRowOfHelp;\r
   UINTN                  BottomRowOfHelp;\r
@@ -166,7 +165,6 @@ RefreshKeyHelp (
   ThdCol            = gScreenDimensions.LeftColumn + (gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3 * 2;\r
 \r
   StartColumnOfHelp = gScreenDimensions.LeftColumn + 2;\r
-  LeftColumnOfHelp  = gScreenDimensions.LeftColumn + 1;\r
   RightColumnOfHelp = gScreenDimensions.RightColumn - 1;\r
   TopRowOfHelp      = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - gFooterHeight + 1;\r
   BottomRowOfHelp   = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - 2;\r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
index 0db450e078d1f7a750730bcd4969c59a87715691..4be8a964641271bf7f0c41e613c7d46d8653caaa 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
@@ -2049,10 +2049,8 @@ UiDisplayMenu (
   UINTN                           TopRow;\r
   UINTN                           BottomRow;\r
   UINTN                           Index;\r
-  UINT16                          Width;\r
   CHAR16                          *StringPtr;\r
   CHAR16                          *OptionString;\r
-  CHAR16                          *OutputString;\r
   CHAR16                          *HelpString;\r
   CHAR16                          *HelpHeaderString;\r
   CHAR16                          *HelpBottomString;\r
@@ -2069,10 +2067,8 @@ UiDisplayMenu (
   UI_MENU_OPTION                  *MenuOption;\r
   UI_MENU_OPTION                  *NextMenuOption;\r
   UI_MENU_OPTION                  *SavedMenuOption;\r
-  UI_MENU_OPTION                  *PreviousMenuOption;\r
   UI_CONTROL_FLAG                 ControlFlag;\r
   UI_SCREEN_OPERATION             ScreenOperation;\r
-  UINT16                          DefaultId;\r
   FORM_DISPLAY_ENGINE_STATEMENT   *Statement;\r
   BROWSER_HOT_KEY                 *HotKey;\r
   UINTN                           HelpPageIndex;\r
@@ -2087,7 +2083,6 @@ UiDisplayMenu (
   UINT16                          BottomLineWidth;\r
   EFI_STRING_ID                   HelpInfo;\r
   UI_EVENT_TYPE                   EventType;\r
-  FORM_DISPLAY_ENGINE_STATEMENT   *InitialHighlight;\r
   BOOLEAN                         SkipHighLight;\r
 \r
   EventType           = UIEventNone;\r
@@ -2098,7 +2093,6 @@ UiDisplayMenu (
   OptionString        = NULL;\r
   ScreenOperation     = UiNoOperation;\r
   NewLine             = TRUE;\r
-  DefaultId           = 0;\r
   HelpPageCount       = 0;\r
   HelpLine            = 0;\r
   RowCount            = 0;\r
@@ -2109,24 +2103,20 @@ UiDisplayMenu (
   EachLineWidth       = 0;\r
   HeaderLineWidth     = 0;\r
   BottomLineWidth     = 0;\r
-  OutputString        = NULL;\r
   UpArrow             = FALSE;\r
   DownArrow           = FALSE;\r
   SkipValue           = 0;\r
   SkipHighLight       = FALSE;\r
 \r
   NextMenuOption      = NULL;\r
-  PreviousMenuOption  = NULL;\r
   SavedMenuOption     = NULL;\r
   HotKey              = NULL;\r
   Repaint             = TRUE;\r
   MenuOption          = NULL;\r
   gModalSkipColumn    = (CHAR16) (gStatementDimensions.RightColumn - gStatementDimensions.LeftColumn) / 6;\r
-  InitialHighlight    = gFormData->HighLightedStatement;\r
 \r
   ZeroMem (&Key, sizeof (EFI_INPUT_KEY));\r
 \r
-  Width     = (UINT16)gOptionBlockWidth - 1;\r
   TopRow    = gStatementDimensions.TopRow    + SCROLL_ARROW_HEIGHT;\r
   BottomRow = gStatementDimensions.BottomRow - SCROLL_ARROW_HEIGHT - 1;\r
 \r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
index 78dd10462c11f1268b5e18db69672bcbb2d1cb71..f76937a442221295187e7c7ade31933a88d091e0 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
@@ -439,7 +439,6 @@ GetNumericInput (
   IN  UI_MENU_OPTION              *MenuOption\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
   UINTN                   Column;\r
   UINTN                   Row;\r
   CHAR16                  InputText[MAX_NUMERIC_INPUT_WIDTH];\r
@@ -685,7 +684,7 @@ GetNumericInput (
       goto TheKey2;\r
     }\r
 \r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
 \r
 TheKey2:\r
     switch (Key.UnicodeChar) {\r
@@ -1118,7 +1117,6 @@ GetSelectionInputPopUp (
   IN  UI_MENU_OPTION              *MenuOption\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
   EFI_INPUT_KEY           Key;\r
   UINTN                   Index;\r
   CHAR16                  *StringPtr;\r
@@ -1351,7 +1349,7 @@ GetSelectionInputPopUp (
       goto TheKey;\r
     }\r
 \r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
 \r
 TheKey:\r
     switch (Key.UnicodeChar) {\r
@@ -1505,7 +1503,6 @@ TheKey:
         } else {\r
           gUserInput->InputValue.Buffer = ReturnValue;\r
           gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;\r
-          Status = EFI_SUCCESS;\r
         }\r
       } else {\r
         ASSERT (CurrentOption != NULL);\r
@@ -1514,7 +1511,6 @@ TheKey:
           return EFI_DEVICE_ERROR;\r
         } else {\r
           SetValuesByType (&gUserInput->InputValue.Value, &CurrentOption->OptionOpCode->Value, gUserInput->InputValue.Type);\r
-          Status = EFI_SUCCESS;\r
         }\r
       }\r
 \r

diff --git a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
index 65d2a749951de3edc9352f85e67cec1927bd8b6f..6e9e6ddfcc9637856b5a3746870cef535767454f 100644 (file)
--- a/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
@@ -955,7 +955,6 @@ ProcessOptions (
   UINTN                           Index2;\r
   UINT8                           *ValueArray;\r
   UINT8                           ValueType;\r
-  EFI_STRING_ID                   StringId;\r
   EFI_IFR_ORDERED_LIST            *OrderList;\r
   BOOLEAN                         ValueInvalid;\r
 \r
@@ -964,7 +963,6 @@ ProcessOptions (
   StringPtr     = NULL;\r
   Character[1]  = L'\0';\r
   *OptionString = NULL;\r
-  StringId      = 0;\r
   ValueInvalid  = FALSE;\r
 \r
   ZeroMem (FormattedNumber, 21 * sizeof (CHAR16));\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 2da4cadd2dc71e1aa293461987acc4ebb02a5f54..a25150165c7c42ef91f82d50098c246e2d8a9e70 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -836,13 +836,11 @@ FormDisplayCallback (
   IN VOID         *Context\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-\r
   if (mFormDisplay != NULL) {\r
     return;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (\r
+  gBS->LocateProtocol (\r
                   &gEdkiiFormDisplayEngineProtocolGuid,\r
                   NULL,\r
                   (VOID **) &mFormDisplay\r
@@ -3217,7 +3215,6 @@ SubmitForSystem (
   EFI_STATUS              Status;\r
   LIST_ENTRY              *Link;\r
   LIST_ENTRY              *StorageLink;\r
-  BROWSER_STORAGE         *Storage;\r
   FORMSET_STORAGE         *FormSetStorage;\r
   FORM_BROWSER_FORM       *Form;\r
   FORM_BROWSER_FORMSET    *LocalFormSet;\r
@@ -3283,7 +3280,6 @@ SubmitForSystem (
         StorageLink = GetFirstNode (&LocalFormSet->StorageListHead);\r
         while (!IsNull (&LocalFormSet->StorageListHead, StorageLink)) {\r
           FormSetStorage = FORMSET_STORAGE_FROM_LINK (StorageLink);\r
-          Storage        = FormSetStorage->BrowserStorage;\r
           StorageLink = GetNextNode (&LocalFormSet->StorageListHead, StorageLink);\r
 \r
           SynchronizeStorage(FormSetStorage->BrowserStorage, FormSetStorage->ConfigRequest, FALSE);\r
@@ -3292,7 +3288,6 @@ SubmitForSystem (
         StorageLink = GetFirstNode (&LocalFormSet->SaveFailStorageListHead);\r
         while (!IsNull (&LocalFormSet->SaveFailStorageListHead, StorageLink)) {\r
           FormSetStorage = FORMSET_STORAGE_FROM_SAVE_FAIL_LINK (StorageLink);\r
-          Storage        = FormSetStorage->BrowserStorage;\r
           StorageLink = GetNextNode (&LocalFormSet->SaveFailStorageListHead, StorageLink);\r
 \r
           SynchronizeStorage(FormSetStorage->BrowserStorage, FormSetStorage->ConfigRequest, FALSE);\r
@@ -4823,13 +4818,11 @@ ConfigRequestAdjust (
   CHAR16       *RequestElement;\r
   CHAR16       *NextRequestElement;\r
   CHAR16       *NextElementBakup;\r
-  UINTN        SpareBufLen;\r
   CHAR16       *SearchKey;\r
   CHAR16       *ValueKey;\r
   BOOLEAN      RetVal;\r
   CHAR16       *ConfigRequest;\r
 \r
-  SpareBufLen    = 0;\r
   RetVal         = FALSE;\r
   NextElementBakup = NULL;\r
   ValueKey         = NULL;\r