From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12449 invoked by alias); 4 Jul 2005 13:36:17 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 12425 invoked by uid 22791); 4 Jul 2005 13:36:09 -0000 Received: from server7.nfra.nl (HELO server7.nfra.nl) (192.87.1.57) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Mon, 04 Jul 2005 13:36:09 +0000 Received: from jop31.nfra.nl [10.87.10.31] by server7.nfra.nl; Mon, 04 Jul 2005 15:36:19 +0200 Received: from jop31.nfra.nl (localhost [127.0.0.1]) by jop31.nfra.nl (8.13.1/8.12.7/SuSE Linux 0.6) with ESMTP id j64Da5se001224 for ; Mon, 4 Jul 2005 15:36:05 +0200 Received: (from kettenis@localhost) by jop31.nfra.nl (8.13.1/8.13.1/Submit) id j64Da5cE001221; Mon, 4 Jul 2005 15:36:05 +0200 Date: Mon, 04 Jul 2005 13:36:00 -0000 Message-Id: <200507041336.j64Da5cE001221@jop31.nfra.nl> From: Mark Kettenis To: gdb-patches@sourceware.org Subject: [commit] Properly cast sentinels for concat() X-SW-Source: 2005-07/txt/msg00046.txt.bz2 This fixes a few warnings with GCC 4.0 on OpenBSD. You'll probably won't see them on other systems, since they only show up if NULL is defined as an integer instead of a pointer constant (both are valid according to C standard). The stddef.h that comes with GCC defines NULL as (void *)NULL, but we don't use that one on OpenBSD. Anyway, I committed the attached patch as obvious. Index: ChangeLog from 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. Index: bsd-kvm.c =================================================================== RCS file: /cvs/src/src/gdb/bsd-kvm.c,v retrieving revision 1.13 diff -u -p -r1.13 bsd-kvm.c --- bsd-kvm.c 16 May 2005 16:36:23 -0000 1.13 +++ bsd-kvm.c 4 Jul 2005 13:26:39 -0000 @@ -70,7 +70,7 @@ bsd_kvm_open (char *filename, int from_t filename = tilde_expand (filename); if (filename[0] != '/') { - temp = concat (current_directory, "/", filename, NULL); + temp = concat (current_directory, "/", filename, (char *)NULL); xfree (filename); filename = temp; } Index: coffread.c =================================================================== RCS file: /cvs/src/src/gdb/coffread.c,v retrieving revision 1.61 diff -u -p -r1.61 coffread.c --- coffread.c 11 Feb 2005 04:05:45 -0000 1.61 +++ coffread.c 4 Jul 2005 13:26:39 -0000 @@ -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 ty { 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 } 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 && *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; Index: corelow.c =================================================================== RCS file: /cvs/src/src/gdb/corelow.c,v retrieving revision 1.51 diff -u -p -r1.51 corelow.c --- corelow.c 13 Jun 2005 18:39:11 -0000 1.51 +++ corelow.c 4 Jul 2005 13:26:39 -0000 @@ -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; } Index: dwarf2read.c =================================================================== RCS file: /cvs/src/src/gdb/dwarf2read.c,v retrieving revision 1.181 diff -u -p -r1.181 dwarf2read.c --- dwarf2read.c 9 Mar 2005 06:03:14 -0000 1.181 +++ dwarf2read.c 4 Jul 2005 13:26:41 -0000 @@ -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 * 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, ch 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) { Index: language.c =================================================================== RCS file: /cvs/src/src/gdb/language.c,v retrieving revision 1.60 diff -u -p -r1.60 language.c --- language.c 9 May 2005 21:20:34 -0000 1.60 +++ language.c 4 Jul 2005 13:26:42 -0000 @@ -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 Index: source.c =================================================================== RCS file: /cvs/src/src/gdb/source.c,v retrieving revision 1.68 diff -u -p -r1.68 source.c --- source.c 27 May 2005 04:39:32 -0000 1.68 +++ source.c 4 Jul 2005 13:26:42 -0000 @@ -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_pa 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_pa 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); } Index: stabsread.c =================================================================== RCS file: /cvs/src/src/gdb/stabsread.c,v retrieving revision 1.80 diff -u -p -r1.80 stabsread.c --- stabsread.c 11 Feb 2005 18:13:53 -0000 1.80 +++ stabsread.c 4 Jul 2005 13:26:43 -0000 @@ -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 } 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) Index: top.c =================================================================== RCS file: /cvs/src/src/gdb/top.c,v retrieving revision 1.104 diff -u -p -r1.104 top.c --- top.c 12 May 2005 21:23:17 -0000 1.104 +++ top.c 4 Jul 2005 13:26:43 -0000 @@ -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); Index: utils.c =================================================================== RCS file: /cvs/src/src/gdb/utils.c,v retrieving revision 1.160 diff -u -p -r1.160 utils.c --- utils.c 18 Mar 2005 20:46:38 -0000 1.160 +++ utils.c 4 Jul 2005 13:26:44 -0000 @@ -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; Index: value.c =================================================================== RCS file: /cvs/src/src/gdb/value.c,v retrieving revision 1.29 diff -u -p -r1.29 value.c --- value.c 9 May 2005 21:20:35 -0000 1.29 +++ value.c 4 Jul 2005 13:26:44 -0000 @@ -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; Index: cli/cli-cmds.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-cmds.c,v retrieving revision 1.61 diff -u -p -r1.61 cli-cmds.c --- cli/cli-cmds.c 27 May 2005 04:39:33 -0000 1.61 +++ cli/cli-cmds.c 4 Jul 2005 13:26:45 -0000 @@ -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); } Index: cli/cli-dump.c =================================================================== RCS file: /cvs/src/src/gdb/cli/cli-dump.c,v retrieving revision 1.22 diff -u -p -r1.22 cli-dump.c --- cli/cli-dump.c 26 May 2005 20:49:03 -0000 1.22 +++ cli/cli-dump.c 4 Jul 2005 13:26:45 -0000 @@ -438,7 +438,7 @@ add_dump_command (char *name, void (*fun && 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. */