pointless whitespace/comment fixes, no code changes

[oweals/busybox.git] / archival / bzip2.c

diff --git a/archival/bzip2.c b/archival/bzip2.c
index 76963365f37d7bd30209003c596927fd79ee38e1..8eb5ca9aef43b5d728800e021ac64f3f5767d390 100644 (file)
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -8,6 +8,7 @@
  */
 
 #include "libbb.h"
+#include "unarchive.h"
 
 #define CONFIG_BZIP2_FEATURE_SPEED 1
 
@@ -101,7 +102,7 @@ USE_DESKTOP(long long) int bz_write(bz_stream *strm, void* rbuf, ssize_t rlen, v
 }
 
 static
-USE_DESKTOP(long long) int compressStream(void)
+USE_DESKTOP(long long) int compressStream(unpack_info_t *info UNUSED_PARAM)
 {
        USE_DESKTOP(long long) int total;
        ssize_t count;
@@ -141,7 +142,7 @@ char* make_new_name_bzip2(char *filename)
 }
 
 int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bzip2_main(int argc, char **argv)
+int bzip2_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned opt;
 
@@ -162,11 +163,11 @@ int bzip2_main(int argc, char **argv)
 
        opt_complementary = "s2"; /* -s means -2 (compatibility) */
        /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-       opt = getopt32(argv, "cfv" USE_BUNZIP2("d") "123456789qzs" );
+       opt = getopt32(argv, "cfv" USE_BUNZIP2("dt") "123456789qzs");
 #if ENABLE_BUNZIP2 /* bunzip2_main may not be visible... */
-       if (opt & 0x8) // -d
+       if (opt & 0x18) // -d and/or -t
                return bunzip2_main(argc, argv);
-       opt >>= 4;
+       opt >>= 5;
 #else
        opt >>= 3;
 #endif