mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-06 15:38:45 +08:00
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.
107 lines
2.8 KiB
C
107 lines
2.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/>. */
|
|
|
|
#include "common-defs.h"
|
|
#include "gdb_vecs.h"
|
|
#include "host-defs.h"
|
|
|
|
/* 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);
|
|
}
|
|
|
|
/* Worker function to split character delimiter separated string of fields
|
|
STR into a char pointer vector. */
|
|
|
|
static void
|
|
delim_string_to_char_ptr_vec_append
|
|
(std::vector<gdb::unique_xmalloc_ptr<char>> *vecp, const char *str,
|
|
char delimiter)
|
|
{
|
|
do
|
|
{
|
|
size_t this_len;
|
|
const char *next_field;
|
|
char *this_field;
|
|
|
|
next_field = strchr (str, delimiter);
|
|
if (next_field == NULL)
|
|
this_len = strlen (str);
|
|
else
|
|
{
|
|
this_len = next_field - str;
|
|
next_field++;
|
|
}
|
|
|
|
this_field = (char *) xmalloc (this_len + 1);
|
|
memcpy (this_field, str, this_len);
|
|
this_field[this_len] = '\0';
|
|
vecp->emplace_back (this_field);
|
|
|
|
str = next_field;
|
|
}
|
|
while (str != NULL);
|
|
}
|
|
|
|
/* See gdb_vecs.h. */
|
|
|
|
std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
delim_string_to_char_ptr_vec (const char *str, char delimiter)
|
|
{
|
|
std::vector<gdb::unique_xmalloc_ptr<char>> retval;
|
|
|
|
delim_string_to_char_ptr_vec_append (&retval, str, delimiter);
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* See gdb_vecs.h. */
|
|
|
|
void
|
|
dirnames_to_char_ptr_vec_append
|
|
(std::vector<gdb::unique_xmalloc_ptr<char>> *vecp, const char *dirnames)
|
|
{
|
|
delim_string_to_char_ptr_vec_append (vecp, dirnames, DIRNAME_SEPARATOR);
|
|
}
|
|
|
|
/* See gdb_vecs.h. */
|
|
|
|
std::vector<gdb::unique_xmalloc_ptr<char>>
|
|
dirnames_to_char_ptr_vec (const char *dirnames)
|
|
{
|
|
std::vector<gdb::unique_xmalloc_ptr<char>> retval;
|
|
|
|
dirnames_to_char_ptr_vec_append (&retval, dirnames);
|
|
|
|
return retval;
|
|
}
|