Remove error_pre_print and quit_pre_print.

  http://sourceware.org/ml/gdb-patches/2013-07/msg00844.html

gdb/ChangeLog

        * 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.

5 files changed, 9 insertions, 23 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ded2a9a263..9fbd29e9e7b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2013-08-01  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.
+
 2013-08-01  Yao Qi  <yao@codesourcery.com>
 
 	* mi/mi-cmd-stack.c (mi_cmd_stack_list_locals): Parse argv
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index d35f42fc46b..6ea3243d31f 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 677f5876c9b..1c240e4d398 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 94ebce858c9..61d502304b4 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 0f6bb064fc8..143cd6bb3d8 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;