[common] seperate validator and clean up output

This commit is contained in:
Geoffrey McRae
2019-05-11 11:35:17 +10:00
parent 9886316e07
commit 86c7286aad
3 changed files with 22 additions and 4 deletions

View File

@@ -199,23 +199,38 @@ bool option_parse(int argc, char * argv[])
free(arg);
}
return true;
}
bool option_validate()
{
// validate the option values
bool ok = true;
for(int i = 0; i < state.oCount; ++i)
{
struct Option * o = &state.options[i];
const char * error = NULL;
if (o->validator)
if (!o->validator(&o->value))
if (!o->validator(&o->value, &error))
{
DEBUG_ERROR("Invalid value provided to option %s:%s", o->module, o->name);
printf("\nInvalid value provided to the option: %s:%s\n", o->module, o->name);
if (error)
printf("\n Error: %s\n", error);
if (o->printHelp)
{
printf("\n");
o->printHelp();
}
ok = false;
}
}
if (!ok)
printf("\n");
return ok;
}