[2/3] Use std::vector and std::string instead of VEC(char_ptr) in gdbserver tdesc

Message ID 1521667509-303-2-git-send-email-simon.marchi@ericsson.com
State New
Headers show
Series
  • [1/3] Use std::vector in uploaded_tp
Related show

Commit Message

Simon Marchi March 21, 2018, 9:25 p.m.
From: Simon Marchi <simon.marchi@polymtl.ca>


This is a straightforward replacement, no change in behavior are
intended/expected.

gdb/gdbserver/ChangeLog:

	* tdesc.h (struct target_desc) <features>: Change type to
	std::vector<std::string>.
	* tdesc.c (tdesc_get_features_xml): Adjust to std::vector
	changes.
	(tdesc_create_feature): Likewise.
---
 gdb/gdbserver/tdesc.c | 7 +++----
 gdb/gdbserver/tdesc.h | 8 +-------
 2 files changed, 4 insertions(+), 11 deletions(-)

-- 
2.7.4

Patch

diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c
index 00a5e8d..3a932e6 100644
--- a/gdb/gdbserver/tdesc.c
+++ b/gdb/gdbserver/tdesc.c
@@ -91,7 +91,7 @@  tdesc_get_features_xml (target_desc *tdesc)
 {
   /* Either .xmltarget or .features is not NULL.  */
   gdb_assert (tdesc->xmltarget != NULL
-	      || (tdesc->features != NULL
+	      || (!tdesc->features.empty ()
 		  && tdesc->arch != NULL));
 
   if (tdesc->xmltarget == NULL)
@@ -111,9 +111,8 @@  tdesc_get_features_xml (target_desc *tdesc)
 	  buffer += "</osabi>";
 	}
 
-      char *xml;
 
-      for (int i = 0; VEC_iterate (char_ptr, tdesc->features, i, xml); i++)
+      for (const std::string &xml : tdesc->features)
 	{
 	  buffer += "<xi:include href=\"";
 	  buffer += xml;
@@ -139,7 +138,7 @@  tdesc_create_feature (struct target_desc *tdesc, const char *name,
 		      const char *xml)
 {
 #ifndef IN_PROCESS_AGENT
-  VEC_safe_push (char_ptr, tdesc->features, xstrdup (xml));
+  tdesc->features.emplace_back (xml);
 #endif
   return tdesc;
 }
diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h
index d21574c..e501257 100644
--- a/gdb/gdbserver/tdesc.h
+++ b/gdb/gdbserver/tdesc.h
@@ -54,7 +54,7 @@  struct target_desc : tdesc_feature
   const char *xmltarget = NULL;
 
   /* XML features in this target description.  */
-  VEC (char_ptr) *features = NULL;
+  std::vector<std::string> features;
 
   /* The value of <architecture> element in the XML, replying GDB.  */
   const char *arch = NULL;
@@ -76,12 +76,6 @@  public:
 
     xfree ((char *) arch);
     xfree ((char *) osabi);
-
-    char *f;
-
-    for (i = 0; VEC_iterate (char_ptr, features, i, f); i++)
-      xfree (f);
-    VEC_free (char_ptr, features);
   }
 
   bool operator== (const target_desc &other) const