aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/exceptions.h2
-rw-r--r--gdb/mi/mi-main.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e637b8..7b1eb13 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
2005-01-13 Andrew Cagney <cagney@gnu.org>
+ * exceptions.h (struct exception): Make message const.
+ * mi/mi-main.c (mi_execute_command): Pass result.message directly
+ to fputstr_unfiltered.
+
* defs.h (error_last_message, error_init): Delete declaration.
* utils.c (fatal, vfatal): Call throw_vfatal.
(error, verror): Call throw_verror;
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index d6c4ffc..e062b18 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -59,7 +59,7 @@ struct exception
{
enum return_reason reason;
enum errors error;
- char *message;
+ const char *message;
};
/* A pre-defined non-exception. */
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 9d7a06c..7df1569 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -1166,13 +1166,11 @@ mi_execute_command (char *cmd, int from_tty)
}
if (result.reason < 0)
{
- char *msg = result.message;
- struct cleanup *cleanup = make_cleanup (xfree, msg);
/* The command execution failed and error() was called
somewhere */
fputs_unfiltered (command->token, raw_stdout);
fputs_unfiltered ("^error,msg=\"", raw_stdout);
- fputstr_unfiltered (msg, '"', raw_stdout);
+ fputstr_unfiltered (result.message, '"', raw_stdout);
fputs_unfiltered ("\"\n", raw_stdout);
}
mi_parse_free (command);