From bb6e4f5d94cbc0488fcd4cf6c6579dfb095b5506 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 6 Aug 2019 20:46:07 +0200 Subject: [PATCH] Boot menu: clarify variable usage 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 --- src/system/boot/platform/atari_m68k/video.cpp | 10 +++++----- src/system/boot/platform/bios_ia32/video.cpp | 10 +++++----- src/system/boot/platform/efi/video.cpp | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/system/boot/platform/atari_m68k/video.cpp b/src/system/boot/platform/atari_m68k/video.cpp index 073f492db2..1a99acafeb 100644 --- a/src/system/boot/platform/atari_m68k/video.cpp +++ b/src/system/boot/platform/atari_m68k/video.cpp @@ -1023,10 +1023,10 @@ video_mode_hook(Menu *menu, MenuItem *item) // find selected mode video_mode *mode = NULL; - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - switch (menu->IndexOf(item)) { + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + switch (submenu->IndexOf(subitem)) { case 0: // "Default" mode special sMode = sDefaultMode; @@ -1037,7 +1037,7 @@ video_mode_hook(Menu *menu, MenuItem *item) // sets sMode to NULL which triggers VGA mode //break; default: - mode = (video_mode *)item->Data(); + mode = (video_mode *)subitem->Data(); break; } } diff --git a/src/system/boot/platform/bios_ia32/video.cpp b/src/system/boot/platform/bios_ia32/video.cpp index 220db2d5a3..9e5573bb98 100644 --- a/src/system/boot/platform/bios_ia32/video.cpp +++ b/src/system/boot/platform/bios_ia32/video.cpp @@ -645,10 +645,10 @@ video_mode_hook(Menu *menu, MenuItem *item) // find selected mode video_mode *mode = NULL; - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - switch (menu->IndexOf(item)) { + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + switch (submenu->IndexOf(subitem)) { case 0: // "Default" mode special sMode = sDefaultMode; @@ -659,7 +659,7 @@ video_mode_hook(Menu *menu, MenuItem *item) // sets sMode to NULL which triggers VGA mode break; default: - mode = (video_mode *)item->Data(); + mode = (video_mode *)subitem->Data(); break; } } diff --git a/src/system/boot/platform/efi/video.cpp b/src/system/boot/platform/efi/video.cpp index bc7e35e6a5..bd97ad973a 100644 --- a/src/system/boot/platform/efi/video.cpp +++ b/src/system/boot/platform/efi/video.cpp @@ -261,10 +261,10 @@ platform_switch_to_logo(void) bool video_mode_hook(Menu *menu, MenuItem *item) { - menu = item->Submenu(); - item = menu->FindMarked(); - if (item != NULL) { - sGraphicsMode = (UINTN)item->Data(); + Menu* submenu = item->Submenu(); + MenuItem* subitem = submenu->FindMarked(); + if (subitem != NULL) { + sGraphicsMode = (UINTN)subitem->Data(); sModeChosen = true; }