Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
static struct fio_option *find_option(struct fio_option *options,
const char *opt)
{
static struct fio_option *find_option(struct fio_option *options,
const char *opt)
{
- struct fio_option *o = &options[0];
+ for (o = &options[0]; o->name; o++) {
if (!strcmp(o->name, opt))
return o;
else if (o->alias && !strcmp(o->alias, opt))
return o;
if (!strcmp(o->name, opt))
return o;
else if (o->alias && !strcmp(o->alias, opt))
return o;
int show_cmd_help(struct fio_option *options, const char *name)
{
int show_all = !strcmp(name, "all");
int show_cmd_help(struct fio_option *options, const char *name)
{
int show_all = !strcmp(name, "all");
- struct fio_option *o = &options[0];
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
const char *typehelp[] = {
"string (opt=bla)",
"string with possible k/m/g postfix (opt=4k)",
"boolean value (opt=1)",
"no argument (opt)",
};
"boolean value (opt=1)",
"no argument (opt)",
};
+ for (o = &options[0]; o->name; o++) {
int match = !strcmp(name, o->name);
if (show_all || match) {
found = 1;
printf("%16s: %s\n", o->name, o->help);
int match = !strcmp(name, o->name);
if (show_all || match) {
found = 1;
printf("%16s: %s\n", o->name, o->help);
- if (match) {
- printf("%16s: %s\n", "type", typehelp[o->type]);
- printf("%16s: %s\n", "default", o->def ? o->def : "no default");
- show_option_range(o);
- show_option_values(o);
- }
+ if (show_all)
+ continue;
+ printf("%16s: %s\n", "type", typehelp[o->type]);
+ printf("%16s: %s\n", "default", o->def ? o->def : "no default");
+ show_option_range(o);
+ show_option_values(o);
*/
void fill_default_options(void *data, struct fio_option *options)
{
*/
void fill_default_options(void *data, struct fio_option *options)
{
- struct fio_option *o = &options[0];
+ for (o = &options[0]; o->name; o++)
if (o->def)
handle_option(o, o->def, data);
if (o->def)
handle_option(o, o->def, data);
*/
void options_init(struct fio_option *options)
{
*/
void options_init(struct fio_option *options)
{
- struct fio_option *o = &options[0];
+ for (o = &options[0]; o->name; o++) {
if (o->type == FIO_OPT_BOOL) {
o->minval = 0;
o->maxval = 1;
}
if (o->type == FIO_OPT_BOOL) {
o->minval = 0;
o->maxval = 1;
}