Always call the wrap_here method

This changes all existing calls to wrap_here to call the method on the
appropriate ui_file instead.  The choice of ui_file is determined by
context.

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index c6a3867d53fc96ccf0641c217bcae29986a1b6ab..5f225ffb6337b15f62609883d9395d3920a19a3a 100644 (file)
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -317,7 +317,7 @@ print_enum_type (struct type *type, struct ui_file *stream)
   LONGEST lastval;
 
   fprintf_filtered (stream, "(");
-  wrap_here (1);
+  stream->wrap_here (1);
 
   lastval = 0;
   for (i = 0; i < len; i++)
@@ -325,7 +325,7 @@ print_enum_type (struct type *type, struct ui_file *stream)
       QUIT;
       if (i)
        fprintf_filtered (stream, ", ");
-      wrap_here (4);
+      stream->wrap_here (4);
       fputs_styled (ada_enum_name (type->field (i).name ()),
                    variable_name_style.style (), stream);
       if (lastval != type->field (i).loc_enumval ())
@@ -416,7 +416,7 @@ print_array_type (struct type *type, struct ui_file *stream, int show,
 
   elt_type = ada_array_element_type (type, n_indices);
   fprintf_filtered (stream, ") of ");
-  wrap_here (0);
+  stream->wrap_here (0);
   ada_print_type (elt_type, "", stream, show == 0 ? 0 : show - 1, level + 1,
                  flags);
   /* Arrays with variable-length elements are never bit-packed in practice but
@@ -892,7 +892,7 @@ print_func_type (struct type *type, struct ui_file *stream, const char *name,
          if (i > 0)
            {
              fputs_filtered ("; ", stream);
-             wrap_here (4);
+             stream->wrap_here (4);
            }
          fprintf_filtered (stream, "a%d: ", i + 1);
          ada_print_type (type->field (i).type (), "", stream, -1, 0,

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 352568d80459865595c29229c690b2f264e2ae20..adab6b42f5b8048ae32f744b9a74c705524b070f 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -178,7 +178,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 + 2 * recurse, stream);
        }
-      wrap_here (2 + 2 * recurse);
+      stream->wrap_here (2 + 2 * recurse);
       maybe_print_array_index (index_type, i + low, stream, options);
 
       i0 = i;
@@ -235,7 +235,7 @@ val_print_packed_array_elements (struct type *type, const gdb_byte *valaddr,
                    {
                      fprintf_filtered (stream, ", ");
                    }
-                 wrap_here (2 + 2 * recurse);
+                 stream->wrap_here (2 + 2 * recurse);
                  maybe_print_array_index (index_type, j + low,
                                           stream, options);
                }
@@ -614,7 +614,7 @@ print_field_values (struct value *value, struct value *outer_value,
        }
       else
        {
-         wrap_here (2 + 2 * recurse);
+         stream->wrap_here (2 + 2 * recurse);
        }
 
       annotate_field_begin (type->field (i).type ());

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index d20b71124aeac768fa6168a17b3a5a79d190af53..a24ada66434a4bc2cae9f24a5bba9404923ac3d4 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -250,7 +250,7 @@ cp_type_print_derivation_info (struct ui_file *stream,
 
   for (i = 0; i < TYPE_N_BASECLASSES (type); i++)
     {
-      wrap_here (8);
+      stream->wrap_here (8);
       fputs_filtered (i == 0 ? ": " : ", ", stream);
       fprintf_filtered (stream, "%s%s ",
                        BASETYPE_VIA_PUBLIC (type, i)
@@ -310,7 +310,7 @@ cp_type_print_method_args (struct type *mtype, const char *prefix,
          else if (i < nargs)
            {
              fprintf_filtered (stream, ", ");
-             wrap_here (8);
+             stream->wrap_here (8);
            }
        }
     }
@@ -573,7 +573,7 @@ c_type_print_args (struct type *type, struct ui_file *stream,
       if (printed_any)
        {
          fprintf_filtered (stream, ", ");
-         wrap_here (4);
+         stream->wrap_here (4);
        }
 
       param_type = type->field (i).type ();
@@ -602,7 +602,7 @@ c_type_print_args (struct type *type, struct ui_file *stream,
       if (printed_any && type->has_varargs ())
        {
          fprintf_filtered (stream, ", ");
-         wrap_here (4);
+         stream->wrap_here (4);
          fprintf_filtered (stream, "...");
        }
     }
@@ -888,14 +888,14 @@ c_type_print_template_args (const struct type_print_options *flags,
 
       if (first)
        {
-         wrap_here (4);
+         stream->wrap_here (4);
          fprintf_filtered (stream, _("[with %s = "), sym->linkage_name ());
          first = 0;
        }
       else
        {
          fputs_filtered (", ", stream);
-         wrap_here (9);
+         stream->wrap_here (9);
          fprintf_filtered (stream, "%s = ", sym->linkage_name ());
        }
 
@@ -1559,7 +1559,7 @@ c_type_print_base_1 (struct type *type, struct ui_file *stream,
            fputs_filtered (" ", stream);
        }
 
-      wrap_here (4);
+      stream->wrap_here (4);
       if (show < 0)
        {
          /* If we just printed a tag name, no need to print anything
@@ -1594,7 +1594,7 @@ c_type_print_base_1 (struct type *type, struct ui_file *stream,
              QUIT;
              if (i)
                fprintf_filtered (stream, ", ");
-             wrap_here (4);
+             stream->wrap_here (4);
              fputs_styled (type->field (i).name (),
                            variable_name_style.style (), stream);
              if (lastval != type->field (i).loc_enumval ())

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 943d4db94de9764505ee0c46ef9d12de4cbebe91..2f5ce3e5fff25bdd04895e57a7050fa94c71e8d0 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -841,7 +841,7 @@ echo_command (const char *text, int from_tty)
   reset_terminal_style (gdb_stdout);
 
   /* Force this output to appear now.  */
-  wrap_here (0);
+  gdb_stdout->wrap_here (0);
   gdb_flush (gdb_stdout);
 }
 

diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index 24c80dc7bd50fd29b84aa9cfe62af16c5bfdc08b..14422e098d43b6a26f708885aaaa621616877ed7 100644 (file)
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1414,7 +1414,7 @@ fput_command_names_styled (const cmd_list_element &c,
        continue;
 
       fputs_filtered (", ", stream);
-      wrap_here (3);
+      stream->wrap_here (3);
       fput_command_name_styled (alias, stream);
     }
 
@@ -1651,7 +1651,7 @@ help_list (struct cmd_list_element *list, const char *cmdtype,
       fprintf_filtered (stream, "\n\
 Type \"help%s\" followed by a class name for a list of commands in ",
                        cmdtype1);
-      wrap_here (0);
+      stream->wrap_here (0);
       fprintf_filtered (stream, "that class.");
 
       fprintf_filtered (stream, "\n\
@@ -1660,16 +1660,16 @@ Type \"help all\" for the list of all commands.");
 
   fprintf_filtered (stream, "\nType \"help%s\" followed by %scommand name ",
                    cmdtype1, cmdtype2);
-  wrap_here (0);
+  stream->wrap_here (0);
   fputs_filtered ("for ", stream);
-  wrap_here (0);
+  stream->wrap_here (0);
   fputs_filtered ("full ", stream);
-  wrap_here (0);
+  stream->wrap_here (0);
   fputs_filtered ("documentation.\n", stream);
   fputs_filtered ("Type \"apropos word\" to search "
                  "for commands related to \"word\".\n", stream);
   fputs_filtered ("Type \"apropos -v word\" for full documentation", stream);
-  wrap_here (0);
+  stream->wrap_here (0);
   fputs_filtered (" of commands related to \"word\".\n", stream);
   fputs_filtered ("Command name abbreviations are allowed if unambiguous.\n",
                  stream);

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 3b0e1df7a1fe9aafe3d0136f8f354d3870222aa7..8e2b631c8395f5592c24151b52319d47d158290e 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -222,7 +222,7 @@ cp_print_value_fields (struct value *val, struct ui_file *stream,
            }
          else
            {
-             wrap_here (2 + 2 * recurse);
+             stream->wrap_here (2 + 2 * recurse);
            }
 
          annotate_field_begin (type->field (i).type ());

diff --git a/gdb/disasm.c b/gdb/disasm.c
index 46aa995a9d5924e99538c629691d633f58e82d30..3000e5dddad98d9de58b42bd35167bec5f20cdc1 100644 (file)
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -1118,7 +1118,7 @@ The following disassembler options are supported for use with the\n\
            fprintf_filtered (file, "%s", valid_options->arg[i]->name);
          if (valid_options->name[i + 1] != NULL)
            fprintf_filtered (file, ", ");
-         wrap_here (2);
+         file->wrap_here (2);
        }
       fprintf_filtered (file, "\n");
     }
@@ -1136,7 +1136,7 @@ The following disassembler options are supported for use with the\n\
          for (j = 0; valid_args[i].values[j] != NULL; j++)
            {
              fprintf_filtered (file, " %s", valid_args[i].values[j]);
-             wrap_here (3);
+             file->wrap_here (3);
            }
          fprintf_filtered (file, "\n");
        }

diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 404cd4c403854c7ef36d64d3d5faf6de3d840c3b..16e26d5e4b100c79b72df2ec45ef0bf8f87c5464 100644 (file)
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -52,7 +52,7 @@ print_flush (void)
 
   /* 1.  The _filtered buffer.  */
   if (filtered_printing_initialized ())
-    wrap_here (0);
+    gdb_stdout->wrap_here (0);
 
   /* 2.  The stdio buffer.  */
   gdb_flush (gdb_stdout);

diff --git a/gdb/exec.c b/gdb/exec.c
index c4161b58e733f2f0637fda1655532de7a5884116..43ecb730a6559bfd91ae06d38e2336e7dfabe7ce 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -909,7 +909,7 @@ print_section_info (const target_section_table *t, bfd *abfd)
   printf_filtered ("\t`%ps', ",
                   styled_string (file_name_style.style (),
                                  bfd_get_filename (abfd)));
-  wrap_here (8);
+  gdb_stdout->wrap_here (8);
   printf_filtered (_("file type %s.\n"), bfd_get_target (abfd));
   if (abfd == current_program_space->exec_bfd ())
     {

diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 3e419a74a9fce79c2d8ce841b55956ea4ab9817c..6fd3d519c86b5541686af4d04483e43e8fd06d3f 100644 (file)
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -250,7 +250,7 @@ f_language::f_type_print_varspec_suffix (struct type *type,
              if (i > 0)
                {
                  fputs_filtered (", ", stream);
-                 wrap_here (4);
+                 stream->wrap_here (4);
                }
              print_type (type->field (i).type (), "", stream, -1, 0, 0);
            }
@@ -290,7 +290,7 @@ f_language::f_type_print_base (struct type *type, struct ui_file *stream,
 
   QUIT;
 
-  wrap_here (4);
+  stream->wrap_here (4);
   if (type == NULL)
     {
       fputs_styled ("<type unknown>", metadata_style.style (), stream);

diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c
index 814a7e7a4bc37cde686677d4514b31b5dd3f7239..c64e834693805dbf3e30e9c00d581a69ad143fd8 100644 (file)
--- a/gdb/guile/scm-pretty-print.c
+++ b/gdb/guile/scm-pretty-print.c
@@ -861,7 +861,7 @@ ppscm_print_children (SCM printer, enum display_hint hint,
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
          else
-           wrap_here (2 + 2 *recurse);
+           stream->wrap_here (2 + 2 *recurse);
        }
 
       if (is_map && i % 2 == 0)

diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index cbb6b545d4f7ce41f8e9dfa6c0e83c91270fcbd7..f3685f75b72321d77745fdfb66a5a473414caf39 100644 (file)
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -79,7 +79,7 @@ m2_print_type (struct type *type, const char *varstring,
 
   QUIT;
 
-  wrap_here (4);
+  stream->wrap_here (4);
   if (type == NULL)
     {
       fputs_styled (_("<type unknown>"), metadata_style.style (), stream);
@@ -292,7 +292,7 @@ m2_procedure (struct type *type, struct ui_file *stream,
          if (i > 0)
            {
              fputs_filtered (", ", stream);
-             wrap_here (4);
+             stream->wrap_here (4);
            }
          m2_print_type (type->field (i).type (), "", stream, -1, 0, flags);
        }
@@ -539,7 +539,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
            fprintf_filtered (stream, " = ");
        }
     }
-  wrap_here (4);
+  stream->wrap_here (4);
   if (show < 0)
     {
       if (type->code () == TYPE_CODE_STRUCT)
@@ -608,7 +608,7 @@ m2_enum (struct type *type, struct ui_file *stream, int show, int level)
          QUIT;
          if (i > 0)
            fprintf_filtered (stream, ", ");
-         wrap_here (4);
+         stream->wrap_here (4);
          fputs_styled (type->field (i).name (),
                        variable_name_style.style (), stream);
          if (lastval != type->field (i).loc_enumval ())

diff --git a/gdb/main.c b/gdb/main.c
index 6b312f85f2bf2fda5f46617aec10a5e92f18e3fa..8f944d86545068dd5dfaa7bf8d4f7e9abde7b9ef 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1121,7 +1121,7 @@ captured_main_1 (struct captured_main_args *context)
   if (print_version)
     {
       print_gdb_version (gdb_stdout, false);
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       printf_filtered ("\n");
       exit (0);
     }
@@ -1135,7 +1135,7 @@ captured_main_1 (struct captured_main_args *context)
   if (print_configuration)
     {
       print_gdb_configuration (gdb_stdout);
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       printf_filtered ("\n");
       exit (0);
     }
@@ -1151,7 +1151,7 @@ captured_main_1 (struct captured_main_args *context)
       print_gdb_version (gdb_stdout, true);
       if (symarg)
        printf_filtered ("..");
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       printf_filtered ("\n");
       gdb_flush (gdb_stdout);  /* Force to screen during slow
                                   operations.  */
@@ -1172,7 +1172,7 @@ captured_main_1 (struct captured_main_args *context)
       print_gdb_version (gdb_stdout, true);
       if (symarg)
        printf_filtered ("..");
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       printf_filtered ("\n");
       gdb_flush (gdb_stdout);  /* Force to screen during slow
                                   operations.  */

diff --git a/gdb/maint.c b/gdb/maint.c
index 49e62292324e21824f59853c4b09a726f5f84ef4..189b14643a82135cbf6c58f9beaba1a57ec97106 100644 (file)
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -364,9 +364,9 @@ maint_print_all_sections (const char *header, bfd *abfd, objfile *objfile,
                          const char *arg)
 {
   puts_filtered (header);
-  wrap_here (8);
+  gdb_stdout->wrap_here (8);
   printf_filtered ("`%s', ", bfd_get_filename (abfd));
-  wrap_here (8);
+  gdb_stdout->wrap_here (8);
   printf_filtered (_("file type %s.\n"), bfd_get_target (abfd));
 
   int section_count = gdb_bfd_count_sections (abfd);

diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index a105d297bc40b8cc3a30a165e680bb8ac4c98035..18c9ab9facb095353695810f4c0141949a13fdd0 100644 (file)
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -287,7 +287,7 @@ pascal_language::print_func_args (struct type *type, struct ui_file *stream,
       if (i > 0)
        {
          fputs_filtered (", ", stream);
-         wrap_here (4);
+         stream->wrap_here (4);
        }
       /*  Can we find if it is a var parameter ??
          if ( TYPE_FIELD(type, i) == )
@@ -419,7 +419,7 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
   section_type;
 
   QUIT;
-  wrap_here (4);
+  stream->wrap_here (4);
   if (type == NULL)
     {
       fputs_styled ("<type unknown>", metadata_style.style (), stream);
@@ -487,7 +487,7 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
       fprintf_filtered (stream, "case <?> of ");
 
     struct_union:
-      wrap_here (4);
+      stream->wrap_here (4);
       if (show < 0)
        {
          /* If we just printed a tag name, no need to print anything else.  */
@@ -692,7 +692,7 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
       /* enum is just defined by
         type enume_name = (enum_member1,enum_member2,...)  */
       fprintf_filtered (stream, " = ");
-      wrap_here (4);
+      stream->wrap_here (4);
       if (show < 0)
        {
          /* If we just printed a tag name, no need to print anything else.  */
@@ -709,7 +709,7 @@ pascal_language::type_print_base (struct type *type, struct ui_file *stream, int
              QUIT;
              if (i)
                fprintf_filtered (stream, ", ");
-             wrap_here (4);
+             stream->wrap_here (4);
              fputs_filtered (type->field (i).name (), stream);
              if (lastval != type->field (i).loc_enumval ())
                {

diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 2019a1d40df120d59b1bf74ec34484483e03f3f1..635d7ed5e4de28d1b45d37c75d6398a6ce2f4a56 100644 (file)
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -574,7 +574,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
            }
          else
            {
-             wrap_here (2 + 2 * recurse);
+             stream->wrap_here (2 + 2 * recurse);
            }
 
          annotate_field_begin (type->field (i).type ());

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index e1444ac1c83caaa1c462c160ebdca25713ea6269..ab87310965df718d36b46224559a2c40504be575 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -317,7 +317,7 @@ print_formatted (struct value *val, int size,
 
        case 'i':
          /* We often wrap here if there are long symbolic names.  */
-         wrap_here (4);
+         stream->wrap_here (4);
          next_address = (value_address (val)
                          + gdb_print_insn (type->arch (),
                                            value_address (val), stream,
@@ -826,7 +826,7 @@ find_instruction_backward (struct gdbarch *gdbarch, CORE_ADDR addr,
             is calculated after the loop.  */
          printf_filtered (_("No line number information available "
                             "for address "));
-         wrap_here (2);
+         gdb_stdout->wrap_here (2);
          print_address (gdbarch, loop_start - 1, gdb_stdout);
          printf_filtered ("\n");
          break;
@@ -1498,7 +1498,7 @@ output_command (const char *exp, int from_tty)
 
   annotate_value_end ();
 
-  wrap_here (0);
+  gdb_stdout->wrap_here (0);
   gdb_flush (gdb_stdout);
 }
 
@@ -2895,7 +2895,7 @@ printf_command (const char *arg, int from_tty)
 {
   ui_printf (arg, gdb_stdout);
   reset_terminal_style (gdb_stdout);
-  wrap_here (0);
+  gdb_stdout->wrap_here (0);
   gdb_stdout->flush ();
 }
 

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 11063bd597510fa35dbb08d6fe9ff41ddedde61c..ce077c67cbbe1ad008f96a87def0d936776512d5 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1422,11 +1422,11 @@ partial_symtab::expand_dependencies (struct objfile *objfile)
          if (info_verbose)
            {
              puts_filtered (" ");
-             wrap_here (0);
+             gdb_stdout->wrap_here (0);
              puts_filtered ("and ");
-             wrap_here (0);
+             gdb_stdout->wrap_here (0);
              printf_filtered ("%s...", dependencies[i]->filename);
-             wrap_here (0);    /* Flush output */
+             gdb_stdout->wrap_here (0);        /* Flush output */
              gdb_flush (gdb_stdout);
            }
          dependencies[i]->expand_psymtab (objfile);
@@ -1679,14 +1679,14 @@ maintenance_info_psymtabs (const char *regexp, int from_tty)
                    if (! printed_objfile_start)
                      {
                        printf_filtered ("{ objfile %s ", objfile_name (objfile));
-                       wrap_here (2);
+                       gdb_stdout->wrap_here (2);
                        printf_filtered ("((struct objfile *) %s)\n",
                                         host_address_to_string (objfile));
                        printed_objfile_start = 1;
                      }
 
                    printf_filtered ("  { psymtab %s ", psymtab->filename);
-                   wrap_here (4);
+                   gdb_stdout->wrap_here (4);
                    printf_filtered ("((struct partial_symtab *) %s)\n",
                                     host_address_to_string (psymtab));
 

diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index 59c311c9b664d8e0c80ce6338cbfb7fb280373af..8d3786844def5bd52bb4ebd4747940d1b6fe9499 100644 (file)
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -474,7 +474,7 @@ print_children (PyObject *printer, const char *hint,
              print_spaces_filtered (2 + 2 * recurse, stream);
            }
          else
-           wrap_here (2 + 2 *recurse);
+           stream->wrap_here (2 + 2 *recurse);
        }
 
       if (is_map && i % 2 == 0)

diff --git a/gdb/source.c b/gdb/source.c
index 2b0a5c9b4078da7755e1f1aef8274364ed8781dd..f749dd64e3b8418b071f7aa63c3508d391a2917b 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1548,7 +1548,7 @@ info_line_command (const char *arg, int from_tty)
                 user about a source line, at least let them have the symbolic
                 address.  */
              printf_filtered (" for address ");
-             wrap_here (2);
+             gdb_stdout->wrap_here (2);
              print_address (gdbarch, sal.pc, gdb_stdout);
            }
          else
@@ -1565,10 +1565,10 @@ info_line_command (const char *arg, int from_tty)
              printf_filtered ("Line %d of \"%s\"",
                               sal.line,
                               symtab_to_filename_for_display (sal.symtab));
-             wrap_here (2);
+             gdb_stdout->wrap_here (2);
              printf_filtered (" is at address ");
              print_address (gdbarch, start_pc, gdb_stdout);
-             wrap_here (2);
+             gdb_stdout->wrap_here (2);
              printf_filtered (" but contains no code.\n");
            }
          else
@@ -1576,10 +1576,10 @@ info_line_command (const char *arg, int from_tty)
              printf_filtered ("Line %d of \"%s\"",
                               sal.line,
                               symtab_to_filename_for_display (sal.symtab));
-             wrap_here (2);
+             gdb_stdout->wrap_here (2);
              printf_filtered (" starts at address ");
              print_address (gdbarch, start_pc, gdb_stdout);
-             wrap_here (2);
+             gdb_stdout->wrap_here (2);
              printf_filtered (" and ends at ");
              print_address (gdbarch, end_pc, gdb_stdout);
              printf_filtered (".\n");

diff --git a/gdb/stack.c b/gdb/stack.c
index 6c3707f1b87e23d25562d3d9a36da4e4c762106d..c7269e2ac32617364b9f1d5669c14a63ed4b7dd2 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1557,13 +1557,13 @@ info_frame_command_core (struct frame_info *fi, bool selected_frame_p)
   else
     fputs_styled ("<unavailable>", metadata_style.style (), gdb_stdout);
 
-  wrap_here (3);
+  gdb_stdout->wrap_here (3);
   if (funname)
     {
       printf_filtered (" in ");
       puts_filtered (funname);
     }
-  wrap_here (3);
+  gdb_stdout->wrap_here (3);
   if (sal.symtab)
     printf_filtered
       (" (%ps:%d)",
@@ -1571,7 +1571,7 @@ info_frame_command_core (struct frame_info *fi, bool selected_frame_p)
                      symtab_to_filename_for_display (sal.symtab)),
        sal.line);
   puts_filtered ("; ");
-  wrap_here (4);
+  gdb_stdout->wrap_here (4);
   printf_filtered ("saved %s = ", pc_regname);
 
   if (!frame_id_p (frame_unwind_caller_id (fi)))
@@ -1627,7 +1627,7 @@ info_frame_command_core (struct frame_info *fi, bool selected_frame_p)
     }
   if (get_next_frame (fi) && calling_frame_info)
     puts_filtered (",");
-  wrap_here (3);
+  gdb_stdout->wrap_here (3);
   if (get_next_frame (fi))
     {
       printf_filtered (" caller of frame at ");
@@ -1765,7 +1765,7 @@ info_frame_command_core (struct frame_info *fi, bool selected_frame_p)
                puts_filtered (" Saved registers:\n ");
              else
                puts_filtered (",");
-             wrap_here (1);
+             gdb_stdout->wrap_here (1);
              printf_filtered (" %s at ",
                               gdbarch_register_name (gdbarch, i));
              puts_filtered (paddress (gdbarch, addr));

diff --git a/gdb/symfile.c b/gdb/symfile.c
index f0a7c7f7c5a7e22d9ff827999aa554e961245677..9bd4f48d0b023b5cd65b443320e45ac237113d41 100644 (file)
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2607,9 +2607,9 @@ reread_symbols (int from_tty)
 
          if (!objfile_has_symbols (objfile))
            {
-             wrap_here (0);
+             gdb_stdout->wrap_here (0);
              printf_filtered (_("(no debugging symbols found)\n"));
-             wrap_here (0);
+             gdb_stdout->wrap_here (0);
            }
 
          /* We're done reading the symbol file; finish off complaints.  */

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 65b06c4030f13f0b9301affe0bf199fc1762b79d..cd51f6645c563965a27dff7e3c255d98aafc0ebf 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -766,7 +766,7 @@ maintenance_info_symtabs (const char *regexp, int from_tty)
                    if (! printed_objfile_start)
                      {
                        printf_filtered ("{ objfile %s ", objfile_name (objfile));
-                       wrap_here (2);
+                       gdb_stdout->wrap_here (2);
                        printf_filtered ("((struct objfile *) %s)\n",
                                         host_address_to_string (objfile));
                        printed_objfile_start = 1;
@@ -816,7 +816,7 @@ maintenance_info_symtabs (const char *regexp, int from_tty)
 
                    printf_filtered ("\t{ symtab %s ",
                                     symtab_to_filename_for_display (symtab));
-                   wrap_here (4);
+                   gdb_stdout->wrap_here (4);
                    printf_filtered ("((struct symtab *) %s)\n",
                                     host_address_to_string (symtab));
                    printf_filtered ("\t  fullname %s\n",
@@ -873,7 +873,7 @@ maintenance_check_symtabs (const char *ignore, int from_tty)
                if (! printed_objfile_start)
                  {
                    printf_filtered ("{ objfile %s ", objfile_name (objfile));
-                   wrap_here (2);
+                   gdb_stdout->wrap_here (2);
                    printf_filtered ("((struct objfile *) %s)\n",
                                     host_address_to_string (objfile));
                    printed_objfile_start = 1;

diff --git a/gdb/symtab.c b/gdb/symtab.c
index d0cda253bf2fed60c63e59e4daac18a700534e2c..a32e561ed774c283d5ec35beb712d9c2b5734fb1 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4380,7 +4380,7 @@ output_source_filename_data::output (const char *disp_name,
     m_uiout->text (", ");
   m_first = false;
 
-  wrap_here (0);
+  m_uiout->wrap_hint (0);
   if (m_uiout->is_mi_like_p ())
     {
       m_uiout->field_string ("file", disp_name, file_name_style.style ());

diff --git a/gdb/top.c b/gdb/top.c
index 46983d1fb6f0b8b95a1c72fbb93976f1499d947c..a94ed5cebdb27ce0d364384affd8d566826cf854 100644 (file)
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1364,7 +1364,7 @@ command_line_input (const char *prompt_arg, const char *annotation_suffix)
       /* Make sure that all output has been output.  Some machines may
         let you get away with leaving out some of the gdb_flush, but
         not all.  */
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       gdb_flush (gdb_stdout);
       gdb_flush (gdb_stderr);
 

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 016bce0bf9b6c132004c20b74309039a8100c84e..95fc58fb8f066fe11b0063ea6cabc0b7d9b72a09 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2395,10 +2395,10 @@ tfind_line_command (const char *args, int from_tty)
          printf_filtered ("Line %d of \"%s\"",
                           sal.line,
                           symtab_to_filename_for_display (sal.symtab));
-         wrap_here (2);
+         gdb_stdout->wrap_here (2);
          printf_filtered (" is at address ");
          print_address (get_current_arch (), start_pc, gdb_stdout);
-         wrap_here (2);
+         gdb_stdout->wrap_here (2);
          printf_filtered (" but contains no code.\n");
          sal = find_pc_line (start_pc, 0);
          if (sal.line > 0

diff --git a/gdb/utils.c b/gdb/utils.c
index 3a019d7d1d443015e50f32e1db2d67de86b1f38a..96e81c83912207bd0c0ce2394f77eaafe4b2b0cd 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -154,7 +154,7 @@ vwarning (const char *string, va_list args)
          target_terminal::ours_for_output ();
        }
       if (filtered_printing_initialized ())
-       wrap_here (0);          /* Force out any buffered output.  */
+       gdb_stdout->wrap_here (0);      /* Force out any buffered output.  */
       gdb_flush (gdb_stdout);
       if (warning_pre_print)
        fputs_unfiltered (warning_pre_print, gdb_stderr);
@@ -881,7 +881,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args)
     {
       target_terminal::scoped_restore_terminal_state term_state;
       target_terminal::ours_for_output ();
-      wrap_here (0);
+      gdb_stdout->wrap_here (0);
       vfprintf_filtered (gdb_stdout, ctlstr, args);
 
       printf_filtered (_("(%s or %s) [answered %c; "
@@ -1795,8 +1795,8 @@ fputs_maybe_filtered (const char *linebuffer, struct ui_file *stream,
       if (*lineptr == '\n')
        {
          chars_printed = 0;
-         wrap_here (0);        /* Spit out chars, cancel
-                                  further wraps.  */
+         stream->wrap_here (0); /* Spit out chars, cancel
+                                   further wraps.  */
          lines_printed++;
          /* XXX: The ideal thing would be to call
             'stream->putc' here, but we can't because it

diff --git a/gdb/valprint.c b/gdb/valprint.c
index 1fc007f6147878a3a935edb3a4d739eecfbd7533..82abcb4173474ab8c5fc5ebd12509aca6f6cbe9c 100644 (file)
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -1946,7 +1946,7 @@ value_print_array_elements (struct value *val, struct ui_file *stream,
          fprintf_filtered (stream, "\n");
          print_spaces_filtered (2 + 2 * recurse, stream);
        }
-      wrap_here (2 + 2 * recurse);
+      stream->wrap_here (2 + 2 * recurse);
       maybe_print_array_index (index_type, i + low_bound,
                               stream, options);