Fix comments and whitespace in lookup_cmd_composition

2020-04-26  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* cli/cli-decode.c (lookup_cmd_composition): Fix comments
	and whitespace.
This commit is contained in:
Philippe Waroquiers
2020-04-26 16:01:52 +02:00
parent a09f656b26
commit bc3609fd38
2 changed files with 34 additions and 29 deletions

View File

@ -1,3 +1,8 @@
2020-04-26 Philippe Waroquiers <philippe.waroquiers@skynet.be>
* cli/cli-decode.c (lookup_cmd_composition): Fix comments
and whitespace.
2020-04-25 Kamil Rytarowski <n54@gmx.com> 2020-04-25 Kamil Rytarowski <n54@gmx.com>
* inf-ptrace.c (inf_ptrace_target::wait): Remove * inf-ptrace.c (inf_ptrace_target::wait): Remove

View File

@ -1812,25 +1812,25 @@ deprecated_cmd_warning (const char *text)
} }
/* Look up the contents of LINE as a command in the command list 'cmdlist'. /* Look up the contents of TEXT as a command in the command list 'cmdlist'.
Return 1 on success, 0 on failure. Return 1 on success, 0 on failure.
If LINE refers to an alias, *alias will point to that alias. If TEXT refers to an alias, *ALIAS will point to that alias.
If LINE is a postfix command (i.e. one that is preceded by a prefix If TEXT is a subcommand (i.e. one that is preceded by a prefix
command) set *prefix_cmd. command) set *PREFIX_CMD.
Set *cmd to point to the command LINE indicates. Set *CMD to point to the command TEXT indicates.
If any of *alias, *prefix_cmd, or *cmd cannot be determined or do not If any of *ALIAS, *PREFIX_CMD, or *CMD cannot be determined or do not
exist, they are NULL when we return. exist, they are NULL when we return.
*/ */
int int
lookup_cmd_composition (const char *text, lookup_cmd_composition (const char *text,
struct cmd_list_element **alias, struct cmd_list_element **alias,
struct cmd_list_element **prefix_cmd, struct cmd_list_element **prefix_cmd,
struct cmd_list_element **cmd) struct cmd_list_element **cmd)
{ {
char *command; char *command;
int len, nfound; int len, nfound;
@ -1840,43 +1840,43 @@ lookup_cmd_composition (const char *text,
*alias = NULL; *alias = NULL;
*prefix_cmd = NULL; *prefix_cmd = NULL;
*cmd = NULL; *cmd = NULL;
cur_list = cmdlist; cur_list = cmdlist;
while (1) while (1)
{ {
/* Go through as many command lists as we need to, /* Go through as many command lists as we need to,
to find the command TEXT refers to. */ to find the command TEXT refers to. */
prev_cmd = *cmd; prev_cmd = *cmd;
while (*text == ' ' || *text == '\t') while (*text == ' ' || *text == '\t')
(text)++; (text)++;
/* Identify the name of the command. */ /* Identify the name of the command. */
len = find_command_name_length (text); len = find_command_name_length (text);
/* If nothing but whitespace, return. */ /* If nothing but whitespace, return. */
if (len == 0) if (len == 0)
return 0; return 0;
/* Text is the start of the first command word to lookup (and /* TEXT is the start of the first command word to lookup (and
it's length is len). We copy this into a local temporary. */ it's length is len). We copy this into a local temporary. */
command = (char *) alloca (len + 1); command = (char *) alloca (len + 1);
memcpy (command, text, len); memcpy (command, text, len);
command[len] = '\0'; command[len] = '\0';
/* Look it up. */ /* Look it up. */
*cmd = 0; *cmd = 0;
nfound = 0; nfound = 0;
*cmd = find_cmd (command, len, cur_list, 1, &nfound); *cmd = find_cmd (command, len, cur_list, 1, &nfound);
if (*cmd == CMD_LIST_AMBIGUOUS) if (*cmd == CMD_LIST_AMBIGUOUS)
{ {
return 0; /* ambiguous */ return 0; /* ambiguous */
} }
if (*cmd == NULL) if (*cmd == NULL)
return 0; /* nothing found */ return 0; /* nothing found */
else else
@ -1884,7 +1884,7 @@ lookup_cmd_composition (const char *text,
if ((*cmd)->cmd_pointer) if ((*cmd)->cmd_pointer)
{ {
/* cmd was actually an alias, we note that an alias was /* cmd was actually an alias, we note that an alias was
used (by assigning *alais) and we set *cmd. */ used (by assigning *ALIAS) and we set *CMD. */
*alias = *cmd; *alias = *cmd;
*cmd = (*cmd)->cmd_pointer; *cmd = (*cmd)->cmd_pointer;
} }
@ -1894,7 +1894,7 @@ lookup_cmd_composition (const char *text,
cur_list = *(*cmd)->prefixlist; cur_list = *(*cmd)->prefixlist;
else else
return 1; return 1;
text += len; text += len;
} }
} }