Cleanup compressed_file_list_new

This commit is contained in:
twinaphex 2016-01-24 00:13:58 +01:00
parent 9256cd2fbc
commit 08f6c9c367

View file

@ -581,10 +581,10 @@ int read_file(const char *path, void **buf, ssize_t *length)
struct string_list *compressed_file_list_new(const char *path, struct string_list *compressed_file_list_new(const char *path,
const char* ext) const char* ext)
{ {
#ifdef HAVE_COMPRESSION #if defined(HAVE_ZLIB) || defined(HAVE_7ZIP)
#if defined(HAVE_7ZIP) || defined(HAVE_ZLIB)
const char* file_ext = path_get_extension(path); const char* file_ext = path_get_extension(path);
#endif #endif
#ifdef HAVE_7ZIP #ifdef HAVE_7ZIP
if (string_is_equal_noncase(file_ext, "7z")) if (string_is_equal_noncase(file_ext, "7z"))
return compressed_7zip_file_list_new(path,ext); return compressed_7zip_file_list_new(path,ext);
@ -592,7 +592,6 @@ struct string_list *compressed_file_list_new(const char *path,
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
if (string_is_equal_noncase(file_ext, "zip")) if (string_is_equal_noncase(file_ext, "zip"))
return zlib_get_file_list(path, ext); return zlib_get_file_list(path, ext);
#endif
#endif #endif
return NULL; return NULL;
} }