From 6085fc2d26557f389a19e00c9288197f66e65ca7 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 1 Jun 2004 13:15:02 +0000 Subject: [PATCH] 2004-06-01 Andrew Cagney * mi/mi-cmds.h (mi_error_last_message): Delete declaration. * mi/mi-interp.c (mi_cmd_interpreter_exec): Call error_last_message instead of mi_error_last_message. * mi/mi-main.c (mi_error_last_message): Delete function. --- gdb/ChangeLog | 5 +++++ gdb/mi/mi-cmds.h | 1 - gdb/mi/mi-interp.c | 2 +- gdb/mi/mi-main.c | 10 ---------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f4931d7a3b9..e3e538dd936 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2004-06-01 Andrew Cagney + * mi/mi-cmds.h (mi_error_last_message): Delete declaration. + * mi/mi-interp.c (mi_cmd_interpreter_exec): Call + error_last_message instead of mi_error_last_message. + * mi/mi-main.c (mi_error_last_message): Delete function. + * mi/mi-main.c (mi_cmd_data_read_memory): Add missing return for "invalid number of columns" error. Delete redundant "out of memory" check. diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h index 545305986c6..095f31679f3 100644 --- a/gdb/mi/mi-cmds.h +++ b/gdb/mi/mi-cmds.h @@ -146,7 +146,6 @@ extern int mi_debug_p; extern struct ui_file *raw_stdout; extern char *mi_error_message; -extern void mi_error_last_message (void); extern void mi_execute_command (char *cmd, int from_tty); #endif diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c index 1a3031f2a61..1a33fde7f44 100644 --- a/gdb/mi/mi-interp.c +++ b/gdb/mi/mi-interp.c @@ -246,7 +246,7 @@ mi_cmd_interpreter_exec (char *command, char **argv, int argc) sync_execution = 1; if (interp_exec (interp_to_use, argv[i]) < 0) { - mi_error_last_message (); + mi_error_message = error_last_message (); result = MI_CMD_ERROR; break; } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 02ed6284152..697b20c1430 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -99,16 +99,6 @@ static void mi_exec_async_cli_cmd_continuation (struct continuation_arg *arg); static int register_changed_p (int regnum); static int get_register (int regnum, int format); -/* A helper function which will set mi_error_message to - error_last_message. */ -void -mi_error_last_message (void) -{ - char *s = error_last_message (); - xasprintf (&mi_error_message, "%s", s); - xfree (s); -} - /* Command implementations. FIXME: Is this libgdb? No. This is the MI layer that calls libgdb. Any operation used in the below should be formalized. */ -- 2.30.2