From 48faced0e5066aaa68f1e84766760e5d7de8b3c9 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Wed, 18 Jul 2012 23:37:58 +0000 Subject: * common/gdb_vecs.h: Moved here from ./gdb_vecs.h. * common/gdb_vecs.c: New file, contents from utils.c. * common/host-defs.h: New file, contents from defs.h. * utils.h: New file, contents from defs.h. * defs.h: Move all declarations of objects defined in utils.c to utils.h (except QUIT() and related). #include "utils.h", "host-defs.h". * probe.h (probe_p): Move here from gdb_vecs.h. * symfile.c: #include "probe.h" instead of "gdb_vecs.h". * utils.c (free_char_ptr_vec): Moved to common/gdb_vecs.c. (dirnames_to_char_ptr_vec_append, dirnames_to_char_ptr_vec): Ditto. * Makefile.in (SFILES): Add common/gdb_vecs.c. (HFILES_NO_SRCDIR): Add common/gdb_vecs.h, common/host-defs.h, utils.h. (COMMON_OBS): Add gdb_vecs.o. (gdb_vecs.o): New rule. --- gdb/utils.c | 66 ------------------------------------------------------------- 1 file changed, 66 deletions(-) (limited to 'gdb/utils.c') diff --git a/gdb/utils.c b/gdb/utils.c index a2bc00da344..c69c3e091d8 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -3637,24 +3637,6 @@ producer_is_gcc_ge_4 (const char *producer) return minor; } -/* Call xfree for each element of CHAR_PTR_VEC and final VEC_free for - CHAR_PTR_VEC itself. - - You must not modify CHAR_PTR_VEC after it got registered with this function - by make_cleanup as the CHAR_PTR_VEC base address may change on its updates. - Contrary to VEC_free this function does not (cannot) clear the pointer. */ - -void -free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec) -{ - int ix; - char *name; - - for (ix = 0; VEC_iterate (char_ptr, char_ptr_vec, ix, name); ++ix) - xfree (name); - VEC_free (char_ptr, char_ptr_vec); -} - /* Helper for make_cleanup_free_char_ptr_vec. */ static void @@ -3678,54 +3660,6 @@ make_cleanup_free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec) return make_cleanup (do_free_char_ptr_vec, char_ptr_vec); } -/* Extended version of dirnames_to_char_ptr_vec - additionally if *VECP is - non-NULL the new list elements from DIRNAMES are appended to the existing - *VECP list of entries. *VECP address will be updated by this call. */ - -void -dirnames_to_char_ptr_vec_append (VEC (char_ptr) **vecp, const char *dirnames) -{ - do - { - size_t this_len; - char *next_dir, *this_dir; - - next_dir = strchr (dirnames, DIRNAME_SEPARATOR); - if (next_dir == NULL) - this_len = strlen (dirnames); - else - { - this_len = next_dir - dirnames; - next_dir++; - } - - this_dir = xmalloc (this_len + 1); - memcpy (this_dir, dirnames, this_len); - this_dir[this_len] = '\0'; - VEC_safe_push (char_ptr, *vecp, this_dir); - - dirnames = next_dir; - } - while (dirnames != NULL); -} - -/* Split DIRNAMES by DIRNAME_SEPARATOR delimiter and return a list of all the - elements in their original order. For empty string ("") DIRNAMES return - list of one empty string ("") element. - - You may modify the returned strings. - Read free_char_ptr_vec for its cleanup. */ - -VEC (char_ptr) * -dirnames_to_char_ptr_vec (const char *dirnames) -{ - VEC (char_ptr) *retval = NULL; - - dirnames_to_char_ptr_vec_append (&retval, dirnames); - - return retval; -} - /* Substitute all occurences of string FROM by string TO in *STRINGP. *STRINGP must come from xrealloc-compatible allocator and it may be updated. FROM needs to be delimited by IS_DIR_SEPARATOR or DIRNAME_SEPARATOR (or be -- cgit v1.2.1