Revision: 16189
http://sourceforge.net/p/edk2/code/16189
Author: ydong10
Date: 2014-09-29 09:02:57 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
Removes some unused assigned variables.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>
Reviewed-by: Eric Dong <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
trunk/edk2/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
Modified:
trunk/edk2/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
===================================================================
--- trunk/edk2/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
2014-09-29 08:48:24 UTC (rev 16188)
+++ trunk/edk2/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.c
2014-09-29 09:02:57 UTC (rev 16189)
@@ -135,7 +135,6 @@
{
UINTN SecCol;
UINTN ThdCol;
- UINTN LeftColumnOfHelp;
UINTN RightColumnOfHelp;
UINTN TopRowOfHelp;
UINTN BottomRowOfHelp;
@@ -166,7 +165,6 @@
ThdCol = gScreenDimensions.LeftColumn +
(gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3 * 2;
StartColumnOfHelp = gScreenDimensions.LeftColumn + 2;
- LeftColumnOfHelp = gScreenDimensions.LeftColumn + 1;
RightColumnOfHelp = gScreenDimensions.RightColumn - 1;
TopRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT -
gFooterHeight + 1;
BottomRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - 2;
Modified: trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
2014-09-29 08:48:24 UTC (rev 16188)
+++ trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
2014-09-29 09:02:57 UTC (rev 16189)
@@ -2049,10 +2049,8 @@
UINTN TopRow;
UINTN BottomRow;
UINTN Index;
- UINT16 Width;
CHAR16 *StringPtr;
CHAR16 *OptionString;
- CHAR16 *OutputString;
CHAR16 *HelpString;
CHAR16 *HelpHeaderString;
CHAR16 *HelpBottomString;
@@ -2069,10 +2067,8 @@
UI_MENU_OPTION *MenuOption;
UI_MENU_OPTION *NextMenuOption;
UI_MENU_OPTION *SavedMenuOption;
- UI_MENU_OPTION *PreviousMenuOption;
UI_CONTROL_FLAG ControlFlag;
UI_SCREEN_OPERATION ScreenOperation;
- UINT16 DefaultId;
FORM_DISPLAY_ENGINE_STATEMENT *Statement;
BROWSER_HOT_KEY *HotKey;
UINTN HelpPageIndex;
@@ -2087,7 +2083,6 @@
UINT16 BottomLineWidth;
EFI_STRING_ID HelpInfo;
UI_EVENT_TYPE EventType;
- FORM_DISPLAY_ENGINE_STATEMENT *InitialHighlight;
BOOLEAN SkipHighLight;
EventType = UIEventNone;
@@ -2098,7 +2093,6 @@
OptionString = NULL;
ScreenOperation = UiNoOperation;
NewLine = TRUE;
- DefaultId = 0;
HelpPageCount = 0;
HelpLine = 0;
RowCount = 0;
@@ -2109,24 +2103,20 @@
EachLineWidth = 0;
HeaderLineWidth = 0;
BottomLineWidth = 0;
- OutputString = NULL;
UpArrow = FALSE;
DownArrow = FALSE;
SkipValue = 0;
SkipHighLight = FALSE;
NextMenuOption = NULL;
- PreviousMenuOption = NULL;
SavedMenuOption = NULL;
HotKey = NULL;
Repaint = TRUE;
MenuOption = NULL;
gModalSkipColumn = (CHAR16) (gStatementDimensions.RightColumn -
gStatementDimensions.LeftColumn) / 6;
- InitialHighlight = gFormData->HighLightedStatement;
ZeroMem (&Key, sizeof (EFI_INPUT_KEY));
- Width = (UINT16)gOptionBlockWidth - 1;
TopRow = gStatementDimensions.TopRow + SCROLL_ARROW_HEIGHT;
BottomRow = gStatementDimensions.BottomRow - SCROLL_ARROW_HEIGHT - 1;
Modified: trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
2014-09-29 08:48:24 UTC (rev 16188)
+++ trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/InputHandler.c
2014-09-29 09:02:57 UTC (rev 16189)
@@ -439,7 +439,6 @@
IN UI_MENU_OPTION *MenuOption
)
{
- EFI_STATUS Status;
UINTN Column;
UINTN Row;
CHAR16 InputText[MAX_NUMERIC_INPUT_WIDTH];
@@ -685,7 +684,7 @@
goto TheKey2;
}
- Status = WaitForKeyStroke (&Key);
+ WaitForKeyStroke (&Key);
TheKey2:
switch (Key.UnicodeChar) {
@@ -1118,7 +1117,6 @@
IN UI_MENU_OPTION *MenuOption
)
{
- EFI_STATUS Status;
EFI_INPUT_KEY Key;
UINTN Index;
CHAR16 *StringPtr;
@@ -1351,7 +1349,7 @@
goto TheKey;
}
- Status = WaitForKeyStroke (&Key);
+ WaitForKeyStroke (&Key);
TheKey:
switch (Key.UnicodeChar) {
@@ -1505,7 +1503,6 @@
} else {
gUserInput->InputValue.Buffer = ReturnValue;
gUserInput->InputValue.BufferLen = Question->CurrentValue.BufferLen;
- Status = EFI_SUCCESS;
}
} else {
ASSERT (CurrentOption != NULL);
@@ -1514,7 +1511,6 @@
return EFI_DEVICE_ERROR;
} else {
SetValuesByType (&gUserInput->InputValue.Value,
&CurrentOption->OptionOpCode->Value, gUserInput->InputValue.Type);
- Status = EFI_SUCCESS;
}
}
Modified: trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
2014-09-29 08:48:24 UTC (rev 16188)
+++ trunk/edk2/MdeModulePkg/Universal/DisplayEngineDxe/ProcessOptions.c
2014-09-29 09:02:57 UTC (rev 16189)
@@ -955,7 +955,6 @@
UINTN Index2;
UINT8 *ValueArray;
UINT8 ValueType;
- EFI_STRING_ID StringId;
EFI_IFR_ORDERED_LIST *OrderList;
BOOLEAN ValueInvalid;
@@ -964,7 +963,6 @@
StringPtr = NULL;
Character[1] = L'\0';
*OptionString = NULL;
- StringId = 0;
ValueInvalid = FALSE;
ZeroMem (FormattedNumber, 21 * sizeof (CHAR16));
Modified: trunk/edk2/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
===================================================================
--- trunk/edk2/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c 2014-09-29
08:48:24 UTC (rev 16188)
+++ trunk/edk2/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c 2014-09-29
09:02:57 UTC (rev 16189)
@@ -836,13 +836,11 @@
IN VOID *Context
)
{
- EFI_STATUS Status;
-
if (mFormDisplay != NULL) {
return;
}
- Status = gBS->LocateProtocol (
+ gBS->LocateProtocol (
&gEdkiiFormDisplayEngineProtocolGuid,
NULL,
(VOID **) &mFormDisplay
@@ -3217,7 +3215,6 @@
EFI_STATUS Status;
LIST_ENTRY *Link;
LIST_ENTRY *StorageLink;
- BROWSER_STORAGE *Storage;
FORMSET_STORAGE *FormSetStorage;
FORM_BROWSER_FORM *Form;
FORM_BROWSER_FORMSET *LocalFormSet;
@@ -3283,7 +3280,6 @@
StorageLink = GetFirstNode (&LocalFormSet->StorageListHead);
while (!IsNull (&LocalFormSet->StorageListHead, StorageLink)) {
FormSetStorage = FORMSET_STORAGE_FROM_LINK (StorageLink);
- Storage = FormSetStorage->BrowserStorage;
StorageLink = GetNextNode (&LocalFormSet->StorageListHead,
StorageLink);
SynchronizeStorage(FormSetStorage->BrowserStorage,
FormSetStorage->ConfigRequest, FALSE);
@@ -3292,7 +3288,6 @@
StorageLink = GetFirstNode (&LocalFormSet->SaveFailStorageListHead);
while (!IsNull (&LocalFormSet->SaveFailStorageListHead, StorageLink)) {
FormSetStorage = FORMSET_STORAGE_FROM_SAVE_FAIL_LINK (StorageLink);
- Storage = FormSetStorage->BrowserStorage;
StorageLink = GetNextNode (&LocalFormSet->SaveFailStorageListHead,
StorageLink);
SynchronizeStorage(FormSetStorage->BrowserStorage,
FormSetStorage->ConfigRequest, FALSE);
@@ -4823,13 +4818,11 @@
CHAR16 *RequestElement;
CHAR16 *NextRequestElement;
CHAR16 *NextElementBakup;
- UINTN SpareBufLen;
CHAR16 *SearchKey;
CHAR16 *ValueKey;
BOOLEAN RetVal;
CHAR16 *ConfigRequest;
- SpareBufLen = 0;
RetVal = FALSE;
NextElementBakup = NULL;
ValueKey = NULL;
------------------------------------------------------------------------------
Slashdot TV. Videos for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
