From 701e262d3d622898279167ba909da631ac460bc1 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Wed, 30 Nov 2022 14:50:18 +0000 Subject: settings: Remove setting ID return from find_setting() Now that all users have replaced setting IDs with direct pointers, find_setting() and friends don't need to return an ID value. Change-Id: I8c5c31bb68d3bca5350d43538335265a55fd5517 --- apps/menu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'apps/menu.c') diff --git a/apps/menu.c b/apps/menu.c index f317f579a4..df2284be12 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -147,7 +147,7 @@ static const char* get_menu_item_name(int selected_item, type = (menu->flags&MENU_TYPE_MASK); if ((type == MT_SETTING) || (type == MT_SETTING_W_TEXT)) { - const struct settings_list *v = find_setting(menu->variable, NULL); + const struct settings_list *v = find_setting(menu->variable); if (v) return str(v->lang_id); else return "Not Done yet!"; @@ -356,14 +356,12 @@ void do_setting_from_menu(const struct menu_item_ex *temp, struct viewport parent[NB_SCREENS]) { char *title; - int setting_id; if (!temp) { panicf("do_setting_from_menu, NULL pointer"); return; } - const struct settings_list *setting = - find_setting(temp->variable, &setting_id); + const struct settings_list *setting = find_setting(temp->variable); if ((temp->flags&MENU_TYPE_MASK) == MT_SETTING_W_TEXT) title = temp->callback_and_desc->desc; @@ -523,7 +521,7 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, ID2P(LANG_RESET_SETTING)); const struct menu_item_ex *context_menu; const struct settings_list *setting = - find_setting(temp->variable, NULL); + find_setting(temp->variable); #ifdef HAVE_QUICKSCREEN if (is_setting_quickscreenable(setting)) context_menu = &quickscreen_able_option; -- cgit v1.2.3