2012-11-30  Yao Qi  <yao@codesourcery.com>

	* breakpoint.c (print_one_breakpoint_location): Combine two
	blocks handling 'hit count' together.
This commit is contained in:
Yao Qi 2012-11-30 14:46:39 +00:00
parent 3d3fef6beb
commit 556ec64d8c
2 changed files with 13 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2012-11-30 Yao Qi <yao@codesourcery.com>
* breakpoint.c (print_one_breakpoint_location): Combine two
blocks handling 'hit count' together.
2012-11-30 Yao Qi <yao@codesourcery.com>
* infrun.c (error_is_running, ensure_not_running): Move them

View File

@ -6026,7 +6026,9 @@ print_one_breakpoint_location (struct breakpoint *b,
ui_out_text (uiout, "\n");
}
if (!part_of_multiple && b->hit_count)
if (!part_of_multiple)
{
if (b->hit_count)
{
/* FIXME should make an annotation for this. */
if (is_catchpoint (b))
@ -6042,12 +6044,13 @@ print_one_breakpoint_location (struct breakpoint *b,
else
ui_out_text (uiout, " times\n");
}
/* Output the count also if it is zero, but only if this is mi.
FIXME: Should have a better test for this. */
else
{
/* Output the count also if it is zero, but only if this is mi. */
if (ui_out_is_mi_like_p (uiout))
if (!part_of_multiple && b->hit_count == 0)
ui_out_field_int (uiout, "times", b->hit_count);
}
}
if (!part_of_multiple && b->ignore_count)
{