2005-01-14 Andrew Cagney <cagney@gnu.org>

	* exceptions.h (catch_exceptions): Delete errstring parameter.
	(catch_exceptions_with_msg): Ditto.
	* exceptions.c (catch_exceptions_with_msg): Update.
	(catch_exceptions): Update.
	* symfile-mem.c (add_vsyscall_page): Update.
	* frame.c (get_current_frame): Update.
	* wrapper.c (gdb_value_struct_elt): Update.
	* exceptions.c (catch_exceptions): Update.
	* thread.c (gdb_list_thread_ids, gdb_thread_select): Update.
	* breakpoint.c (gdb_breakpoint_query, gdb_breakpoint): Update.
	* remote-fileio.c (remote_fileio_request): Update.

9 files changed, 24 insertions, 15 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 48ee486e20f..f0dd4f1b7a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,17 @@
 2005-01-14  Andrew Cagney  <cagney@gnu.org>
 
+	* exceptions.h (catch_exceptions): Delete errstring parameter.
+	(catch_exceptions_with_msg): Ditto.
+	* exceptions.c (catch_exceptions_with_msg): Update.
+	(catch_exceptions): Update.
+	* symfile-mem.c (add_vsyscall_page): Update.
+	* frame.c (get_current_frame): Update.
+	* wrapper.c (gdb_value_struct_elt): Update.
+	* exceptions.c (catch_exceptions): Update.
+	* thread.c (gdb_list_thread_ids, gdb_thread_select): Update.
+	* breakpoint.c (gdb_breakpoint_query, gdb_breakpoint): Update.
+	* remote-fileio.c (remote_fileio_request): Update.
+	
 	* exceptions.h (exception_fprintf): Declare.
 	(exception_print): Drop pre_print parameter.
 	* mi/mi-main.c (mi_execute_command): Update exception_print call.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 9b77543c85b..690ec5d218a 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3604,7 +3604,7 @@ gdb_breakpoint_query (struct ui_out *uiout, int bnum, char **error_message)
   /* For the moment we don't trust print_one_breakpoint() to not throw
      an error. */
   return catch_exceptions_with_msg (uiout, do_captured_breakpoint_query, &args,
-				    NULL, error_message, RETURN_MASK_ALL);
+				    error_message, RETURN_MASK_ALL);
 }
 
 /* Return non-zero if B is user settable (breakpoints, watchpoints,
@@ -5437,7 +5437,7 @@ gdb_breakpoint (char *address, char *condition,
   args.thread = thread;
   args.ignore_count = ignore_count;
   return catch_exceptions_with_msg (uiout, do_captured_breakpoint, &args,
-				    NULL, error_message, RETURN_MASK_ALL);
+				    error_message, RETURN_MASK_ALL);
 }
 
 
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 1301623edc4..7d4ce500e7f 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -467,11 +467,9 @@ int
 catch_exceptions (struct ui_out *uiout,
 		  catch_exceptions_ftype *func,
 		  void *func_args,
-		  char *errstring,
 		  return_mask mask)
 {
-  return catch_exceptions_with_msg (uiout, func, func_args, errstring,
-				    NULL, mask);
+  return catch_exceptions_with_msg (uiout, func, func_args, NULL, mask);
 }
 
 struct exception
@@ -493,13 +491,12 @@ int
 catch_exceptions_with_msg (struct ui_out *uiout,
 		  	   catch_exceptions_ftype *func,
 		  	   void *func_args,
-		  	   char *errstring,
 			   char **gdberrmsg,
 		  	   return_mask mask)
 {
   volatile struct exception exception;
   volatile int val = 0;
-  SIGJMP_BUF *catch = catcher_init (uiout, errstring, &exception, mask, 1);
+  SIGJMP_BUF *catch = catcher_init (uiout, NULL, &exception, mask, 1);
   for (SIGSETJMP ((*catch)); catcher_state_machine (CATCH_ITER);)
     val = (*func) (uiout, func_args);
   gdb_assert (val >= 0);
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index 80c120d57ca..fddaf37ea10 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -122,12 +122,12 @@ struct ui_out;
 typedef int (catch_exceptions_ftype) (struct ui_out *ui_out, void *args);
 extern int catch_exceptions (struct ui_out *uiout,
 			     catch_exceptions_ftype *func, void *func_args,
-			     char *errstring, return_mask mask);
+			     return_mask mask);
 typedef void (catch_exception_ftype) (struct ui_out *ui_out, void *args);
 extern int catch_exceptions_with_msg (struct ui_out *uiout,
 			     	      catch_exceptions_ftype *func, 
 			     	      void *func_args,
-			     	      char *errstring, char **gdberrmsg,
+			     	      char **gdberrmsg,
 				      return_mask mask);
 
 /* This function, in addition, suppresses the printing of the captured
diff --git a/gdb/frame.c b/gdb/frame.c
index 13a9f1d2734..054b062fdeb 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -803,7 +803,7 @@ get_current_frame (void)
       struct frame_info *sentinel_frame =
 	create_sentinel_frame (current_regcache);
       if (catch_exceptions (uiout, unwind_to_current_frame, sentinel_frame,
-			    NULL, RETURN_MASK_ERROR) != 0)
+			    RETURN_MASK_ERROR) != 0)
 	{
 	  /* Oops! Fake a current frame?  Is this useful?  It has a PC
              of zero, for instance.  */
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index d7657b3bdfd..9e6cc3f0b51 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -1329,7 +1329,7 @@ remote_fileio_request (char *buf)
   remote_fio_no_longjmp = 0;
 
   ex = catch_exceptions (uiout, do_remote_fileio_request, (void *)buf,
-			 NULL, RETURN_MASK_ALL);
+			 RETURN_MASK_ALL);
   switch (ex)
     {
       case RETURN_ERROR:
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 7a4549f1eea..6cb04f2fd37 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -204,7 +204,7 @@ add_vsyscall_page (struct target_ops *target, int from_tty)
 	 typed "run" at the TTY.  */
       args.from_tty = 0;
       catch_exceptions (uiout, symbol_file_add_from_memory_wrapper,
-			&args, NULL, RETURN_MASK_ALL);
+			&args, RETURN_MASK_ALL);
     }
 }
 
diff --git a/gdb/thread.c b/gdb/thread.c
index d201b431bde..ecdbe5e4c37 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -285,7 +285,7 @@ enum gdb_rc
 gdb_list_thread_ids (struct ui_out *uiout, char **error_message)
 {
   return catch_exceptions_with_msg (uiout, do_captured_list_thread_ids, NULL,
-				    NULL, error_message, RETURN_MASK_ALL);
+				    error_message, RETURN_MASK_ALL);
 }
 
 /* Load infrun state for the thread PID.  */
@@ -670,7 +670,7 @@ enum gdb_rc
 gdb_thread_select (struct ui_out *uiout, char *tidstr, char **error_message)
 {
   return catch_exceptions_with_msg (uiout, do_captured_thread_select, tidstr,
-				    NULL, error_message, RETURN_MASK_ALL);
+				    error_message, RETURN_MASK_ALL);
 }
 
 /* Commands with a prefix of `thread'.  */
diff --git a/gdb/wrapper.c b/gdb/wrapper.c
index 0e4714e5d07..706394baa6e 100644
--- a/gdb/wrapper.c
+++ b/gdb/wrapper.c
@@ -320,7 +320,7 @@ gdb_value_struct_elt (struct ui_out *uiout, struct value **result, struct value
   cargs.err = err;
   cargs.result_ptr = result;
   return catch_exceptions (uiout, do_captured_value_struct_elt, &cargs,
-			   NULL, RETURN_MASK_ALL);
+			   RETURN_MASK_ALL);
 }
 
 static int