espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-08-06 06:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std::string in memory_map_parsing_data

Browse Source 
Replace the fixed-size array with a string.

gdb/ChangeLog:

	* memory-map.c (struct memory_map_parsing_data) <property_name>:
	Change type to std::string.
	(memory_map_start_property): Adjust.
	(memory_map_end_property): Adjust.
This commit is contained in:
Simon Marchi
2017-10-21 12:06:22 -04:00
committed by Simon Marchi
parent cfba98720f
commit 6e17c56511
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2017-10-21 Simon Marchi <simon.marchi@ericsson.com>
* memory-map.c (struct memory_map_parsing_data) <property_name>:
Change type to std::string.
(memory_map_start_property): Adjust.
(memory_map_end_property): Adjust.
2017-10-21 Simon Marchi <simon.marchi@polymtl.ca>
* infrun.h: Include common/byte-vector.h.

17
gdb/memory-map.c
View File

@ -43,10 +43,11 @@ parse_memory_map (const char *memory_map)
/* Internal parsing data passed to all XML callbacks. */
struct memory_map_parsing_data
{
VEC(mem_region_s) **memory_map;
char property_name[32];
};
{
VEC(mem_region_s) **memory_map;
std::string property_name;
};
/* Handle the start of a <memory> element. */
@ -103,7 +104,7 @@ memory_map_start_property (struct gdb_xml_parser *parser,
char *name;
name = (char *) xml_find_attribute (attributes, "name")->value;
snprintf (data->property_name, sizeof (data->property_name), "%s", name);
data->property_name.assign (name);
}
/* Handle the end of a <property> element and its value. */
@ -115,16 +116,16 @@ memory_map_end_property (struct gdb_xml_parser *parser,
{
struct memory_map_parsing_data *data
= (struct memory_map_parsing_data *) user_data;
char *name = data->property_name;
if (strcmp (name, "blocksize") == 0)
if (data->property_name == "blocksize")
{
struct mem_region *r = VEC_last (mem_region_s, *data->memory_map);
r->attrib.blocksize = gdb_xml_parse_ulongest (parser, body_text);
}
else
gdb_xml_debug (parser, _("Unknown property \"%s\""), name);
gdb_xml_debug (parser, _("Unknown property \"%s\""),
data->property_name.c_str ());
}
/* Discard the constructed memory map (if an error occurs). */