Move code out of 'between TRY and CATCH'

I tried building GDB with TRY/CATCH mapped to raw C++ try/catch (by
defining GDB_XCPT to GDB_XCPT_RAW_TRY in
gdb/common/common-exceptions.h), and that caught a case of code
written between try and catch.  This commit fixes it.

gdb/ChangeLog:
2017-10-04  Pedro Alves  <palves@redhat.com>

	* guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code
	out of 'between TRY and CATCH'.
This commit is contained in:
Pedro Alves 2017-10-04 11:07:28 +01:00
parent 44704526e4
commit 73dcd72d4e
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2017-10-04 Pedro Alves <palves@redhat.com>
* guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Move code
out of 'between TRY and CATCH'.
2017-10-04 Pedro Alves <palves@redhat.com>
* cli/cli-cmds.c (complete_command): Add missing END_CATCH.

View File

@ -988,13 +988,14 @@ gdbscm_breakpoint_commands (SCM self)
{
print_command_lines (current_uiout, breakpoint_commands (bp), 0);
}
current_uiout->redirect (NULL);
CATCH (except, RETURN_MASK_ALL)
{
current_uiout->redirect (NULL);
gdbscm_throw_gdb_exception (except);
}
END_CATCH
current_uiout->redirect (NULL);
result = gdbscm_scm_from_c_string (buf.c_str ());
return result;