Always send the breakpoint table headers to ui-out. MI/CLI can

internally decide if they should be displayed.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 18dbe7b2c79d57ee76875a719dab7f5bd85a314c..2976b944bdfb7c75e2b0b68701810166b0850515 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26  Andrew Cagney  <ac131313@redhat.com>
+
+       * breakpoint.c (breakpoint_1): Always output the breakpoint
+       headings.  Leave it to ui-out to decide which
+
 2001-06-25  Andrew Cagney  <ac131313@redhat.com>
 
        * stack.c (print_frame): For ui_out, output a list of arguments.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 879a31eb218c0d3689b929b15e97f1429d999bfd..20f7251d3f1d6e30510a5554d6adc2dcff4717c3 100644 (file)
--- 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)
     {