From 4d0fdd9b357aff1fea3ef3def55d12464a41bf5b Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 7 Jan 2018 09:29:52 -0500 Subject: Replace VEC(gdb_xml_value_s) with std::vector This patch replaces VEC(gdb_xml_value_s), which is passed to XML visitors, with an std::vector. In order to be able to remove the cleanup in gdb_xml_parser::start_element, the gdb_xml_parser structure is made to own the value with a gdb::unique_xmalloc_ptr. This patch has been tested on the buildbot. gdb/ChangeLog: * xml-support.h (struct gdb_xml_value): Add constructor. : Change type to unique_xmalloc_ptr. (gdb_xml_value_s): Remove typedef. (DEF_VEC_O (gdb_xml_value_s)): Remove. (gdb_xml_element_start_handler): Change parameter type to std::vector. (xml_find_attribute): Likewise. * xml-support.c (xml_find_attribute): Change parameter type to std::vector and adjust. (gdb_xml_values_cleanup): Remove. (gdb_xml_parser::start_element): Adjust to std::vector. (xinclude_start_include): Change paraeter type to std::vector and adjust. * btrace.c (check_xml_btrace_version): Likewise. (parse_xml_btrace_block): Likewise. (parse_xml_btrace_pt_config_cpu): Likewise. (parse_xml_btrace_pt): Likewise. (parse_xml_btrace_conf_bts): Likewise. (parse_xml_btrace_conf_pt): Likewise. * memory-map.c (memory_map_start_memory): Likewise. (memory_map_start_property): Likewise. * osdata.c (osdata_start_osdata): Likewise. (osdata_start_item): Likewise. (osdata_start_column): Likewise. * remote.c (start_thread): Likewise. * solib-aix.c (library_list_start_library): Likewise. (library_list_start_list): Likewise. * solib-svr4.c (library_list_start_library): Likewise. (svr4_library_list_start_list): Likewise. * solib-target.c (library_list_start_segment): Likewise. (library_list_start_section): Likewise. (library_list_start_library): Likewise. (library_list_start_list): Likewise. * tracepoint.c (traceframe_info_start_memory): Likewise. (traceframe_info_start_tvar): Likewise. * xml-syscall.c (syscall_start_syscall): Likewise. * xml-tdesc.c (tdesc_start_target): Likewise. (tdesc_start_feature): Likewise. (tdesc_start_reg): Likewise. (tdesc_start_union): Likewise. (tdesc_start_struct): Likewise. (tdesc_start_flags): Likewise. (tdesc_start_enum): Likewise. (tdesc_start_field): Likewise. (tdesc_start_enum_value): Likewise. (tdesc_start_vector): Likewise. --- gdb/xml-support.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gdb/xml-support.h') diff --git a/gdb/xml-support.h b/gdb/xml-support.h index ee5fd52..5947623 100644 --- a/gdb/xml-support.h +++ b/gdb/xml-support.h @@ -74,11 +74,13 @@ bool xml_process_xincludes (std::string &result, struct gdb_xml_value { + gdb_xml_value (const char *name_, void *value_) + : name (name_), value (value_) + {} + const char *name; - void *value; + gdb::unique_xmalloc_ptr value; }; -typedef struct gdb_xml_value gdb_xml_value_s; -DEF_VEC_O(gdb_xml_value_s); /* The type of an attribute handler. @@ -146,7 +148,7 @@ enum gdb_xml_element_flag typedef void (gdb_xml_element_start_handler) (struct gdb_xml_parser *parser, const struct gdb_xml_element *element, - void *user_data, VEC(gdb_xml_value_s) *attributes); + void *user_data, std::vector &attributes); /* A handler called at the end of an element. @@ -199,8 +201,8 @@ void gdb_xml_error (struct gdb_xml_parser *parser, const char *format, ...) /* Find the attribute named NAME in the set of parsed attributes ATTRIBUTES. Returns NULL if not found. */ -struct gdb_xml_value *xml_find_attribute (VEC(gdb_xml_value_s) *attributes, - const char *name); +struct gdb_xml_value *xml_find_attribute + (std::vector &attributes, const char *name); /* Parse an integer attribute into a ULONGEST. */ -- cgit v1.1