i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Boot menu: clarify variable usage

Browse Source 
The video mode hook gets passed a menu and an item, but is actually
interested in the submenu pointed by the item and the items inside that.

Don't reuse the passed parameters and instead declare new local
variables.

Change-Id: Id17adde552fac2c248afa78380ff299fb21bc968
Reviewed-on: https://review.haiku-os.org/c/1693
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Adrien Destugues
2019-08-10 17:58:09 +00:00
committed by waddlesplash
parent 95901dc145
commit bb6e4f5d94
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/atari_m68k/video.cpp
+5 -5
View File
@@ -1023,10 +1023,10 @@ video_mode_hook(Menu *menu, MenuItem *item)
// find selected mode // find selected mode
video_mode *mode = NULL; video_mode *mode = NULL;
menu = item->Submenu(); Menu* submenu = item->Submenu();
item = menu->FindMarked(); MenuItem* subitem = submenu->FindMarked();
if (item != NULL) { if (subitem != NULL) {
switch (menu->IndexOf(item)) { switch (submenu->IndexOf(subitem)) {
case 0: case 0:
// "Default" mode special // "Default" mode special
sMode = sDefaultMode; sMode = sDefaultMode;
@@ -1037,7 +1037,7 @@ video_mode_hook(Menu *menu, MenuItem *item)
// sets sMode to NULL which triggers VGA mode // sets sMode to NULL which triggers VGA mode
//break; //break;
default: default:
mode = (video_mode *)item->Data(); mode = (video_mode *)subitem->Data();
break; break;
} }
} }
src/system/boot/platform/bios_ia32/video.cpp
+5 -5
View File
@@ -645,10 +645,10 @@ video_mode_hook(Menu *menu, MenuItem *item)
// find selected mode // find selected mode
video_mode *mode = NULL; video_mode *mode = NULL;
menu = item->Submenu(); Menu* submenu = item->Submenu();
item = menu->FindMarked(); MenuItem* subitem = submenu->FindMarked();
if (item != NULL) { if (subitem != NULL) {
switch (menu->IndexOf(item)) { switch (submenu->IndexOf(subitem)) {
case 0: case 0:
// "Default" mode special // "Default" mode special
sMode = sDefaultMode; sMode = sDefaultMode;
@@ -659,7 +659,7 @@ video_mode_hook(Menu *menu, MenuItem *item)
// sets sMode to NULL which triggers VGA mode // sets sMode to NULL which triggers VGA mode
break; break;
default: default:
mode = (video_mode *)item->Data(); mode = (video_mode *)subitem->Data();
break; break;
} }
} }
src/system/boot/platform/efi/video.cpp
+4 -4
View File
@@ -261,10 +261,10 @@ platform_switch_to_logo(void)
bool bool
video_mode_hook(Menu *menu, MenuItem *item) video_mode_hook(Menu *menu, MenuItem *item)
{ {
menu = item->Submenu(); Menu* submenu = item->Submenu();
item = menu->FindMarked(); MenuItem* subitem = submenu->FindMarked();
if (item != NULL) { if (subitem != NULL) {
sGraphicsMode = (UINTN)item->Data(); sGraphicsMode = (UINTN)subitem->Data();
sModeChosen = true; sModeChosen = true;
} }