Re: [PATCH 10/13] constify deprecate_cmd

[Pedro Alves <palves at redhat dot com>]

Looks fine.

Thanks,
Pedro Alves

On 07/22/2014 07:55 PM, Tom Tromey wrote:
> This constifies deprecate_cmd and the "replacement" field in struct
> cmd_list_element.
> 
> 2014-07-22  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.
> ---
>  gdb/ChangeLog        | 8 ++++++++
>  gdb/cli/cli-decode.c | 2 +-
>  gdb/cli/cli-decode.h | 2 +-
>  gdb/command.h        | 2 +-
>  gdb/maint.c          | 4 ++--
>  5 files changed, 13 insertions(+), 5 deletions(-)
> 
> 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 336856c..3472c35 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)
>  	{
>