From: Zachary T Welch <zw@superlucidity.net>
Date: Sat, 21 Nov 2009 00:36:32 +0000 (-0800)
Subject: log: improve initialization
X-Git-Tag: v0.4.0-rc1~329
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be482a5335dd35ee1fa163faa0af481b2ec65b70;p=openocd

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 3799fb32..27fa8317 100644
--- 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)
 {
-	start = timeval_ms();
-
 	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)
-	{
 		log_output = stderr;
-	}
 
 	start = last_time = timeval_ms();
-
-	return ERROR_OK;
 }
 
 int set_log_output(struct command_context *cmd_ctx, FILE *output)
diff --git a/src/helper/log.h b/src/helper/log.h
index 6f7c24a8..f2d19d16 100644
--- 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)));
 
-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);
diff --git a/src/openocd.c b/src/openocd.c
index 1f29acdb..629d50ae 100644
--- 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)
 {
+	log_init();
+	LOG_DEBUG("log_init: complete");
+
 	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);
 
-	if (log_init(cmd_ctx) != ERROR_OK)
-	{
-		exit(-1);
-	}
-	LOG_DEBUG("log init complete");
+	LOG_DEBUG("command registration: complete");
 
 	LOG_OUTPUT(OPENOCD_VERSION "\n");