2012-11-30  Yao Qi  <yao@codesourcery.com>

	* 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.
This commit is contained in:
Yao Qi 2012-11-30 14:35:50 +00:00
parent 7cd12a76b7
commit 3d3fef6beb
4 changed files with 27 additions and 20 deletions

View file

@ -1,3 +1,12 @@
2012-11-30 Yao Qi <yao@codesourcery.com>
* 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 <yao@codesourcery.com>
* tic6x-linux-tdep.c (tic6x_register_sigcontext_offset): Don't

View file

@ -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)
{

View file

@ -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 */

View file

@ -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)
{