From: Tom Tromey <tom@tromey.com>
Date: Wed, 25 Oct 2017 21:44:56 +0000 (-0600)
Subject: Remove cleanups from link_callbacks_einfo
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=20dcd8cae7d87910f6c3936bad72e78b647a8de6;p=binutils-gdb.git

Remove cleanups from link_callbacks_einfo

This removes a cleanup from link_callbacks_einfo by using std::string.

gdb/ChangeLog
2017-11-04  Tom Tromey  <tom@tromey.com>

	* compile/compile-object-load.c (link_callbacks_einfo): Use
	std::string.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f7d821c1e27..af1ef2489e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-04  Tom Tromey  <tom@tromey.com>
+
+	* compile/compile-object-load.c (link_callbacks_einfo): Use
+	std::string.
+
 2017-11-04  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2read.c (process_full_comp_unit, process_full_type_unit):
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
index 41d5fc347fb..8e55d3c2c9f 100644
--- a/gdb/compile/compile-object-load.c
+++ b/gdb/compile/compile-object-load.c
@@ -281,18 +281,13 @@ static void link_callbacks_einfo (const char *fmt, ...)
 static void
 link_callbacks_einfo (const char *fmt, ...)
 {
-  struct cleanup *cleanups;
   va_list ap;
-  char *str;
 
   va_start (ap, fmt);
-  str = xstrvprintf (fmt, ap);
+  std::string str = string_vprintf (fmt, ap);
   va_end (ap);
-  cleanups = make_cleanup (xfree, str);
-
-  warning (_("Compile module: warning: %s"), str);
 
-  do_cleanups (cleanups);
+  warning (_("Compile module: warning: %s"), str.c_str ());
 }
 
 /* Helper for bfd_get_relocated_section_contents.