diff options
| -rw-r--r-- | gdb/event-top.c | 6 | ||||
| -rw-r--r-- | gdb/top.c | 8 | ||||
| -rw-r--r-- | gdb/utils.c | 12 | ||||
| -rw-r--r-- | gdb/utils.h | 4 |
4 files changed, 3 insertions, 27 deletions
diff --git a/gdb/event-top.c b/gdb/event-top.c index 3ba7239..7de3c91 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -673,11 +673,7 @@ handle_line_of_input (struct buffer *cmd_line_buffer, cmd_line_buffer->used_size = 0; if (from_tty && annotation_level > 1) - { - printf_unfiltered (("\n\032\032post-")); - puts_unfiltered (annotation_suffix); - printf_unfiltered (("\n")); - } + printf_unfiltered (("\n\032\032post-%s\n"), annotation_suffix); #define SERVER_COMMAND_PREFIX "server " server_command = startswith (cmd, SERVER_COMMAND_PREFIX); @@ -866,7 +866,7 @@ gdb_readline_no_editing (const char *prompt) /* Don't use a _filtered function here. It causes the assumed character position to be off, since the newline we read from the user is not accounted for. */ - puts_unfiltered (prompt); + printf_unfiltered ("%s", prompt); gdb_flush (gdb_stdout); } @@ -1365,11 +1365,7 @@ command_line_input (const char *prompt_arg, const char *annotation_suffix) ++source_line_number; if (from_tty && annotation_level > 1) - { - puts_unfiltered ("\n\032\032pre-"); - puts_unfiltered (annotation_suffix); - puts_unfiltered ("\n"); - } + printf_unfiltered ("\n\032\032pre-%s\n", annotation_suffix); /* Don't use fancy stuff if not talking to stdin. */ if (deprecated_readline_hook diff --git a/gdb/utils.c b/gdb/utils.c index 48aedb0..a071721 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1868,12 +1868,6 @@ fputs_highlighted (const char *str, const compiled_regex &highlight, fputs_filtered (str, stream); } -int -putchar_unfiltered (int c) -{ - return fputc_unfiltered (c, gdb_stdout); -} - /* Write character C to gdb_stdout using GDB's paging mechanism and return C. May return nonlocally. */ @@ -2046,12 +2040,6 @@ puts_filtered (const char *string) fputs_filtered (string, gdb_stdout); } -void -puts_unfiltered (const char *string) -{ - fputs_unfiltered (string, gdb_stdout); -} - /* Return a pointer to N spaces and a null. The pointer is good until the next call to here. */ const char * diff --git a/gdb/utils.h b/gdb/utils.h index 2cd0cff..cd73af4 100644 --- a/gdb/utils.h +++ b/gdb/utils.h @@ -243,12 +243,8 @@ extern int fputc_unfiltered (int c, struct ui_file *); extern int putchar_filtered (int c); -extern int putchar_unfiltered (int c); - extern void puts_filtered (const char *); -extern void puts_unfiltered (const char *); - extern void puts_filtered_tabular (char *string, int width, int right); extern void vprintf_filtered (const char *, va_list) ATTRIBUTE_PRINTF (1, 0); |