diff mbox

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

Message ID 20200128142830.89282-2-ldurfina@tachyum.com
State New
Headers show

Commit Message

ldurfina@tachyum.com Jan. 28, 2020, 2:28 p.m. UTC
---
 gdb/ChangeLog | 4 ++++
 gdb/charset.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Simon Marchi Jan. 28, 2020, 4:43 p.m. UTC | #1
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
Tankut Baris Aktemur Jan. 28, 2020, 5:06 p.m. UTC | #2
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
ldurfina@tachyum.com Jan. 30, 2020, 1:58 p.m. UTC | #3
Hello,

nullptr works of course too. I will prepare the second version with nullptr.

To Simon: I will merge both patches into the single one.
Also, I will update the commit message about fixed compilation error.
You are right, it fixes the issue for cross compiling, but for our new architecture (Tachyum) that is being developed.

I assume the change is generic improvement.

Thanks
Lukas


> -----Original Message-----

> From: Aktemur, Tankut Baris <tankut.baris.aktemur@intel.com>

> Sent: Tuesday, January 28, 2020 6:06 PM

> To: Simon Marchi <simark@simark.ca>; Lukas Durfina

> <ldurfina@tachyum.com>; gdb-patches@sourceware.org

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

> 

> 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
diff mbox

Patch

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");