Fix some compiler warnings emitted by gcc-4.8.0

[oweals/busybox.git] / miscutils / bbconfig.c

diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 28607716806d8bcb5b56d4d717dd75f2c8bcc451..e5f4eb379f0d2d9410e792dc4bb968ec078f77fc 100644 (file)
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -1,10 +1,16 @@
 /* vi: set sw=4 ts=4: */
 /* This file was released into the public domain by Paul Fox.
  */
+
+//usage:#define bbconfig_trivial_usage
+//usage:       ""
+//usage:#define bbconfig_full_usage "\n\n"
+//usage:       "Print the config file used by busybox build"
+
 #include "libbb.h"
 #include "bbconfigopts.h"
 #if ENABLE_FEATURE_COMPRESS_BBCONFIG
-# include "unarchive.h"
+# include "bb_archive.h"
 # include "bbconfigopts_bz2.h"
 #endif
 
@@ -15,7 +21,7 @@ int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
        bunzip_data *bd;
        int i = start_bunzip(&bd,
                        /* src_fd: */ -1,
-                       /* inbuf:  */ (void *)bbconfig_config_bz2,
+                       /* inbuf:  */ bbconfig_config_bz2,
                        /* len:    */ sizeof(bbconfig_config_bz2));
        /* read_bunzip can longjmp to start_bunzip, and ultimately
         * end up here with i != 0 on read data errors! Not trivial */