Fixed bogus error message and plugged memory leak for the case when there was no...

git-svn-id: svn://svn.berlios.de/openocd/trunk@728 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/target.c b/src/target/target.c
index 91fdd9ea5f782b799f2018bf013a68e9e24e8c4d..1be4885d031c6c9ec9433e53f3fd125cb20bca79 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -217,6 +217,8 @@ target_t* get_current_target(command_context_t *cmd_ctx)
 
 static void execute_script(struct command_context_s *cmd_ctx, char *reset_script)
 {
+       if (reset_script==NULL)
+               return;
        FILE *script;
        script = open_file_from_path(reset_script, "r");
        if (!script)
@@ -237,7 +239,7 @@ int target_init_handler(struct target_s *target, enum target_event event, void *
 {
        struct command_context_s *cmd_ctx = priv;
        
-       if ((event == TARGET_EVENT_HALTED) && (target->reset_script))
+       if (event == TARGET_EVENT_HALTED)
        {
                target_unregister_event_callback(target_init_handler, priv);