mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

more archive paths

Browse Source
This commit is contained in:
Brad Parker 2016-09-19 21:06:07 -04:00
parent c7a739b2bd
commit 992b87321a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libretro-common/file/archive_file.c
View File

@ -572,19 +572,13 @@ struct string_list *file_archive_get_file_list(const char *path,
goto error; goto error;
if (userdata.archive_path) if (userdata.archive_path)
{
free(userdata.archive_path); free(userdata.archive_path);
userdata.archive_path = NULL;
}
return userdata.list; return userdata.list;
error: error:
if (userdata.archive_path) if (userdata.archive_path)
{
free(userdata.archive_path); free(userdata.archive_path);
userdata.archive_path = NULL;
}
if (userdata.list) if (userdata.list)
string_list_free(userdata.list); string_list_free(userdata.list);
return NULL; return NULL;

8
tasks/task_database.c
View File

@ -414,14 +414,22 @@ static int task_database_iterate_playlist_archive(
strlcpy(userdata.archive_name, db_state->archive_name, sizeof(userdata.archive_name)); strlcpy(userdata.archive_name, db_state->archive_name, sizeof(userdata.archive_name));
userdata.crc = db_state->crc; userdata.crc = db_state->crc;
userdata.archive_path = strdup(name);
if (file_archive_parse_file_iterate(&db->state, if (file_archive_parse_file_iterate(&db->state,
&returnerr, name, NULL, archive_compare_crc32, &returnerr, name, NULL, archive_compare_crc32,
&userdata)) &userdata))
{
if (userdata.archive_path)
free(userdata.archive_path);
return 0; return 0;
}
if (db_state->crc) if (db_state->crc)
file_archive_parse_file_iterate_stop(&db->state); file_archive_parse_file_iterate_stop(&db->state);
if (userdata.archive_path)
free(userdata.archive_path);
#endif #endif
return 1; return 1;