From 1754f103e6323b908fc004d992930933a04183ce Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 4 Jul 2005 13:29:13 +0000 Subject: [PATCH] * bsd-kvm.c (bsd_kvm_open): Properly cast sentinel in concat call. * coffread.c (patch_type, process_coff_symbol): Likewise. * corelow.c (core_open): Likewise. * dwarf2read.c (dwarf_decode_lines, dwarf2_start_subfile): * language.c (set_lang_str, set_type_str, set_range_str) (set_case_str): Likewise. * source.c (add_path, openp): Likewise. * stabsread.c: Likewise. * top.c (init_history): Likewise. * utils.c (xfullpath): Likewise. * value.c (lookup_internalvar): Likewise. * cli/cli-cmds.c (cd_command): Likewise. * cli/cli-dump.c (add_dump_command): Likewise. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/bsd-kvm.c | 2 +- gdb/cli/cli-cmds.c | 5 +++-- gdb/cli/cli-dump.c | 2 +- gdb/coffread.c | 8 ++++---- gdb/corelow.c | 2 +- gdb/dwarf2read.c | 12 ++++++------ gdb/language.c | 8 ++++---- gdb/source.c | 15 ++++++++------- gdb/stabsread.c | 7 ++++--- gdb/top.c | 6 ++++-- gdb/utils.c | 4 ++-- gdb/value.c | 2 +- 13 files changed, 53 insertions(+), 34 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 86cdb77ec52..0c2ea6e2a02 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2005-07-04 Mark Kettenis + * bsd-kvm.c (bsd_kvm_open): Properly cast sentinel in concat call. + * coffread.c (patch_type, process_coff_symbol): Likewise. + * corelow.c (core_open): Likewise. + * dwarf2read.c (dwarf_decode_lines, dwarf2_start_subfile): + * language.c (set_lang_str, set_type_str, set_range_str) + (set_case_str): Likewise. + * source.c (add_path, openp): Likewise. + * stabsread.c: Likewise. + * top.c (init_history): Likewise. + * utils.c (xfullpath): Likewise. + * value.c (lookup_internalvar): Likewise. + * cli/cli-cmds.c (cd_command): Likewise. + * cli/cli-dump.c (add_dump_command): Likewise. + * i387-tdep.c (print_i387_value, print_i387_ext, i387_tag): Change type of first argument to `const gdb_byte *'. (i387_print_float_info, i387_register_to_value) diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c index db60052ecca..32da68dd61b 100644 --- a/gdb/bsd-kvm.c +++ b/gdb/bsd-kvm.c @@ -70,7 +70,7 @@ bsd_kvm_open (char *filename, int from_tty) filename = tilde_expand (filename); if (filename[0] != '/') { - temp = concat (current_directory, "/", filename, NULL); + temp = concat (current_directory, "/", filename, (char *)NULL); xfree (filename); filename = temp; } diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index aaba486ed33..8d3416764ba 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -366,9 +366,10 @@ cd_command (char *dir, int from_tty) else { if (IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1])) - current_directory = concat (current_directory, dir, NULL); + current_directory = concat (current_directory, dir, (char *)NULL); else - current_directory = concat (current_directory, SLASH_STRING, dir, NULL); + current_directory = concat (current_directory, SLASH_STRING, + dir, (char *)NULL); xfree (dir); } diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c index e855c4c4d27..a842246436a 100644 --- a/gdb/cli/cli-dump.c +++ b/gdb/cli/cli-dump.c @@ -438,7 +438,7 @@ add_dump_command (char *name, void (*func) (char *args, char *mode), && c->doc[3] == 't' && c->doc[4] == 'e' && c->doc[5] == ' ') - c->doc = concat ("Append ", c->doc + 6, NULL); + c->doc = concat ("Append ", c->doc + 6, (char *)NULL); } /* Opaque data for restore_section_callback. */ diff --git a/gdb/coffread.c b/gdb/coffread.c index 205b733b98a..36e4d813519 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -1,6 +1,6 @@ /* Read coff symbol tables and convert to internal format, for GDB. Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, - 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by David D. Johnson, Brown University (ddj@cs.brown.edu). @@ -1399,7 +1399,7 @@ patch_type (struct type *type, struct type *real_type) { if (TYPE_NAME (target)) xfree (TYPE_NAME (target)); - TYPE_NAME (target) = concat (TYPE_NAME (real_target), NULL); + TYPE_NAME (target) = concat (TYPE_NAME (real_target), (char *)NULL); } } @@ -1636,7 +1636,7 @@ process_coff_symbol (struct coff_symbol *cs, } else TYPE_NAME (SYMBOL_TYPE (sym)) = - concat (DEPRECATED_SYMBOL_NAME (sym), NULL); + concat (DEPRECATED_SYMBOL_NAME (sym), (char *)NULL); } /* Keep track of any type which points to empty structured type, @@ -1671,7 +1671,7 @@ process_coff_symbol (struct coff_symbol *cs, && *DEPRECATED_SYMBOL_NAME (sym) != '~' && *DEPRECATED_SYMBOL_NAME (sym) != '.') TYPE_TAG_NAME (SYMBOL_TYPE (sym)) = - concat (DEPRECATED_SYMBOL_NAME (sym), NULL); + concat (DEPRECATED_SYMBOL_NAME (sym), (char *)NULL); add_symbol_to_list (sym, &file_symbols); break; diff --git a/gdb/corelow.c b/gdb/corelow.c index c07b5749716..0f8269eaff6 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -300,7 +300,7 @@ core_open (char *filename, int from_tty) filename = tilde_expand (filename); if (filename[0] != '/') { - temp = concat (current_directory, "/", filename, NULL); + temp = concat (current_directory, "/", filename, (char *)NULL); xfree (filename); filename = temp; } diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index a6a76842eea..eb6cec91f61 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -1,7 +1,7 @@ /* DWARF 2 debugging format support for GDB. Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004 + 2004, 2005 Free Software Foundation, Inc. Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology, @@ -6632,15 +6632,15 @@ dwarf_decode_lines (struct line_header *lh, char *comp_dir, bfd *abfd, if (!IS_ABSOLUTE_PATH (include_name) && dir_name != NULL) { - include_name = - concat (dir_name, SLASH_STRING, include_name, NULL); + include_name = concat (dir_name, SLASH_STRING, + include_name, (char *)NULL); make_cleanup (xfree, include_name); } if (!IS_ABSOLUTE_PATH (pst_filename) && pst->dirname != NULL) { - pst_filename = - concat (pst->dirname, SLASH_STRING, pst_filename, NULL); + pst_filename = concat (pst->dirname, SLASH_STRING, + pst_filename, (char *)NULL); make_cleanup (xfree, pst_filename); } @@ -6679,7 +6679,7 @@ dwarf2_start_subfile (char *filename, char *dirname) if (!IS_ABSOLUTE_PATH (filename) && dirname != NULL) { struct subfile *subfile; - char *fullname = concat (dirname, "/", filename, NULL); + char *fullname = concat (dirname, "/", filename, (char *)NULL); for (subfile = subfiles; subfile; subfile = subfile->next) { diff --git a/gdb/language.c b/gdb/language.c index 3d6ecfc960e..654f0f498a3 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -412,7 +412,7 @@ set_lang_str (void) if (language_mode == language_mode_auto) prefix = "auto; currently "; - language = concat (prefix, current_language->la_name, NULL); + language = concat (prefix, current_language->la_name, (char *)NULL); } static void @@ -440,7 +440,7 @@ set_type_str (void) error (_("Unrecognized type check setting.")); } - type = concat (prefix, tmp, NULL); + type = concat (prefix, tmp, (char *)NULL); } static void @@ -468,7 +468,7 @@ set_range_str (void) if (range) xfree (range); - range = concat (pref, tmp, NULL); + range = concat (pref, tmp, (char *)NULL); } static void @@ -492,7 +492,7 @@ set_case_str (void) } xfree (case_sensitive); - case_sensitive = concat (prefix, tmp, NULL); + case_sensitive = concat (prefix, tmp, (char *)NULL); } /* Print out the current language settings: language, range and diff --git a/gdb/source.c b/gdb/source.c index 063ffe59006..e2baddc6166 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1,6 +1,6 @@ /* List lines of source files for GDB, the GNU debugger. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GDB. @@ -487,10 +487,10 @@ add_path (char *dirname, char **which_path, int parse_separators) name = tilde_expand (name); #ifdef HAVE_DOS_BASED_FILE_SYSTEM else if (IS_ABSOLUTE_PATH (name) && p == name + 2) /* "d:" => "d:." */ - name = concat (name, ".", NULL); + name = concat (name, ".", (char *)NULL); #endif else if (!IS_ABSOLUTE_PATH (name) && name[0] != '$') - name = concat (current_directory, SLASH_STRING, name, NULL); + name = concat (current_directory, SLASH_STRING, name, (char *)NULL); else name = savestring (name, p - name); make_cleanup (xfree, name); @@ -563,15 +563,16 @@ add_path (char *dirname, char **which_path, int parse_separators) c = old[prefix]; old[prefix] = '\0'; - temp = concat (old, tinybuf, name, NULL); + temp = concat (old, tinybuf, name, (char *)NULL); old[prefix] = c; - *which_path = concat (temp, "", &old[prefix], NULL); + *which_path = concat (temp, "", &old[prefix], (char *)NULL); prefix = strlen (temp); xfree (temp); } else { - *which_path = concat (name, (old[0] ? tinybuf : old), old, NULL); + *which_path = concat (name, (old[0] ? tinybuf : old), + old, (char *)NULL); prefix = strlen (name); } xfree (old); @@ -771,7 +772,7 @@ done: char *f = concat (current_directory, IS_DIR_SEPARATOR (current_directory[strlen (current_directory) - 1]) ? "" : SLASH_STRING, - filename, NULL); + filename, (char *)NULL); *filename_opened = xfullpath (f); xfree (f); } diff --git a/gdb/stabsread.c b/gdb/stabsread.c index d3d4b318fc3..b387c25cb3f 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1,8 +1,8 @@ /* Support routines for decoding "stabs" debugging information format. Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, - 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free - Software Foundation, Inc. + 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Free Software Foundation, Inc. This file is part of GDB. @@ -2527,7 +2527,8 @@ read_member_functions (struct field_info *fip, char **pp, struct type *type, } else if (has_destructor && new_fnlist->fn_fieldlist.name[0] != '~') { - new_fnlist->fn_fieldlist.name = concat ("~", main_fn_name, NULL); + new_fnlist->fn_fieldlist.name = + concat ("~", main_fn_name, (char *)NULL); xfree (main_fn_name); } else if (!has_stub) diff --git a/gdb/top.c b/gdb/top.c index 1bd22e3706d..98ad51b7f8e 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1370,9 +1370,11 @@ init_history (void) that was read. */ #ifdef __MSDOS__ /* No leading dots in file names are allowed on MSDOS. */ - history_filename = concat (current_directory, "/_gdb_history", NULL); + history_filename = concat (current_directory, "/_gdb_history", + (char *)NULL); #else - history_filename = concat (current_directory, "/.gdb_history", NULL); + history_filename = concat (current_directory, "/.gdb_history", + (char *)NULL); #endif } read_history (history_filename); diff --git a/gdb/utils.c b/gdb/utils.c index d151174ea3f..690f87ce931 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3030,9 +3030,9 @@ xfullpath (const char *filename) directory separator, avoid doubling it. */ real_path = gdb_realpath (dir_name); if (IS_DIR_SEPARATOR (real_path[strlen (real_path) - 1])) - result = concat (real_path, base_name, NULL); + result = concat (real_path, base_name, (char *)NULL); else - result = concat (real_path, SLASH_STRING, base_name, NULL); + result = concat (real_path, SLASH_STRING, base_name, (char *)NULL); xfree (real_path); return result; diff --git a/gdb/value.c b/gdb/value.c index 8662d68a85a..0b20a5acc46 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -743,7 +743,7 @@ lookup_internalvar (char *name) return var; var = (struct internalvar *) xmalloc (sizeof (struct internalvar)); - var->name = concat (name, NULL); + var->name = concat (name, (char *)NULL); var->value = allocate_value (builtin_type_void); release_value (var->value); var->next = internalvars; -- 2.30.2