Add static keywords to main application helper functions.

[fw/openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 471a097a4bf09307704c7883e6b96dbc2d3883fc..00b33d4dec9b0d1dd37a92d722bd1d5b13a5fd8f 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -24,8 +24,6 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -35,6 +33,7 @@
 #include "jtag.h"
 #include "configuration.h"
 #include "xsvf.h"
+#include "svf.h"
 #include "target.h"
 #include "flash.h"
 #include "nand.h"
@@ -56,15 +55,11 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#include <alloca.h>
-#endif
 
-#include "replacements.h"
+#define OPENOCD_VERSION \
+               "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
 
-void print_version(void)
+static void print_version(void)
 {
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
        /* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
@@ -80,14 +75,17 @@ void print_version(void)
 }
 
 /* Give TELNET a way to find out what version this is */
-int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+       if (argc!=0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        command_print(cmd_ctx, OPENOCD_VERSION);
 
        return ERROR_OK;
 }
 
-void exit_handler(void)
+static void exit_handler(void)
 {
        /* close JTAG interface */
        if (jtag && jtag->quit)
@@ -121,8 +119,12 @@ 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! :-) */
-int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+
+       if (argc!=0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+
        int retval;
        static int initialized=0;
        if (initialized)
@@ -132,13 +134,6 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 
        atexit(exit_handler);
 
-#if BUILD_IOUTIL
-       if (ioutil_init(cmd_ctx) != ERROR_OK)
-       {
-               return ERROR_FAIL;
-       }
-#endif
-
        if (target_init(cmd_ctx) != ERROR_OK)
                return ERROR_FAIL;
        LOG_DEBUG("target init complete");
@@ -192,7 +187,7 @@ int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, char **arg
 
 command_context_t *global_cmd_ctx;
 
-command_context_t *setup_command_handler(void)
+static command_context_t *setup_command_handler(void)
 {
        command_context_t *cmd_ctx;
 
@@ -209,6 +204,7 @@ command_context_t *setup_command_handler(void)
        log_register_commands(cmd_ctx);
        jtag_register_commands(cmd_ctx);
        xsvf_register_commands(cmd_ctx);
+       svf_register_commands(cmd_ctx);
        target_register_commands(cmd_ctx);
        flash_register_commands(cmd_ctx);
        nand_register_commands(cmd_ctx);
@@ -244,6 +240,13 @@ int openocd_main(int argc, char *argv[])
 
        cmd_ctx = setup_command_handler();
 
+#if BUILD_IOUTIL
+       if (ioutil_init(cmd_ctx) != ERROR_OK)
+       {
+               return EXIT_FAILURE;
+       }
+#endif
+
        LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
        print_version();