andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cli: avoid unnecessary strtail for geo rep config.

Browse Source 
Found while looking at this function for another patch.

Compile Tested Only!

Updates bz#1193929
Change-Id: I46a9e95bf4d6609bc122edf86418659369258abe
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
This commit is contained in:
Ravishankar N 2018-11-08 16:03:23 +05:30 committed by Atin Mukherjee
parent cefdd02776
commit db28fc7a35
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cli/src/cli.c
View File

@ -428,7 +428,6 @@ parse_cmdline(int argc, char *argv[], struct cli_state *state)
int i = 0;
int j = 0;
char *opt = NULL;
gf_boolean_t geo_rep_config = _gf_false;
state->argc = argc - 1;
state->argv = &argv[1];
@ -442,31 +441,32 @@ parse_cmdline(int argc, char *argv[], struct cli_state *state)
if (state->argc > GEO_REP_CMD_CONFIG_INDEX &&
strtail(state->argv[GEO_REP_CMD_INDEX], "geo") &&
strtail(state->argv[GEO_REP_CMD_CONFIG_INDEX], "co"))
geo_rep_config = _gf_true;
goto done;
for (i = 0; i < state->argc; i++) {
opt = strtail(state->argv[i], "--");
if (opt && !geo_rep_config) {
ret = cli_opt_parse(opt, state);
if (ret == -1) {
cli_out("unrecognized option --%s", opt);
return ret;
} else if (ret == -2) {
return ret;
}
for (j = i; j < state->argc - 1; j++)
state->argv[j] = state->argv[j + 1];
state->argc--;
/* argv shifted, next check should be at i again */
i--;
if (ret == 1) {
/* end of cli options */
ret = 0;
break;
}
if (!opt)
continue;
ret = cli_opt_parse(opt, state);
if (ret == -1) {
cli_out("unrecognized option --%s", opt);
return ret;
} else if (ret == -2) {
return ret;
}
for (j = i; j < state->argc - 1; j++)
state->argv[j] = state->argv[j + 1];
state->argc--;
/* argv shifted, next check should be at i again */
i--;
if (ret == 1) {
/* end of cli options */
ret = 0;
break;
}
}
done:
state->argv[state->argc] = NULL;
return ret;