[RFA 49/67] Constify some commands in btrace.c

Tom Tromey
2017-09-21T05:39:39Z

* btrace.c (get_uint, get_context_size, no_chunk)
(maint_btrace_packet_history_cmd)
(maint_btrace_clear_packet_history_cmd, maint_btrace_clear_cmd)
(maint_info_btrace_cmd): Constify.
---
gdb/ChangeLog | 7 +++++++
gdb/btrace.c | 24 ++++++++++++++----------
2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/gdb/btrace.c b/gdb/btrace.c
index 8527c6f..b42e68e 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -3180,9 +3180,10 @@ btrace_maint_print_packets (struct btrace_thread_info *btinfo,
/* Read a number from an argument string. */

static unsigned int
-get_uint (char **arg)
+get_uint (const char **arg)
{
- char *begin, *end, *pos;
+ const char *begin, *pos;
+ char *end;
unsigned long number;

begin = *arg;
@@ -3203,9 +3204,9 @@ get_uint (char **arg)
/* Read a context size from an argument string. */

static int
-get_context_size (char **arg)
+get_context_size (const char **arg)
{
- char *pos;
+ const char *pos;
int number;

pos = skip_spaces (*arg);
@@ -3213,13 +3214,16 @@ get_context_size (char **arg)
if (!isdigit (*pos))
error (_("Expected positive number, got: %s."), pos);

- return strtol (pos, arg, 10);
+ char *end;
+ long result = strtol (pos, &end, 10);
+ *arg = end;
+ return result;
}

/* Complain about junk at the end of an argument string. */

static void
-no_chunk (char *arg)
+no_chunk (const char *arg)
{
if (*arg != 0)
error (_("Junk after argument: %s."), arg);
@@ -3228,7 +3232,7 @@ no_chunk (char *arg)
/* The "maintenance btrace packet-history" command. */

static void
-maint_btrace_packet_history_cmd (char *arg, int from_tty)
+maint_btrace_packet_history_cmd (const char *arg, int from_tty)
{
struct btrace_thread_info *btinfo;
struct thread_info *tp;
@@ -3333,7 +3337,7 @@ maint_btrace_packet_history_cmd (char *arg, int from_tty)
/* The "maintenance btrace clear-packet-history" command. */

static void
-maint_btrace_clear_packet_history_cmd (char *args, int from_tty)
+maint_btrace_clear_packet_history_cmd (const char *args, int from_tty)
{
struct btrace_thread_info *btinfo;
struct thread_info *tp;
@@ -3355,7 +3359,7 @@ maint_btrace_clear_packet_history_cmd (char *args, int from_tty)
/* The "maintenance btrace clear" command. */

static void
-maint_btrace_clear_cmd (char *args, int from_tty)
+maint_btrace_clear_cmd (const char *args, int from_tty)
{
struct btrace_thread_info *btinfo;
struct thread_info *tp;
@@ -3418,7 +3422,7 @@ maint_btrace_pt_show_cmd (char *args, int from_tty)
/* The "maintenance info btrace" command. */

static void
-maint_info_btrace_cmd (char *args, int from_tty)
+maint_info_btrace_cmd (const char *args, int from_tty)
{
struct btrace_thread_info *btinfo;
struct thread_info *tp;
--
2.9.4