From 833e7f5248778bcb31b4db1a1b91160995415203 Mon Sep 17 00:00:00 2001
From: Zachary T Welch <zw@superlucidity.net>
Date: Fri, 20 Nov 2009 11:26:35 -0800
Subject: use COMMAND_REGISTER macro
Replaces direct calls to register_command() with a macro, to allow
its parameters to be changed and callers updated in phases.
---
src/helper/command.c | 6 +++---
src/helper/ioutil.c | 12 ++++++------
src/helper/log.c | 4 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'src/helper')
diff --git a/src/helper/command.c b/src/helper/command.c
index f6c6b2d7..0561c6c5 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -908,7 +908,7 @@ struct command_context* command_init(const char *startup_tcl)
interp->cb_fflush = openocd_jim_fflush;
interp->cb_fgets = openocd_jim_fgets;
- register_command(context, NULL, "add_help_text",
+ COMMAND_REGISTER(context, NULL, "add_help_text",
handle_help_add_command, COMMAND_ANY,
"<command> [...] <help_text>] - "
"add new command help text");
@@ -925,12 +925,12 @@ struct command_context* command_init(const char *startup_tcl)
}
Jim_DeleteAssocData(interp, "context");
- register_command(context, NULL, "sleep",
+ COMMAND_REGISTER(context, NULL, "sleep",
handle_sleep_command, COMMAND_ANY,
"<n> [busy] - sleep for n milliseconds. "
"\"busy\" means busy wait");
- register_command(context, NULL, "help",
+ COMMAND_REGISTER(context, NULL, "help",
&handle_help_command, COMMAND_ANY,
"[<command_name> ...] - show built-in command help");
diff --git a/src/helper/ioutil.c b/src/helper/ioutil.c
index 3fb3014a..52ecb9f2 100644
--- a/src/helper/ioutil.c
+++ b/src/helper/ioutil.c
@@ -647,22 +647,22 @@ static int zylinjtag_Jim_Command_mac(Jim_Interp *interp, int argc,
int ioutil_init(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
+ COMMAND_REGISTER(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
"remove file");
- register_command(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY,
+ COMMAND_REGISTER(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY,
"display file content");
- register_command(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY,
+ COMMAND_REGISTER(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY,
"truncate a file to 0 size");
- register_command(cmd_ctx, NULL, "cp", handle_cp_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "cp", handle_cp_command,
COMMAND_ANY, "copy a file <from> <to>");
- register_command(cmd_ctx, NULL, "append_file", handle_append_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "append_file", handle_append_command,
COMMAND_ANY, "append a variable number of strings to a file");
- register_command(cmd_ctx, NULL, "meminfo", handle_meminfo_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "meminfo", handle_meminfo_command,
COMMAND_ANY, "display available ram memory");
Jim_CreateCommand(interp, "rm", zylinjtag_Jim_Command_rm, NULL, NULL);
diff --git a/src/helper/log.c b/src/helper/log.c
index 2dcf7bb6..b1352a32 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -319,9 +319,9 @@ COMMAND_HANDLER(handle_log_output_command)
int log_register_commands(struct command_context *cmd_ctx)
{
start = timeval_ms();
- register_command(cmd_ctx, NULL, "log_output", handle_log_output_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "log_output", handle_log_output_command,
COMMAND_ANY, "redirect logging to <file> (default: stderr)");
- register_command(cmd_ctx, NULL, "debug_level", handle_debug_level_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "debug_level", handle_debug_level_command,
COMMAND_ANY, "adjust debug level <0-3>");
return ERROR_OK;
--
cgit v1.2.3