[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] Hurd, C++: Avoid "const char *" to "char *" casts
From: |
Thomas Schwinge |
Subject: |
[PATCH 3/5] Hurd, C++: Avoid "const char *" to "char *" casts |
Date: |
Thu, 8 Dec 2016 08:50:34 +0100 |
... 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.
---
gdb/ChangeLog | 5 +++++
gdb/gnu-nat.c | 39 ++++++++++++++++++++++++++++-----------
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);
}
--
2.10.2
- Fix C++ compilation of the Hurd port, Thomas Schwinge, 2016/12/08
- [PATCH 1/5] Hurd, C++: Explicitly cast "void *", Thomas Schwinge, 2016/12/08
- [PATCH 2/5] Hurd, C++: Avoid GNU C nested functions, Thomas Schwinge, 2016/12/08
- [PATCH 5/5] Hurd, C++: Mach/Hurd headers and MIG stubs are not yet fit for C++, Thomas Schwinge, 2016/12/08
- [PATCH 3/5] Hurd, C++: Avoid "const char *" to "char *" casts,
Thomas Schwinge <=
- [PATCH 4/5] Hurd, C++: kern_return_t vs. error_t, Thomas Schwinge, 2016/12/08
- Re: Fix C++ compilation of the Hurd port, Luis Machado, 2016/12/23