From 907ed71a5c14985e67324b80e9b7a01fa171014a Mon Sep 17 00:00:00 2001 From: Arif Ali Date: Mon, 18 Apr 2011 03:54:24 +0100 Subject: [PATCH] yes/no only, yes before no --- extendedcommands.c | 13 ++----------- recovery.c | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/extendedcommands.c b/extendedcommands.c index be93770..239b8af 100644 --- a/extendedcommands.c +++ b/extendedcommands.c @@ -394,21 +394,12 @@ int confirm_selection(const char* title, const char* confirm) return 1; char* confirm_headers[] = { title, " THIS CAN NOT BE UNDONE.", "", NULL }; - char* items[] = { "No", - "No", - "No", - "No", - "No", - "No", - "No", - confirm, //" Yes -- wipe partition", // [7 - "No", - "No", + char* items[] = { confirm, //" Yes -- wipe partition", // [0] "No", NULL }; int chosen_item = get_menu_selection(confirm_headers, items, 0, 0); - return chosen_item == 7; + return chosen_item == 0; } #define MKE2FS_BIN "/sbin/mke2fs" diff --git a/recovery.c b/recovery.c index 09a7b7f..3fe7806 100644 --- a/recovery.c +++ b/recovery.c @@ -658,21 +658,12 @@ wipe_data(int confirm) { title_headers = prepend_title((const char**)headers); } - char* items[] = { " No", - " No", - " No", - " No", - " No", - " No", - " No", - " Yes -- delete all user data", // [7] - " No", - " No", + char* items[] = { " Yes -- delete all user data", // [0] " No", NULL }; int chosen_item = get_menu_selection(title_headers, items, 1, 0); - if (chosen_item != 7) { + if (chosen_item != 0) { return; } }