Return unique_xmalloc_ptr from target_read_stralloc

[deliverable/binutils-gdb.git] / gdb / osdata.c

diff --git a/gdb/osdata.c b/gdb/osdata.c
index 9da3d07cdb3098d42cf2cbb87f22f7ccdd0edc89..276d22427a62a908fdf1650780150425ace95e8a 100644 (file)
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -245,13 +245,11 @@ struct osdata *
 get_osdata (const char *type)
 {
   struct osdata *osdata = NULL;
-  char *xml = target_get_osdata (type);
+  gdb::unique_xmalloc_ptr<char> xml = target_get_osdata (type);
 
   if (xml)
     {
-      struct cleanup *old_chain = make_cleanup (xfree, xml);
-
-      if (xml[0] == '\0')
+      if (xml.get ()[0] == '\0')
        {
          if (type)
            warning (_("Empty data returned by target.  Wrong osdata type?"));
@@ -259,9 +257,7 @@ get_osdata (const char *type)
            warning (_("Empty type list returned by target.  No type data?"));
        }
       else
-       osdata = osdata_parse (xml);
-
-      do_cleanups (old_chain);
+       osdata = osdata_parse (xml.get ());
     }
 
   if (!osdata)