727605ca75
This commit makes 19 of the 22 shared .c files in common, nat and target include common-defs.h instead of defs.h/server.h. The remaining three files need slight extra work and are dealt with in separate commits. gdb/ChangeLog: * common/agent.c: Include common-defs.h. Don't include defs.h or server.h. * common/buffer.c: Likewise. * common/common-debug.c: Likewise. * common/common-utils.c: Likewise. * common/errors.c: Likewise. * common/filestuff.c: Likewise. * common/format.c: Likewise. * common/gdb_vecs.c: Likewise. * common/print-utils.c: Likewise. * common/ptid.c: Likewise. * common/rsp-low.c: Likewise. * common/signals.c: Likewise. * common/vec.c: Likewise. * common/xml-utils.c: Likewise. * nat/linux-osdata.c: Likewise. * nat/linux-procfs.c: Likewise. * nat/linux-ptrace.c: Likewise. * nat/mips-linux-watch.c: Likewise. * target/waitstatus.c: Likewise.
113 lines
3.2 KiB
C
113 lines
3.2 KiB
C
/* Some commonly-used VEC types.
|
|
|
|
Copyright (C) 2012-2014 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_PTR_VEC. */
|
|
|
|
static void
|
|
delim_string_to_char_ptr_vec_append (VEC (char_ptr) **vecp,
|
|
const char *str, char delimiter)
|
|
{
|
|
do
|
|
{
|
|
size_t this_len;
|
|
char *next_field, *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 = xmalloc (this_len + 1);
|
|
memcpy (this_field, str, this_len);
|
|
this_field[this_len] = '\0';
|
|
VEC_safe_push (char_ptr, *vecp, this_field);
|
|
|
|
str = next_field;
|
|
}
|
|
while (str != NULL);
|
|
}
|
|
|
|
/* Split STR, a list of DELIMITER-separated fields, into a CHAR_PTR_VEC.
|
|
|
|
You may modify the returned strings.
|
|
Read free_char_ptr_vec for its cleanup. */
|
|
|
|
VEC (char_ptr) *
|
|
delim_string_to_char_ptr_vec (const char *str, char delimiter)
|
|
{
|
|
VEC (char_ptr) *retval = NULL;
|
|
|
|
delim_string_to_char_ptr_vec_append (&retval, str, delimiter);
|
|
|
|
return retval;
|
|
}
|
|
|
|
/* 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)
|
|
{
|
|
delim_string_to_char_ptr_vec_append (vecp, dirnames, DIRNAME_SEPARATOR);
|
|
}
|
|
|
|
/* 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;
|
|
}
|