diff options
Diffstat (limited to 'arch/sandbox/include/asm/getopt.h')
| -rw-r--r-- | arch/sandbox/include/asm/getopt.h | 23 | 
1 files changed, 12 insertions, 11 deletions
| diff --git a/arch/sandbox/include/asm/getopt.h b/arch/sandbox/include/asm/getopt.h index 685883cd3..3048c2cc3 100644 --- a/arch/sandbox/include/asm/getopt.h +++ b/arch/sandbox/include/asm/getopt.h @@ -18,7 +18,7 @@ struct sandbox_state;   * consumer code should focus on the macros below and   * the callback function.   */ -struct sb_cmdline_option { +struct sandbox_cmdline_option {  	/* The long flag name: "help" for "--help" */  	const char *flag;  	/* The (optional) short flag name: "h" for "-h" */ @@ -35,18 +35,19 @@ struct sb_cmdline_option {   * Internal macro to expand the lower macros into the necessary   * magic junk that makes this all work.   */ -#define _SB_CMDLINE_OPT(f, s, ha, h) \ -	static struct sb_cmdline_option sb_cmdline_option_##f = { \ +#define _SANDBOX_CMDLINE_OPT(f, s, ha, h) \ +	static struct sandbox_cmdline_option sandbox_cmdline_option_##f = { \  		.flag = #f, \  		.flag_short = s, \  		.help = h, \  		.has_arg = ha, \ -		.callback = sb_cmdline_cb_##f, \ +		.callback = sandbox_cmdline_cb_##f, \  	}; \  	/* Ppointer to the struct in a special section for the linker script */ \  	static __attribute__((section(".u_boot_sandbox_getopt"), used)) \ -		struct sb_cmdline_option *sb_cmdline_option_##f##_ptr = \ -		&sb_cmdline_option_##f +		struct sandbox_cmdline_option \ +			*sandbox_cmdline_option_##f##_ptr = \ +			&sandbox_cmdline_option_##f  /**   * Macros for end code to declare new command line flags. @@ -56,16 +57,16 @@ struct sb_cmdline_option {   * @param h   The help string displayed when showing --help   *   * This invocation: - *   SB_CMDLINE_OPT(foo, 0, "The foo arg"); + *   SANDBOX_CMDLINE_OPT(foo, 0, "The foo arg");   * Will create a new flag named "--foo" (no short option) that takes   * no argument.  If the user specifies "--foo", then the callback func - * sb_cmdline_cb_foo() will automatically be called. + * sandbox_cmdline_cb_foo() will automatically be called.   */ -#define SB_CMDLINE_OPT(f, ha, h) _SB_CMDLINE_OPT(f, 0, ha, h) +#define SANDBOX_CMDLINE_OPT(f, ha, h) _SANDBOX_CMDLINE_OPT(f, 0, ha, h)  /*   * Same as above, but @s is used to specify a short flag e.g. - *   SB_CMDLINE_OPT(foo, 'f', 0, "The foo arg"); + *   SANDBOX_CMDLINE_OPT(foo, 'f', 0, "The foo arg");   */ -#define SB_CMDLINE_OPT_SHORT(f, s, ha, h) _SB_CMDLINE_OPT(f, s, ha, h) +#define SANDBOX_CMDLINE_OPT_SHORT(f, s, ha, h) _SANDBOX_CMDLINE_OPT(f, s, ha, h)  #endif |