Add new_inferior, inferior_deleted, and new_thread events

[deliverable/binutils-gdb.git] / gdb / python / py-varobj.c

diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c
index e85855620c2ed52dcf833df44b3c1c31e8503dd7..5f6ab64393cadaa4af575f4eef4e234526bfb706 100644 (file)
--- a/gdb/python/py-varobj.c
+++ b/gdb/python/py-varobj.c
@@ -71,7 +71,6 @@ py_varobj_iter_next (struct varobj_iter *self)
       if (PyErr_ExceptionMatches (gdbpy_gdb_memory_error))
        {
          PyObject *type, *value, *trace;
-         char *name_str;
 
          PyErr_Fetch (&type, &value, &trace);
          gdb::unique_xmalloc_ptr<char>
@@ -85,10 +84,10 @@ py_varobj_iter_next (struct varobj_iter *self)
              return NULL;
            }
 
-         name_str = xstrprintf ("<error at %d>",
-                                self->next_raw_index++);
-         item.reset (Py_BuildValue ("(ss)", name_str, value_str.get ()));
-         xfree (name_str);
+         std::string name_str = string_printf ("<error at %d>",
+                                               self->next_raw_index++);
+         item.reset (Py_BuildValue ("(ss)", name_str.c_str (),
+                                    value_str.get ()));
          if (item == NULL)
            {
              gdbpy_print_stack ();