pointless whitespace/comment fixes, no code changes

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

diff --git a/archival/gzip.c b/archival/gzip.c
index dce40ec922a1842f91d25c6a254fc69ab30eb7a7..43804b2e4060fd2a0cd447e501595e6338d0df51 100644 (file)
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -40,6 +40,7 @@ aa:      85.1% -- replaced with aa.gz
 */
 
 #include "libbb.h"
+#include "unarchive.h"
 
 
 /* ===========================================================================
@@ -2014,7 +2015,7 @@ char* make_new_name_gzip(char *filename)
 }
 
 static
-USE_DESKTOP(long long) int pack_gzip(void)
+USE_DESKTOP(long long) int pack_gzip(unpack_info_t *info UNUSED_PARAM)
 {
        struct stat s;
 
@@ -2043,15 +2044,15 @@ int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 #if ENABLE_GUNZIP
 int gzip_main(int argc, char **argv)
 #else
-int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int gzip_main(int argc UNUSED_PARAM, char **argv)
 #endif
 {
        unsigned opt;
 
        /* Must match bbunzip's constants OPT_STDOUT, OPT_FORCE! */
-       opt = getopt32(argv, "cfv" USE_GUNZIP("d") "q123456789n" );
+       opt = getopt32(argv, "cfv" USE_GUNZIP("dt") "q123456789n");
 #if ENABLE_GUNZIP /* gunzip_main may not be visible... */
-       if (opt & 0x8) // -d
+       if (opt & 0x18) // -d and/or -t
                return gunzip_main(argc, argv);
 #endif
        option_mask32 &= 0x7; /* ignore -q, -0..9 */
@@ -2062,6 +2063,7 @@ int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
 
        SET_PTR_TO_GLOBALS(xzalloc(sizeof(struct globals) + sizeof(struct globals2))
                        + sizeof(struct globals));
+       barrier();
        G2.l_desc.dyn_tree    = G2.dyn_ltree;
        G2.l_desc.static_tree = G2.static_ltree;
        G2.l_desc.extra_bits  = extra_lbits;