From f802f572b1cb1d33bab9747e87e6506b284546cf Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Wed, 24 Jun 2015 09:09:17 -0700 Subject: btrfs-progs: alias btrfs device delete to btrfs device remove There's an awkward asymmetry between btrfs device add and btrfs device delete. Resolve this by aliasing delete to remove. Signed-off-by: Omar Sandoval Signed-off-by: David Sterba --- help.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'help.c') diff --git a/help.c b/help.c index e57d9f2..eacce84 100644 --- a/help.c +++ b/help.c @@ -79,11 +79,13 @@ static int do_usage_one_command(const char * const *usagestr, static int usage_command_internal(const char * const *usagestr, const char *token, int full, int lst, - FILE *outf) + int alias, FILE *outf) { - unsigned int flags = USAGE_SHORT; + unsigned int flags = 0; int ret; + if (!alias) + flags |= USAGE_SHORT; if (full) flags |= USAGE_LONG | USAGE_OPTIONS; if (lst) @@ -108,7 +110,7 @@ static void usage_command_usagestr(const char * const *usagestr, FILE *outf = err ? stderr : stdout; int ret; - ret = usage_command_internal(usagestr, token, full, 0, outf); + ret = usage_command_internal(usagestr, token, full, 0, 0, outf); if (!ret) fputc('\n', outf); } @@ -144,7 +146,7 @@ static void usage_command_group_internal(const struct cmd_group *grp, int full, } usage_command_internal(cmd->usagestr, cmd->token, full, - 1, outf); + 1, cmd->flags & CMD_ALIAS, outf); continue; } -- cgit v1.2.1