aboutsummaryrefslogtreecommitdiff
path: root/gdb/charset.c
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2020-02-12 11:15:33 +0100
committerTom de Vries <tdevries@suse.de>2020-02-12 11:15:33 +0100
commit38de8abe21fe17c31888094bd860a84f88cb5749 (patch)
tree43a649e2fcb5e7043286e14cd7171308802a41a7 /gdb/charset.c
parent9706160abd7dd2137359e4575b25ef49dfdaad0c (diff)
downloadgdb-38de8abe21fe17c31888094bd860a84f88cb5749.zip
gdb-38de8abe21fe17c31888094bd860a84f88cb5749.tar.gz
gdb-38de8abe21fe17c31888094bd860a84f88cb5749.tar.bz2
[gdb] Fix -Wstrict-null-sentinel warning (--with-iconv-bin)
When using configure flag --with-iconv-bin=$(which iconv), we run into: ... gdb/charset.c: In function 'void find_charset_names()': gdb/charset.c:821:75: error: missing sentinel in function call [-Werror=format=] iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL); ^ cc1plus: all warnings being treated as errors ... Fix the warning. Build and reg-tested on x86_64-linux. 2020-02-12 Lukas Durfina <ldurfina@tachyum.com> Tom de Vries <tdevries@suse.de> * charset.c (find_charset_names): Cast concat NULL sentinel to char *.
Diffstat (limited to 'gdb/charset.c')
-rw-r--r--gdb/charset.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/charset.c b/gdb/charset.c
index 5cfd2d8..4e459c2 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -818,7 +818,8 @@ 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");