From 14dba4b472beeb95c8018fedc795d9379b36e0a3 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 3 Sep 2010 15:42:04 +0000 Subject: gdb/ * breakpoint.c (save_breakpoints): Use RETURN_MASK_ALL. * cli-out.c: Include vec.h. (cli_field_fmt, cli_spaces, cli_text, cli_message, cli_flush): New variable stream, initialize it, use it. (cli_redirect): New function comment. Replace the stream and original_stream fields by the new streams field. Remove the original_stream != NULL conditional, assert error on NULL instead. (out_field_fmt, field_separator): New variable stream, initialize it, use it. (cli_out_data_ctor): Assert non-NULL stream. Replace the stream and original_stream fields by the new streams field. (cli_out_set_stream): Replace the stream field by the new streams field. * cli-out.h: Include vec.h. (ui_filep): New typedef, call DEF_VEC_P for it. (struct cli_ui_out_data): Replace the stream and original_stream fields by the new streams field. * cli/cli-logging.c (set_logging_redirect): Call ui_out_redirect with NULL first. Extend the comment. (handle_redirections): Call ui_out_redirect with output. * python/py-breakpoint.c (bppy_get_commands): Move ui_out_redirect calls outside of the TRY_CATCH block. gdb/testsuite/ * gdb.base/ui-redirect.exp: New file. --- gdb/python/py-breakpoint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gdb/python/py-breakpoint.c') diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 14f0417..0c70cbf 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -474,12 +474,12 @@ bppy_get_commands (PyObject *self, void *closure) string_file = mem_fileopen (); chain = make_cleanup_ui_file_delete (string_file); + ui_out_redirect (uiout, string_file); TRY_CATCH (except, RETURN_MASK_ALL) { - ui_out_redirect (uiout, string_file); print_command_lines (uiout, breakpoint_commands (bp), 0); - ui_out_redirect (uiout, NULL); } + ui_out_redirect (uiout, NULL); cmdstr = ui_file_xstrdup (string_file, &length); GDB_PY_HANDLE_EXCEPTION (except); -- cgit v1.1