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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ded2a9a263e3281694e1daccb831f000fe436bd..9fbd29e9e7bc01dc550fb08817e8a94ef81c48dc 100644 (file)
--- 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 d35f42fc46bd1de4606dbcce217c79d67c17962d..6ea3243d31f0ddfec0ee9d1502e992e898b5e8ec 100644 (file)
--- 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 677f5876c9ba60ca376ce98ced5b3412f5f39c8e..1c240e4d398e432529b3040a436d05bc65e3c4cf 100644 (file)
--- 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 94ebce858c98bb5448e01cea298354fde69f4087..61d502304b47d948098aedc99f7284006334f243 100644 (file)
--- 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 0f6bb064fc8946c1d0549294b4a10f93cdf93eeb..143cd6bb3d894a9cf2c1608c8880b5283f3a5c64 100644 (file)
--- 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;