ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file_archive_get_file_list - take out HAVE_COMPRESSION code

This commit is contained in:
twinaphex 2016-12-17 11:59:19 +01:00
parent 5364b0b837
commit 39b41a1f51
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
database_info.c
View File

@ -425,8 +425,8 @@ database_info_handle_t *database_info_dir_init(const char *dir,
if (path_is_compressed_file(path) && !path_contains_compressed_file(path)) if (path_is_compressed_file(path) && !path_contains_compressed_file(path))
{ {
struct string_list *archive_list = struct string_list *archive_list = path_is_compressed_file(path) ?
file_archive_get_file_list(path, NULL); file_archive_get_file_list(path, NULL) : NULL;
if (archive_list && archive_list->size > 0) if (archive_list && archive_list->size > 0)
{ {
@ -487,8 +487,8 @@ database_info_handle_t *database_info_file_init(const char *path,
if (path_is_compressed_file(path)) if (path_is_compressed_file(path))
{ {
struct string_list *archive_list = struct string_list *archive_list =path_is_compressed_file(path) ?
file_archive_get_file_list(path, NULL); file_archive_get_file_list(path, NULL) : NULL;
if (archive_list && archive_list->size > 0) if (archive_list && archive_list->size > 0)
{ {

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

@ -575,13 +575,6 @@ struct string_list *file_archive_get_file_list(const char *path,
{ {
struct archive_extract_userdata userdata = {{0}}; struct archive_extract_userdata userdata = {{0}};
#ifdef HAVE_COMPRESSION
if (!path_is_compressed_file(path))
return NULL;
#else
return NULL;
#endif
userdata.list_only = true; userdata.list_only = true;
strlcpy(userdata.archive_path, path, sizeof(userdata.archive_path)); strlcpy(userdata.archive_path, path, sizeof(userdata.archive_path));