Commit f7ee6595 authored by Soramichi AKIYAMA's avatar Soramichi AKIYAMA Committed by Arnaldo Carvalho de Melo
Browse files

tools lib subcmd: Fix missing member name 



This patch adds missing member names to struct initializations.

Although in C99 for struct S {int x, int y} two init codes struct S s =
{.x = (a), (b)} and struct S s = {.x = (a), .y = (b)} are the same, it
is better to explicitly write .y (.argh in this patch) for readability
and robustness against language/compiler evolutions.

Signed-off-by: default avatarSoramichi Akiyama <akiyama@m.soramichi.jp>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170113215623.32fb1ac2d862af0048c30fe6@m.soramichi.jp


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2484c4c5

tools/lib/subcmd/parse-options.h

+9 −9
Original line number Diff line number Diff line
@@ -133,32 +133,32 @@ struct option { 
#define OPT_UINTEGER(s, l, v, h)    { .type = OPTION_UINTEGER, .short_name = (s), .long_name = (l), .value = check_vtype(v, unsigned int *), .help = (h) }

#define OPT_LONG(s, l, v, h)        { .type = OPTION_LONG, .short_name = (s), .long_name = (l), .value = check_vtype(v, long *), .help = (h) }

#define OPT_U64(s, l, v, h)         { .type = OPTION_U64, .short_name = (s), .long_name = (l), .value = check_vtype(v, u64 *), .help = (h) }

#define OPT_STRING(s, l, v, a, h)   { .type = OPTION_STRING,  .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), (a), .help = (h) }

#define OPT_STRING(s, l, v, a, h)   { .type = OPTION_STRING,  .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), .argh = (a), .help = (h) }

#define OPT_STRING_OPTARG(s, l, v, a, h, d) \

	{ .type = OPTION_STRING,  .short_name = (s), .long_name = (l), \

	  .value = check_vtype(v, const char **), (a), .help = (h), \

	  .value = check_vtype(v, const char **), .argh =(a), .help = (h), \

	  .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d) }

#define OPT_STRING_OPTARG_SET(s, l, v, os, a, h, d) \

	{ .type = OPTION_STRING, .short_name = (s), .long_name = (l), \

	  .value = check_vtype(v, const char **), (a), .help = (h), \

	  .value = check_vtype(v, const char **), .argh = (a), .help = (h), \

	  .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d), \

	  .set = check_vtype(os, bool *)}

#define OPT_STRING_NOEMPTY(s, l, v, a, h)   { .type = OPTION_STRING,  .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), (a), .help = (h), .flags = PARSE_OPT_NOEMPTY}

#define OPT_STRING_NOEMPTY(s, l, v, a, h)   { .type = OPTION_STRING,  .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), .argh = (a), .help = (h), .flags = PARSE_OPT_NOEMPTY}

#define OPT_DATE(s, l, v, h) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb }

#define OPT_CALLBACK(s, l, v, a, h, f) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f) }

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = (a), .help = (h), .callback = (f) }

#define OPT_CALLBACK_NOOPT(s, l, v, a, h, f) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG }

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = (a), .help = (h), .callback = (f), .flags = PARSE_OPT_NOARG }

#define OPT_CALLBACK_DEFAULT(s, l, v, a, h, f, d) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), (a), .help = (h), .callback = (f), .defval = (intptr_t)d, .flags = PARSE_OPT_LASTARG_DEFAULT }

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = (a), .help = (h), .callback = (f), .defval = (intptr_t)d, .flags = PARSE_OPT_LASTARG_DEFAULT }

#define OPT_CALLBACK_DEFAULT_NOOPT(s, l, v, a, h, f, d) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l),\

	.value = (v), (a), .help = (h), .callback = (f), .defval = (intptr_t)d,\

	.value = (v), .arg = (a), .help = (h), .callback = (f), .defval = (intptr_t)d,\

	.flags = PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NOARG}

#define OPT_CALLBACK_OPTARG(s, l, v, d, a, h, f) \

	{ .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), \

	  .value = (v), (a), .help = (h), .callback = (f), \

	  .value = (v), .argh = (a), .help = (h), .callback = (f), \

	  .flags = PARSE_OPT_OPTARG, .data = (d) }



/* parse_options() will filter out the processed options and leave the

CRA Git | Maintained and supported by SUSTech CRA and CCSE