Re: [PATCH 04/18] Remove c_printstr

[Andrew Burgess <aburgess@redhat.com>]

* Tom Tromey <tom@tromey.com> [2022-02-16 06:55:04 -0700]:

> This renames c_printstr, removing a layer of indirection.
> ---
>  gdb/c-lang.c    |  8 ++++----
>  gdb/c-lang.h    |  8 --------
>  gdb/language.c  | 12 ------------
>  gdb/rust-lang.c |  5 +++--
>  4 files changed, 7 insertions(+), 26 deletions(-)
> 
> diff --git a/gdb/c-lang.c b/gdb/c-lang.c
> index 342109c94ef..fbbecb696b9 100644
> --- a/gdb/c-lang.c
> +++ b/gdb/c-lang.c
> @@ -190,10 +190,10 @@ language_defn::printchar (int c, struct type *type,
>     characters, or if FORCE_ELLIPSES.  */
>  
>  void
> -c_printstr (struct ui_file *stream, struct type *type, 
> -	    const gdb_byte *string, unsigned int length, 
> -	    const char *user_encoding, int force_ellipses,
> -	    const struct value_print_options *options)
> +language_defn::printstr (struct ui_file *stream, struct type *type, 
> +			 const gdb_byte *string, unsigned int length, 

I know you didn't add them, but there's a trailing whitespace on both
the preceding lines, would you mind fixing these please?

> +			 const char *user_encoding, int force_ellipses,
> +			 const struct value_print_options *options) const
>  {
>    c_string_type str_type;
>    const char *type_encoding;
> diff --git a/gdb/c-lang.h b/gdb/c-lang.h
> index 16c9b116393..5441bfe10c7 100644
> --- a/gdb/c-lang.h
> +++ b/gdb/c-lang.h
> @@ -92,14 +92,6 @@ extern void c_value_print (struct value *, struct ui_file *,
>  
>  extern void c_printchar (int, struct type *, struct ui_file *);
>  
> -extern void c_printstr (struct ui_file * stream,
> -			struct type *elttype,
> -			const gdb_byte *string,
> -			unsigned int length,
> -			const char *user_encoding,
> -			int force_ellipses,
> -			const struct value_print_options *options);
> -
>  extern void c_language_arch_info (struct gdbarch *gdbarch,
>  				  struct language_arch_info *lai);
>  
> diff --git a/gdb/language.c b/gdb/language.c
> index 931abcd3076..20b6d8ccf9b 100644
> --- a/gdb/language.c
> +++ b/gdb/language.c
> @@ -635,18 +635,6 @@ language_defn::value_print_inner
>  
>  /* See language.h.  */
>  
> -void
> -language_defn::printstr (struct ui_file *stream, struct type *elttype,
> -			 const gdb_byte *string, unsigned int length,
> -			 const char *encoding, int force_ellipses,
> -			 const struct value_print_options *options) const
> -{
> -  c_printstr (stream, elttype, string, length, encoding, force_ellipses,
> -	      options);
> -}
> -
> -/* See language.h.  */
> -
>  void
>  language_defn::print_typedef (struct type *type, struct symbol *new_symbol,
>  			      struct ui_file *stream) const
> diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
> index 7584d2572fa..3668d2d0c6d 100644
> --- a/gdb/rust-lang.c
> +++ b/gdb/rust-lang.c
> @@ -283,8 +283,9 @@ rust_language::printstr (struct ui_file *stream, struct type *type,
>  	{
>  	  /* This is probably some C string, so let's let C deal with
>  	     it.  */
> -	  c_printstr (stream, type, string, length, user_encoding,
> -		      force_ellipses, options);
> +	  this->language_defn::printstr (stream, type, string, length,
> +					 user_encoding, force_ellipses,
> +					 options);

Personally, not a fan of the 'this->' when we're already using the
parent class name.  In ada_language::read_var_value we don't use
'this->'.  But I think it's up to you really, I'm not that offended by
it.

Thanks,
Andrew