Hurd, C++: Avoid "const char *" to "char *" casts

... by a bit of code refactoring:

	gdb/
	* gnu-nat.c (set_task_pause_cmd, set_signals_cmd)
	(set_exceptions_cmd): Add variants taking an "int arg" instead of
	a "char *".  Make the "char *" variants use the former.
	(set_noninvasive_cmd): Also use the "int arg" variants.
This commit is contained in:
Thomas Schwinge 2016-11-25 15:16:13 +01:00
parent a9617a426d
commit 785102a7d3
2 changed files with 33 additions and 11 deletions

View file

@ -1,5 +1,10 @@
2016-12-08 Thomas Schwinge <thomas@codesourcery.com>
* gnu-nat.c (set_task_pause_cmd, set_signals_cmd)
(set_exceptions_cmd): Add variants taking an "int arg" instead of
a "char *". Make the "char *" variants use the former.
(set_noninvasive_cmd): Also use the "int arg" variants.
* gnu-nat.c (gnu_create_inferior): Move nested "trace_me"
function...
(gnu_ptrace_me): ... here.

View file

@ -2792,12 +2792,12 @@ active_inf (void)
static void
set_task_pause_cmd (char *args, int from_tty)
set_task_pause_cmd (int arg, int from_tty)
{
struct inf *inf = cur_inf ();
int old_sc = inf->pause_sc;
inf->pause_sc = parse_bool_arg (args, "set task pause");
inf->pause_sc = arg;
if (old_sc == 0 && inf->pause_sc != 0)
/* If the task is currently unsuspended, immediately suspend it,
@ -2805,6 +2805,12 @@ set_task_pause_cmd (char *args, int from_tty)
inf_suspend (inf);
}
static void
set_task_pause_cmd (char *args, int from_tty)
{
set_task_pause_cmd (parse_bool_arg (args, "set task pause"), from_tty);
}
static void
show_task_pause_cmd (char *args, int from_tty)
{
@ -2991,17 +2997,23 @@ show_sig_thread_cmd (char *args, int from_tty)
static void
set_signals_cmd (char *args, int from_tty)
set_signals_cmd (int arg, int from_tty)
{
struct inf *inf = cur_inf ();
inf->want_signals = parse_bool_arg (args, "set signals");
inf->want_signals = arg;
if (inf->task && inf->want_signals != inf->traced)
/* Make this take effect immediately in a running process. */
inf_set_traced (inf, inf->want_signals);
}
static void
set_signals_cmd (char *args, int from_tty)
{
set_signals_cmd(parse_bool_arg (args, "set signals"), from_tty);
}
static void
show_signals_cmd (char *args, int from_tty)
{
@ -3015,15 +3027,20 @@ show_signals_cmd (char *args, int from_tty)
}
static void
set_exceptions_cmd (char *args, int from_tty)
set_exceptions_cmd (int arg, int from_tty)
{
struct inf *inf = cur_inf ();
int val = parse_bool_arg (args, "set exceptions");
/* Make this take effect immediately in a running process. */
/* XXX */ ;
inf->want_exceptions = val;
inf->want_exceptions = arg;
}
static void
set_exceptions_cmd (char *args, int from_tty)
{
set_exceptions_cmd (parse_bool_arg (args, "set exceptions"), from_tty);
}
static void
@ -3078,11 +3095,11 @@ static void
set_noninvasive_cmd (char *args, int from_tty)
{
/* Invert the sense of the arg for each component. */
char *inv_args = parse_bool_arg (args, "set noninvasive") ? "off" : "on";
int inv_arg = parse_bool_arg (args, "set noninvasive") ? 0 : 1;
set_task_pause_cmd (inv_args, from_tty);
set_signals_cmd (inv_args, from_tty);
set_exceptions_cmd (inv_args, from_tty);
set_task_pause_cmd (inv_arg, from_tty);
set_signals_cmd (inv_arg, from_tty);
set_exceptions_cmd (inv_arg, from_tty);
}