From patchwork Sat Feb 7 14:45:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 4954 Received: (qmail 24509 invoked by alias); 7 Feb 2015 14:45:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 24486 invoked by uid 89); 7 Feb 2015 14:45:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 07 Feb 2015 14:45:12 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t17EjAUk030595 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Sat, 7 Feb 2015 09:45:10 -0500 Received: from host1.jankratochvil.net (ovpn-116-113.ams2.redhat.com [10.36.116.113]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t17Ej93t013932; Sat, 7 Feb 2015 09:45:09 -0500 Subject: [PATCH 1/6] framefilter quit: Obvious whitespacing fixes From: Jan Kratochvil To: gdb-patches@sourceware.org Cc: Phil Muldoon Date: Sat, 07 Feb 2015 15:45:08 +0100 Message-ID: <20150207144508.14897.90189.stgit@host1.jankratochvil.net> In-Reply-To: <20150207144501.14897.90709.stgit@host1.jankratochvil.net> References: <20150207144501.14897.90709.stgit@host1.jankratochvil.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes Hi, planned to be checked in with the series. Jan gdb/ChangeLog 2015-02-06 Jan Kratochvil * python/py-framefilter.c (py_print_frame): Whitespacing fixes. --- gdb/python/py-framefilter.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 97dce89..c1c2653 100644 --- a/gdb/python/py-framefilter.c +++ b/gdb/python/py-framefilter.c @@ -1052,7 +1052,6 @@ py_print_frame (PyObject *filter, int flags, goto error; } - /* stack-list-variables. */ if (print_locals && print_args && ! print_frame_info) { @@ -1077,15 +1076,15 @@ py_print_frame (PyObject *filter, int flags, and are printed with indention. */ if (indent > 0) { - TRY_CATCH (except, RETURN_MASK_ALL) - { - ui_out_spaces (out, indent*4); - } - if (except.reason < 0) - { - gdbpy_convert_exception (except); - goto error; - } + TRY_CATCH (except, RETURN_MASK_ALL) + { + ui_out_spaces (out, indent*4); + } + if (except.reason < 0) + { + gdbpy_convert_exception (except); + goto error; + } } /* The address is required for frame annotations, and also for @@ -1175,7 +1174,7 @@ py_print_frame (PyObject *filter, int flags, if (gdbpy_is_string (py_func)) { - char *function_to_free = NULL; + char *function_to_free; function = function_to_free = python_string_to_host_string (py_func); @@ -1208,7 +1207,6 @@ py_print_frame (PyObject *filter, int flags, goto error; } - TRY_CATCH (except, RETURN_MASK_ALL) { annotate_frame_function_name (); @@ -1254,8 +1252,8 @@ py_print_frame (PyObject *filter, int flags, if (PyObject_HasAttrString (filter, "filename")) { - PyObject *py_fn = PyObject_CallMethod (filter, "filename", - NULL); + PyObject *py_fn = PyObject_CallMethod (filter, "filename", NULL); + if (py_fn != NULL) { if (py_fn != Py_None) @@ -1344,7 +1342,7 @@ py_print_frame (PyObject *filter, int flags, } /* Finally recursively print elided frames, if any. */ - elided = get_py_iter_from_func (filter, "elided"); + elided = get_py_iter_from_func (filter, "elided"); if (elided == NULL) goto error;