aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2014-07-21 20:37:34 -0600
committerTom Tromey <tromey@redhat.com>2014-07-24 11:30:03 -0600
commit429e55ea941f54f8e0481dd2048dc15af751ed71 (patch)
tree6a5b542cb8dee24e8a2ebe286537ac7e16eee3e2
parent64669f3b4bab4096df75b7279c5b2d0a4784b835 (diff)
downloadgdb-429e55ea941f54f8e0481dd2048dc15af751ed71.zip
gdb-429e55ea941f54f8e0481dd2048dc15af751ed71.tar.gz
gdb-429e55ea941f54f8e0481dd2048dc15af751ed71.tar.bz2
constify deprecate_cmd
This constifies deprecate_cmd and the "replacement" field in struct cmd_list_element. 2014-07-24 Tom Tromey <tromey@redhat.com> * cli/cli-decode.c (deprecate_cmd): Make "replacement" const. * cli/cli-decode.h (struct cmd_list_element) <replacement>: Now const. * command.h (deprecate_cmd): Update. * maint.c (maintenance_do_deprecate): Add casts.
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/cli/cli-decode.c2
-rw-r--r--gdb/cli/cli-decode.h2
-rw-r--r--gdb/command.h2
-rw-r--r--gdb/maint.c4
5 files changed, 13 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a20220..ce4893c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
2014-07-24 Tom Tromey <tromey@redhat.com>
+ * cli/cli-decode.c (deprecate_cmd): Make "replacement" const.
+ * cli/cli-decode.h (struct cmd_list_element) <replacement>: Now
+ const.
+ * command.h (deprecate_cmd): Update.
+ * maint.c (maintenance_do_deprecate): Add casts.
+
+2014-07-24 Tom Tromey <tromey@redhat.com>
+
* cli/cli-decode.c (help_cmd): Make parameter "const".
* cli/cli-decode.h (help_cmd): Update.
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index fcd4ceb..a08cc45 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -261,7 +261,7 @@ add_cmd (const char *name, enum command_class class, cmd_cfunc_ftype *fun,
Returns a pointer to the deprecated command. */
struct cmd_list_element *
-deprecate_cmd (struct cmd_list_element *cmd, char *replacement)
+deprecate_cmd (struct cmd_list_element *cmd, const char *replacement)
{
cmd->cmd_deprecated = 1;
cmd->deprecated_warn_user = 1;
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 48ed604..9cd887d 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -135,7 +135,7 @@ struct cmd_list_element
show_value_ftype *show_value_func;
/* If this command is deprecated, this is the replacement name. */
- char *replacement;
+ const char *replacement;
/* If this command represents a show command, then this function
is called before the variable's value is examined. */
diff --git a/gdb/command.h b/gdb/command.h
index 5761447..1d63d2b 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -194,7 +194,7 @@ extern struct cmd_list_element *lookup_cmd_1 (const char **,
int);
extern struct cmd_list_element *deprecate_cmd (struct cmd_list_element *,
- char * );
+ const char * );
extern void deprecated_cmd_warning (const char *);
diff --git a/gdb/maint.c b/gdb/maint.c
index 99c7f9e..d4d5810 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -628,7 +628,7 @@ maintenance_do_deprecate (char *text, int deprecate)
if (alias)
{
if (alias->malloced_replacement)
- xfree (alias->replacement);
+ xfree ((char *) alias->replacement);
if (deprecate)
{
@@ -647,7 +647,7 @@ maintenance_do_deprecate (char *text, int deprecate)
else if (cmd)
{
if (cmd->malloced_replacement)
- xfree (cmd->replacement);
+ xfree ((char *) cmd->replacement);
if (deprecate)
{