From 724127627fef458ed330d027cf0b3d17580af615 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 Jan 2019 06:38:59 -0700 Subject: [PATCH] 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 * solib-aix.c: Use make_scope_exit. --- gdb/ChangeLog | 4 ++++ gdb/solib-aix.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) 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 + + * solib-aix.c: Use make_scope_exit. + 2019-03-06 Tom Tromey * 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; } -- 2.30.2