diff options
| author | Pedro Alves <palves@redhat.com> | 2016-04-21 11:34:18 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-04-21 11:34:18 +0100 |
| commit | b36cec19e826c19648964576ef2d20d63f99e888 (patch) | |
| tree | 63fd4feb5e17a10fb337e47938b4dd335239ca98 /gdb/dwarf2read.c | |
| parent | 96bf8cb07d2cc8d6f7b509c4430be9966fff1fdd (diff) | |
| download | fsf-binutils-gdb-b36cec19e826c19648964576ef2d20d63f99e888.zip fsf-binutils-gdb-b36cec19e826c19648964576ef2d20d63f99e888.tar.gz fsf-binutils-gdb-b36cec19e826c19648964576ef2d20d63f99e888.tar.bz2 | |
Add missing sentinel 'char *' casts in concat/reconcat calls
The wildebeest-debian-wheezy-i686 buildslave's build is broken due to:
../../binutils-gdb/gdb/python/python.c: In function void _initialize_python():
../../binutils-gdb/gdb/python/python.c:1709:36: error: missing sentinel in function call [-Werror=format]
Reproduced on Fedora 23 by sticking a few:
#undef NULL
#define 0
in build/gdb/build-gnulib/{stddef|signal|stdio}.h. Hopefully this
caught all instances.
gdb/ChangeLog:
2016-04-21 Pedro Alves <palves@redhat.com>
* dwarf2read.c (try_open_dwop_file, open_dwo_file)
(file_file_name, file_full_name): Add char * cast to sentinel in
concat/reconcat calls.
* event-top.c (top_level_prompt): Likewise.
* guile/guile.c (initialize_scheme_side): Likewise.
* linux-tdep.c (linux_fill_prpsinfo): Likewise.
* macrotab.c (macro_source_fullname): Likewise.
* main.c (get_init_files, captured_main): Likewise.
* psymtab.c (psymtab_to_fullname): Likewise.
* python/python.c (_initialize_python)
(gdbpy_finish_initialization): Likewise.
* source.c (symtab_to_fullname): Likewise.
Diffstat (limited to 'gdb/dwarf2read.c')
| -rw-r--r-- | gdb/dwarf2read.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index dcd49e3..7bbf080 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -10482,7 +10482,7 @@ try_open_dwop_file (const char *file_name, int is_dwp, int search_cwd) { if (*debug_file_directory != '\0') search_path = concat (".", dirname_separator_string, - debug_file_directory, NULL); + debug_file_directory, (char *) NULL); else search_path = xstrdup ("."); } @@ -10538,7 +10538,8 @@ open_dwo_file (const char *file_name, const char *comp_dir) if (comp_dir != NULL) { - char *path_to_try = concat (comp_dir, SLASH_STRING, file_name, NULL); + char *path_to_try = concat (comp_dir, SLASH_STRING, + file_name, (char *) NULL); /* NOTE: If comp_dir is a relative path, this will also try the search path, which seems useful. */ @@ -20871,7 +20872,7 @@ file_file_name (int file, struct line_header *lh) || lh->include_dirs == NULL) return xstrdup (fe->name); return concat (lh->include_dirs[fe->dir_index - 1], SLASH_STRING, - fe->name, NULL); + fe->name, (char *) NULL); } else { @@ -20906,7 +20907,8 @@ file_full_name (int file, struct line_header *lh, const char *comp_dir) if (IS_ABSOLUTE_PATH (relative) || comp_dir == NULL) return relative; - return reconcat (relative, comp_dir, SLASH_STRING, relative, NULL); + return reconcat (relative, comp_dir, SLASH_STRING, + relative, (char *) NULL); } else return file_file_name (file, lh); |