constify do_set_command and do_show_command

This changes do_set_command and do_show_command to take const
arguments.

2014-06-26  Tom Tromey  <tromey@redhat.com>

	* cli/cli-setshow.c (do_set_command): Make "arg" const.
	(do_show_command): Make "arg" const.
	* cli/cli-setshow.h (do_set_command, do_show_command): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49d41fcad790744e7038109fea9d2506539b8985..2b26f6352e6da2ca8f7dd0e1ffad13339a1ed4c6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-26  Tom Tromey  <tromey@redhat.com>
+
+       * cli/cli-setshow.c (do_set_command): Make "arg" const.
+       (do_show_command): Make "arg" const.
+       * cli/cli-setshow.h (do_set_command, do_show_command): Update.
+
 2014-06-26  Tom Tromey  <tromey@redhat.com>
 
        * record-full.c (record_full_get_bookmark): Make "args" const.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index d14d3614f70b99850f696bee5349e7f59195f066..61ff0853eb7482410af4702c34c94c96d75d6579 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -148,7 +148,7 @@ is_unlimited_literal (const char *arg)
    other command).  C is the command list element for the command.  */
 
 void
-do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
+do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
 {
   /* A flag to indicate the option is changed or not.  */
   int option_changed = 0;
@@ -233,13 +233,15 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
        if (arg != NULL)
          {
            /* Clear trailing whitespace of filename.  */
-           char *ptr = arg + strlen (arg) - 1;
+           const char *ptr = arg + strlen (arg) - 1;
+           char *copy;
 
            while (ptr >= arg && (*ptr == ' ' || *ptr == '\t'))
              ptr--;
-           *(ptr + 1) = '\0';
+           copy = xstrndup (arg, ptr + 1 - arg);
 
-           val = tilde_expand (arg);
+           val = tilde_expand (copy);
+           xfree (copy);
          }
        else
          val = xstrdup ("");
@@ -564,7 +566,7 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
    other command).  C is the command list element for the command.  */
 
 void
-do_show_command (char *arg, int from_tty, struct cmd_list_element *c)
+do_show_command (const char *arg, int from_tty, struct cmd_list_element *c)
 {
   struct ui_out *uiout = current_uiout;
   struct cleanup *old_chain;

diff --git a/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h
index a68d610c29ea93aeb55cb804e08a539c82b3ac83..7619badad8000b7e872cef3509c65edda91cdd53 100644 (file)
--- a/gdb/cli/cli-setshow.h
+++ b/gdb/cli/cli-setshow.h
@@ -23,9 +23,9 @@ struct cmd_list_element;
    Returns 1 for true, 0 for false, and -1 if invalid.  */
 extern int parse_cli_boolean_value (const char *arg);
 
-extern void do_set_command (char *arg, int from_tty,
+extern void do_set_command (const char *arg, int from_tty,
                            struct cmd_list_element *c);
-extern void do_show_command (char *arg, int from_tty,
+extern void do_show_command (const char *arg, int from_tty,
                             struct cmd_list_element *c);
 
 extern void cmd_show_list (struct cmd_list_element *list, int from_tty,