Commit c19de41a authored by Antonio Borneo's avatar Antonio Borneo Committed by Tomas Vanek

helper/command: handle empty "usage" with add_help_text/add_usage_text

By using the command "add_help_text" to add a help text to a TCL
procedure it implicitly creates a new command_registration struct
that has field .usage set to NULL. This triggers a debug message
	BUG: command '%s' does not have the '.usage' field filled out

Use an empty string if usage field is NULL.

Plus, do not annoy the user with a LOG_INFO when the command
"add_usage_text" replaces an empty usage.

Change-Id: I4a72646e0fb704ba354f938d774055540cde3967
Signed-off-by: default avatarAntonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/5025
Tested-by: jenkins
Reviewed-by: default avatarTomas Vanek <vanekt@fbl.cz>
parent b61e4548
...@@ -1119,7 +1119,7 @@ int help_add_command(struct command_context *cmd_ctx, struct command *parent, ...@@ -1119,7 +1119,7 @@ int help_add_command(struct command_context *cmd_ctx, struct command *parent,
.name = cmd_name, .name = cmd_name,
.mode = COMMAND_ANY, .mode = COMMAND_ANY,
.help = help_text, .help = help_text,
.usage = usage, .usage = usage ? : "",
}; };
nc = register_command(cmd_ctx, parent, &cr); nc = register_command(cmd_ctx, parent, &cr);
if (NULL == nc) { if (NULL == nc) {
...@@ -1144,8 +1144,9 @@ int help_add_command(struct command_context *cmd_ctx, struct command *parent, ...@@ -1144,8 +1144,9 @@ int help_add_command(struct command_context *cmd_ctx, struct command *parent,
if (usage) { if (usage) {
bool replaced = false; bool replaced = false;
if (nc->usage) { if (nc->usage) {
if (*nc->usage)
replaced = true;
free(nc->usage); free(nc->usage);
replaced = true;
} }
nc->usage = strdup(usage); nc->usage = strdup(usage);
if (replaced) if (replaced)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment