* breakpoint.c (find_condition_and_thread): Initialize

	TASK and REST.
	(create_breakpiont): find_condition_and_thread will now
	initialize COND_STRING, THREAD, and REST (and TASK).
	(addr_string_to_sals): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0f15a845d57c1b3dd49bfcf45ebeb636920e0231..b77ae350f7b6a4e48825edf67e7b41a130dfa9c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-18  Keith Seitz  <keiths@redhat.com>
+
+       * breakpoint.c (find_condition_and_thread): Initialize
+       TASK and REST.
+       (create_breakpiont): find_condition_and_thread will now
+       initialize COND_STRING, THREAD, and REST (and TASK).
+       (addr_string_to_sals): Likewise.
+
 2012-07-18  Pedro Alves  <palves@redhat.com>
 
        * infrun.c (handle_inferior_event) <TARGET_WAITKIND_NO_HISTORY>:

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 6b9faf33e0c1d74eb15b1ddcb8fc86daa6b681fa..665a18de78719bc5cdd2ffffe8fdd83d72787bb4 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9245,6 +9245,9 @@ find_condition_and_thread (char *tok, CORE_ADDR pc,
 {
   *cond_string = NULL;
   *thread = -1;
+  *task = 0;
+  *rest = NULL;
+
   while (tok && *tok)
     {
       char *end_tok;
@@ -9495,9 +9498,7 @@ create_breakpoint (struct gdbarch *gdbarch,
                from thread number, so parsing in context of first
                sal is OK.  When setting the breakpoint we'll 
                re-parse it in context of each sal.  */
-            cond_string = NULL;
-            thread = -1;
-           rest = NULL;
+
             find_condition_and_thread (arg, lsal->sals.sals[0].pc, &cond_string,
                                        &thread, &task, &rest);
             if (cond_string)
@@ -14009,10 +14010,8 @@ addr_string_to_sals (struct breakpoint *b, char *addr_string, int *found)
        resolve_sal_pc (&sals.sals[i]);
       if (b->condition_not_parsed && s && s[0])
        {
-         char *cond_string = 0;
-         int thread = -1;
-         int task = 0;
-         char *extra_string = NULL;
+         char *cond_string, *extra_string;
+         int thread, task;
 
          find_condition_and_thread (s, sals.sals[0].pc,
                                     &cond_string, &thread, &task,