From: Tom Tromey <tom@tromey.com>
Date: Thu, 24 Jan 2019 13:38:59 +0000 (-0700)
Subject: Remove last cleanup solib-aix.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=724127627fef458ed330d027cf0b3d17580af615;p=binutils-gdb.git

Remove last cleanup solib-aix.c

This removes the last cleanup solib-aix.c, replacing it with a use of
make_scope_exit.

2019-03-06  Tom Tromey  <tom@tromey.com>

	* solib-aix.c: Use make_scope_exit.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a3698e888a..0dc54e7eb38 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-06  Tom Tromey  <tom@tromey.com>
+
+	* solib-aix.c: Use make_scope_exit.
+
 2019-03-06  Tom Tromey  <tom@tromey.com>
 
 	* solib-svr4.c (svr4_parse_libraries, svr4_current_sos_direct):
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 85c05a42ebf..ab4f3626290 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -26,6 +26,7 @@
 #include "xcoffread.h"
 #include "observable.h"
 #include "gdbcmd.h"
+#include "common/scope-exit.h"
 
 /* Variable controlling the output of the debugging traces for
    this module.  */
@@ -242,18 +243,19 @@ static VEC (lm_info_aix_p) *
 solib_aix_parse_libraries (const char *library)
 {
   VEC (lm_info_aix_p) *result = NULL;
-  struct cleanup *back_to = make_cleanup (solib_aix_free_library_list,
-                                          &result);
+  auto cleanup = make_scope_exit ([&] ()
+    {
+      solib_aix_free_library_list (&result);
+    });
 
   if (gdb_xml_parse_quick (_("aix library list"), "library-list-aix.dtd",
                            library_list_elements, library, &result) == 0)
     {
       /* Parsed successfully, keep the result.  */
-      discard_cleanups (back_to);
+      cleanup.release ();
       return result;
     }
 
-  do_cleanups (back_to);
   return NULL;
 }