This one should be able to deal with the USAGE macros a little

[oweals/busybox.git] / busybox.h

diff --git a/busybox.h b/busybox.h
index aef537b2b516206e47fc8bf436bf1491fa723a4e..8d4976a4b8f77e25f70234ab5cff85ea6bedeb7a 100644 (file)
--- a/busybox.h
+++ b/busybox.h
@@ -72,7 +72,6 @@ struct BB_applet {
        const   char*   name;
        int     (*main)(int argc, char** argv);
        enum    Location        location;
-       int     usage_index;
 };
 /* From busybox.c */
 extern const struct BB_applet applets[];
@@ -87,19 +86,13 @@ extern const struct BB_applet applets[];
 #include "applets.h"
 #undef PROTOTYPES
 
-#define APPLET_ENUM
-enum APPLET_INDEX_NUMBERS {
-#include "applets.h"
-};
-#undef APPLET_ENUM
-
 extern const char *applet_name;
 
 extern void show_usage(void) __attribute__ ((noreturn));
-extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
-extern void perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
+extern void error_msg(const char *s, ...);
+extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
+extern void perror_msg(const char *s, ...);
+extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn));
 
 const char *mode_string(int mode);
 const char *time_string(time_t timeVal);