aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2016-11-25 15:16:13 +0100
committerThomas Schwinge <thomas@codesourcery.com>2016-12-08 08:24:53 +0100
commit785102a7d34f2d48f9a1616bf931fea6de2385fb (patch)
treefed8ee31f308cffd98ed0a31ede72f6d4ebc23b4
parenta9617a426d001a748168fbc399fcc77e6d8d3cac (diff)
downloadgdb-785102a7d34f2d48f9a1616bf931fea6de2385fb.zip
gdb-785102a7d34f2d48f9a1616bf931fea6de2385fb.tar.gz
gdb-785102a7d34f2d48f9a1616bf931fea6de2385fb.tar.bz2
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.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/gnu-nat.c39
2 files changed, 33 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8b43cd8..b40ac6f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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.
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 34fd6f1..29bd9b9 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -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,
@@ -2806,6 +2806,12 @@ set_task_pause_cmd (char *args, int from_tty)
}
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)
{
struct inf *inf = cur_inf ();
@@ -2991,11 +2997,11 @@ 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. */
@@ -3003,6 +3009,12 @@ set_signals_cmd (char *args, int from_tty)
}
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)
{
struct inf *inf = cur_inf ();
@@ -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);
}