From 27d326da434d60056eae0d14c1f0175d0e121c2a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 31 Dec 2021 15:04:58 -0700 Subject: [PATCH] Remove global wrap_here function This removes the global wrap_here function, so that future calls cannot be introduced. Instead, all callers must use the method on the appropriate ui_file. This temporarily moves the implementation of this method to utils.c. This will change once the remaining patches to untangle the pager have been written. --- gdb/ui-file.c | 6 ------ gdb/utils.c | 20 +++----------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/gdb/ui-file.c b/gdb/ui-file.c index 57fc05a6c84..d30ec04a68f 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -131,12 +131,6 @@ ui_file::printchar (int c, int quoter, bool async_safe) this->write (buf, out); } -void -ui_file::wrap_here (int indent) -{ - ::wrap_here (indent); -} - void diff --git a/gdb/utils.c b/gdb/utils.c index 96e81c83912..152fa9b630a 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1519,29 +1519,15 @@ get_chars_per_line () return chars_per_line; } -/* Indicate that if the next sequence of characters overflows the - line, a newline should be inserted here rather than when it hits - the end. If INDENT is non-zero, it is a number of spaces to be - printed to indent the wrapped part on the next line. - - If the line is already overfull, we immediately print a newline and - the indentation, and disable further wrapping. - - If we don't know the width of lines, but we know the page height, - we must not wrap words, but should still keep track of newlines - that were explicitly printed. - - This routine is guaranteed to force out any output which has been - squirreled away in the wrap_buffer, so wrap_here (0) can be - used to force out output from the wrap_buffer. */ +/* See ui-file.h. */ void -wrap_here (int indent) +ui_file::wrap_here (int indent) { /* This should have been allocated, but be paranoid anyway. */ gdb_assert (filter_initialized); - flush_wrap_buffer (gdb_stdout); + flush_wrap_buffer (this); if (chars_per_line == UINT_MAX) /* No line overflow checking. */ { wrap_column = 0; -- 2.30.2