Class-ify ui_out

[deliverable/binutils-gdb.git] / gdb / probe.c

diff --git a/gdb/probe.c b/gdb/probe.c
index 611a7522981a37640c42ce241a808e79d6bd8ac4..e3bc915ba7d7a784ae32dc07d4db112ba9f42cfd 100644 (file)
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -438,8 +438,8 @@ gen_ui_out_table_header_info (VEC (bound_probe_s) *probes,
          do_cleanups (c2);
        }
 
-      ui_out_table_header (current_uiout, size_max, ui_left,
-                          column->field_name, column->print_name);
+      current_uiout->table_header (size_max, ui_left,
+                                  column->field_name, column->print_name);
     }
 
   do_cleanups (c);
@@ -465,7 +465,7 @@ print_ui_out_not_applicables (const struct probe_ops *pops)
   for (ix = 0;
        VEC_iterate (info_probe_column_s, headings, ix, column);
        ++ix)
-    ui_out_field_string (current_uiout, column->field_name, _("n/a"));
+    current_uiout->field_string (column->field_name, _("n/a"));
 
   do_cleanups (c);
 }
@@ -511,9 +511,9 @@ print_ui_out_info (struct probe *probe)
       const char *val = VEC_index (const_char_ptr, values, j++);
 
       if (val == NULL)
-       ui_out_field_skip (current_uiout, column->field_name);
+       current_uiout->field_skip (column->field_name);
       else
-       ui_out_field_string (current_uiout, column->field_name, val);
+       current_uiout->field_string (column->field_name, val);
     }
 
   do_cleanups (c);
@@ -652,11 +652,11 @@ info_probes_for_ops (const char *arg, int from_tty,
                               size_objname);
     }
 
-  ui_out_table_header (current_uiout, size_type, ui_left, "type", _("Type"));
-  ui_out_table_header (current_uiout, size_provider, ui_left, "provider",
-                      _("Provider"));
-  ui_out_table_header (current_uiout, size_name, ui_left, "name", _("Name"));
-  ui_out_table_header (current_uiout, size_addr, ui_left, "addr", _("Where"));
+  current_uiout->table_header (size_type, ui_left, "type", _("Type"));
+  current_uiout->table_header (size_provider, ui_left, "provider",
+                              _("Provider"));
+  current_uiout->table_header (size_name, ui_left, "name", _("Name"));
+  current_uiout->table_header (size_addr, ui_left, "addr", _("Where"));
 
   if (pops == NULL)
     {
@@ -673,9 +673,8 @@ info_probes_for_ops (const char *arg, int from_tty,
   else
     gen_ui_out_table_header_info (probes, pops);
 
-  ui_out_table_header (current_uiout, size_objname, ui_left, "object",
-                      _("Object"));
-  ui_out_table_body (current_uiout);
+  current_uiout->table_header (size_objname, ui_left, "object", _("Object"));
+  current_uiout->table_body ();
 
   for (i = 0; VEC_iterate (bound_probe_s, probes, i, probe); ++i)
     {
@@ -684,12 +683,12 @@ info_probes_for_ops (const char *arg, int from_tty,
 
       inner = make_cleanup_ui_out_tuple_begin_end (current_uiout, "probe");
 
-      ui_out_field_string (current_uiout, "type",probe_type);
-      ui_out_field_string (current_uiout, "provider", probe->probe->provider);
-      ui_out_field_string (current_uiout, "name", probe->probe->name);
-      ui_out_field_core_addr (current_uiout, "addr",
-                             probe->probe->arch,
-                             get_probe_address (probe->probe, probe->objfile));
+      current_uiout->field_string ("type",probe_type);
+      current_uiout->field_string ("provider", probe->probe->provider);
+      current_uiout->field_string ("name", probe->probe->name);
+      current_uiout->field_core_addr (
+       "addr", probe->probe->arch,
+       get_probe_address (probe->probe, probe->objfile));
 
       if (pops == NULL)
        {
@@ -706,9 +705,9 @@ info_probes_for_ops (const char *arg, int from_tty,
       else
        print_ui_out_info (probe->probe);
 
-      ui_out_field_string (current_uiout, "object",
+      current_uiout->field_string ("object",
                           objfile_name (probe->objfile));
-      ui_out_text (current_uiout, "\n");
+      current_uiout->text ("\n");
 
       do_cleanups (inner);
     }
@@ -717,7 +716,7 @@ info_probes_for_ops (const char *arg, int from_tty,
   do_cleanups (cleanup);
 
   if (!any_found)
-    ui_out_message (current_uiout, _("No probes matched.\n"));
+    current_uiout->message (_("No probes matched.\n"));
 }
 
 /* Implementation of the `info probes' command.  */
@@ -747,7 +746,7 @@ enable_probes_command (char *arg, int from_tty)
   probes = collect_probes (objname, provider, probe_name, NULL);
   if (VEC_empty (bound_probe_s, probes))
     {
-      ui_out_message (current_uiout, _("No probes matched.\n"));
+      current_uiout->message (_("No probes matched.\n"));
       do_cleanups (cleanup);
       return;
     }
@@ -761,14 +760,12 @@ enable_probes_command (char *arg, int from_tty)
       if (pops->enable_probe != NULL)
        {
          pops->enable_probe (probe->probe);
-         ui_out_message (current_uiout,
-                         _("Probe %s:%s enabled.\n"),
-                         probe->probe->provider, probe->probe->name);
+         current_uiout->message (_("Probe %s:%s enabled.\n"),
+                                 probe->probe->provider, probe->probe->name);
        }
       else
-       ui_out_message (current_uiout,
-                       _("Probe %s:%s cannot be enabled.\n"),
-                       probe->probe->provider, probe->probe->name);
+       current_uiout->message (_("Probe %s:%s cannot be enabled.\n"),
+                               probe->probe->provider, probe->probe->name);
     }
 
   do_cleanups (cleanup);
@@ -793,7 +790,7 @@ disable_probes_command (char *arg, int from_tty)
   probes = collect_probes (objname, provider, probe_name, NULL /* pops */);
   if (VEC_empty (bound_probe_s, probes))
     {
-      ui_out_message (current_uiout, _("No probes matched.\n"));
+      current_uiout->message (_("No probes matched.\n"));
       do_cleanups (cleanup);
       return;
     }
@@ -807,14 +804,12 @@ disable_probes_command (char *arg, int from_tty)
       if (pops->disable_probe != NULL)
        {
          pops->disable_probe (probe->probe);
-         ui_out_message (current_uiout,
-                         _("Probe %s:%s disabled.\n"),
-                         probe->probe->provider, probe->probe->name);
+         current_uiout->message (_("Probe %s:%s disabled.\n"),
+                                 probe->probe->provider, probe->probe->name);
        }
       else
-       ui_out_message (current_uiout,
-                       _("Probe %s:%s cannot be disabled.\n"),
-                       probe->probe->provider, probe->probe->name);
+       current_uiout->message (_("Probe %s:%s cannot be disabled.\n"),
+                               probe->probe->provider, probe->probe->name);
     }
 
   do_cleanups (cleanup);