Removes the message asking for confirmation prior to exiting iprutils
when there are disks known to be in the zeroed state. This message has
no use anymore.
Signed-off-by: Gabriel Krisman Bertazi <kris...@linux.vnet.ibm.com>
---
iprconfig.c | 41 +----------------------------------------
iprconfig.h | 16 ----------------
2 files changed, 1 insertion(+), 56 deletions(-)
diff --git a/iprconfig.c b/iprconfig.c
index fadf562..3327bc4 100644
--- a/iprconfig.c
+++ b/iprconfig.c
@@ -297,20 +297,6 @@ static i_container *add_i_con(i_container *i_con, char *f,
void *d)
}
/**
- * exit_confirmed -
- * @i_con: i_container struct
- *
- * Returns:
- * 0
- **/
-int exit_confirmed(i_container *i_con)
-{
- exit_func();
- exit(0);
- return 0;
-}
-
-/**
* free_screen -
* @panel:
* @win:
@@ -19169,35 +19155,10 @@ int main(int argc, char *argv[])
ipr_cleanup_zeroed_devs();
}
- while (head_zdev) {
- struct screen_output *s_out;
- i_container *i_con;
-
- n_exit_confirm.body = body_init(n_exit_confirm.header, NULL);
-
- for (i = 0; i < n_exit_confirm.num_opts; i++) {
- n_exit_confirm.body = ipr_list_opts(n_exit_confirm.body,
-
n_exit_confirm.options[i].key,
-
n_exit_confirm.options[i].list_str);
- }
-
- n_exit_confirm.body = ipr_end_list(n_exit_confirm.body);
-
- s_out = screen_driver(&n_exit_confirm, 0, NULL);
- free(n_exit_confirm.body);
- n_exit_confirm.body = NULL;
- rc = s_out->rc;
- i_con = s_out->i_con;
- i_con = free_i_con(i_con);
- free(s_out);
- check_current_config(false);
- ipr_cleanup_zeroed_devs();
- }
-
clear();
refresh();
endwin();
- exit(0);
+
return 0;
}
diff --git a/iprconfig.h b/iprconfig.h
index 5a40700..b3cf22d 100644
--- a/iprconfig.h
+++ b/iprconfig.h
@@ -208,22 +208,6 @@ s_node n_main_menu = {
.title = __("IBM Power RAID Configuration Utility")
};
-struct screen_opts exit_confirm_opt[] = {
- {main_menu, "1", __("Return to main menu")},
- {exit_confirmed, "2", __("Exit iprconfig")},
-};
-
-s_node n_exit_confirm = {
- .num_opts = NUM_OPTS(exit_confirm_opt),
- .options = &exit_confirm_opt[0],
- .title = __("Confirm Exit"),
- .header = {
- __("One or more disks is currently known to be zeroed. Exiting
now "
- "will cause this state to be lost, resulting in longer array
creation times\n\n"),
- "" }
-};
-
-
struct screen_opts disk_status_opt[] = {
{device_details, "\n"}
};
--
2.1.0
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Iprdd-devel mailing list
Iprdd-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/iprdd-devel
