auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

helper/command: pass command prefix to command registration

Browse Source 
Replace the "struct command *parent" parameter with a string that
contains the command prefix.
This abstracts the openocd code from the knowledge of the tree of
struct command.
This also makes unused the function command_find_in_context(), so
remove it.

Change-Id: I598d60719cfdc1811ee6f6edfff8a116f82c7ed6
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5668
Tested-by: jenkins
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
This commit is contained in:
Antonio Borneo
2020-05-10 19:35:56 +02:00
parent 4289389937
commit 41c95aa4ea
7 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/helper/command.c
View File

@@ -244,12 +244,6 @@ static struct command *command_find(struct command *head, const char *name)
return NULL;
}
struct command *command_find_in_context(struct command_context *cmd_ctx,
const char *name)
{
return command_find(cmd_ctx->commands, name);
}
/**
* Add the command into the linked list, sorted by name.
* @param head Address to head of command list pointer, which may be
@@ -391,7 +385,7 @@ static struct command *register_command(struct command_context *context,
return c;
}
int __register_commands(struct command_context *cmd_ctx, struct command *parent,
static int ___register_commands(struct command_context *cmd_ctx, struct command *parent,
const struct command_registration *cmds, void *data,
struct target *override_target)
{
@@ -412,7 +406,7 @@ int __register_commands(struct command_context *cmd_ctx, struct command *parent,
}
if (NULL != cr->chain) {
struct command *p = c ? : parent;
retval = __register_commands(cmd_ctx, p, cr->chain, data, override_target);
retval = ___register_commands(cmd_ctx, p, cr->chain, data, override_target);
if (ERROR_OK != retval)
break;
}
@@ -424,6 +418,18 @@ int __register_commands(struct command_context *cmd_ctx, struct command *parent,
return retval;
}
int __register_commands(struct command_context *cmd_ctx, const char *cmd_prefix,
const struct command_registration *cmds, void *data,
struct target *override_target)
{
struct command *parent = NULL;
if (cmd_prefix)
parent = command_find(cmd_ctx->commands, cmd_prefix);
return ___register_commands(cmd_ctx, parent, cmds, data, override_target);
}
int unregister_all_commands(struct command_context *context,
struct command *parent)
{