Patch from Vladimir to move struct applet from busybox.c to applets.c,
which looks like the right place for such things to live.
This commit is contained in:
parent
23c1a18126
commit
2ccfef2004
@ -29,12 +29,20 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
|
#undef APPLET
|
||||||
|
#undef APPLET_NOUSAGE
|
||||||
|
#undef PROTOTYPES
|
||||||
|
#include "applets.h"
|
||||||
|
|
||||||
#define bb_need_full_version
|
#define bb_need_full_version
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
|
|
||||||
struct BB_applet *applet_using;
|
struct BB_applet *applet_using;
|
||||||
|
|
||||||
|
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
|
||||||
|
const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
|
||||||
|
|
||||||
extern void show_usage(void)
|
extern void show_usage(void)
|
||||||
{
|
{
|
||||||
const char *format_string;
|
const char *format_string;
|
||||||
|
@ -436,7 +436,4 @@
|
|||||||
{ 0,NULL,0 }
|
{ 0,NULL,0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
|
|
||||||
size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@ -29,12 +29,20 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
|
#undef APPLET
|
||||||
|
#undef APPLET_NOUSAGE
|
||||||
|
#undef PROTOTYPES
|
||||||
|
#include "applets.h"
|
||||||
|
|
||||||
#define bb_need_full_version
|
#define bb_need_full_version
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
|
|
||||||
struct BB_applet *applet_using;
|
struct BB_applet *applet_using;
|
||||||
|
|
||||||
|
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
|
||||||
|
const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
|
||||||
|
|
||||||
extern void show_usage(void)
|
extern void show_usage(void)
|
||||||
{
|
{
|
||||||
const char *format_string;
|
const char *format_string;
|
||||||
|
@ -6,11 +6,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
#undef APPLET
|
|
||||||
#undef APPLET_NOUSAGE
|
|
||||||
#undef PROTOTYPES
|
|
||||||
#include "applets.h"
|
|
||||||
|
|
||||||
#define bb_need_full_version
|
#define bb_need_full_version
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
|
@ -6,11 +6,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
#undef APPLET
|
|
||||||
#undef APPLET_NOUSAGE
|
|
||||||
#undef PROTOTYPES
|
|
||||||
#include "applets.h"
|
|
||||||
|
|
||||||
#define bb_need_full_version
|
#define bb_need_full_version
|
||||||
#define BB_DECLARE_EXTERN
|
#define BB_DECLARE_EXTERN
|
||||||
#include "messages.c"
|
#include "messages.c"
|
||||||
|
@ -436,7 +436,4 @@
|
|||||||
{ 0,NULL,0 }
|
{ 0,NULL,0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
/* The -1 arises because of the {0,NULL,0,-1} entry above. */
|
|
||||||
size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user