Make ada-lang.c::add_angle_brackets return an std::string

This removes the need for manual memory management.  It may also be a
bit more efficient, since the returned string can be moved all the way
into the destination, in ada_lookup_name_info::matches.

gdb/ChangeLog:

	* ada-lang.c (add_angle_brackets): Return std::string.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e3d6bc27acdad8f18f488de4245c2eaa567f8f8..eae5c2f6c01336f96550f7f355037d4993ebe75d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-26  Simon Marchi  <simon.marchi@polymtl.ca>
+
+       * ada-lang.c (add_angle_brackets): Return std::string.
+
 2018-08-25  Simon Marchi  <simon.marchi@polymtl.ca>
 
        * python/py-threadevent.c (py_get_event_thread): Initialize

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index db5334dd1e00cbfc831932ae4febe3a1adb19f1c..d9d3087642bcd46a3881789191546fa873829aca 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -541,17 +541,12 @@ ada_unqualified_name (const char *decoded_name)
   return result;
 }
 
-/* Return a string starting with '<', followed by STR, and '>'.
-   The result is good until the next call.  */
+/* Return a string starting with '<', followed by STR, and '>'.  */
 
-static char *
+static std::string
 add_angle_brackets (const char *str)
 {
-  static char *result = NULL;
-
-  xfree (result);
-  result = xstrprintf ("<%s>", str);
-  return result;
+  return string_printf ("<%s>", str);
 }
 
 static const char *