From e16868dede6455cab644805af6fe1ac312775e13 Mon Sep 17 00:00:00 2001 From: Gluster Ant Date: Wed, 12 Sep 2018 17:52:45 +0530 Subject: Land part 2 of clang-format changes Change-Id: Ia84cc24c8924e6d22d02ac15f611c10e26db99b4 Signed-off-by: Nigel Babu --- cli/src/cli-cmd-misc.c | 149 +++++++++++++++++++++++-------------------------- 1 file changed, 70 insertions(+), 79 deletions(-) (limited to 'cli/src/cli-cmd-misc.c') diff --git a/cli/src/cli-cmd-misc.c b/cli/src/cli-cmd-misc.c index c887515af85..04dd2efc220 100644 --- a/cli/src/cli-cmd-misc.c +++ b/cli/src/cli-cmd-misc.c @@ -35,107 +35,98 @@ extern struct cli_cmd global_cmds[]; struct cli_cmd cli_misc_cmds[]; int -cli_cmd_quit_cbk (struct cli_state *state, struct cli_cmd_word *word, - const char **words, int wordcount) +cli_cmd_quit_cbk(struct cli_state *state, struct cli_cmd_word *word, + const char **words, int wordcount) { - exit (0); + exit(0); } - static gf_boolean_t -cli_is_help_command (const char *pattern) +cli_is_help_command(const char *pattern) { - /* FixFixFix - * This is not the best way to determine whether - * this is a help command - */ - if (strstr (pattern, "help")) - return _gf_true; - - return _gf_false; + /* FixFixFix + * This is not the best way to determine whether + * this is a help command + */ + if (strstr(pattern, "help")) + return _gf_true; + + return _gf_false; } - int -cli_cmd_display_help (struct cli_state *state, struct cli_cmd_word *in_word, - const char **words, int wordcount) +cli_cmd_display_help(struct cli_state *state, struct cli_cmd_word *in_word, + const char **words, int wordcount) { - struct cli_cmd *cmd[] = {cli_misc_cmds, cli_probe_cmds, - volume_cmds, bitrot_cmds, quota_cmds, + struct cli_cmd *cmd[] = { + cli_misc_cmds, + cli_probe_cmds, + volume_cmds, + bitrot_cmds, + quota_cmds, #if !defined(__NetBSD__) - tier_cmds, + tier_cmds, #endif - snapshot_cmds, global_cmds, NULL}; - struct cli_cmd *cmd_ind = NULL; - int i = 0; - gf_boolean_t list_all = _gf_false; - - /* cli_system_cmds commands for internal usage - they are not exposed - */ - - /* If "help all" */ - if (wordcount == 2) - list_all = _gf_true; - - for (i = 0; cmd[i] != NULL; i++) { - for (cmd_ind = cmd[i]; cmd_ind->pattern; cmd_ind++) { - if ((_gf_false == cmd_ind->disable) && - cli_is_help_command (cmd_ind->pattern)) { - if (list_all && (cmd_ind->cbk)) { - cmd_ind->cbk (state, in_word, words, - wordcount); - } else { - cli_out (" %-25s- %s", cmd_ind->pattern, - cmd_ind->desc); - } - } + snapshot_cmds, + global_cmds, + NULL + }; + struct cli_cmd *cmd_ind = NULL; + int i = 0; + gf_boolean_t list_all = _gf_false; + + /* cli_system_cmds commands for internal usage + they are not exposed + */ + + /* If "help all" */ + if (wordcount == 2) + list_all = _gf_true; + + for (i = 0; cmd[i] != NULL; i++) { + for (cmd_ind = cmd[i]; cmd_ind->pattern; cmd_ind++) { + if ((_gf_false == cmd_ind->disable) && + cli_is_help_command(cmd_ind->pattern)) { + if (list_all && (cmd_ind->cbk)) { + cmd_ind->cbk(state, in_word, words, wordcount); + } else { + cli_out(" %-25s- %s", cmd_ind->pattern, cmd_ind->desc); } + } } + } - cli_out ("\n"); - return 0; + cli_out("\n"); + return 0; } - struct cli_cmd cli_help_cmds[] = { - { "help [all]", - cli_cmd_display_help, - "display help for command classes"}, - - { NULL, NULL, NULL } -}; - + {"help [all]", cli_cmd_display_help, "display help for command classes"}, -struct cli_cmd cli_misc_cmds[] = { - { "quit", - cli_cmd_quit_cbk, - "quit"}, - { "exit", - cli_cmd_quit_cbk, - "exit"}, + {NULL, NULL, NULL}}; - { NULL, NULL, NULL } -}; +struct cli_cmd cli_misc_cmds[] = {{"quit", cli_cmd_quit_cbk, "quit"}, + {"exit", cli_cmd_quit_cbk, "exit"}, + {NULL, NULL, NULL}}; int -cli_cmd_misc_register (struct cli_state *state) +cli_cmd_misc_register(struct cli_state *state) { - int ret = 0; - struct cli_cmd *cmd = NULL; - - for (cmd = cli_misc_cmds; cmd->pattern; cmd++) { - ret = cli_cmd_register (&state->tree, cmd); - if (ret) - goto out; - } - - for (cmd = cli_help_cmds; cmd->pattern; cmd++) { - ret = cli_cmd_register (&state->tree, cmd); - if (ret) - goto out; - } + int ret = 0; + struct cli_cmd *cmd = NULL; + + for (cmd = cli_misc_cmds; cmd->pattern; cmd++) { + ret = cli_cmd_register(&state->tree, cmd); + if (ret) + goto out; + } + + for (cmd = cli_help_cmds; cmd->pattern; cmd++) { + ret = cli_cmd_register(&state->tree, cmd); + if (ret) + goto out; + } out: - return ret; + return ret; } -- cgit