From 8ba7bc695af9cde6701fc4b512104c9e7d1c9e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 20 Jun 2007 00:51:20 +0000 Subject: [PATCH] * Calms down a superfluous GCC 2 warning. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21468 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/loader/menu.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp index 0854037f95..8ad3768175 100644 --- a/src/system/boot/loader/menu.cpp +++ b/src/system/boot/loader/menu.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Copyright 2003-2007, Axel Dörfler, axeld@pinc-software.de. All rights reserved. * Distributed under the terms of the MIT License. */ @@ -407,7 +407,8 @@ add_boot_volume_menu(Directory *bootVolume) menu->AddSeparatorItem(); menu->AddItem(item = new(nothrow) MenuItem("Rescan volumes")); - item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - depending on your system, you can then boot from them."); + item->SetHelpText("Please insert a Haiku CD-ROM or attach a USB disk - " + "depending on your system, you can then boot from them."); item->SetType(MENU_ITEM_NO_CHOICE); if (count == 0) item->Select(true); @@ -492,14 +493,16 @@ status_t user_menu(Directory **_bootVolume) { Menu *menu = new(nothrow) Menu(MAIN_MENU); - Menu *safeModeMenu; + Menu *safeModeMenu = NULL; MenuItem *item; // Add boot volume - menu->AddItem(item = new(nothrow) MenuItem("Select boot volume", add_boot_volume_menu(*_bootVolume))); + menu->AddItem(item = new(nothrow) MenuItem("Select boot volume", + add_boot_volume_menu(*_bootVolume))); // Add safe mode - menu->AddItem(item = new(nothrow) MenuItem("Select safe mode options", safeModeMenu = add_safe_mode_menu())); + menu->AddItem(item = new(nothrow) MenuItem("Select safe mode options", + safeModeMenu = add_safe_mode_menu())); // Add platform dependent menus platform_add_menus(menu);