From af527746bb3a23e0f8fbb0bb1bbd5a138e381db8 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 12 May 2019 20:53:01 +0200 Subject: [PATCH] Cleanups --- menu/menu_setting.c | 24 ++++++++++++++---------- menu/menu_thumbnail_path.c | 1 - 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 65ab26fb80..88c54e6d12 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -14422,16 +14422,22 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf list_info->size, sizeof(*list)); if (!list) - goto error; + return NULL; for (i = 0; i < ARRAY_SIZE(list_types); i++) { if (!setting_append_list(list_types[i], &list, list_info, root)) - goto error; + { + free(list); + return NULL; + } } - if (!(settings_list_append(&list, list_info))) - goto error; + if (!settings_list_append(&list, list_info)) + { + free(list); + return NULL; + } menu_setting_terminate_last(list, list_info->index); list_info->index++; @@ -14439,16 +14445,14 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf resized_list = (rarch_setting_t*)realloc(list, list_info->index * sizeof(rarch_setting_t)); if (!resized_list) - goto error; + { + free(list); + return NULL; + } list = resized_list; return list; - -error: - if (list) - free(list); - return NULL; } /** diff --git a/menu/menu_thumbnail_path.c b/menu/menu_thumbnail_path.c index 595174b386..4cc7a4af6d 100644 --- a/menu/menu_thumbnail_path.c +++ b/menu/menu_thumbnail_path.c @@ -141,7 +141,6 @@ bool menu_thumbnail_is_enabled(enum menu_thumbnail_id thumbnail_id) return settings->uints.menu_thumbnails != 0; case MENU_THUMBNAIL_LEFT: return settings->uints.menu_left_thumbnails != 0; - break; default: break; }