diff options
| author |   Daniel Jacobowitz <drow@false.org> | 2006-11-17 19:30:41 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2006-11-17 19:30:41 +0000 |
| commit | 63f06803320d4e116c402579694399540816b55f (patch) | |
| tree | e89f70692c93b083ae949e66297675c708b5785e /gdb | |
| parent | * NEWS: Mention QPassSignals. (diff) | |
| download | binutils-gdb-63f06803320d4e116c402579694399540816b55f.tar.gz binutils-gdb-63f06803320d4e116c402579694399540816b55f.tar.bz2 binutils-gdb-63f06803320d4e116c402579694399540816b55f.zip | |
* utils.c (string_to_core_addr): Use error instead of
internal_error.
* mi/mi-main.c (mi_execute_command): Check for a NULL message.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/mi/mi-main.c | 5 | ||||
| -rw-r--r-- | gdb/utils.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6712d8c891b..1ecd3683c4b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2006-11-17 Daniel Jacobowitz <dan@codesourcery.com> + * utils.c (string_to_core_addr): Use error instead of + internal_error. + * mi/mi-main.c (mi_execute_command): Check for a NULL message. + +2006-11-17 Daniel Jacobowitz <dan@codesourcery.com> + * NEWS: Mention QPassSignals. 2006-11-16 Maxim Grigoriev <maxim2405@gmail.com> diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index e2e084005c5..abb43f33241 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1183,7 +1183,10 @@ mi_execute_command (char *cmd, int from_tty) somewhere. */ fputs_unfiltered (command->token, raw_stdout); fputs_unfiltered ("^error,msg=\"", raw_stdout); - fputstr_unfiltered (result.message, '"', raw_stdout); + if (result.message == NULL) + fputs_unfiltered ("unknown error", raw_stdout); + else + fputstr_unfiltered (result.message, '"', raw_stdout); fputs_unfiltered ("\"\n", raw_stdout); mi_out_rewind (uiout); } diff --git a/gdb/utils.c b/gdb/utils.c index c64629c5161..b33eadd1878 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2865,7 +2865,7 @@ string_to_core_addr (const char *my_string) else if (isxdigit (my_string[i])) addr = (tolower (my_string[i]) - 'a' + 0xa) + (addr * 16); else - internal_error (__FILE__, __LINE__, _("invalid hex")); + error (_("invalid hex \"%s\""), my_string); } } else @@ -2877,7 +2877,7 @@ string_to_core_addr (const char *my_string) if (isdigit (my_string[i])) addr = (my_string[i] - '0') + (addr * 10); else - internal_error (__FILE__, __LINE__, _("invalid decimal")); + error (_("invalid decimal \"%s\""), my_string); } } return addr; |