[RFA,05/10] Avoid manual resource management in py-framefilter.c
Commit Message
This patch removes the last bit of manual resource management from
py-framefilter.c. This will be useful in the next patch.
ChangeLog
2017-04-25 Tom Tromey <tom@tromey.com>
* python/py-framefilter.c (enumerate_args): Use
gdb::unique_xmalloc_ptr.
---
gdb/ChangeLog | 5 +++++
gdb/python/py-framefilter.c | 20 +++++---------------
2 files changed, 10 insertions(+), 15 deletions(-)
Comments
On 25/04/17 20:41, Tom Tromey wrote:
> This patch removes the last bit of manual resource management from
> py-framefilter.c. This will be useful in the next patch.
>
> ChangeLog
> 2017-04-25 Tom Tromey <tom@tromey.com>
>
> * python/py-framefilter.c (enumerate_args): Use
> gdb::unique_xmalloc_ptr.
LGTM (and much cleaner). Thanks for doing this and the original automated resource management and reference counting from previous patches.
Cheers
Phil
On 04/25/2017 08:41 PM, Tom Tromey wrote:
> This patch removes the last bit of manual resource management from
> py-framefilter.c. This will be useful in the next patch.
>
> ChangeLog
> 2017-04-25 Tom Tromey <tom@tromey.com>
>
> * python/py-framefilter.c (enumerate_args): Use
> gdb::unique_xmalloc_ptr.
OK.
Thanks,
Pedro Alves
@@ -1,5 +1,10 @@
2017-04-25 Tom Tromey <tom@tromey.com>
+ * python/py-framefilter.c (enumerate_args): Use
+ gdb::unique_xmalloc_ptr.
+
+2017-04-25 Tom Tromey <tom@tromey.com>
+
* python/py-framefilter.c (py_print_frame): Return
EXT_LANG_BT_OK.
(gdbpy_apply_frame_filter): Update comment.
@@ -560,6 +560,9 @@ enumerate_args (PyObject *iter,
}
END_CATCH
+ gdb::unique_xmalloc_ptr<char> arg_holder (arg.error);
+ gdb::unique_xmalloc_ptr<char> entry_holder (entryarg.error);
+
/* The object has not provided a value, so this is a frame
argument to be read by GDB. In this case we have to
account for entry-values. */
@@ -571,11 +574,7 @@ enumerate_args (PyObject *iter,
args_type,
print_args_field,
NULL) == EXT_LANG_BT_ERROR)
- {
- xfree (arg.error);
- xfree (entryarg.error);
- return EXT_LANG_BT_ERROR;
- }
+ return EXT_LANG_BT_ERROR;
}
if (entryarg.entry_kind != print_entry_values_no)
@@ -589,8 +588,6 @@ enumerate_args (PyObject *iter,
}
CATCH (except, RETURN_MASK_ALL)
{
- xfree (arg.error);
- xfree (entryarg.error);
gdbpy_convert_exception (except);
return EXT_LANG_BT_ERROR;
}
@@ -600,15 +597,8 @@ enumerate_args (PyObject *iter,
if (py_print_single_arg (out, NULL, &entryarg, NULL, &opts,
args_type, print_args_field, NULL)
== EXT_LANG_BT_ERROR)
- {
- xfree (arg.error);
- xfree (entryarg.error);
- return EXT_LANG_BT_ERROR;
- }
+ return EXT_LANG_BT_ERROR;
}
-
- xfree (arg.error);
- xfree (entryarg.error);
}
else
{