use COMMAND_HANDLER macro to define all commands

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 95c2f237db33bc4a05d43200f00d9badb67096a1..2a74a46b741b0c2ad762f175d47371f2336a5024 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -49,7 +49,7 @@
 
 
 #define OPENOCD_VERSION \
-               "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
+               "Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
 static void print_version(void)
 {
@@ -67,7 +67,7 @@ static void print_version(void)
 }
 
 /* Give TELNET a way to find out what version this is */
-static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_version_command)
 {
        if (argc != 0)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -109,7 +109,7 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 int ioutil_init(struct command_context_s *cmd_ctx);
 
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
-static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+COMMAND_HANDLER(handle_init_command)
 {
 
        if (argc != 0)
@@ -255,7 +255,9 @@ int openocd_main(int argc, char *argv[])
 
        print_version();
 
-       LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n");
+       LOG_OUTPUT("For bug reports, read\n\t"
+               "http://openocd.berlios.de/doc/doxygen/bugs.html"
+               "\n");
 
 
        command_context_mode(cmd_ctx, COMMAND_CONFIG);