From: Jan Kratochvil Date: Wed, 11 Feb 2015 13:35:52 +0000 (+0100) Subject: framefilter quit: Obvious whitespacing fixes X-Git-Tag: gdb-7.9.0-release~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25a0672ba8b7f4badc682eaf08a1e342b496b483;p=thirdparty%2Fbinutils-gdb.git framefilter quit: Obvious whitespacing fixes gdb/ChangeLog 2015-02-11 Jan Kratochvil * python/py-framefilter.c (py_print_frame): Whitespacing fixes. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1f23daee0bb..80e19b8f485 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2015-02-11 Jan Kratochvil + + * python/py-framefilter.c (py_print_frame): Whitespacing fixes. + 2015-02-04 Doug Evans Pedro Alves Eli Zaretskii diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c index 97dce89d97e..c1c26535fec 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;