diff options
| author | Keith Seitz <keiths@redhat.com> | 2017-08-17 13:58:01 -0700 |
|---|---|---|
| committer | Keith Seitz <keiths@redhat.com> | 2017-08-17 13:58:01 -0700 |
| commit | b5f28d7abc02ca509e389fa932d725cf111e4b40 (patch) | |
| tree | 57a0dc0feaff890630a6ba2c9fab811d56b1f9cf /gdb/python/py-varobj.c | |
| parent | 2a95a158fae932f758d75a1178a40d4cc4804ff0 (diff) | |
| parent | 1a457753cfad05989574c671a221ffce2d5df703 (diff) | |
| download | binutils-users/pmuldoon/c++compile.zip binutils-users/pmuldoon/c++compile.tar.gz binutils-users/pmuldoon/c++compile.tar.bz2 | |
Update w/HEADusers/pmuldoon/c++compile
Problems:
gdb/compile/compile.c
gdb/cp-support.c
gdb/cp-support.h
gdb/gdbtypes.h
gdb/language.c
gdb/linespec.c
Diffstat (limited to 'gdb/python/py-varobj.c')
| -rw-r--r-- | gdb/python/py-varobj.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c index e858556..5f6ab64 100644 --- 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 (); |