* 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.
This commit is contained in:
Keith Seitz
2012-07-18 19:30:20 +00:00
parent eab402dfcc
commit ed1d1739a1
2 changed files with 14 additions and 7 deletions

View File

@ -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> 2012-07-18 Pedro Alves <palves@redhat.com>
* infrun.c (handle_inferior_event) <TARGET_WAITKIND_NO_HISTORY>: * infrun.c (handle_inferior_event) <TARGET_WAITKIND_NO_HISTORY>:

View File

@ -9245,6 +9245,9 @@ find_condition_and_thread (char *tok, CORE_ADDR pc,
{ {
*cond_string = NULL; *cond_string = NULL;
*thread = -1; *thread = -1;
*task = 0;
*rest = NULL;
while (tok && *tok) while (tok && *tok)
{ {
char *end_tok; char *end_tok;
@ -9495,9 +9498,7 @@ create_breakpoint (struct gdbarch *gdbarch,
from thread number, so parsing in context of first from thread number, so parsing in context of first
sal is OK. When setting the breakpoint we'll sal is OK. When setting the breakpoint we'll
re-parse it in context of each sal. */ 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, find_condition_and_thread (arg, lsal->sals.sals[0].pc, &cond_string,
&thread, &task, &rest); &thread, &task, &rest);
if (cond_string) 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]); resolve_sal_pc (&sals.sals[i]);
if (b->condition_not_parsed && s && s[0]) if (b->condition_not_parsed && s && s[0])
{ {
char *cond_string = 0; char *cond_string, *extra_string;
int thread = -1; int thread, task;
int task = 0;
char *extra_string = NULL;
find_condition_and_thread (s, sals.sals[0].pc, find_condition_and_thread (s, sals.sals[0].pc,
&cond_string, &thread, &task, &cond_string, &thread, &task,