mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create load_content_append_to_temporary_content

Browse Source
This commit is contained in:
twinaphex 2016-01-19 17:14:57 +01:00
parent a8ee8ec0cd
commit d7375b88e7
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
content.c
View File

@ -382,6 +382,20 @@ static bool load_content_dont_need_fullpath(
return true; return true;
} }
static bool load_content_append_to_temporary_content(const char *elem,
union string_list_elem_attr attributes)
{
if (!temporary_content)
{
temporary_content = string_list_new();
if (!temporary_content)
return false;
}
string_list_append(temporary_content, elem, attributes);
return true;
}
#ifdef HAVE_COMPRESSION #ifdef HAVE_COMPRESSION
static bool load_content_need_fullpath( static bool load_content_need_fullpath(
struct retro_game_info *info, unsigned i, struct retro_game_info *info, unsigned i,
@ -435,17 +449,11 @@ static bool load_content_need_fullpath(
} }
string_list_append(additional_path_allocs,new_path, attributes); string_list_append(additional_path_allocs,new_path, attributes);
info[i].path = info[i].path =
additional_path_allocs->elems additional_path_allocs->elems[additional_path_allocs->size -1 ].data;
[additional_path_allocs->size -1 ].data;
/* temporary_content is initialized in init_content_file if (!load_content_append_to_temporary_content(new_path, attributes))
* The following part takes care of cleanup of the unzipped files return false;
* after exit.
*/
retro_assert(temporary_content != NULL);
string_list_append(temporary_content,
new_path, attributes);
return true; return true;
} }
@ -613,9 +621,10 @@ static bool init_content_file_extract(
temp_content); temp_content);
return false; return false;
} }
string_list_set(content, i, temp_content); string_list_set(content, i, temp_content);
string_list_append(temporary_content, if (!load_content_append_to_temporary_content(temp_content, *attr))
temp_content, *attr); return false;
} }
} }
@ -677,30 +686,23 @@ bool init_content_file(void)
unsigned i; unsigned i;
union string_list_elem_attr attr; union string_list_elem_attr attr;
struct retro_game_info *info = NULL; struct retro_game_info *info = NULL;
bool ret = false; bool ret = false;
struct string_list* additional_path_allocs = NULL; struct string_list* additional_path_allocs = NULL;
struct string_list *content = NULL; struct string_list *content = NULL;
const struct retro_subsystem_info *special = NULL; const struct retro_subsystem_info *special = NULL;
rarch_system_info_t *system = NULL; rarch_system_info_t *system = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
temporary_content = string_list_new();
global->inited.content = false; global->inited.content = false;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system); runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (!temporary_content)
goto error;
if (*global->subsystem) if (*global->subsystem)
if (!init_content_file_subsystem(special, system)) if (!init_content_file_subsystem(special, system))
goto error; goto error;
content = string_list_new(); content = string_list_new();
if (!content) if (!content)
goto error; goto error;