From: Tom Tromey <tom@tromey.com>
Date: Fri, 10 Nov 2017 21:42:35 +0000 (-0700)
Subject: Remove cleanup from print_mention_exception
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=862d101ada6b6e8496e545c0bcd801cf8b9a46c1;p=binutils-gdb.git

Remove cleanup from print_mention_exception

This removes a cleanup from print_mention_exception by using
string_printf.

ChangeLog
2018-05-04  Tom Tromey  <tom@tromey.com>

	* ada-lang.c (print_mention_exception): Use std::string.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1a86a210716..730a357216d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-04  Tom Tromey  <tom@tromey.com>
+
+	* ada-lang.c (print_mention_exception): Use std::string.
+
 2018-05-04  Tom Tromey  <tom@tromey.com>
 
 	* ada-lang.c (create_excep_cond_exprs): Update.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 1af09bc00ec..7cbf1ec08de 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -12805,11 +12805,9 @@ print_mention_exception (enum ada_exception_catchpoint_kind ex,
       case ada_catch_exception:
         if (c->excep_string != NULL)
 	  {
-	    char *info = xstrprintf (_("`%s' Ada exception"), c->excep_string);
-	    struct cleanup *old_chain = make_cleanup (xfree, info);
-
-	    uiout->text (info);
-	    do_cleanups (old_chain);
+	    std::string info = string_printf (_("`%s' Ada exception"),
+					      c->excep_string);
+	    uiout->text (info.c_str ());
 	  }
         else
           uiout->text (_("all Ada exceptions"));