shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

command: refactor test for relative opt

Browse Source 
Use _update_relative_opt to check for relative option and
update val_enum accordingly.
This commit is contained in:
Zdenek Kabelac 2024-04-27 19:26:32 +02:00
parent ee45cd8965
commit e1211d38a4
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tools/command.c
View File

@ -1625,25 +1625,38 @@ static void _print_usage_description(struct command *cmd)
}
}
static void _print_val_usage(struct command *cmd, int opt_enum, int val_enum)
static void _update_relative_opt(const char *name, int opt_enum, int *val_enum)
{
int is_relative_opt = (opt_enum == size_ARG) ||
(opt_enum == extents_ARG) ||
(opt_enum == poolmetadatasize_ARG) ||
(opt_enum == mirrors_ARG);
/* check for relative sign */
switch (opt_enum) {
case extents_ARG:
case mirrors_ARG:
case poolmetadatasize_ARG:
case size_ARG:
/*
* Suppress the [+] prefix for lvcreate which we have to
* accept for backwards compat, but don't want to advertise.
*/
if (!strcmp(cmd->name, "lvcreate") && is_relative_opt) {
if (val_enum == psizemb_VAL)
val_enum = sizemb_VAL;
else if (val_enum == pextents_VAL)
val_enum = extents_VAL;
else if ((val_enum == pnumber_VAL) && (opt_enum == mirrors_ARG))
val_enum = number_VAL;
if (!strcmp(name, "lvcreate")) {
switch (*val_enum) {
case psizemb_VAL:
*val_enum = sizemb_VAL;
break;
case pextents_VAL:
*val_enum = extents_VAL;
break;
case pnumber_VAL:
if (opt_enum == mirrors_ARG)
*val_enum = number_VAL;
break;
}
}
}
}
static void _print_val_usage(struct command *cmd, int opt_enum, int val_enum)
{
_update_relative_opt(cmd->name, opt_enum, &val_enum);
if (!val_names[val_enum].usage)
printf("%s", val_names[val_enum].name);

18
tools/man-generator.c
View File

@ -191,24 +191,10 @@ static void _print_val_man(struct command_name *cname, int opt_enum, int val_enu
char *line_argv[MAX_LINE_ARGC];
int line_argc;
int i;
int is_relative_opt = (opt_enum == size_ARG) ||
(opt_enum == extents_ARG) ||
(opt_enum == poolmetadatasize_ARG) ||
(opt_enum == mirrors_ARG);
_was_hyphen = 0;
/*
* Suppress the [+] prefix for lvcreate which we have to
* accept for backwards compat, but don't want to advertise.
*/
if (!strcmp(cname->name, "lvcreate") && is_relative_opt) {
if (val_enum == psizemb_VAL)
val_enum = sizemb_VAL;
else if (val_enum == pextents_VAL)
val_enum = extents_VAL;
else if ((val_enum == pnumber_VAL) && (opt_enum == mirrors_ARG))
val_enum = number_VAL;
}
_update_relative_opt(cname->name, opt_enum, &val_enum);
switch (val_enum) {
case sizemb_VAL: