*: tidy up usage of char **environ

[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 c26f2e036d6bf3e9471796bc23764002ccfc4eee..969dd1e3ef08122f3ff148f22823c24673c34c3f 100644 (file)
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -5,17 +5,13 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "libbb.h"
 #include "unarchive.h"
 
 /*
- *     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
+ * 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
  */
 char filter_accept_list_reassign(archive_handle_t *archive_handle)
 {
@@ -27,22 +23,22 @@ char filter_accept_list_reassign(archive_handle_t *archive_handle)
                name_ptr = strrchr(archive_handle->file_header->name, '.');
 
                /* Modify the subarchive handler based on the extension */
-#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+#if ENABLE_FEATURE_DEB_TAR_GZ
                if (strcmp(name_ptr, ".gz") == 0) {
                        archive_handle->action_data_subarchive = get_header_tar_gz;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
 #endif
-#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+#if ENABLE_FEATURE_DEB_TAR_BZ2
                if (strcmp(name_ptr, ".bz2") == 0) {
                        archive_handle->action_data_subarchive = get_header_tar_bz2;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
 #endif
                if (ENABLE_FEATURE_DEB_TAR_LZMA && !strcmp(name_ptr, ".lzma")) {
                        archive_handle->action_data_subarchive = get_header_tar_lzma;
-                       return(EXIT_SUCCESS);
+                       return EXIT_SUCCESS;
                }
        }
-       return(EXIT_FAILURE);
+       return EXIT_FAILURE;
 }