From 9fbf7f083e21263b0a0e1f76d615adaa4e13cfe5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 2 Jan 2022 11:54:06 -0700 Subject: [PATCH] Rename puts_filtered_tabular puts_filtered_tabular is now misnamed, because whether filtering happens is now up to the stream. So, rename it. (This function is pretty weird, and should probably be rewritten to avoid using the chars_printed global, and moved into objc-lang.c. However, I haven't done so.) --- gdb/objc-lang.c | 4 ++-- gdb/utils.c | 13 ++++++------- gdb/utils.h | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index e116fbe5611..ed13097f7a8 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -666,7 +666,7 @@ info_selectors_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(asel, maxlen + 1, 0); + puts_tabular(asel, maxlen + 1, 0); } begin_line(); } @@ -800,7 +800,7 @@ info_classes_command (const char *regexp, int from_tty) *p++ = *name++; *p++ = '\0'; /* Print in columns. */ - puts_filtered_tabular(aclass, maxlen + 1, 0); + puts_tabular(aclass, maxlen + 1, 0); } begin_line(); } diff --git a/gdb/utils.c b/gdb/utils.c index e358a5a560d..bf6f4fb9b89 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1504,15 +1504,14 @@ pager_file::wrap_here (int indent) } } -/* Print input string to gdb_stdout, filtered, with wrap, - arranging strings in columns of n chars. String can be - right or left justified in the column. Never prints - trailing spaces. String should never be longer than - width. FIXME: this could be useful for the EXAMINE - command, which currently doesn't tabulate very well. */ +/* Print input string to gdb_stdout arranging strings in columns of n + chars. String can be right or left justified in the column. Never + prints trailing spaces. String should never be longer than width. + FIXME: this could be useful for the EXAMINE command, which + currently doesn't tabulate very well. */ void -puts_filtered_tabular (char *string, int width, int right) +puts_tabular (char *string, int width, int right) { int spaces = 0; int stringlen; diff --git a/gdb/utils.h b/gdb/utils.h index 981090e3019..8b7eccb7bb3 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -241,7 +241,7 @@ extern int gdb_putc (int c); extern void gdb_puts (const char *); -extern void puts_filtered_tabular (char *string, int width, int right); +extern void puts_tabular (char *string, int width, int right); extern void gdb_vprintf (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); -- 2.30.2