[RFA,37/67] Constify some commands in record.c
Commit Message
ChangeLog
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.
---
gdb/ChangeLog | 8 ++++++++
gdb/record.c | 36 ++++++++++++++++++++----------------
2 files changed, 28 insertions(+), 16 deletions(-)
Comments
> -----Original Message-----
> From: gdb-patches-owner@sourceware.org [mailto:gdb-patches-
> owner@sourceware.org] On Behalf Of Tom Tromey
> Sent: Thursday, September 21, 2017 7:10 AM
> To: gdb-patches@sourceware.org
> Cc: Tom Tromey <tom@tromey.com>
> Subject: [RFA 37/67] Constify some commands in record.c
Hello Tom,
> ChangeLog
> 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.
> ---
> gdb/ChangeLog | 8 ++++++++
> gdb/record.c | 36 ++++++++++++++++++++----------------
> 2 files changed, 28 insertions(+), 16 deletions(-)
Looks good to me.
> @@ -354,7 +354,8 @@ info_record_command (char *args, int from_tty)
> static void
> cmd_record_save (char *args, int from_tty)
> {
> - char *recfilename, recfilename_buffer[40];
> + const char *recfilename;
> + char recfilename_buffer[40];
>
> require_record_target ();
This isn't really related to adding a const add_cmd () version.
> @@ -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;
> }
The rest of the declarations are still at the beginning.
Thanks,
Markus.
Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Christian Lamprechter
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
On 09/21/2017 06:09 AM, Tom Tromey wrote:
> @@ -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;
> }
Indentation looks odd. [3 spaces instead of 2?]
Thanks,
Pedro Alves
>>>>> "Markus" == Metzger, Markus T <markus.t.metzger@intel.com> writes:
>> static void
>> cmd_record_save (char *args, int from_tty)
>> {
>> - char *recfilename, recfilename_buffer[40];
>> + const char *recfilename;
>> + char recfilename_buffer[40];
>>
>> require_record_target ();
Markus> This isn't really related to adding a const add_cmd () version.
Thanks for noticing this. I forgot to change the signature of
cmd_record_save. I've updated my patch so that it takes a
"const char *".
Tom
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:
Pedro> On 09/21/2017 06:09 AM, Tom Tromey wrote:
>> @@ -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;
>> }
Pedro> Indentation looks odd. [3 spaces instead of 2?]
I've fixed it.
Tom
@@ -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;
@@ -354,7 +354,8 @@ info_record_command (char *args, int from_tty)
static void
cmd_record_save (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;