From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8739 invoked by alias); 20 Nov 2016 20:42:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 8429 invoked by uid 89); 20 Nov 2016 20:42:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=no version=3.3.2 spammy=Hx-spam-relays-external:69.89.25.95, H*RU:sk:gproxy1, H*RU:69.89.25.95, HX-HELO:sk:gproxy1 X-HELO: gproxy1.mail.unifiedlayer.com Received: from gproxy1-pub.mail.unifiedlayer.com (HELO gproxy1.mail.unifiedlayer.com) (69.89.25.95) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 20 Nov 2016 20:42:15 +0000 Received: from cmgw4 (cmgw5 [10.0.90.85]) by gproxy1.mail.unifiedlayer.com (Postfix) with ESMTP id E878C17695D for ; Sun, 20 Nov 2016 13:41:45 -0700 (MST) Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id ALhi1u00n2f2jeq01LhlmN; Sun, 20 Nov 2016 13:41:45 -0700 X-Authority-Analysis: v=2.1 cv=Zpp+dbLG c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=L24OOQBejmoA:10 a=zstS-IiYAAAA:8 a=OZf4TBAPo2iOUvnzSMEA:9 a=4G6NA9xxw8l3yy4pmD5M:22 Received: from 174-16-143-211.hlrn.qwest.net ([174.16.143.211]:40590 helo=bapiya.Home) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1c8Yvm-0005f5-NI; Sun, 20 Nov 2016 13:41:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 07/13] Use gdbpy_ref in py-param.c Date: Sun, 20 Nov 2016 20:42:00 -0000 Message-Id: <1479674496-14000-8-git-send-email-tom@tromey.com> In-Reply-To: <1479674496-14000-1-git-send-email-tom@tromey.com> References: <1479674496-14000-1-git-send-email-tom@tromey.com> X-BWhitelist: no X-Exim-ID: 1c8Yvm-0005f5-NI X-Source-Sender: 174-16-143-211.hlrn.qwest.net (bapiya.Home) [174.16.143.211]:40590 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-SW-Source: 2016-11/txt/msg00592.txt.bz2 This changes py-param.c to use gdbpy_ref in a couple more spots. 2016-11-20 Tom Tromey * python/py-param.c (get_doc_string, compute_enum_values): Use gdbpy_ref. --- gdb/ChangeLog | 5 +++++ gdb/python/py-param.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 28e427e..92fee8c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2016-11-20 Tom Tromey + * python/py-param.c (get_doc_string, compute_enum_values): Use + gdbpy_ref. + +2016-11-20 Tom Tromey + * python/py-inferior.c (find_thread_object, build_inferior_list): Use gdbpy_ref. diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index d402928..de42f46 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -307,15 +307,14 @@ get_doc_string (PyObject *object, PyObject *attr) if (PyObject_HasAttr (object, attr)) { - PyObject *ds_obj = PyObject_GetAttr (object, attr); + gdbpy_ref ds_obj (PyObject_GetAttr (object, attr)); - if (ds_obj && gdbpy_is_string (ds_obj)) + if (ds_obj != NULL && gdbpy_is_string (ds_obj.get ())) { - result = python_string_to_host_string (ds_obj); + result = python_string_to_host_string (ds_obj.get ()); if (result == NULL) gdbpy_print_stack (); } - Py_XDECREF (ds_obj); } if (! result) result.reset (xstrdup (_("This command is not documented."))); @@ -587,23 +586,22 @@ compute_enum_values (parmpy_object *self, PyObject *enum_values) for (i = 0; i < size; ++i) { - PyObject *item = PySequence_GetItem (enum_values, i); + gdbpy_ref item (PySequence_GetItem (enum_values, i)); - if (! item) + if (item == NULL) { do_cleanups (back_to); return 0; } - if (! gdbpy_is_string (item)) + if (! gdbpy_is_string (item.get ())) { - Py_DECREF (item); do_cleanups (back_to); PyErr_SetString (PyExc_RuntimeError, _("The enumeration item not a string.")); return 0; } - self->enumeration[i] = python_string_to_host_string (item).release (); - Py_DECREF (item); + self->enumeration[i] + = python_string_to_host_string (item.get ()).release (); if (self->enumeration[i] == NULL) { do_cleanups (back_to); -- 2.7.4