summaryrefslogtreecommitdiff
path: root/archival/libunarchive
diff options
context:
space:
mode:
Diffstat (limited to 'archival/libunarchive')
-rw-r--r--archival/libunarchive/check_header_gzip.c9
-rw-r--r--archival/libunarchive/get_header_tar_gz.c2
2 files changed, 4 insertions, 7 deletions
diff --git a/archival/libunarchive/check_header_gzip.c b/archival/libunarchive/check_header_gzip.c
index 0cfa944..09cd6a9 100644
--- a/archival/libunarchive/check_header_gzip.c
+++ b/archival/libunarchive/check_header_gzip.c
@@ -2,12 +2,11 @@
/*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <stdlib.h>
-#include <unistd.h>
+
#include "libbb.h"
-#include "unarchive.h" /* for external decl of check_header_gzip */
+#include "unarchive.h" /* for external decl of check_header_gzip_or_die */
-void check_header_gzip(int src_fd)
+void check_header_gzip_or_die(int src_fd)
{
union {
unsigned char raw[8];
@@ -57,6 +56,4 @@ void check_header_gzip(int src_fd)
xread_char(src_fd);
xread_char(src_fd);
}
-
- return;
}
diff --git a/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index 41c02e1..1f07e4e 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.c
@@ -20,7 +20,7 @@ char get_header_tar_gz(archive_handle_t *archive_handle)
bb_error_msg_and_die("invalid gzip magic");
}
- check_header_gzip(archive_handle->src_fd);
+ check_header_gzip_or_die(archive_handle->src_fd);
archive_handle->src_fd = open_transformer(archive_handle->src_fd, inflate_gunzip);
archive_handle->offset = 0;