X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fbreakpoint.c;h=822f4b76fa19d58f9a879de20c2ca5e2ee7adeb5;hb=ce43223b29f59ab4642af0a3ce5b073fe1dcd3de;hp=b05bf4ec34b39284fbaca125b4c4798765a60e67;hpb=f30f06b84e743947076abbd254918bba8033f8d4;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index b05bf4ec34..822f4b76fa 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3603,14 +3603,14 @@ do_captured_breakpoint_query (struct ui_out *uiout, void *data)
 }
 
 enum gdb_rc
-gdb_breakpoint_query (struct ui_out *uiout, int bnum)
+gdb_breakpoint_query (struct ui_out *uiout, int bnum, char **error_message)
 {
   struct captured_breakpoint_query_args args;
   args.bnum = bnum;
   /* For the moment we don't trust print_one_breakpoint() to not throw
      an error. */
-  return catch_exceptions (uiout, do_captured_breakpoint_query, &args,
-			   NULL, RETURN_MASK_ALL);
+  return catch_exceptions_with_msg (uiout, do_captured_breakpoint_query, &args,
+				    NULL, error_message, RETURN_MASK_ALL);
 }
 
 /* Return non-zero if B is user settable (breakpoints, watchpoints,
@@ -5334,7 +5334,7 @@ struct captured_breakpoint_args
   };
 
 static int
-do_captured_breakpoint (void *data)
+do_captured_breakpoint (struct ui_out *uiout, void *data)
 {
   struct captured_breakpoint_args *args = data;
   struct symtabs_and_lines sals;
@@ -5432,7 +5432,8 @@ do_captured_breakpoint (void *data)
 enum gdb_rc
 gdb_breakpoint (char *address, char *condition,
 		int hardwareflag, int tempflag,
-		int thread, int ignore_count)
+		int thread, int ignore_count,
+		char **error_message)
 {
   struct captured_breakpoint_args args;
   args.address = address;
@@ -5441,8 +5442,8 @@ gdb_breakpoint (char *address, char *condition,
   args.tempflag = tempflag;
   args.thread = thread;
   args.ignore_count = ignore_count;
-  return catch_errors (do_captured_breakpoint, &args,
-		       NULL, RETURN_MASK_ALL);
+  return catch_exceptions_with_msg (uiout, do_captured_breakpoint, &args,
+				    NULL, error_message, RETURN_MASK_ALL);
 }