shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 18:55:19 +03:00
Code Releases Activity

dmsetup: Rename _commands to _dmsetup_commands.

Browse Source 
We'll need to accommodate sub-commands for dmstats.
This commit is contained in:
Alasdair G Kergon 2015-07-31 16:13:45 +01:00
parent f54198eed6
commit 027fe112ec
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/dmsetup.c
View File

@ -3057,7 +3057,7 @@ static int _help(CMD_ARGS);
/*
* Dispatch table
*/
static struct command _commands[] = {
static struct command _dmsetup_commands[] = {
{"help", "[-c|-C|--columns]", 0, 0, 0, _help},
{"create", "<dev_name> [-j|--major <major> -m|--minor <minor>]\n"
"\t [-U|--uid <uid>] [-G|--gid <gid>] [-M|--mode <octal_mode>]\n"
@ -3108,8 +3108,8 @@ static void _usage(FILE *out)
" [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
" [-S|--select <selection>] [--nameprefixes] [--noheadings]\n"
" [--separator <separator>]\n\n");
for (i = 0; _commands[i].name; i++)
fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
for (i = 0; _dmsetup_commands[i].name; i++)
fprintf(out, "\t%s %s\n", _dmsetup_commands[i].name, _dmsetup_commands[i].help);
fprintf(out, "\n<device> may be device name or -u <uuid> or "
"-j <major> -m <minor>\n");
fprintf(out, "<mangling_mode> is one of 'none', 'auto' and 'hex'.\n");
@ -3147,17 +3147,23 @@ static int _help(CMD_ARGS)
return 1;
}
static struct command *_find_command(const char *name)
static struct command *_find_command(const struct command *commands,
const char *name)
{
int i;
for (i = 0; _commands[i].name; i++)
if (!strcmp(_commands[i].name, name))
return _commands + i;
for (i = 0; commands[i].name; i++)
if (!strcmp(commands[i].name, name))
return commands + i;
return NULL;
}
static struct command *_find_dmsetup_command(const char *name)
{
return _find_command(_dmsetup_commands, name);
}
static int _process_tree_options(const char *options)
{
const char *s, *end;
@ -3816,13 +3822,13 @@ int main(int argc, char **argv)
}
if (_switches[HELP_ARG]) {
if ((cmd = _find_command("help")))
if ((cmd = _find_dmsetup_command("help")))
goto doit;
goto unknown;
}
if (_switches[VERSION_ARG]) {
if ((cmd = _find_command("version")))
if ((cmd = _find_dmsetup_command("version")))
goto doit;
goto unknown;
}
@ -3832,7 +3838,7 @@ int main(int argc, char **argv)
goto out;
}
if (!(cmd = _find_command(argv[0]))) {
if (!(cmd = _find_dmsetup_command(argv[0]))) {
unknown:
fprintf(stderr, "Unknown command\n");
_usage(stderr);