[gdb] Fix -Wstrict-null-sentinel warnings

When passed in CXXFLAGS, -Wstrict-null-sentinel triggers twice in a
gdb/gdbserver build.

Fix the two occurrences.

Build and reg-tested on x86_64-linux.

gdb/ChangeLog:

2020-02-10  Tom de Vries  <tdevries@suse.de>

	* dwarf2/read.c (process_psymtab_comp_unit_reader): Cast concat NULL
	sentinel to char *.

gdbsupport/ChangeLog:

2020-02-10  Tom de Vries  <tdevries@suse.de>

	* environ.c (gdb_environ::set): Cast concat NULL sentinel to char *.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c751df7d9a50eb6381b272efe4961d82d7ff3632..ab02a74a61d288531173ec7bd5df2d3dfacc91f1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-10  Tom de Vries  <tdevries@suse.de>
+
+       * dwarf2/read.c (process_psymtab_comp_unit_reader): Cast concat NULL
+       sentinel to char *.
+
 2020-02-09  Tom de Vries  <tdevries@suse.de>
 
        * dwarf2read.c (process_psymtab_comp_unit_reader): Append CU offset to

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 9e66e613cd63b788b9e39d0e8ed86732906e2f01..7edbd9d7dfa4b9d56143009139b1c3871b479816 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -7260,7 +7260,8 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
   else if (strcmp (filename, artificial) == 0)
     {
       debug_filename.reset (concat (artificial, "@",
-                                   sect_offset_str (per_cu->sect_off), NULL));
+                                   sect_offset_str (per_cu->sect_off),
+                                   (char *) NULL));
       filename = debug_filename.get ();
     }
 

diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6ea2f2c2530e8b7019ec2f7763ff31ee4fbeb7ad..3225befc3dfe0e0be20ec1f78aacca8e3eaecbb8 100644 (file)
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-10  Tom de Vries  <tdevries@suse.de>
+
+       * environ.c (gdb_environ::set): Cast concat NULL sentinel to char *.
+
 2020-01-24  Christian Biesinger  <cbiesinger@google.com>
 
        * thread-pool.c (set_thread_name): Add an overload for the NetBSD

diff --git a/gdbsupport/environ.c b/gdbsupport/environ.c
index 55d0a74c3721a87448e99fc795f2b0afcbabe979..32434ee0b74f01a9c18d7d4452ec9f385678180e 100644 (file)
--- a/gdbsupport/environ.c
+++ b/gdbsupport/environ.c
@@ -105,7 +105,7 @@ gdb_environ::get (const char *var) const
 void
 gdb_environ::set (const char *var, const char *value)
 {
-  char *fullvar = concat (var, "=", value, NULL);
+  char *fullvar = concat (var, "=", value, (char *) NULL);
 
   /* We have to unset the variable in the vector if it exists.  */
   unset (var, false);