* breakpointc (print_it_typical): Move NULL check from here...

(print_bp_stop_message): ... to here.
This commit is contained in:
Thiago Jung Bauermann
2011-03-04 20:00:34 +00:00
parent 488919c487
commit 1a6a67de74
2 changed files with 11 additions and 7 deletions

View File

@@ -1,3 +1,8 @@
2011-03-04 Thiago Jung Bauermann <bauerman@br.ibm.com>
* breakpointc (print_it_typical): Move NULL check from here...
(print_bp_stop_message): ... to here.
2011-03-04 Michael Snyder <msnyder@msnyder-server.eng.vmware.com>
* breakpoint.c (enable_command): Use break instead of continue,

View File

@@ -3309,11 +3309,6 @@ print_it_typical (bpstat bs)
int bp_temp = 0;
enum print_stop_action result;
/* bs->breakpoint_at can be NULL if it was a momentary breakpoint
which has since been deleted. */
if (bs->breakpoint_at == NULL)
return PRINT_UNKNOWN;
gdb_assert (bs->bp_location_at != NULL);
bl = bs->bp_location_at;
@@ -3519,10 +3514,14 @@ print_bp_stop_message (bpstat bs)
{
struct breakpoint *b = bs->breakpoint_at;
/* bs->breakpoint_at can be NULL if it was a momentary breakpoint
which has since been deleted. */
if (b == NULL)
return PRINT_UNKNOWN;
/* Normal case. Call the breakpoint's print_it method, or
print_it_typical. */
/* FIXME: how breakpoint can ever be NULL here? */
if (b != NULL && b->ops != NULL && b->ops->print_it != NULL)
if (b->ops != NULL && b->ops->print_it != NULL)
return b->ops->print_it (b);
else
return print_it_typical (bs);