From 3d3fef6bebbc69ad069f05b5fcb17181553e7fa1 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 30 Nov 2012 14:35:50 +0000 Subject: [PATCH] gdb/ 2012-11-30 Yao Qi * infrun.c (error_is_running, ensure_not_running): Move them to ... * infcmd.c (error_is_running, ensure_not_running): ... here. Make them 'static'. * inferior.h: Remove declarations of error_is_running and ensure_not_running. --- gdb/ChangeLog | 9 +++++++++ gdb/infcmd.c | 18 ++++++++++++++++++ gdb/inferior.h | 6 ------ gdb/infrun.c | 14 -------------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 10e2019770..3fa899dbde 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2012-11-30 Yao Qi + + * infrun.c (error_is_running, ensure_not_running): Move them + to ... + * infcmd.c (error_is_running, ensure_not_running): ... here. + Make them 'static'. + * inferior.h: Remove declarations of error_is_running and + ensure_not_running. + 2012-11-30 Yao Qi * tic6x-linux-tdep.c (tic6x_register_sigcontext_offset): Don't diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 7a08e31eda..db9b9b59ef 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -708,6 +708,24 @@ ensure_not_tfind_mode (void) error (_("Cannot execute this command while looking at trace frames.")); } +/* Throw an error indicating the current thread is running. */ + +static void +error_is_running (void) +{ + error (_("Cannot execute this command while " + "the selected thread is running.")); +} + +/* Calls error_is_running if the current thread is running. */ + +static void +ensure_not_running (void) +{ + if (is_running (inferior_ptid)) + error_is_running (); +} + void continue_1 (int all_threads) { diff --git a/gdb/inferior.h b/gdb/inferior.h index e1e7d29a65..f7236e7b55 100644 --- a/gdb/inferior.h +++ b/gdb/inferior.h @@ -228,12 +228,6 @@ extern void get_last_target_status(ptid_t *ptid, extern void follow_inferior_reset_breakpoints (void); -/* Throw an error indicating the current thread is running. */ -extern void error_is_running (void); - -/* Calls error_is_running if the current thread is running. */ -extern void ensure_not_running (void); - void set_step_info (struct frame_info *frame, struct symtab_and_line sal); /* From infcmd.c */ diff --git a/gdb/infrun.c b/gdb/infrun.c index d0ff62a152..b036682460 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3040,20 +3040,6 @@ init_infwait_state (void) infwait_state = infwait_normal_state; } -void -error_is_running (void) -{ - error (_("Cannot execute this command while " - "the selected thread is running.")); -} - -void -ensure_not_running (void) -{ - if (is_running (inferior_ptid)) - error_is_running (); -} - static int stepped_in_from (struct frame_info *frame, struct frame_id step_frame_id) {