* utils.c (string_to_core_addr): Use error instead of

internal_error.
	* mi/mi-main.c (mi_execute_command): Check for a NULL message.
This commit is contained in:
Daniel Jacobowitz 2006-11-17 19:30:41 +00:00
parent e554a4b262
commit 63f0680332
3 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
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.

View File

@ -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);
}

View File

@ -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;