Convert dprintf to vtable ops

[binutils-gdb.git] / gdb / p-valprint.c

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 926b0f1aa57c47e9535fd1cfcbd24ae3fe436528..43c286d6472705cd3bfdda9c27a3daaa660faef2 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -228,7 +228,7 @@ pascal_language::value_print_inner (struct value *val,
          /* If 'symbol_print' is set, we did the work above.  */
          if (!options->symbol_print
              && (msymbol.minsym != NULL)
-             && (vt_address == BMSYMBOL_VALUE_ADDRESS (msymbol)))
+             && (vt_address == msymbol.value_address ()))
            {
              if (want_space)
                gdb_puts (" ", stream);
@@ -267,7 +267,7 @@ pascal_language::value_print_inner (struct value *val,
              if (options->prettyformat)
                {
                  gdb_printf (stream, "\n");
-                 print_spaces_filtered (2 + 2 * recurse, stream);
+                 print_spaces (2 + 2 * recurse, stream);
                }
            }
        }
@@ -559,7 +559,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
              if (options->prettyformat)
                {
                  gdb_printf (stream, "\n");
-                 print_spaces_filtered (2 + 2 * recurse, stream);
+                 print_spaces (2 + 2 * recurse, stream);
                  gdb_puts ("members of ", stream);
                  gdb_puts (type->name (), stream);
                  gdb_puts (": ", stream);
@@ -570,7 +570,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
          if (options->prettyformat)
            {
              gdb_printf (stream, "\n");
-             print_spaces_filtered (2 + 2 * recurse, stream);
+             print_spaces (2 + 2 * recurse, stream);
            }
          else
            {
@@ -582,10 +582,10 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
          if (field_is_static (&type->field (i)))
            {
              gdb_puts ("static ", stream);
-             fprintf_symbol_filtered (stream,
-                                      type->field (i).name (),
-                                      current_language->la_language,
-                                      DMGL_PARAMS | DMGL_ANSI);
+             fprintf_symbol (stream,
+                             type->field (i).name (),
+                             current_language->la_language,
+                             DMGL_PARAMS | DMGL_ANSI);
            }
          else
            fputs_styled (type->field (i).name (),
@@ -671,7 +671,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
       if (options->prettyformat)
        {
          gdb_printf (stream, "\n");
-         print_spaces_filtered (2 * recurse, stream);
+         print_spaces (2 * recurse, stream);
        }
     }
   gdb_printf (stream, "}");
@@ -762,7 +762,7 @@ pascal_object_print_value (struct value *val, struct ui_file *stream,
       if (options->prettyformat)
        {
          gdb_printf (stream, "\n");
-         print_spaces_filtered (2 * recurse, stream);
+         print_spaces (2 * recurse, stream);
        }
       gdb_puts ("<", stream);
       /* Not sure what the best notation is in the case where there is no