summaryrefslogtreecommitdiffstats
path: root/libdwfl/linux-kernel-modules.c
diff options
context:
space:
mode:
authorMark Wielaard <[email protected]>2016-01-08 13:35:33 +0100
committerMark Wielaard <[email protected]>2016-01-08 13:35:48 +0100
commitdd131168e2abf2f0fc872829e1101366395cc390 (patch)
treefad165581e3df1f869cce5e8a5535d55ff5f7afa /libdwfl/linux-kernel-modules.c
parentcc888f73c3a1370d5cc91c5357ae400f3870f285 (diff)
Simplify code and build now that zlib support is no longer optional.
Now that we always require zlib support we don't need to conditionally build or compile code that depends on it. Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'libdwfl/linux-kernel-modules.c')
-rw-r--r--libdwfl/linux-kernel-modules.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
index 38b5170a..79faf994 100644
--- a/libdwfl/linux-kernel-modules.c
+++ b/libdwfl/linux-kernel-modules.c
@@ -64,12 +64,9 @@
#define MODULE_SECT_NAME_LEN 32 /* Minimum any linux/module.h has had. */
-#if defined (USE_ZLIB) || defined (USE_BZLIB) || defined (USE_LZMA)
static const char *vmlinux_suffixes[] =
{
-#ifdef USE_ZLIB
".gz",
-#endif
#ifdef USE_BZLIB
".bz2",
#endif
@@ -77,7 +74,6 @@ static const char *vmlinux_suffixes[] =
".xz",
#endif
};
-#endif
/* Try to open the given file as it is or under the debuginfo directory. */
static int
@@ -114,7 +110,6 @@ try_kernel_name (Dwfl *dwfl, char **fname, bool try_debug)
}
}
-#if defined (USE_ZLIB) || defined (USE_BZLIB) || defined (USE_LZMA)
if (fd < 0)
for (size_t i = 0;
i < sizeof vmlinux_suffixes / sizeof vmlinux_suffixes[0];
@@ -133,7 +128,6 @@ try_kernel_name (Dwfl *dwfl, char **fname, bool try_debug)
}
}
}
-#endif
if (fd < 0)
{
@@ -303,9 +297,7 @@ check_suffix (const FTSENT *f, size_t namelen)
return sizeof sfx - 1
TRY (".ko");
-#if USE_ZLIB
TRY (".ko.gz");
-#endif
#if USE_BZLIB
TRY (".ko.bz2");
#endif