2004-06-01 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f4931d7..e3e538d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-01  Andrew Cagney  <cagney@gnu.org>
 
 2004-06-01  Andrew Cagney  <cagney@gnu.org>
 

+       * 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.
        * 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 5453059..095f316 100644 (file)
--- 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 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
 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 1a3031f..1a33fde 100644 (file)
--- 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)
        {
       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;
        }
          result = MI_CMD_ERROR;
          break;
        }

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 02ed628..697b20c 100644 (file)
--- 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);
 
 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. */
 /* Command implementations. FIXME: Is this libgdb? No.  This is the MI
    layer that calls libgdb.  Any operation used in the below should be
    formalized. */