This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Use std::string in memory_map_parsing_data
- From: Simon Marchi <simon dot marchi at ericsson dot com>
- To: <gdb-patches at sourceware dot org>
- Cc: Simon Marchi <simon dot marchi at ericsson dot com>
- Date: Mon, 16 Oct 2017 11:49:26 -0400
- Subject: [PATCH] Use std::string in memory_map_parsing_data
- Authentication-results: sourceware.org; auth=none
- Authentication-results: spf=none (sender IP is ) smtp.mailfrom=simon dot marchi at ericsson dot com;
- References: <1508168838-17957-1-git-send-email-simon.marchi@ericsson.com>
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
[Woops, I forgot to send this patch. It should be applied before
"Get rid of VEC (mem_region)"]
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.
---
gdb/memory-map.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 0b21456..ff05394 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -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). */
--
2.7.4