log: improve initialization

Removes redundant assignment of start_ms from log_register_commands().
Eliminates command_context parameter and return value.
Adds Doxygen comment block for this API call.

diff --git a/src/helper/log.c b/src/helper/log.c
index 3799fb322b91cf00a9120d51c27ea64170edc682..27fa8317aa6e0526037257affc9e14d1a3a8ddfa 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -336,25 +336,20 @@ static struct command_registration log_command_handlers[] = {
 
 int log_register_commands(struct command_context *cmd_ctx)
 {
 
 int log_register_commands(struct command_context *cmd_ctx)
 {

-       start = timeval_ms();
-

        return register_commands(cmd_ctx, NULL, log_command_handlers);
 }
 
        return register_commands(cmd_ctx, NULL, log_command_handlers);
 }
 

-int log_init(struct command_context *cmd_ctx)
+void log_init(void)

 {
 {

-       /* set defaults for daemon configuration, if not set by cmdline or cfgfile */
+       /* set defaults for daemon configuration,
+        * if not set by cmdline or cfgfile */

        if (debug_level == -1)
                debug_level = LOG_LVL_INFO;
 
        if (log_output == NULL)
        if (debug_level == -1)
                debug_level = LOG_LVL_INFO;
 
        if (log_output == NULL)

-       {

                log_output = stderr;
                log_output = stderr;

-       }

 
        start = last_time = timeval_ms();
 
        start = last_time = timeval_ms();

-
-       return ERROR_OK;

 }
 
 int set_log_output(struct command_context *cmd_ctx, FILE *output)
 }
 
 int set_log_output(struct command_context *cmd_ctx, FILE *output)

diff --git a/src/helper/log.h b/src/helper/log.h
index 6f7c24a80bb40f361381aaa7dfa6b97ae9822d4f..f2d19d16b13531152a7a8983a4cc02880e962bb3 100644 (file)
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -66,7 +66,10 @@ void log_printf_lf(enum log_levels level, const char *file, unsigned line,
        const char *function, const char *format, ...)
 __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 
        const char *function, const char *format, ...)
 __attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 

-int log_init(struct command_context *cmd_ctx);
+/**
+ * Initialize logging module.  Call during program startup.
+ */
+void log_init(void);

 int set_log_output(struct command_context *cmd_ctx, FILE *output);
 
 int log_register_commands(struct command_context *cmd_ctx);
 int set_log_output(struct command_context *cmd_ctx, FILE *output);
 
 int log_register_commands(struct command_context *cmd_ctx);

diff --git a/src/openocd.c b/src/openocd.c
index 1f29acdb5b3a1e825adfce053901db9d1fda38cf..629d50ae890bff1d9f73298d250c6d423a1fd524 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -182,6 +182,9 @@ struct command_context *global_cmd_ctx;
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
 struct command_context *setup_command_handler(void)
 {
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
 struct command_context *setup_command_handler(void)
 {

+       log_init();
+       LOG_DEBUG("log_init: complete");
+

        struct command_context *cmd_ctx;
 
        global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);
        struct command_context *cmd_ctx;
 
        global_cmd_ctx = cmd_ctx = command_init(openocd_startup_tcl);


@@ -202,11 +205,7 @@ struct command_context *setup_command_handler(void)
        pld_register_commands(cmd_ctx);
        mflash_register_commands(cmd_ctx);
 
        pld_register_commands(cmd_ctx);
        mflash_register_commands(cmd_ctx);
 

-       if (log_init(cmd_ctx) != ERROR_OK)
-       {
-               exit(-1);
-       }
-       LOG_DEBUG("log init complete");
+       LOG_DEBUG("command registration: complete");

 
        LOG_OUTPUT(OPENOCD_VERSION "\n");
 
 
        LOG_OUTPUT(OPENOCD_VERSION "\n");