From e9a0aba85b8afefd6f9107ee7d32f2235feba3f3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 4 Mar 2016 19:42:30 +0100 Subject: [PATCH] Silence bunch of warnings and fix an error --- core_info.c | 1 - gfx/video_context_driver.c | 1 - gfx/video_shader_driver.c | 1 - menu/menu_displaylist.c | 3 +-- menu/menu_input.c | 1 - performance.c | 2 +- runloop.c | 2 +- 7 files changed, 3 insertions(+), 8 deletions(-) diff --git a/core_info.c b/core_info.c index f0a721e416..1434adbb27 100644 --- a/core_info.c +++ b/core_info.c @@ -704,7 +704,6 @@ bool core_info_ctl(enum core_info_state state, void *data) return core_info_list_update_missing_firmware(core_info_curr_list, info->path, info->system_directory); } - break; case CORE_INFO_CTL_FIND: { core_info_ctx_find_t *info = (core_info_ctx_find_t*)data; diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c index ab6ada1709..983134bc1c 100644 --- a/gfx/video_context_driver.c +++ b/gfx/video_context_driver.c @@ -421,7 +421,6 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data) video_context_data, mode_info->width, mode_info->height, mode_info->fullscreen); } - break; case GFX_CTL_SET_RESIZE: { gfx_ctx_mode_t *mode_info = (gfx_ctx_mode_t*)data; diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c index 0f877adfb3..1be5b578b3 100644 --- a/gfx/video_shader_driver.c +++ b/gfx/video_shader_driver.c @@ -160,7 +160,6 @@ bool video_shader_driver_ctl(enum video_shader_driver_ctl_state state, void *dat unsigned *index = (unsigned*)data; return current_shader->mipmap_input(shader_data, *index); } - break; case SHADER_CTL_SET_COORDS: { video_shader_ctx_coords_t *coords = (video_shader_ctx_coords_t*) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 4401851097..90356ce0f8 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3143,9 +3143,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) entry->add_empty_entry) == -1) return false; - return true; } - break; + return true; case DISPLAYLIST_SETTINGS: ret = menu_displaylist_parse_settings(menu, info, info->label, PARSE_NONE, true); diff --git a/menu/menu_input.c b/menu/menu_input.c index d24737d2f7..66de0cbc0a 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -781,7 +781,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data) return false; return menu_input_key_bind_iterate(bind->s, bind->len); } - break; case MENU_INPUT_CTL_START_LINE: { bool keyboard_display = true; diff --git a/performance.c b/performance.c index 858df8642a..a48377b026 100644 --- a/performance.c +++ b/performance.c @@ -446,10 +446,10 @@ unsigned retro_get_cpu_cores(void) **/ uint64_t retro_get_cpu_features(void) { - size_t len; int flags[4]; int vendor_shuffle[3]; char vendor[13] = {0}; + size_t len = 0; uint64_t cpu_flags = 0; uint64_t cpu = 0; unsigned max_flag = 0; diff --git a/runloop.c b/runloop.c index b3036f251f..32083e7b8d 100644 --- a/runloop.c +++ b/runloop.c @@ -1426,7 +1426,7 @@ int runloop_iterate(unsigned *sleep_ms) if (bsv_movie_ctl(BSV_MOVIE_CTL_IS_INITED, NULL)) bsv_movie_ctl(BSV_MOVIE_CTL_SET_FRAME_START, NULL); - runloop_ctl(RARCH_CAMERA_CTL_POLL, NULL); + camera_driver_ctl(RARCH_CAMERA_CTL_POLL, NULL); /* Update binds for analog dpad modes. */ for (i = 0; i < settings->input.max_users; i++)