RE: [PATCH 2/2] gdb: Fix a type of sentinel

["Aktemur, Tankut Baris" <tankut.baris.aktemur@intel.com>]

On Tuesday, January 28, 2020 5:44 PM, Simon Marchi wrote:
> On 2020-01-28 9:28 a.m., Lukas Durfina wrote:
> > ---
> >  gdb/ChangeLog | 4 ++++
> >  gdb/charset.c | 2 +-
> >  2 files changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/gdb/ChangeLog b/gdb/ChangeLog
> > index 8b6da62bd4..1dd89ae2e0 100644
> > --- a/gdb/ChangeLog
> > +++ b/gdb/ChangeLog
> > @@ -1,3 +1,7 @@
> > +2020-01-28 Lukas Durfina <ldurfina@tachyum.com>
> > +
> > +	* charset.c (find_charset_names): Fix a type of sentinel.
> > +
> >  2020-01-26  Tom Tromey  <tom@tromey.com>
> >
> >  	* ctfread.c (struct ctf_fp_info): Reindent.
> > diff --git a/gdb/charset.c b/gdb/charset.c
> > index 5cfd2d8030..abf795ce6d 100644
> > --- a/gdb/charset.c
> > +++ b/gdb/charset.c
> > @@ -818,7 +818,7 @@ find_charset_names (void)
> >    {
> >      std::string iconv_dir = relocate_gdb_directory (ICONV_BIN,
> >  						    ICONV_BIN_RELOCATABLE);
> > -    iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL);
> > +    iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", (char *) NULL);
> >    }
> >  #else
> >    iconv_program = xstrdup ("iconv");
> > --
> > 2.17.1
> >
> 
> Hi Lukas,
> 
> Same comment as patch 1/2.
> 
> If this change fixes the same problem as patch 1/2, then you can put
> both changes in the same patch.
> 
> Simon

Now that the line is being touched, it might also be a good idea to replace
NULL with nullptr.

-Baris


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, Gary Kershaw
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928