From 53b7fb2ba2a296c93ceb31f5e2d77d536d978dde Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Tue, 19 Nov 2019 06:08:54 +0100 Subject: [PATCH] Remove unused variables --- cheevos-new/cheevos.c | 9 ++++----- libretro-common/formats/cdfs/cdfs.c | 24 +++++++++--------------- menu/drivers/materialui.c | 4 ---- retroarch.c | 4 ---- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c index a0c091ec8d..c141e4e6bf 100644 --- a/cheevos-new/cheevos.c +++ b/cheevos-new/cheevos.c @@ -1220,15 +1220,14 @@ static int rcheevos_hash_psx(rcheevos_coro_t* coro) char exe_name_buffer[64]; size_t exe_name_size; char* exe_name = NULL; - uint8_t* ptr = NULL; - const char* end = NULL; - char* scan = NULL; + char* scan = NULL; char buffer[2048]; - int success = 0; + int success = 0; size_t to_read = 0; /* find the data track - it should be the first one */ - coro->track = cdfs_open_data_track(coro->path); + coro->track = cdfs_open_data_track(coro->path); + if (!coro->track) { CHEEVOS_LOG(RCHEEVOS_TAG "could not open CD\n"); diff --git a/libretro-common/formats/cdfs/cdfs.c b/libretro-common/formats/cdfs/cdfs.c index 045729c87e..79dc3b26cc 100644 --- a/libretro-common/formats/cdfs/cdfs.c +++ b/libretro-common/formats/cdfs/cdfs.c @@ -358,21 +358,16 @@ static cdfs_track_t* cdfs_wrap_stream(intfstream_t* stream, unsigned pregap_sect static cdfs_track_t* cdfs_open_cue_track(const char* path, unsigned int track_index) { - char* cue_contents = NULL; - char* cue = NULL; - const char* line = NULL; - int found_track = 0; + char* cue = NULL; + const char* line = NULL; + int found_track = 0; char current_track_path[PATH_MAX_LENGTH] = {0}; - char track_path[PATH_MAX_LENGTH] = {0}; - intfstream_t* cue_stream = NULL; - cdfs_track_t* track = NULL; - int64_t stream_size = 0; - unsigned int pregap_sectors = 0; - - cue_stream = intfstream_open_file(path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE); - - stream_size = intfstream_get_size(cue_stream); - cue_contents = (char*)malloc(stream_size + 1); + char track_path[PATH_MAX_LENGTH] = {0}; + unsigned int pregap_sectors = 0; + intfstream_t *cue_stream = intfstream_open_file(path, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE); + int64_t stream_size = intfstream_get_size(cue_stream); + char *cue_contents = (char*)malloc(stream_size + 1); + if (!cue_contents) { intfstream_close(cue_stream); @@ -512,7 +507,6 @@ static cdfs_track_t* cdfs_open_chd_track(const char* path, int32_t track_index) struct cdfs_track_t* cdfs_open_track(const char* path, unsigned int track_index) { - intfstream_t* stream = NULL; const char* ext = path_get_extension(path); if (string_is_equal_noncase(ext, "cue")) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 4c32cb8937..10f77b442b 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -3648,7 +3648,6 @@ static void materialui_render_header( size_t sys_bar_battery_width = 0; size_t sys_bar_clock_width = 0; int sys_bar_text_y = (int)(((float)mui->sys_bar_height / 2.0f) + ((float)mui->font_data.hint.font_height / 4.0f)); - int title_x_offset = 0; int title_x = 0; bool show_back_icon = menu_entries_ctl(MENU_ENTRIES_CTL_SHOW_BACK, NULL); bool show_search_icon = mui->is_playlist || mui->is_file_list; @@ -5354,9 +5353,7 @@ static void materialui_navigation_alphabet(void *data, size_t *unused) static void materialui_populate_nav_bar( materialui_handle_t *mui, const char *label, settings_t *settings) { - menu_handle_t *menu_data = menu_driver_get_ptr(); unsigned menu_tab_index = 0; - bool content_loaded = false; /* Cache last active menu tab index */ mui->nav_bar.last_active_menu_tab_index = mui->nav_bar.active_menu_tab_index; @@ -6421,7 +6418,6 @@ static int materialui_pointer_up_nav_bar( static void materialui_switch_list_view(materialui_handle_t *mui) { settings_t *settings = config_get_ptr(); - size_t selection = menu_navigation_get_selection(); bool secondary_thumbnail_enabled_prev = mui->secondary_thumbnail_enabled; if (!settings) diff --git a/retroarch.c b/retroarch.c index 30d7c3410e..0a80d3e55d 100644 --- a/retroarch.c +++ b/retroarch.c @@ -4057,9 +4057,7 @@ static void handle_translation_cb( uint8_t* raw_output_data = NULL; char* raw_image_file_data = NULL; struct scaler_ctx* scaler = NULL; - bool is_paused = runloop_paused; http_transfer_data_t *data = (http_transfer_data_t*)task_data; - int new_image_size = 0; #ifdef HAVE_AUDIOMIXER int new_sound_size = 0; @@ -4069,8 +4067,6 @@ static void handle_translation_cb( void* raw_image_data_alpha = NULL; void* raw_sound_data = NULL; int retval = 0; - settings_t *settings = configuration_settings; - int i = 0; int start = -1; char* found_string = NULL;