Use unique_xmalloc_ptr in darwin_current_sos

This changes darwin_current_sos to use unique_xmalloc_ptr rather than
a cleanup.

gdb/ChangeLog
2018-06-18  Tom Tromey  <tom@tromey.com>

	* solib-darwin.c (darwin_current_sos): Use unique_xmalloc_ptr.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9c83a4a2619c2ea908ae8636da39efb17efbb1fa..c6112d23e867e153c8d3eb528a94a7b3a9a6aa58 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-18  Tom Tromey  <tom@tromey.com>
+
+       * solib-darwin.c (darwin_current_sos): Use unique_xmalloc_ptr.
+
 2018-06-18  Tom Tromey  <tom@tromey.com>
 
        * solib-frv.c (frv_relocate_main_executable): Use

diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index e655110d2d5ed384ba804995dd359d8cf95a9830..ed8e0c13365609b76383b5435985afcc0648d1c1 100644 (file)
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -263,8 +263,6 @@ darwin_current_sos (void)
       unsigned long hdr_val;
       gdb::unique_xmalloc_ptr<char> file_path;
       int errcode;
-      struct so_list *newobj;
-      struct cleanup *old_chain;
 
       /* Read image info from inferior.  */
       if (target_read_memory (iinfo, buf, image_info_size))
@@ -293,8 +291,7 @@ darwin_current_sos (void)
        break;
 
       /* Create and fill the new so_list element.  */
-      newobj = XCNEW (struct so_list);
-      old_chain = make_cleanup (xfree, newobj);
+      gdb::unique_xmalloc_ptr<struct so_list> newobj (XCNEW (struct so_list));
 
       lm_info_darwin *li = new lm_info_darwin;
       newobj->lm_info = li;
@@ -305,12 +302,10 @@ darwin_current_sos (void)
       li->lm_addr = load_addr;
 
       if (head == NULL)
-       head = newobj;
+       head = newobj.get ();
       else
-       tail->next = newobj;
-      tail = newobj;
-
-      discard_cleanups (old_chain);
+       tail->next = newobj.get ();
+      tail = newobj.release ();
     }
 
   return head;