]> git.sur5r.net Git - openocd/commitdiff
warnings: null pointer check fix
authorØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 31 Oct 2011 20:21:35 +0000 (21:21 +0100)
committerSpencer Oliver <spen@spen-soft.co.uk>
Mon, 31 Oct 2011 20:43:36 +0000 (20:43 +0000)
rewrite broken null pointer check code by reducing scope
of variable.

Change-Id: I8254f6849b187e5c9cd083053cdc11973c6fe339
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/142
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/target/target_request.c

index 3cdca5e189c4a93159d8691cb25b4e057cc6522a..1fedfb222dd27e35eafb19db345f2645a432e0fd 100644 (file)
@@ -194,11 +194,9 @@ static int add_debug_msg_receiver(struct command_context *cmd_ctx, struct target
 static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target)
 {
        int do_all_targets = 0;
 static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context *cmd_ctx, struct target *target)
 {
        int do_all_targets = 0;
-       struct debug_msg_receiver **p = &target->dbgmsg;
 
        /* if no target has been specified search all of them */
 
        /* if no target has been specified search all of them */
-       if (target == NULL)
-       {
+       if (target == NULL) {
                /* if no targets haven been specified */
                if (all_targets == NULL)
                        return NULL;
                /* if no targets haven been specified */
                if (all_targets == NULL)
                        return NULL;
@@ -207,8 +205,9 @@ static struct debug_msg_receiver* find_debug_msg_receiver(struct command_context
                do_all_targets = 1;
        }
 
                do_all_targets = 1;
        }
 
-       do
-       {
+       /* so we target != null */
+       struct debug_msg_receiver **p = &target->dbgmsg;
+       do {
                while (*p)
                {
                        if ((*p)->cmd_ctx == cmd_ctx)
                while (*p)
                {
                        if ((*p)->cmd_ctx == cmd_ctx)