From 1cc8ee7861a59532700a6fd1255689576eda0f52 Mon Sep 17 00:00:00 2001 From: xli24 Date: Thu, 25 Jan 2007 06:15:58 +0000 Subject: Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2313 6f19259b-4bc3-4df7-8a09-765794883524 --- .../UserInterface/DriverSample/DriverSample.c | 1 + .../UserInterface/HiiDataBase/Dxe/Fonts.c | 9 ++- .../UserInterface/HiiDataBase/Dxe/Forms.c | 11 +++- .../UserInterface/HiiDataBase/Dxe/HiiDatabase.c | 6 -- .../UserInterface/HiiDataBase/Dxe/Package.c | 8 +-- .../UserInterface/HiiDataBase/Dxe/Strings.c | 4 +- .../UserInterface/SetupBrowser/Dxe/Boolean.c | 11 +++- .../UserInterface/SetupBrowser/Dxe/InputHandler.c | 69 ++++++++++------------ .../UserInterface/SetupBrowser/Dxe/Presentation.c | 4 ++ .../UserInterface/SetupBrowser/Dxe/Print.h | 2 + .../SetupBrowser/Dxe/ProcessOptions.c | 1 + .../UserInterface/SetupBrowser/Dxe/Setup.c | 5 +- .../Universal/UserInterface/SetupBrowser/Dxe/Ui.c | 11 ++-- 13 files changed, 76 insertions(+), 66 deletions(-) (limited to 'EdkModulePkg/Universal/UserInterface') diff --git a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c index dd316114bf..f78d4226e5 100644 --- a/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c +++ b/EdkModulePkg/Universal/UserInterface/DriverSample/DriverSample.c @@ -30,6 +30,7 @@ Abstract: EFI_GUID mFormSetGuid = FORMSET_GUID; EFI_GUID mStringPackGuid = STRING_PACK_GUID; +STATIC EFI_STATUS EFIAPI DriverCallback ( diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c index d7daa64902..ebab3bc3d0 100644 --- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c +++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c @@ -210,14 +210,17 @@ Returns: if (Narrow) { for (Value = 0; Value != Count; Value++) { - *GlyphBuffer[Location + Value] |= GlobalData->NarrowGlyphs[Character].GlyphCol1[Value]; + *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] | + GlobalData->NarrowGlyphs[Character].GlyphCol1[Value]); } Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING; } else { for (Value = 0; Value != Count; Value++) { - *GlyphBuffer[Location + Value] |= GlobalData->WideGlyphs[Character].GlyphCol1[Value]; - *GlyphBuffer[Location + Value + Count] |= GlobalData->WideGlyphs[Character].GlyphCol2[Value]; + *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] | + GlobalData->WideGlyphs[Character].GlyphCol1[Value]); + *GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] | + GlobalData->WideGlyphs[Character].GlyphCol2[Value]); } Attributes = GlobalData->WideGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING; diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c index 4178284a49..0c8629c06f 100644 --- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c +++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c @@ -22,6 +22,7 @@ Abstract: #include "HiiDatabase.h" +STATIC CHAR16* Ascii2Unicode ( OUT CHAR16 *UnicodeStr, @@ -54,6 +55,7 @@ Ascii2Unicode ( } } +STATIC CHAR8* Unicode2Ascii ( OUT CHAR8 *AsciiStr, @@ -86,6 +88,7 @@ Unicode2Ascii ( } } +STATIC VOID ExtractDevicePathData ( IN EFI_HII_DATA_TABLE *DataTable, @@ -129,6 +132,7 @@ Returns: *ExportBufferPtr = ExportBuffer; } +STATIC VOID ExtractVariableData ( IN OUT EFI_HII_DATA_TABLE *DataTable, @@ -205,6 +209,7 @@ Returns: &gEfiFormCallbackProtocolGuid, (VOID *) &FormCallback ); + ASSERT_EFI_ERROR (Status); } // // Since we have a "Setup" variable that wasn't specified by a variable op-code @@ -240,6 +245,7 @@ Returns: &TempValue, ExportBuffer ); + ASSERT_EFI_ERROR (Status); } else { Status = gRT->GetVariable ( (CHAR16 *) SETUP_MAP_NAME, @@ -248,6 +254,7 @@ Returns: &TempValue, ExportBuffer ); + ASSERT_EFI_ERROR (Status); } ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue); @@ -306,6 +313,7 @@ Returns: &TempValue, ExportBuffer ); + ASSERT_EFI_ERROR (Status); } else { Status = gRT->GetVariable ( String, @@ -314,6 +322,7 @@ Returns: &TempValue, ExportBuffer ); + ASSERT_EFI_ERROR (Status); } ExportBuffer = (UINT8 *) (UINTN) (((UINTN) ExportBuffer) + TempValue); @@ -367,7 +376,6 @@ Returns: UINT8 *ExportBuffer; EFI_HII_EXPORT_TABLE *ExportTable; EFI_HII_DATA_TABLE *DataTable; - BOOLEAN InsufficientSize; BOOLEAN VariableExist; UINT16 NumberOfHiiDataTables; UINTN SizeNeeded; @@ -386,7 +394,6 @@ Returns: FormPack = NULL; RawData = NULL; PackageInstance = NULL; - InsufficientSize = FALSE; NumberOfHiiDataTables = 0; VariableSize = 0; TempValue = 0; diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c index ce34eff5bd..bcec42b24e 100644 --- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c +++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/HiiDatabase.c @@ -154,7 +154,6 @@ Returns: --*/ { - EFI_HII_GLOBAL_DATA *GlobalData; EFI_HII_HANDLE_DATABASE *Database; EFI_HII_DATA *HiiData; UINTN HandleCount; @@ -165,8 +164,6 @@ Returns: HiiData = EFI_HII_DATA_FROM_THIS (This); - GlobalData = HiiData->GlobalData; - Database = HiiData->DatabaseHead; if (Database == NULL) { @@ -333,7 +330,6 @@ Returns: EFI_HII_DATA *HiiData; EFI_HII_HANDLE_DATABASE *HandleDatabase; EFI_HII_STRING_PACK *StringPack; - EFI_HII_STRING_PACK *Location; RELOFST Token; UINT32 Length; @@ -376,8 +372,6 @@ Returns: StringPack = (EFI_HII_STRING_PACK *) (&StringPackageInstance->IfrData); } - Location = StringPack; - // // Remember that the string packages are formed into contiguous blocks of language data. // diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c index 3e9e5364e9..ec3f49c5dc 100644 --- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c +++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Package.c @@ -264,7 +264,6 @@ Returns: UINT32 TotalTokenNumber; UINT8 *Local; EFI_NARROW_GLYPH *NarrowGlyph; - EFI_WIDE_GLYPH *WideGlyph; if (Packages->NumberOfPackages == 0 || This == NULL) { return EFI_INVALID_PARAMETER; @@ -439,7 +438,7 @@ Returns: // we go down one level deeper, increment the handle value that will be passed back. // if (Database->Handle >= *Handle) { - *Handle = Database->Handle + 1; + *Handle = (EFI_HII_HANDLE) (Database->Handle + 1); } } @@ -518,7 +517,6 @@ Returns: Local = (UINT8 *) (&FontPack->NumberOfWideGlyphs + sizeof (UINT8)) + (sizeof (EFI_NARROW_GLYPH)) * NumNarrowGlyphs; - WideGlyph = (EFI_WIDE_GLYPH *) Local; CopyMem ( &Member, (UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count), @@ -530,7 +528,6 @@ Returns: CopyMem (&Unicode, &GlobalData->WideGlyphs[Member].UnicodeWeight, sizeof (UINT16)); if (Unicode == 0) { Local = (UINT8*)(&FontPack->NumberOfWideGlyphs + sizeof(UINT8)) + (sizeof(EFI_NARROW_GLYPH)) * NumNarrowGlyphs; - WideGlyph = (EFI_WIDE_GLYPH *) Local; CopyMem ( &GlobalData->WideGlyphs[Member], (UINTN *) (Local + sizeof (EFI_WIDE_GLYPH) * Count), @@ -619,7 +616,6 @@ Returns: EFI_HII_DATA *HiiData; EFI_HII_HANDLE_DATABASE *HandleDatabase; EFI_HII_HANDLE_DATABASE *PreviousHandleDatabase; - UINTN Count; if (This == NULL || Handle == 0) { return EFI_INVALID_PARAMETER; @@ -635,7 +631,7 @@ Returns: // PreviousHandleDatabase = HandleDatabase; - for (Count = 0; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) { + for (; HandleDatabase != NULL; HandleDatabase = HandleDatabase->NextHandleDatabase) { // // Match the numeric value with the database entry - if matched, // free the package instance and apply fix-up to database linked list diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c index 742a01dc43..26f797e63b 100644 --- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c +++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Strings.c @@ -22,6 +22,7 @@ Abstract: #include "HiiDatabase.h" +STATIC VOID AsciiToUnicode ( IN UINT8 *Lang, @@ -138,6 +139,7 @@ Returns: return EFI_SUCCESS; } +STATIC EFI_STATUS HiiNewString2 ( IN EFI_HII_PROTOCOL *This, @@ -766,7 +768,7 @@ Returns: &NewString, TRUE ); - + ASSERT_EFI_ERROR (Status); } gBS->FreePool (LangCodes); diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c index 122da065a9..d3f77e09f5 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Boolean.c @@ -83,6 +83,7 @@ Returns: mBooleanEvaluationStackEnd = NewStack + StackSizeInBoolean; } +STATIC VOID InitializeBooleanEvaluator ( VOID @@ -176,6 +177,7 @@ Returns: return ReturnValue; } +STATIC EFI_STATUS GrowBooleanExpression ( IN EFI_INCONSISTENCY_DATA *InconsistentTags, @@ -212,6 +214,7 @@ GrowBooleanExpression ( return EFI_SUCCESS; } +STATIC VOID CreateBooleanExpression ( IN EFI_FILE_FORM_TAGS *FileFormTags, @@ -311,6 +314,7 @@ NextEntry: GrowBooleanExpression (&FakeInconsistentTags, BooleanExpression, BooleanExpressionLength); } +STATIC EFI_STATUS BooleanVariableWorker ( IN CHAR16 *VariableName, @@ -369,6 +373,7 @@ Returns: return Status; } +STATIC UINT8 PredicateIfrType ( IN EFI_INCONSISTENCY_DATA *Iterator @@ -416,6 +421,7 @@ Returns: return 0x2; } +STATIC VOID PostOrderEvaluate ( IN EFI_FILE_FORM_TAGS *FileFormTags, @@ -616,7 +622,7 @@ Returns: break; case EFI_IFR_NOT_OP: Operator = PopBool (StackPtr); - PushBool (StackPtr, !Operator); + PushBool (StackPtr, (BOOLEAN) (!Operator)); break; case EFI_IFR_SUPPRESS_IF_OP: @@ -1350,11 +1356,12 @@ Returns: return Operator; } - return FALSE; + goto Done; } Iterator++; } +Done: return FALSE; } diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c index 466039f8dc..ebf038581f 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/InputHandler.c @@ -215,7 +215,6 @@ ReadPassword ( ) { EFI_STATUS Status; - UINTN PasswordSize; UINTN ScreenSize; CHAR16 NullCharacter; CHAR16 Space[2]; @@ -234,12 +233,12 @@ ReadPassword ( UINTN DimensionsWidth; UINTN DimensionsHeight; EFI_IFR_DATA_ENTRY *DataEntry; + UINTN WidthOfString; DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn; DimensionsHeight = gScreenDimensions.BottomRow - gScreenDimensions.TopRow; VariableDefinition = NULL; - PasswordSize = 0; NullCharacter = CHAR_NULL; Space[0] = L' '; Space[1] = CHAR_NULL; @@ -309,7 +308,8 @@ Error: // Upon error, we will likely receive a string to print out // Display error popup // - ScreenSize = EFI_MAX(GetStringWidth (Packet->String), GetStringWidth (gPressEnter)) / 2; + WidthOfString = GetStringWidth (Packet->String); + ScreenSize = EFI_MAX(WidthOfString, GetStringWidth (gPressEnter)) / 2; CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter); gBS->FreePool (Packet); @@ -318,9 +318,8 @@ Error: } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN); } - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_NOT_READY; + Status = EFI_NOT_READY; + goto Done; } } @@ -418,10 +417,12 @@ Error: if (Confirmation) { if (EFI_ERROR (Status)) { if (Packet->String == NULL) { - ScreenSize = EFI_MAX (GetStringWidth (gConfirmError), GetStringWidth (gPressEnter)) / 2; + WidthOfString = GetStringWidth (gConfirmError); + ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2; CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter); } else { - ScreenSize = EFI_MAX (GetStringWidth (Packet->String), GetStringWidth (gPressEnter)) / 2; + WidthOfString = GetStringWidth (Packet->String); + ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2; CreatePopUp (ScreenSize, 4, &NullCharacter, Packet->String, gPressEnter, &NullCharacter); gBS->FreePool (Packet); } @@ -431,15 +432,13 @@ Error: Status = WaitForKeyStroke (&Key); if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) { - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_NOT_READY; + Status = EFI_NOT_READY; + goto Done; } } while (1); } else { - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_NOT_READY; + Status = EFI_NOT_READY; + goto Done; } } else { // @@ -451,9 +450,8 @@ Error: } if (PromptForPassword && EFI_ERROR (Status)) { - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_DEVICE_ERROR; + Status = EFI_DEVICE_ERROR; + goto Done; } } } @@ -464,19 +462,18 @@ Error: // Otherwise, kick and error box, and return an error // if (StrCmp (TempString, TempString2) == 0) { - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_SUCCESS; + Status = EFI_SUCCESS; + goto Done; } else { - ScreenSize = EFI_MAX (GetStringWidth (gConfirmError), GetStringWidth (gPressEnter)) / 2; + WidthOfString = GetStringWidth (gConfirmError); + ScreenSize = EFI_MAX (WidthOfString, GetStringWidth (gPressEnter)) / 2; CreatePopUp (ScreenSize, 4, &NullCharacter, gConfirmError, gPressEnter, &NullCharacter); StringPtr[0] = CHAR_NULL; do { Status = WaitForKeyStroke (&Key); if (Key.UnicodeChar == CHAR_CARRIAGE_RETURN) { - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_DEVICE_ERROR; + Status = EFI_DEVICE_ERROR; + goto Done; } } while (1); } @@ -486,9 +483,8 @@ Error: // // I was asked for a password, return it back in StringPtr // - gBS->FreePool (TempString); - gBS->FreePool (TempString2); - return EFI_SUCCESS; + Status = EFI_SUCCESS; + goto Done; } else { // // If the two passwords were not the same kick an error popup @@ -575,6 +571,8 @@ Error: } while (!ConfirmationComplete); } while (1); + +Done: gBS->FreePool (TempString); gBS->FreePool (TempString2); return Status; @@ -655,7 +653,6 @@ Returns: CHAR16 NullCharacter; CHAR16 *StringPtr; EFI_FILE_FORM_TAGS *FileFormTags; - EFI_STATUS Status; EFI_VARIABLE_DEFINITION *VariableDefinition; UINTN Loop; @@ -689,7 +686,7 @@ Returns: goto TheKey2; } - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); TheKey2: switch (Key.UnicodeChar) { @@ -879,7 +876,7 @@ EnterCarriageReturn: CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter); do { - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); switch (Key.UnicodeChar) { @@ -985,7 +982,6 @@ GetSelectionInputPopUp ( OUT UINT16 *KeyValue ) { - EFI_STATUS Status; EFI_INPUT_KEY Key; UINTN Index; UINTN TempIndex; @@ -1005,7 +1001,6 @@ GetSelectionInputPopUp ( UINTN MenuLinesInView; UINTN PopUpWidth; CHAR16 Character; - UINTN FirstOption; BOOLEAN FirstOptionFoundFlag; INT32 SavedAttribute; EFI_TAG TagBackup; @@ -1017,10 +1012,8 @@ GetSelectionInputPopUp ( BOOLEAN ShowDownArrow; BOOLEAN ShowUpArrow; UINTN DimensionsWidth; - UINTN DimensionsHeight; DimensionsWidth = gScreenDimensions.RightColumn - gScreenDimensions.LeftColumn; - DimensionsHeight = gScreenDimensions.BottomRow - gScreenDimensions.TopRow; TempValue = 0; TempIndex = 0; @@ -1050,7 +1043,6 @@ GetSelectionInputPopUp ( Count = 0; PopUpWidth = 0; - FirstOption = MenuOption->TagIndex; FirstOptionFoundFlag = FALSE; StringPtr = AllocateZeroPool ((gOptionBlockWidth + 1) * 2); @@ -1066,7 +1058,6 @@ GetSelectionInputPopUp ( if (MenuOption->Tags[Index].Operand == EFI_IFR_ONE_OF_OPTION_OP && !MenuOption->Tags[Index].Suppress) { if (!FirstOptionFoundFlag) { - FirstOption = Index; FirstOptionFoundFlag = TRUE; } @@ -1309,7 +1300,7 @@ GetSelectionInputPopUp ( KeyInitialized = TRUE; } - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); TheKey: switch (Key.UnicodeChar) { @@ -1553,14 +1544,14 @@ TheKey: *Value = TempValue; } - gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute); - return EFI_SUCCESS; + goto Done; default: break; } } while (1); +Done: gST->ConOut->SetAttribute (gST->ConOut, SavedAttribute); return EFI_SUCCESS; } diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c index 7b219c85bb..8c81fd8c54 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c @@ -348,6 +348,7 @@ DisplayPageFrame ( | ^"=Move Highlight Toggles Checkbox Esc=Discard Changes | +------------------------------------------------------------------------------+ */ +STATIC UI_MENU_OPTION * DisplayForm ( OUT UI_MENU_OPTION *Selection, @@ -796,6 +797,7 @@ Returns: } +STATIC VOID ExtractFormHandle ( IN UI_MENU_OPTION *Selection, @@ -851,6 +853,7 @@ ExtractFormHandle ( return ; } +STATIC EFI_STATUS UpdateNewTagData ( IN UINT8 *FormData, @@ -1092,6 +1095,7 @@ UpdateNewTagData ( return Status; } +STATIC VOID ExtractDynamicFormHandle ( IN UI_MENU_OPTION *Selection, diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Print.h b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Print.h index 86feb88bdf..d055513b71 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Print.h +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Print.h @@ -22,6 +22,8 @@ Abstract: #ifndef _PRINT_H_ #define _PRINT_H_ +#include "Setup.h" + #define LEFT_JUSTIFY 0x01 #define PREFIX_SIGN 0x02 #define PREFIX_BLANK 0x04 diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c index 8a878bcf71..a2aa50fbd5 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c @@ -77,6 +77,7 @@ ExtractNvValue ( return Status; } +STATIC VOID AdjustNvMap ( IN EFI_FILE_FORM_TAGS *FileFormTags, diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c index f62bc120f0..407f7694ba 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Setup.c @@ -144,6 +144,7 @@ InstallPrint ( VOID ); +STATIC EFI_STATUS EFIAPI SendForm ( @@ -189,7 +190,6 @@ Returns: --*/ { - EFI_FORM_CONFIGURATION_DATA *FormData; EFI_FORM_CALLBACK_PROTOCOL *FormCallback; EFI_FILE_FORM_TAGS *FileFormTagsHead; UI_MENU_OPTION *Selection; @@ -279,7 +279,6 @@ Returns: ASSERT (gPreviousValue != NULL); } - FormData = EFI_FORM_DATA_FROM_THIS (This); Callback = FALSE; FormCallback = NULL; @@ -710,6 +709,7 @@ GetTagCount ( (*NumberOfTags)++; } +STATIC VOID AddNextInconsistentTag ( IN OUT EFI_INCONSISTENCY_DATA **InconsistentTagsPtr @@ -1643,6 +1643,7 @@ Returns: return Buffer; } +STATIC EFI_STATUS PopulateHomePage ( IN UINTN NumberOfIfrImages, diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c index 369d2b4911..854d023f8e 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c @@ -211,6 +211,7 @@ Returns: } } +STATIC VOID UpdateDateAndTime ( VOID @@ -492,7 +493,6 @@ Returns: UINTN Start; UINTN Top; UINTN Index; - EFI_STATUS Status; BOOLEAN SelectionComplete; UINTN InputOffset; UINTN CurrentAttribute; @@ -570,12 +570,12 @@ Returns: // Take the first key typed and report it back? // if (HotKey) { - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); CopyMem (KeyValue, &Key, sizeof (EFI_INPUT_KEY)); } else { do { - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); switch (Key.UnicodeChar) { case CHAR_NULL: @@ -1046,6 +1046,7 @@ Returns: return ; } +STATIC BOOLEAN SelectionsAreValid ( IN UI_MENU_OPTION *MenuOption, @@ -1068,7 +1069,6 @@ Returns: EFI_FILE_FORM_TAGS *FileFormTags; CHAR16 *StringPtr; CHAR16 NullCharacter; - EFI_STATUS Status; UINTN Index; UINT16 *NvRamMap; STRING_REF PopUp; @@ -1103,7 +1103,7 @@ Returns: CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter); do { - Status = WaitForKeyStroke (&Key); + WaitForKeyStroke (&Key); switch (Key.UnicodeChar) { @@ -1284,6 +1284,7 @@ Returns: } } +STATIC VOID UpdateOptionSkipLines ( IN EFI_IFR_DATA_ARRAY *PageData, -- cgit v1.2.3