diff options
| author | Andrew Burgess <aburgess@broadcom.com> | 2013-07-31 15:36:49 +0000 |
|---|---|---|
| committer | Andrew Burgess <aburgess@broadcom.com> | 2013-07-31 15:36:49 +0000 |
| commit | 13f78033fc9765b1ab92f50ebfbf2d2c5975d93a (patch) | |
| tree | 3ea3a00c3e7d4ca36caef7a0b7658c2419dd728d /gdb | |
| parent | 039e3c22825cb0177d4f853f644a56f7fc577e23 (diff) | |
| download | gdb-13f78033fc9765b1ab92f50ebfbf2d2c5975d93a.zip gdb-13f78033fc9765b1ab92f50ebfbf2d2c5975d93a.tar.gz gdb-13f78033fc9765b1ab92f50ebfbf2d2c5975d93a.tar.bz2 | |
Remove deprecated_throw_reason from mips_error.
http://sourceware.org/ml/gdb-patches/2013-07/msg00777.html
gdb/ChangeLog
* remote-mips.c (mips_error): Replace use of
deprecated_throw_reason with throw_verror. Use the error message
passed to mips_error as the error message for throw_verror.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/remote-mips.c | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fa14d16..ee43344 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2013-07-31 Andrew Burgess <aburgess@broadcom.com> + * remote-mips.c (mips_error): Replace use of + deprecated_throw_reason with throw_verror. Use the error message + passed to mips_error as the error message for throw_verror. + +2013-07-31 Andrew Burgess <aburgess@broadcom.com> + * monitor.c (monitor_interrupt_query): Replace use of deprecated_throw_reason with quit. * nto-procfs.c (interrupt_query): Likewise. diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index b769c69..081fbd0 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -488,17 +488,11 @@ static void ATTRIBUTE_NORETURN mips_error (char *string,...) { va_list args; - - va_start (args, string); + char *fmt; target_terminal_ours (); wrap_here (""); /* Force out any buffered output. */ gdb_flush (gdb_stdout); - if (error_pre_print) - fputs_filtered (error_pre_print, gdb_stderr); - vfprintf_filtered (gdb_stderr, string, args); - fprintf_filtered (gdb_stderr, "\n"); - va_end (args); gdb_flush (gdb_stderr); /* Clean up in such a way that mips_close won't try to talk to the @@ -506,11 +500,16 @@ mips_error (char *string,...) it). */ close_ports (); - printf_unfiltered ("Ending remote MIPS debugging.\n"); if (!ptid_equal (inferior_ptid, null_ptid)) target_mourn_inferior (); - deprecated_throw_reason (RETURN_ERROR); + fmt = concat (_("Ending remote MIPS debugging: "), + string, (char *) NULL); + make_cleanup (xfree, fmt); + + va_start (args, string); + throw_verror (TARGET_CLOSE_ERROR, fmt, args); + va_end (args); } /* putc_readable - print a character, displaying non-printable chars in |