diff options
| author | Mark Wielaard <mjw@redhat.com> | 2016-01-08 13:35:33 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2016-01-08 13:35:48 +0100 |
| commit | dd131168e2abf2f0fc872829e1101366395cc390 (patch) | |
| tree | fad165581e3df1f869cce5e8a5535d55ff5f7afa /libdwfl/open.c | |
| parent | cc888f73c3a1370d5cc91c5357ae400f3870f285 (diff) | |
| download | elfutils-dd131168e2abf2f0fc872829e1101366395cc390.tar.gz | |
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 <mjw@redhat.com>
Diffstat (limited to 'libdwfl/open.c')
| -rw-r--r-- | libdwfl/open.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libdwfl/open.c b/libdwfl/open.c index c1d0ed2b..92f2798b 100644 --- a/libdwfl/open.c +++ b/libdwfl/open.c @@ -1,5 +1,5 @@ -/* Decompression support for libdwfl: zlib (gzip) and/or bzlib (bzip2). - Copyright (C) 2009 Red Hat, Inc. +/* Decompression support for libdwfl: zlib (gzip), bzlib (bzip2) or lzma (xz). + Copyright (C) 2009, 2016 Red Hat, Inc. This file is part of elfutils. This file is free software; you can redistribute it and/or modify @@ -32,10 +32,6 @@ #include <unistd.h> -#if !USE_ZLIB -# define __libdw_gunzip(...) DWFL_E_BADELF -#endif - #if !USE_BZLIB # define __libdw_bunzip2(...) DWFL_E_BADELF #endif @@ -52,7 +48,6 @@ decompress (int fd __attribute__ ((unused)), Elf **elf) void *buffer = NULL; size_t size = 0; -#if USE_ZLIB || USE_BZLIB || USE_LZMA const off_t offset = (*elf)->start_offset; void *const mapped = ((*elf)->map_address == NULL ? NULL : (*elf)->map_address + offset); @@ -65,7 +60,6 @@ decompress (int fd __attribute__ ((unused)), Elf **elf) error = __libdw_bunzip2 (fd, offset, mapped, mapped_size, &buffer, &size); if (error == DWFL_E_BADELF) error = __libdw_unlzma (fd, offset, mapped, mapped_size, &buffer, &size); -#endif if (error == DWFL_E_NOERROR) { |