X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhello.c;h=903123c492588983a24dd3b1028935884fd1c936;hp=2e5c9289c19d08842f149f8e3756b5bf8b2d38f6;hb=13288a44bee0aa26067cb51c262b82a12b61699f;hpb=a93b404161dc42f8dee805c8f95bc4974aded9cb

diff --git a/src/hello.c b/src/hello.c
index 2e5c9289c1..903123c492 100644
--- a/src/hello.c
+++ b/src/hello.c
@@ -20,22 +20,18 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include "log.h"
+#include <helper/log.h>
 
 COMMAND_HANDLER(handle_foo_command)
 {
 	if (CMD_ARGC < 1 || CMD_ARGC > 2)
-	{
-		LOG_ERROR("%s: incorrect number of arguments", CMD_NAME);
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	uint32_t address;
 	COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address);
 
 	const char *msg = "<unchanged>";
-	if (CMD_ARGC == 2)
-	{
+	if (CMD_ARGC == 2) {
 		bool enable;
 		COMMAND_PARSE_ENABLE(CMD_ARGV[1], enable);
 		msg = enable ? "enable" : "disable";
@@ -50,7 +46,7 @@ static bool foo_flag;
 COMMAND_HANDLER(handle_flag_command)
 {
 	return CALL_COMMAND_HANDLER(handle_command_parse_bool,
-			&foo_flag, "foo flag");
+		&foo_flag, "foo flag");
 }
 
 static const struct command_registration foo_command_handlers[] = {
@@ -58,19 +54,22 @@ static const struct command_registration foo_command_handlers[] = {
 		.name = "bar",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.help = "<address> [enable|disable] - an example command",
+		.usage = "address ['enable'|'disable']",
+		.help = "an example command",
 	},
 	{
 		.name = "baz",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.help = "<address> [enable|disable] - a sample command",
+		.usage = "address ['enable'|'disable']",
+		.help = "a sample command",
 	},
 	{
 		.name = "flag",
 		.handler = &handle_flag_command,
 		.mode = COMMAND_ANY,
-		.help = "[on|off] - set a flag",
+		.usage = "[on|off]",
+		.help = "set a flag",
 	},
 	COMMAND_REGISTRATION_DONE
 };
@@ -78,16 +77,11 @@ static const struct command_registration foo_command_handlers[] = {
 static COMMAND_HELPER(handle_hello_args, const char **sep, const char **name)
 {
 	if (CMD_ARGC > 1)
-	{
-		LOG_ERROR("%s: too many arguments", CMD_NAME);
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-	if (1 == CMD_ARGC)
-	{
+	if (1 == CMD_ARGC) {
 		*sep = " ";
 		*name = CMD_ARGV[0];
-	}
-	else
+	} else
 		*sep = *name = "";
 
 	return ERROR_OK;
@@ -104,10 +98,10 @@ COMMAND_HANDLER(handle_hello_command)
 const struct command_registration hello_command_handlers[] = {
 	{
 		.name = "hello",
-		.handler = &handle_hello_command,
+		.handler = handle_hello_command,
 		.mode = COMMAND_ANY,
 		.help = "prints a warm welcome",
-		.usage = "[<name>]",
+		.usage = "[name]",
 	},
 	{
 		.name = "foo",
@@ -118,8 +112,3 @@ const struct command_registration hello_command_handlers[] = {
 	},
 	COMMAND_REGISTRATION_DONE
 };
-
-int hello_register_commands(struct command_context *cmd_ctx)
-{
-	return register_commands(cmd_ctx, NULL, hello_command_handlers);
-}