This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Remove error_pre_print and quit_pre_print
- From: "Andrew Burgess" <aburgess at broadcom dot com>
- To: "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>
- Date: Wed, 31 Jul 2013 21:54:16 +0100
- Subject: [PATCH] Remove error_pre_print and quit_pre_print
With recent patch:
http://sourceware.org/ml/gdb-patches/2013-07/msg00819.html
the last use of error_pre_print has been removed.
I notice that of the three *_pre_print variables
(error_pre_print, quit_pre_print, and warning_pre_print) only
warning_pre_print is still used.
I had a quick look back as far as 2008 and I don't think the
error/quit variables have been used in a long time so I guess
everyone is happy with the current output, so the patch below
removes the remaining places we reference error/quit _pre_print.
OK to apply?
Thanks,
Andrew
2013-07-31 Andrew Burgess <aburgess@broadcom.com>
* cli/cli-script.c (script_from_file): Remove use of
error_pre_print.
* main.c (captured_main): Remove use of error_pre_print and
quit_pre_print.
* utils.c (error_pre_print, quit_pre_print): Remove.
* utils.h (error_pre_print, quit_pre_print): Likewise.
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index d35f42f..6ea3243 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -1636,9 +1636,6 @@ script_from_file (FILE *stream, const char *file)
old_cleanups = make_cleanup (source_cleanup_lines, &old_lines);
source_line_number = 0;
source_file_name = file;
- /* This will get set every time we read a line. So it won't stay ""
- for long. */
- error_pre_print = "";
{
volatile struct gdb_exception e;
diff --git a/gdb/main.c b/gdb/main.c
index 677f587..1c240e4 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -885,8 +885,6 @@ captured_main (void *data)
}
/* Set off error and warning messages with a blank line. */
- error_pre_print = "\n";
- quit_pre_print = error_pre_print;
warning_pre_print = _("\nwarning: ");
/* Read and execute the system-wide gdbinit file, if it exists.
@@ -990,8 +988,6 @@ captured_main (void *data)
set_inferior_io_terminal (ttyarg);
/* Error messages should no longer be distinguished with extra output. */
- error_pre_print = NULL;
- quit_pre_print = NULL;
warning_pre_print = _("warning: ");
/* Read the .gdbinit file in the current directory, *if* it isn't
diff --git a/gdb/utils.c b/gdb/utils.c
index 94ebce8..61d5023 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -185,14 +185,6 @@ show_sevenbit_strings (struct ui_file *file, int from_tty,
value);
}
-/* String to be printed before error messages, if any. */
-
-char *error_pre_print;
-
-/* String to be printed before quit messages, if any. */
-
-char *quit_pre_print;
-
/* String to be printed before warning messages, if any. */
char *warning_pre_print = "\nwarning: ";
diff --git a/gdb/utils.h b/gdb/utils.h
index 0f6bb06..143cd6b 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -291,14 +291,6 @@ extern void print_sys_errmsg (const char *, int);
extern void (*deprecated_error_begin_hook) (void);
-/* Message to be printed before the error message, when an error occurs. */
-
-extern char *error_pre_print;
-
-/* Message to be printed before the error message, when an error occurs. */
-
-extern char *quit_pre_print;
-
/* Message to be printed before the warning message, when a warning occurs. */
extern char *warning_pre_print;