diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3fa899d..a5fcbfb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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 to ... * infcmd.c (error_is_running, ensure_not_running): ... here. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 57d4434..b1bb8ed 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -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) { |