Replace most uses of deprecated_throw_reason with quit.

[deliverable/binutils-gdb.git] / gdb / remote.c

diff --git a/gdb/remote.c b/gdb/remote.c
index 7928f5723c82ab71fa08983de423f902996303aa..7830e67345ff51fb488620d2b00f011c5debfdf6 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -97,7 +97,7 @@ static int getpkt_or_notif_sane (char **buf, long *sizeof_buf,
 static void handle_remote_sigint (int);
 static void handle_remote_sigint_twice (int);
 static void async_remote_interrupt (gdb_client_data);
-void async_remote_interrupt_twice (gdb_client_data);
+static void async_remote_interrupt_twice (gdb_client_data);
 
 static void remote_files_info (struct target_ops *ignore);
 
@@ -5022,7 +5022,7 @@ async_remote_interrupt (gdb_client_data arg)
 
 /* Perform interrupt, if the first attempt did not succeed.  Just give
    up on the target alltogether.  */
-void
+static void
 async_remote_interrupt_twice (gdb_client_data arg)
 {
   if (remote_debug)
@@ -5165,7 +5165,7 @@ interrupt_query (void)
   if (target_can_async_p ())
     {
       signal (SIGINT, handle_sigint);
-      deprecated_throw_reason (RETURN_QUIT);
+      quit ();
     }
   else
     {
@@ -5173,7 +5173,7 @@ interrupt_query (void)
 Give up (and stop debugging it)? ")))
        {
          remote_unpush_target ();
-         deprecated_throw_reason (RETURN_QUIT);
+         quit ();
        }
     }
 
@@ -10527,7 +10527,7 @@ remote_download_tracepoint (struct bp_location *loc)
   struct breakpoint *b = loc->owner;
   struct tracepoint *t = (struct tracepoint *) b;
 
-  encode_actions (loc, &tdp_actions, &stepping_actions);
+  encode_actions_rsp (loc, &tdp_actions, &stepping_actions);
   old_chain = make_cleanup (free_actions_list_cleanup_wrapper,
                            tdp_actions);
   (void) make_cleanup (free_actions_list_cleanup_wrapper,