X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhello.c;h=25938bcf88d75e5a45c2f07e5237a32823519e78;hb=ce8937a987620cb32de0ccad60ea06c296850139;hp=0cd06adc1e1be97ab8b10655beb7799ebcee8e57;hpb=c79cca04bed78839a18e73f3996805eb8001a812;p=openocd.git

diff --git a/src/hello.c b/src/hello.c
index 0cd06adc1e..25938bcf88 100644
--- a/src/hello.c
+++ b/src/hello.c
@@ -12,9 +12,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -25,17 +23,13 @@
 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 +44,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,14 +52,14 @@ static const struct command_registration foo_command_handlers[] = {
 		.name = "bar",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.usage = "<address> [enable|disable]",
+		.usage = "address ['enable'|'disable']",
 		.help = "an example command",
 	},
 	{
 		.name = "baz",
 		.handler = &handle_foo_command,
 		.mode = COMMAND_ANY,
-		.usage = "<address> [enable|disable]",
+		.usage = "address ['enable'|'disable']",
 		.help = "a sample command",
 	},
 	{
@@ -81,16 +75,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;
@@ -107,10 +96,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",
@@ -121,8 +110,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);
-}