Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Simplify XML parsing a bit.

Browse Source 
* xml-support.h (gdb_xml_parse_quick): Declare.
	* xml-support.c (gdb_xml_create_parser_and_cleanup_1): Renamed
	from gdb_xml_create_parser_and_cleanup, and added `old_chain'
	parameter.
	(gdb_xml_create_parser_and_cleanup): Reimplement on top of
	gdb_xml_create_parser_and_cleanup_1.
	(gdb_xml_parse_quick): New.
	* memory-map.c (parse_memory_map): Use gdb_xml_parse_quick.
	* osdata.c (osdata_parse): Ditto.
	* remote.c (remote_threads_info): Ditto.
	* solib-target.c (solib_target_parse_libraries): Ditto.
	* xml-syscall.c (syscall_parse_xml): Ditto.
	* xml-tdesc.c (tdesc_parse_xml): Ditto.
This commit is contained in:
Pedro Alves
2011-01-25 09:49:59 +00:00
parent f30f86fa95
commit efc0eabd60
9 changed files with 111 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gdb/solib-target.c
View File

@@ -227,24 +227,20 @@ const struct gdb_xml_element library_list_elements[] = {
static VEC(lm_info_p) *
solib_target_parse_libraries (const char *library)
{
struct gdb_xml_parser *parser;
VEC(lm_info_p) *result = NULL;
struct cleanup *before_deleting_result, *back_to;
struct cleanup *back_to = make_cleanup (solib_target_free_library_list,
&result);
back_to = make_cleanup (null_cleanup, NULL);
parser = gdb_xml_create_parser_and_cleanup (_("target library list"),
library_list_elements, &result);
gdb_xml_use_dtd (parser, "library-list.dtd");
before_deleting_result = make_cleanup (solib_target_free_library_list,
&result);
if (gdb_xml_parse (parser, library) == 0)
/* Parsed successfully, don't need to delete the result. */
discard_cleanups (before_deleting_result);
if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd",
library_list_elements, library, &result) == 0)
{
/* Parsed successfully, keep the result. */
discard_cleanups (back_to);
return result;
}
do_cleanups (back_to);
return result;
return NULL;
}
#endif