e80aaf6183
This patch makes delim_string_to_char_ptr_vec and all related functions use std::vector of gdb::unique_xmalloc_ptr. This allows getting rid of make_cleanup_free_char_ptr_vec. Returning a vector of unique_xmalloc_ptr instead of std::string allows to minimize the impacts on the calling code. We can evaluate later whether we could/should return a vector of std::strings instead. gdb/ChangeLog: * common/gdb_vecs.h (make_cleanup_free_char_ptr_vec): Remove. (delim_string_to_char_ptr_vec): Return std::vector of gdb::unique_xmalloc_ptr. (dirnames_to_char_ptr_vec_append): Take std::vector of gdb::unique_xmalloc_ptr. (dirnames_to_char_ptr_vec): Return std::vector of gdb::unique_xmalloc_ptr. * common/gdb_vecs.c (delim_string_to_char_ptr_vec_append): Take std::vector of gdb::unique_xmalloc_ptr, adjust the code. (delim_string_to_char_ptr_vec): Return an std::vector of gdb::unique_xmalloc_ptr, adjust the code. (dirnames_to_char_ptr_vec_append): Take an std::vector of gdb::unique_xmalloc_ptr, adjust the code. (dirnames_to_char_ptr_vec): Return an std::vector of gdb::unique_xmalloc_ptr, adjust the code. * auto-load.c (auto_load_safe_path_vec): Change type to std::vector of gdb::unique_xmalloc_ptr. (auto_load_expand_dir_vars): Return an std::vector of gdb::unique_xmalloc_ptr, adjust the code. (auto_load_safe_path_vec_update): Adjust. (filename_is_in_auto_load_safe_path_vec): Adjust. (auto_load_objfile_script_1): Adjust. * build-id.c (build_id_to_debug_bfd): Adjust. * linux-thread-db.c (thread_db_load_search): Adjust. * source.c (add_path): Adjust. (openp): Adjust. * symfile.c (find_separate_debug_file): Adjust. * utils.c (do_free_char_ptr_vec): Remove. (make_cleanup_free_char_ptr_vec): Remove. gdb/gdbserver/ChangeLog: * server.c (parse_debug_format_options): Adjust to delim_string_to_char_ptr_vec changes. * thread-db.c (thread_db_load_search): Adjust to dirnames_to_char_ptr_vec changes.
55 lines
1.8 KiB
C++
55 lines
1.8 KiB
C++
/* Some commonly-used VEC types.
|
|
|
|
Copyright (C) 2012-2018 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef GDB_VECS_H
|
|
#define GDB_VECS_H
|
|
|
|
#include "vec.h"
|
|
|
|
typedef char *char_ptr;
|
|
typedef const char *const_char_ptr;
|
|
|
|
DEF_VEC_P (char_ptr);
|
|
|
|
DEF_VEC_P (const_char_ptr);
|
|
|
|
extern void free_char_ptr_vec (VEC (char_ptr) *char_ptr_vec);
|
|
|
|
/* Split STR, a list of DELIMITER-separated fields, into a char pointer vector.
|
|
|
|
You may modify the returned strings. */
|
|
|
|
extern std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
delim_string_to_char_ptr_vec (const char *str, char delimiter);
|
|
|
|
/* Like dirnames_to_char_ptr_vec, but append the directories to *VECP. */
|
|
|
|
extern void dirnames_to_char_ptr_vec_append
|
|
(std::vector<gdb::unique_xmalloc_ptr<char>> *vecp, const char *dirnames);
|
|
|
|
/* 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. */
|
|
|
|
extern std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
dirnames_to_char_ptr_vec (const char *dirnames);
|
|
|
|
#endif /* GDB_VECS_H */
|