diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c index 72c3fe8774..f0102ea69d 100644 --- a/menu/cbs/menu_cbs_cancel.c +++ b/menu/cbs/menu_cbs_cancel.c @@ -34,8 +34,8 @@ int action_cancel_pop_default(const char *path, const char *label, unsigned type, size_t idx) { size_t new_selection_ptr; - const char *menu_label = NULL; - enum msg_hash_enums enum_idx = 0; + const char *menu_label = NULL; + enum msg_hash_enums enum_idx = MSG_UNKNOWN; (void)path; (void)label; diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c index 218bcf28d2..957a30cfc8 100644 --- a/menu/drivers/ozone/ozone.c +++ b/menu/drivers/ozone/ozone.c @@ -122,7 +122,7 @@ static void *ozone_init(void **userdata, bool video_is_threaded) menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); if (!menu) - return false; + return NULL; if (!menu_display_init_first_driver(video_is_threaded)) goto error; diff --git a/menu/drivers/ozone/ozone_texture.h b/menu/drivers/ozone/ozone_texture.h index e8b24ca12c..bc01aa4283 100644 --- a/menu/drivers/ozone/ozone_texture.h +++ b/menu/drivers/ozone/ozone_texture.h @@ -34,7 +34,7 @@ enum OZONE_TEXTURE { OZONE_TEXTURE_LAST }; -static char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = { +static const char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = { "retroarch", "cursor_border" }; @@ -51,7 +51,7 @@ enum OZONE_THEME_TEXTURES { OZONE_THEME_TEXTURE_LAST }; -static char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = { +static const char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = { "button_a", "button_b", "switch", @@ -74,7 +74,7 @@ enum OZONE_TAB_TEXTURES { OZONE_TAB_TEXTURE_LAST }; -static char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = { +static const char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = { "retroarch", "settings", "history", diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e0d4ba7a19..5a8ec69001 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -8445,7 +8445,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); { unsigned i, size = 0; - struct video_display_config *list = video_display_server_get_resolution_list(&size); + struct video_display_config *list = (struct video_display_config*) + video_display_server_get_resolution_list(&size); if (list) { diff --git a/record/record_driver.c b/record/record_driver.c index d65700b9ea..5d672e1585 100644 --- a/record/record_driver.c +++ b/record/record_driver.c @@ -405,12 +405,14 @@ bool recording_init(void) if (streaming_is_enabled()) { params.config = settings->paths.path_stream_config; - params.preset = settings->uints.video_stream_quality; + params.preset = (enum record_config_type) + settings->uints.video_stream_quality; } else { params.config = settings->paths.path_record_config; - params.preset = settings->uints.video_record_quality; + params.preset = (enum record_config_type) + settings->uints.video_record_quality; } } diff --git a/runahead/dirty_input.c b/runahead/dirty_input.c index 6a9cc68a21..25b87f1072 100644 --- a/runahead/dirty_input.c +++ b/runahead/dirty_input.c @@ -48,7 +48,7 @@ static void InputListElementRealloc(InputListElement *element, unsigned int newS { if (newSize > element->state_size) { - element->state = realloc(element->state, newSize * sizeof(int16_t)); + element->state = (int16_t*)realloc(element->state, newSize * sizeof(int16_t)); memset(&element->state[element->state_size], 0, (newSize - element->state_size) * sizeof(int16_t)); element->state_size = newSize; }