Bernhard Fischer says: use xmalloc() instead of malloc()

[oweals/busybox.git] / archival / libunarchive / filter_accept_list_reassign.c

diff --git a/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index fa294c70ab46ee468c61f6f0a7353d459468123e..d0436549b0f919d2f4588e2a6ac37e5f11845c50 100644 (file)
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -26,7 +26,7 @@
 /*
  *     Reassign the subarchive metadata parser based on the filename extension
  *  e.g. if its a .tar.gz modify archive_handle->sub_archive to process a .tar.gz
- *       or if its a .tar.bz2 make archive_handle->sub_archive handle that 
+ *       or if its a .tar.bz2 make archive_handle->sub_archive handle that
  */
 extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
 {
@@ -40,17 +40,13 @@ extern char filter_accept_list_reassign(archive_handle_t *archive_handle)
                /* Modify the subarchive handler based on the extension */
 #ifdef CONFIG_FEATURE_DEB_TAR_GZ
                if (strcmp(name_ptr, ".gz") == 0) {
-                       archive_handle->sub_archive->read = read;
                        archive_handle->action_data_subarchive = get_header_tar_gz;
                        return(EXIT_SUCCESS);
                }
 #endif
 #ifdef CONFIG_FEATURE_DEB_TAR_BZ2
                if (strcmp(name_ptr, ".bz2") == 0) {
-                       archive_handle->sub_archive->read = read_bz2;
-//                     BZ2_bzReadOpen(archive_handle->sub_archive->src_fd, NULL, 0);
-                       BZ2_bzReadOpen(archive_handle->src_fd, NULL, 0);
-                       archive_handle->action_data_subarchive = get_header_tar;
+                       archive_handle->action_data_subarchive = get_header_tar_bz2;
                        return(EXIT_SUCCESS);
                }
 #endif