From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA v2 4/7] Change one more spot to use gdbpy_ref
Date: Thu, 09 Feb 2017 21:25:00 -0000 [thread overview]
Message-ID: <20170209212456.2385-5-tom@tromey.com> (raw)
In-Reply-To: <20170209212456.2385-1-tom@tromey.com>
This patch changes one more spot in the Python layer to use gdbpy_ref.
2017-02-09 Tom Tromey <tom@tromey.com>
* python/py-prettyprint.c (pretty_print_one_value): Use
gdbpy_ref.
---
gdb/ChangeLog | 5 +++++
gdb/python/py-prettyprint.c | 15 ++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 446ad24..169c2f7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2017-02-09 Tom Tromey <tom@tromey.com>
+ * python/py-prettyprint.c (pretty_print_one_value): Use
+ gdbpy_ref.
+
+2017-02-09 Tom Tromey <tom@tromey.com>
+
* python/py-cmd.c (cmdpy_destroyer): Use gdbpy_ref.
* python/py-breakpoint.c (gdbpy_breakpoint_deleted): Use
gdbpy_ref.
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index e0d2110..66929bf 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -190,21 +190,22 @@ find_pretty_printer (PyObject *value)
static PyObject *
pretty_print_one_value (PyObject *printer, struct value **out_value)
{
- PyObject *result = NULL;
+ gdbpy_ref<> result;
*out_value = NULL;
TRY
{
- result = PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst, NULL);
- if (result)
+ result.reset (PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst,
+ NULL));
+ if (result != NULL)
{
- if (! gdbpy_is_string (result) && ! gdbpy_is_lazy_string (result)
+ if (! gdbpy_is_string (result.get ())
+ && ! gdbpy_is_lazy_string (result.get ())
&& result != Py_None)
{
- *out_value = convert_value_from_python (result);
+ *out_value = convert_value_from_python (result.get ());
if (PyErr_Occurred ())
*out_value = NULL;
- Py_DECREF (result);
result = NULL;
}
}
@@ -214,7 +215,7 @@ pretty_print_one_value (PyObject *printer, struct value **out_value)
}
END_CATCH
- return result;
+ return result.release ();
}
/* Return the display hint for the object printer, PRINTER. Return
--
2.9.3
next prev parent reply other threads:[~2017-02-09 21:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-09 21:25 [RFA v2 0/7] more cleanup removal in Python Tom Tromey
2017-02-09 21:25 ` Tom Tromey [this message]
2017-02-09 21:25 ` [RFA v2 1/7] Remove some ui_out-related cleanups from Python Tom Tromey
2017-02-10 15:57 ` Simon Marchi
2017-02-10 19:18 ` Tom Tromey
2017-02-09 21:25 ` [RFA v2 2/7] Turn gdbpy_ref into a template Tom Tromey
2017-02-09 21:25 ` [RFA v2 6/7] Remove unnecessary local variables Tom Tromey
2017-02-09 21:25 ` [RFA v2 7/7] Fix Python test to use lowercase command Tom Tromey
2017-02-09 21:25 ` [RFA v2 3/7] Use gdbpy_ref to simplify some logic Tom Tromey
2017-02-09 21:25 ` [RFA v2 5/7] Remove some gotos from Python Tom Tromey
2017-02-10 16:21 ` [RFA v2 0/7] more cleanup removal in Python Simon Marchi
2017-02-10 16:36 ` Pedro Alves
2017-02-10 19:18 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170209212456.2385-5-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).