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
This commit is contained in:
Olivier Martin 2014-09-29 09:02:57 +00:00 committed by ydong10
parent cec6685c7d
commit 831537d6ca
5 changed files with 3 additions and 28 deletions

View File

@ -135,7 +135,6 @@ RefreshKeyHelp (
{ {
UINTN SecCol; UINTN SecCol;
UINTN ThdCol; UINTN ThdCol;
UINTN LeftColumnOfHelp;
UINTN RightColumnOfHelp; UINTN RightColumnOfHelp;
UINTN TopRowOfHelp; UINTN TopRowOfHelp;
UINTN BottomRowOfHelp; UINTN BottomRowOfHelp;
@ -166,7 +165,6 @@ RefreshKeyHelp (
ThdCol = gScreenDimensions.LeftColumn + (gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3 * 2; ThdCol = gScreenDimensions.LeftColumn + (gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn) / 3 * 2;
StartColumnOfHelp = gScreenDimensions.LeftColumn + 2; StartColumnOfHelp = gScreenDimensions.LeftColumn + 2;
LeftColumnOfHelp = gScreenDimensions.LeftColumn + 1;
RightColumnOfHelp = gScreenDimensions.RightColumn - 1; RightColumnOfHelp = gScreenDimensions.RightColumn - 1;
TopRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - gFooterHeight + 1; TopRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - gFooterHeight + 1;
BottomRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - 2; BottomRowOfHelp = gScreenDimensions.BottomRow - STATUS_BAR_HEIGHT - 2;

View File

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

View File

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

View File

@ -955,7 +955,6 @@ ProcessOptions (
UINTN Index2; UINTN Index2;
UINT8 *ValueArray; UINT8 *ValueArray;
UINT8 ValueType; UINT8 ValueType;
EFI_STRING_ID StringId;
EFI_IFR_ORDERED_LIST *OrderList; EFI_IFR_ORDERED_LIST *OrderList;
BOOLEAN ValueInvalid; BOOLEAN ValueInvalid;
@ -964,7 +963,6 @@ ProcessOptions (
StringPtr = NULL; StringPtr = NULL;
Character[1] = L'\0'; Character[1] = L'\0';
*OptionString = NULL; *OptionString = NULL;
StringId = 0;
ValueInvalid = FALSE; ValueInvalid = FALSE;
ZeroMem (FormattedNumber, 21 * sizeof (CHAR16)); ZeroMem (FormattedNumber, 21 * sizeof (CHAR16));

View File

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