Remove cleanup from complaints.c

This removes a cleanup from complaints.c by using std::string.

gdb/ChangeLog
2017-09-29  Tom Tromey  <tom@tromey.com>

	* complaints.c (vcomplaint): Use std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fda159245893c474c3ae910a3673117b96003496..d2678d4bb6963957a2844861d7368525ff5da291 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2017-09-29  Tom Tromey  <tom@tromey.com>
+
+       * complaints.c (vcomplaint): Use std::string.
+
 2017-09-29  Tom Tromey  <tom@tromey.com>
 
        * tracepoint.c (trace_variable_command): Use std::string.

diff --git a/gdb/complaints.c b/gdb/complaints.c
index aba305c72925c74520a3bee1c893abfc3583bc5b..58b6b7b51c3b477de20dd104817436ccd3bb2deb 100644 (file)
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -192,16 +192,14 @@ vcomplaint (struct complaints **c, const char *file,
        vwarning (fmt, args);
       else
        {
-         char *msg;
-         struct cleanup *cleanups;
-         msg = xstrvprintf (fmt, args);
-         cleanups = make_cleanup (xfree, msg);
+         std::string msg = string_vprintf (fmt, args);
          wrap_here ("");
          if (series != SUBSEQUENT_MESSAGE)
            begin_line ();
          /* XXX: i18n */
          fprintf_filtered (gdb_stderr, "%s%s%s",
-                           complaints->explanation[series].prefix, msg,
+                           complaints->explanation[series].prefix,
+                           msg.c_str (),
                            complaints->explanation[series].postfix);
          /* Force a line-break after any isolated message.  For the
              other cases, clear_complaints() takes care of any missing
@@ -214,7 +212,6 @@ vcomplaint (struct complaints **c, const char *file,
            fputs_filtered ("\n", gdb_stderr);
          else
            wrap_here ("");
-         do_cleanups (cleanups);
        }
     }