From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Mon, 30 Nov 2009 08:13:56 +0000 (+0100)
Subject: main: invoke jtag_interface_quit() explicitly
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=51e9b25c9ae3478989940f925a36d78364d88764;p=fw%2Fopenocd

main: invoke jtag_interface_quit() explicitly

There is no particular reason to invoke jtag_interface_quit()
on the atexit() handler, it just makes the code more obtuse
and stops other legitimate usage of atexit().

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/openocd.c b/src/openocd.c
index 1be209ad6..22d45828d 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -60,10 +60,6 @@ COMMAND_HANDLER(handle_version_command)
 	return ERROR_OK;
 }
 
-static void exit_handler(void)
-{
-	jtag_interface_quit();
-}
 
 static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
@@ -115,8 +111,6 @@ COMMAND_HANDLER(handle_init_command)
 
 	initialized = 1;
 
-	atexit(exit_handler);
-
 	command_context_mode(CMD_CTX, COMMAND_EXEC);
 
 	if (target_init(CMD_CTX) != ERROR_OK)
@@ -303,5 +297,7 @@ int openocd_main(int argc, char *argv[])
 	/* free commandline interface */
 	command_done(cmd_ctx);
 
+	jtag_interface_quit();
+
 	return ret;
 }