Re: [RFA 37/67] Constify some commands in record.c

Tom Tromey
2017-09-23T04:29:52Z

Pedro> Indentation looks odd. [3 spaces instead of 2?]

Here's the update.

Tom

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9b1af80..0764f07 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2017-09-20 Tom Tromey <tom@tromey.com>

+ * record.c (cmd_record_delete, cmd_record_stop, cmd_record_save)
+ (cmd_record_goto_begin, cmd_record_goto_end, get_insn_number)
+ (get_context_size, no_chunk, get_insn_history_modifiers)
+ (cmd_record_insn_history, get_call_history_modifiers)
+ (cmd_record_call_history): Constify.
+
+2017-09-20 Tom Tromey <tom@tromey.com>
+
* source.c (show_substitute_path_command)
(unset_substitute_path_command, set_substitute_path_command):
Constify.
diff --git a/gdb/record.c b/gdb/record.c
index 59fb240..f4ef269 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -272,7 +272,7 @@ cmd_record_start (char *args, int from_tty)
of replay until the end. */

static void
-cmd_record_delete (char *args, int from_tty)
+cmd_record_delete (const char *args, int from_tty)
{
require_record_target ();

@@ -298,7 +298,7 @@ cmd_record_delete (char *args, int from_tty)
/* Implement the "stoprecord" or "record stop" command. */

static void
-cmd_record_stop (char *args, int from_tty)
+cmd_record_stop (const char *args, int from_tty)
{
struct target_ops *t;

@@ -352,9 +352,10 @@ info_record_command (char *args, int from_tty)
/* The "record save" command. */

static void
-cmd_record_save (char *args, int from_tty)
+cmd_record_save (const char *args, int from_tty)
{
- char *recfilename, recfilename_buffer[40];
+ const char *recfilename;
+ char recfilename_buffer[40];

require_record_target ();

@@ -401,7 +402,7 @@ cmd_record_goto (char *arg, int from_tty)
/* The "record goto begin" command. */

static void
-cmd_record_goto_begin (char *arg, int from_tty)
+cmd_record_goto_begin (const char *arg, int from_tty)
{
if (arg != NULL && *arg != '\0')
error (_("Junk after argument: %s."), arg);
@@ -413,7 +414,7 @@ cmd_record_goto_begin (char *arg, int from_tty)
/* The "record goto end" command. */

static void
-cmd_record_goto_end (char *arg, int from_tty)
+cmd_record_goto_end (const char *arg, int from_tty)
{
if (arg != NULL && *arg != '\0')
error (_("Junk after argument: %s."), arg);
@@ -425,7 +426,7 @@ cmd_record_goto_end (char *arg, int from_tty)
/* Read an instruction number from an argument string. */

static ULONGEST
-get_insn_number (char **arg)
+get_insn_number (const char **arg)
{
ULONGEST number;
const char *begin, *end, *pos;
@@ -446,9 +447,10 @@ get_insn_number (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;
+ char *end;
int number;

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

- return strtol (pos, arg, 10);
+ 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);
@@ -471,10 +475,10 @@ no_chunk (char *arg)
/* Read instruction-history modifiers from an argument string. */

static gdb_disassembly_flags
-get_insn_history_modifiers (char **arg)
+get_insn_history_modifiers (const char **arg)
{
gdb_disassembly_flags modifiers;
- char *args;
+ const char *args;

modifiers = 0;
args = *arg;
@@ -549,7 +553,7 @@ command_size_to_target_size (unsigned int size)
/* The "record instruction-history" command. */

static void
-cmd_record_insn_history (char *arg, int from_tty)
+cmd_record_insn_history (const char *arg, int from_tty)
{
require_record_target ();

@@ -612,10 +616,10 @@ cmd_record_insn_history (char *arg, int from_tty)
/* Read function-call-history modifiers from an argument string. */

static int
-get_call_history_modifiers (char **arg)
+get_call_history_modifiers (const char **arg)
{
int modifiers;
- char *args;
+ const char *args;

modifiers = 0;
args = *arg;
@@ -666,7 +670,7 @@ get_call_history_modifiers (char **arg)
/* The "record function-call-history" command. */

static void
-cmd_record_call_history (char *arg, int from_tty)
+cmd_record_call_history (const char *arg, int from_tty)
{
int flags, size;