diff --git a/content.c b/content.c index c126cfb65a..ca1ff31d18 100644 --- a/content.c +++ b/content.c @@ -342,9 +342,7 @@ static bool load_content(const struct retro_subsystem_info *special, { unsigned i; bool ret = true; - struct string_list* additional_path_allocs = string_list_new(); - struct retro_game_info *info = (struct retro_game_info*) calloc(content->size, sizeof(*info)); @@ -503,9 +501,10 @@ bool init_content_file(void) } union string_list_elem_attr attr; + struct string_list *content = string_list_new(); + attr.i = 0; - struct string_list *content = (struct string_list*)string_list_new(); if (!content) return false; diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c index 25b349a93f..011633ce91 100644 --- a/decompress/7zip_support.c +++ b/decompress/7zip_support.c @@ -321,7 +321,7 @@ struct string_list *compressed_7zip_file_list_new(const char *path, { struct string_list *ext_list = NULL; - struct string_list *list = (struct string_list*)string_list_new(); + struct string_list *list = string_list_new(); if (!list) { RARCH_ERR("Could not allocate list memory in compressed_7zip_file_list_new\n."); diff --git a/decompress/zip_support.c b/decompress/zip_support.c index b07cf4bd19..1f84e58559 100644 --- a/decompress/zip_support.c +++ b/decompress/zip_support.c @@ -181,7 +181,7 @@ struct string_list *compressed_zip_file_list_new(const char *path, const char* ext) { struct string_list *ext_list = NULL; - struct string_list *list = (struct string_list*)string_list_new(); + struct string_list *list = string_list_new(); if (!list) { RARCH_ERR("Could not allocate list memory in compressed_7zip_file_list_new\n."); diff --git a/input/input_context.c b/input/input_context.c index 64531b209a..a88c8f2f45 100644 --- a/input/input_context.c +++ b/input/input_context.c @@ -77,10 +77,9 @@ const char* config_get_joypad_driver_options(void) char *options = NULL; int option_k = 0; int options_len = 0; - struct string_list *options_l = NULL; + struct string_list *options_l = string_list_new(); attr.i = 0; - options_l = (struct string_list*)string_list_new(); for (option_k = 0; joypad_drivers[option_k]; option_k++) { diff --git a/libretro-sdk/file/dir_list.c b/libretro-sdk/file/dir_list.c index b6f5a21718..ea545fa6ca 100644 --- a/libretro-sdk/file/dir_list.c +++ b/libretro-sdk/file/dir_list.c @@ -96,9 +96,9 @@ struct string_list *dir_list_new(const char *dir, { char path_buf[PATH_MAX]; WIN32_FIND_DATA ffd; - struct string_list *ext_list = NULL, *list = NULL; + struct string_list *ext_list = NULL; HANDLE hFind = INVALID_HANDLE_VALUE; - list = string_list_new(); + struct string_list *list = string_list_new(); if (!list) return NULL; @@ -196,7 +196,7 @@ struct string_list *dir_list_new(const char *dir, DIR *directory = NULL; const struct dirent *entry = NULL; struct string_list *ext_list = NULL; - struct string_list *list = (struct string_list*)string_list_new(); + struct string_list *list = string_list_new(); if (!list) return NULL;