From a84992825219f23dbcb7bdddb1f92c5bab5431d3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 26 Jan 2015 00:11:08 +0100 Subject: [PATCH] (menu_entries_cbs.c) Cut down on some code duplication --- menu/menu_entries_cbs.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index 8ee18398a2..a89c98131a 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -400,44 +400,36 @@ static int action_ok_shader_preset_load(const char *path, #endif } -static int action_ok_save_as_generic(const char *desc, - const char *label, unsigned type, size_t idx, - input_keyboard_line_complete_t cb) -{ - if (!driver.menu) - return -1; - - menu_input_key_start_line(driver.menu, desc, - label, type, idx, cb); - return 0; -} - static int action_ok_cheat(const char *path, const char *label, unsigned type, size_t idx) { - return action_ok_save_as_generic("Input Cheat", + menu_input_key_start_line(driver.menu, "Input Cheat", label, type, idx, menu_input_st_cheat_callback); + return 0; } static int action_ok_shader_preset_save_as(const char *path, const char *label, unsigned type, size_t idx) { - return action_ok_save_as_generic("Preset Filename", + menu_input_key_start_line(driver.menu, "Preset Filename", label, type, idx, menu_input_st_string_callback); + return 0; } static int action_ok_cheat_file_save_as(const char *path, const char *label, unsigned type, size_t idx) { - return action_ok_save_as_generic("Cheat Filename", + menu_input_key_start_line(driver.menu, "Cheat Filename", label, type, idx, menu_input_st_string_callback); + return 0; } static int action_ok_remap_file_save_as(const char *path, const char *label, unsigned type, size_t idx) { - return action_ok_save_as_generic("Remapping Filename", + menu_input_key_start_line(driver.menu, "Remapping Filename", label, type, idx, menu_input_st_string_callback); + return 0; } static int action_ok_path_use_directory(const char *path,