From 242bfaba78167f371a3402d1aab94d6e6e3188cd Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Sun, 22 Mar 2015 09:36:32 +0100 Subject: [PATCH] Remove unused variables --- menu/menu.c | 2 -- menu/menu_entries.c | 1 - menu/menu_entries_cbs_deferred_push.c | 17 +---------------- menu/menu_entries_cbs_iterate.c | 6 ------ menu/menu_list.c | 1 - runloop_data.c | 1 - 6 files changed, 1 insertion(+), 27 deletions(-) diff --git a/menu/menu.c b/menu/menu.c index 3ad5d1b11b..2304bcadf0 100644 --- a/menu/menu.c +++ b/menu/menu.c @@ -280,7 +280,6 @@ void menu_free_list(void *data) void menu_free(void *data) { menu_handle_t *menu = (menu_handle_t*)data; - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); if (!menu) @@ -405,7 +404,6 @@ int menu_iterate(retro_input_t input, unsigned action = menu_input_frame(input, trigger_input); runloop_t *runloop = rarch_main_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); menu->cur_time = rarch_get_time_usec(); diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 99ccdadbd7..10be4d46ac 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -87,7 +87,6 @@ int menu_entries_push_list(menu_handle_t *menu, unsigned type, unsigned setting_flags) { rarch_setting_t *setting = NULL; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); settings_list_free(menu->list_settings); diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c index 3d85f5957a..d1427d4e76 100644 --- a/menu/menu_entries_cbs_deferred_push.c +++ b/menu/menu_entries_cbs_deferred_push.c @@ -131,7 +131,6 @@ static int deferred_push_core_information(void *data, void *userdata, core_info_t *info = NULL; file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); @@ -283,7 +282,6 @@ static int deferred_push_rdb_entry_detail(void *data, void *userdata, file_list_t *menu_list = NULL; struct string_list *str_list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu) return -1; @@ -919,7 +917,6 @@ static int deferred_push_performance_counters(void *data, void *userdata, { file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - driver_t *driver = driver_get_ptr(); if (!list || !menu_list) return -1; @@ -942,7 +939,6 @@ static int deferred_push_video_shader_parameters_common(void *data, void *userda unsigned i; file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - driver_t *driver = driver_get_ptr(); if (!list || !menu_list) return -1; @@ -998,7 +994,6 @@ static int deferred_push_settings(void *data, void *userdata, file_list_t *list = NULL; file_list_t *menu_list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu) @@ -1067,7 +1062,6 @@ static int deferred_push_settings_subgroup(void *data, void *userdata, file_list_t *list = NULL; file_list_t *menu_list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return -1; @@ -1148,8 +1142,7 @@ static int deferred_push_video_options(void *data, void *userdata, { file_list_t *list = NULL; file_list_t *menu_list = NULL; - menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); + menu_handle_t *menu = menu_driver_get_ptr(); if (!menu) return -1; @@ -1185,7 +1178,6 @@ static int deferred_push_shader_options(void *data, void *userdata, file_list_t *list = NULL; file_list_t *menu_list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return -1; @@ -1242,7 +1234,6 @@ static int deferred_push_options(void *data, void *userdata, { file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); if (!list || !menu_list) @@ -1279,7 +1270,6 @@ static int deferred_push_management_options(void *data, void *userdata, { file_list_t *list = (file_list_t*)data; file_list_t *menu_list = (file_list_t*)userdata; - driver_t *driver = driver_get_ptr(); if (!list || !menu_list) return -1; @@ -1324,7 +1314,6 @@ static int push_perfcounter_generic( file_list_t *list = NULL; file_list_t *menu_list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return -1; @@ -1365,7 +1354,6 @@ static int deferred_push_core_cheat_options(void *data, void *userdata, unsigned i; file_list_t *list = (file_list_t*)data; global_t *global = global_get_ptr(); - driver_t *driver = driver_get_ptr(); cheat_manager_t *cheat = global->cheat; (void)userdata; @@ -1412,7 +1400,6 @@ static int deferred_push_core_input_remapping_options(void *data, void *userdata { unsigned p, retro_id; file_list_t *list = (file_list_t*)data; - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); @@ -1457,7 +1444,6 @@ static int deferred_push_core_options(void *data, void *userdata, { unsigned i; file_list_t *list = (file_list_t*)data; - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); (void)userdata; @@ -1489,7 +1475,6 @@ static int deferred_push_disk_options(void *data, void *userdata, const char *path, const char *label, unsigned type) { file_list_t *list = (file_list_t*)data; - driver_t *driver = driver_get_ptr(); (void)userdata; diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c index 675d4314a4..75545cc9eb 100644 --- a/menu/menu_entries_cbs_iterate.c +++ b/menu/menu_entries_cbs_iterate.c @@ -112,7 +112,6 @@ static int load_or_open_zip_iterate(unsigned action) { char msg[PATH_MAX_LENGTH]; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return -1; @@ -240,7 +239,6 @@ static int action_iterate_help(const char *label, unsigned action) char desc[ARRAY_SIZE(binds)][64]; char msg[PATH_MAX_LENGTH]; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); if (!menu) @@ -299,7 +297,6 @@ static int action_iterate_info(const char *label, unsigned action) rarch_setting_t *current_setting = NULL; file_list_t *list = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return 0; @@ -563,8 +560,6 @@ static int action_iterate_custom_bind_keyboard(const char *label, unsigned actio static int action_iterate_message(const char *label, unsigned action) { menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); - if (!menu) return -1; @@ -667,7 +662,6 @@ static int action_iterate_main(const char *label, unsigned action) const char *path_offset = NULL; menu_file_list_cbs_t *cbs = NULL; menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); global_t *global = global_get_ptr(); if (!menu) return 0; diff --git a/menu/menu_list.c b/menu/menu_list.c index 95bb75e516..da1156930e 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -441,7 +441,6 @@ int menu_list_populate_generic(file_list_t *list, const char *path, const char *label, unsigned type) { menu_handle_t *menu = menu_driver_get_ptr(); - driver_t *driver = driver_get_ptr(); if (!menu) return -1; diff --git a/runloop_data.c b/runloop_data.c index 1755a05d51..31c4e49917 100644 --- a/runloop_data.c +++ b/runloop_data.c @@ -267,7 +267,6 @@ static int rarch_main_data_http_iterate_poll(http_handle_t *http) static int cb_image_menu_wallpaper_upload(void *data, size_t len) { nbio_handle_t *nbio = (nbio_handle_t*)data; - driver_t *driver = driver_get_ptr(); if (!nbio || !data) return -1;