From 08f6c9c367c07b4c5c16c149b01c521c11a1dbc2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 24 Jan 2016 00:13:58 +0100 Subject: [PATCH] Cleanup compressed_file_list_new --- file_ops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/file_ops.c b/file_ops.c index c1df23b6e4..259649c900 100644 --- a/file_ops.c +++ b/file_ops.c @@ -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, const char* ext) { -#ifdef HAVE_COMPRESSION -#if defined(HAVE_7ZIP) || defined(HAVE_ZLIB) +#if defined(HAVE_ZLIB) || defined(HAVE_7ZIP) const char* file_ext = path_get_extension(path); #endif + #ifdef HAVE_7ZIP if (string_is_equal_noncase(file_ext, "7z")) 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 if (string_is_equal_noncase(file_ext, "zip")) return zlib_get_file_list(path, ext); -#endif #endif return NULL; }