From d7faa9e713540e28182dcc3d08cfd6ff7c6dd4b6 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 27 Jun 2001 00:09:01 +0000 Subject: [PATCH] Always send the breakpoint table headers to ui-out. MI/CLI can internally decide if they should be displayed. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 39 ++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18dbe7b2c79..2976b944bdf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2001-06-26 Andrew Cagney + + * breakpoint.c (breakpoint_1): Always output the breakpoint + headings. Leave it to ui-out to decide which + 2001-06-25 Andrew Cagney * stack.c (print_frame): For ui_out, output a list of arguments. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 879a31eb218..20f7251d3f1 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3598,29 +3598,34 @@ breakpoint_1 (int bnum, int allflag) #ifdef UI_OUT if (nr_printable_breakpoints > 0) - { - annotate_breakpoints_headers (); - annotate_field (0); - ui_out_table_header (uiout, 3, ui_left, "number", "Num"); /* 1 */ - annotate_field (1); - ui_out_table_header (uiout, 14, ui_left, "type", "Type"); /* 2 */ - annotate_field (2); - ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ - annotate_field (3); - ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ - if (addressprint) + annotate_breakpoints_headers (); + if (nr_printable_breakpoints > 0) + annotate_field (0); + ui_out_table_header (uiout, 3, ui_left, "number", "Num"); /* 1 */ + if (nr_printable_breakpoints > 0) + annotate_field (1); + ui_out_table_header (uiout, 14, ui_left, "type", "Type"); /* 2 */ + if (nr_printable_breakpoints > 0) + annotate_field (2); + ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ + if (nr_printable_breakpoints > 0) + annotate_field (3); + ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ + if (addressprint) { - annotate_field (4); + if (nr_printable_breakpoints > 0) + annotate_field (4); if (TARGET_ADDR_BIT <= 32) ui_out_table_header (uiout, 10, ui_left, "addr", "Address");/* 5 */ else ui_out_table_header (uiout, 18, ui_left, "addr", "Address");/* 5 */ } - annotate_field (5); - ui_out_table_header (uiout, 40, ui_noalign, "what", "What"); /* 6 */ - ui_out_table_body (uiout); - annotate_breakpoints_table (); - } + if (nr_printable_breakpoints > 0) + annotate_field (5); + ui_out_table_header (uiout, 40, ui_noalign, "what", "What"); /* 6 */ + ui_out_table_body (uiout); + if (nr_printable_breakpoints > 0) + annotate_breakpoints_table (); #else if (nr_printable_breakpoints > 0) { -- 2.30.2