From 1285ce8629b37f800bf21731ee7c7a8b1b8d0233 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 30 Dec 2021 10:29:03 -0700 Subject: 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. --- gdb/cli/cli-cmds.c | 2 +- gdb/cli/cli-decode.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'gdb/cli') diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 943d4db..2f5ce3e 100644 --- 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 24c80dc..14422e0 100644 --- 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); -- cgit v1.1