From ee7ce4feaa3993537bbcb0cc7f9d9283ecf7f332 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 25 Sep 2015 15:02:19 +0200 Subject: [PATCH] Remove unused variables --- menu/cbs/menu_cbs_ok.c | 1 - menu/drivers/rgui.c | 3 +-- menu/drivers/xmb.c | 3 --- menu/menu_input.c | 1 - menu/menu_iterate.c | 1 - 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 30dc096476..595c0600f0 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1541,7 +1541,6 @@ static int action_ok_load_archive_detect_core(const char *path, size_t selection; int ret = 0; global_t *global = global_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); const char *menu_path = menu ? menu->scratch2_buf : NULL; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index c4c0d55eaf..774704ac90 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -394,7 +394,6 @@ static void rgui_render(void) menu_handle_t *menu = menu_driver_get_ptr(); menu_display_t *disp = menu_display_get_ptr(); menu_framebuf_t *frame_buf = menu_display_fb_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); menu_animation_t *anim = menu_animation_get_ptr(); @@ -546,7 +545,7 @@ static void rgui_render(void) bool entry_selected = menu_entry_is_currently_selected(i); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) - return false; + continue; if (i > (selection + 100)) continue; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index ee2b543e6d..7e63b662a7 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -571,7 +571,6 @@ static void xmb_selection_pointer_changed(bool allow_animations) xmb_handle_t *xmb = NULL; menu_handle_t *menu = menu_driver_get_ptr(); menu_display_t *disp = menu_display_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); settings_t *settings = config_get_ptr(); @@ -921,7 +920,6 @@ static void xmb_list_switch(xmb_handle_t *xmb) int dir = -1; menu_handle_t *menu = menu_driver_get_ptr(); menu_display_t *disp = menu_display_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) @@ -1415,7 +1413,6 @@ static void xmb_render(void) menu_handle_t *menu = menu_driver_get_ptr(); menu_display_t *disp = menu_display_get_ptr(); menu_animation_t *anim = menu_animation_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); if (!menu) diff --git a/menu/menu_input.c b/menu/menu_input.c index 3d55e8fbe3..c1f6261506 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -1157,7 +1157,6 @@ void menu_input_post_iterate(int *ret, unsigned action) menu_entry_t entry = {{0}}; menu_input_t *menu_input = menu_input_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c index 1702144dd8..c613b94093 100644 --- a/menu/menu_iterate.c +++ b/menu/menu_iterate.c @@ -176,7 +176,6 @@ static int action_iterate_info(char *s, size_t len, const char *label) uint32_t label_hash = 0; menu_file_list_cbs_t *cbs = NULL; menu_list_t *menu_list = menu_list_get_ptr(); - menu_navigation_t *nav = menu_navigation_get_ptr(); if (!menu_list) return 0;