From 1ed787cc803db5308f2bfcf5f7acb347588edf84 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Jun 2015 00:02:04 +0200 Subject: [PATCH] (menu_entries_cbs_title.c) Refactors --- menu/menu_entries_cbs_title.c | 57 ++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/menu/menu_entries_cbs_title.c b/menu/menu_entries_cbs_title.c index 1ed56d099e..4de4f98fae 100644 --- a/menu/menu_entries_cbs_title.c +++ b/menu/menu_entries_cbs_title.c @@ -45,6 +45,7 @@ static int action_get_title_default(const char *path, const char *label, char elem0_path[PATH_MAX_LENGTH], elem1_path[PATH_MAX_LENGTH]; struct string_list *list_label = string_split(label, "|"); struct string_list *list_path = string_split(path, "|"); + driver_t *driver = driver_get_ptr(); *elem0 = *elem1 = *elem0_path = *elem1_path = 0; @@ -283,36 +284,36 @@ static int action_get_title_default(const char *path, const char *label, snprintf(s, len, "AUTOCONFIG DIR %s", path); break; default: - if (menu_type == MENU_SETTINGS_CUSTOM_VIEWPORT || - menu_type == MENU_SETTINGS) - snprintf(s, len, "MENU %s", path); - else if (menu_type == MENU_SETTINGS_CUSTOM_BIND || - menu_type == MENU_SETTINGS_CUSTOM_BIND_KEYBOARD) + switch (menu_type) { - strlcpy(s, "INPUT SETTINGS", len); - if (elem1[0] != '\0') - { - strlcat(s, " - ", len); - strlcat(s, string_to_upper(elem1), len); - } - } - else - { - driver_t *driver = driver_get_ptr(); + case MENU_SETTINGS_CUSTOM_VIEWPORT: + case MENU_SETTINGS: + snprintf(s, len, "MENU %s", path); + break; + case MENU_SETTINGS_CUSTOM_BIND: + case MENU_SETTINGS_CUSTOM_BIND_KEYBOARD: + strlcpy(s, "INPUT SETTINGS", len); + if (elem1[0] != '\0') + { + strlcat(s, " - ", len); + strlcat(s, string_to_upper(elem1), len); + } + break; + default: + if (driver->menu->defer_core) + snprintf(s, len, "CONTENT %s", path); + else + { + global_t *global = global_get_ptr(); + const char *core_name = global->menu.info.library_name; - if (driver->menu->defer_core) - snprintf(s, len, "CONTENT %s", path); - else - { - global_t *global = global_get_ptr(); - const char *core_name = global->menu.info.library_name; - - if (!core_name) - core_name = global->system.info.library_name; - if (!core_name) - core_name = "No Core"; - snprintf(s, len, "CONTENT (%s) %s", core_name, path); - } + if (!core_name) + core_name = global->system.info.library_name; + if (!core_name) + core_name = "No Core"; + snprintf(s, len, "CONTENT (%s) %s", core_name, path); + } + break; } break; }