FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

21
gdb/remote.c
View file

@ -2595,25 +2595,16 @@ remote_threads_info (struct target_ops *ops)
TARGET_OBJECT_THREADS, NULL);
struct cleanup *back_to = make_cleanup (xfree, xml);
if (xml && *xml)
{
struct gdb_xml_parser *parser;
struct threads_parsing_context context;
struct cleanup *clear_parsing_context;
context.items = 0;
/* Note: this parser cleanup is already guarded by BACK_TO
above. */
parser = gdb_xml_create_parser_and_cleanup (_("threads"),
threads_elements,
&context);
context.items = NULL;
make_cleanup (clear_threads_parsing_context, &context);
gdb_xml_use_dtd (parser, "threads.dtd");
clear_parsing_context
= make_cleanup (clear_threads_parsing_context, &context);
if (gdb_xml_parse (parser, xml) == 0)
if (gdb_xml_parse_quick (_("threads"), "threads.dtd",
threads_elements, xml, &context) == 0)
{
int i;
struct thread_item *item;
@ -2640,8 +2631,6 @@ remote_threads_info (struct target_ops *ops)
}
}
}
do_cleanups (clear_parsing_context);
}
do_cleanups (back_to);