mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-22 22:01:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[common] further option help cleanup

Browse source
This commit is contained in:
Geoffrey McRae 2019-05-11 11:50:26 +10:00
parent 2ddae623b8
commit 823164a924
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
a12-174-g86c7286aad+1
a12-175-g2ddae623b8+1

34
common/src/option.c
View file

@ -35,6 +35,7 @@ struct OptionGroup
struct State
{
bool doHelp;
struct Option * options;
int oCount;
struct OptionGroup * groups;
@ -43,6 +44,7 @@ struct State
struct State state =
{
.doHelp = false,
.options = NULL,
.oCount = 0,
.groups = NULL,
@ -136,8 +138,8 @@ bool option_parse(int argc, char * argv[])
{
if (strcmp(argv[a], "-h") == 0 || strcmp(argv[a], "--help") == 0)
{
option_print();
return false;
state.doHelp = true;
continue;
}
char * arg = strdup(argv[a]);
@ -204,6 +206,12 @@ bool option_parse(int argc, char * argv[])
bool option_validate()
{
if (state.doHelp)
{
option_print();
return false;
}
// validate the option values
bool ok = true;
for(int i = 0; i < state.oCount; ++i)
@ -245,7 +253,27 @@ void option_print()
for(int i = 0; i < state.groups[g].count; ++i)
{
struct Option * o = state.groups[g].options[i];
printf(" %s:%-*s - %s\n", o->module, state.groups[g].pad, o->name, o->description);
printf(" Option: %s:%-*s - %s [", o->module, state.groups[g].pad, o->name, o->description);
switch(o->value.type)
{
case OPTION_TYPE_INT:
printf("%d]\n", o->value.v.x_int);
break;
case OPTION_TYPE_STRING:
printf("%s]\n", o->value.v.x_string);
break;
case OPTION_TYPE_BOOL:
printf("%s]\n", o->value.v.x_bool ? "yes" : "no");
break;
default:
DEBUG_ERROR("BUG: Invalid option type, this should never happen");
assert(false);
break;
}
}
printf("\n");
}