aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-02-10 15:13:42 +0100
committerTom de Vries <tdevries@suse.de>2020-02-10 15:13:42 +0100
commit85f0dd3ce8b249638e00f9e43153b712705a3347 (patch)
tree547a4613f5a0a95c2bdd9ec0eadcdf082bf24906
parent44f6938ead9cfadecd705dbd30fa177fac1330ad (diff)
downloadgdb-85f0dd3ce8b249638e00f9e43153b712705a3347.zip
gdb-85f0dd3ce8b249638e00f9e43153b712705a3347.tar.gz
gdb-85f0dd3ce8b249638e00f9e43153b712705a3347.tar.bz2
[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 *.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/dwarf2/read.c3
-rw-r--r--gdbsupport/ChangeLog4
-rw-r--r--gdbsupport/environ.c2
4 files changed, 12 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c751df7..ab02a74 100644
--- 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 9e66e61..7edbd9d 100644
--- 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 6ea2f2c..3225bef 100644
--- 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 55d0a74..32434ee 100644
--- 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);