summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2009-11-30 09:13:56 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2009-12-01 07:51:26 +0100
commit51e9b25c9ae3478989940f925a36d78364d88764 (patch)
treef9f0e5835a57a27250b98e239e994e51f898e47b /src
parent330733eadf76ea87ee8714ed7958f174b1be21db (diff)
downloadopenocd+libswd-51e9b25c9ae3478989940f925a36d78364d88764.tar.gz
openocd+libswd-51e9b25c9ae3478989940f925a36d78364d88764.tar.bz2
openocd+libswd-51e9b25c9ae3478989940f925a36d78364d88764.tar.xz
openocd+libswd-51e9b25c9ae3478989940f925a36d78364d88764.zip
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>
Diffstat (limited to 'src')
-rw-r--r--src/openocd.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/openocd.c b/src/openocd.c
index 1be209ad..22d45828 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;
}