From ea41325b7d134e91648e340d8297e8f6ee5fe26a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 27 Dec 2018 11:57:28 -0700 Subject: [PATCH] Simplify gdbpy_stop_recording This simplifies gdbpy_stop_recording, by having it use Py_RETURN_NONE rather than writing it out manually, and by usin the idiomatic GDB_PY_HANDLE_EXCEPTION. gdb/ChangeLog 2019-01-03 Tom Tromey * python/py-record.c (gdbpy_stop_recording): Use Py_RETURN_NONE. --- gdb/ChangeLog | 4 ++++ gdb/python/py-record.c | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a01c1491ff1..6ed1545f5e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-01-03 Tom Tromey + + * python/py-record.c (gdbpy_stop_recording): Use Py_RETURN_NONE. + 2019-01-03 Tom Tromey * python/py-value.c (valpy_dealloc): Use Py_XDECREF. diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c index 3d638e5e5df..e818560174e 100644 --- a/gdb/python/py-record.c +++ b/gdb/python/py-record.c @@ -638,19 +638,15 @@ gdbpy_current_recording (PyObject *self, PyObject *args) PyObject * gdbpy_stop_recording (PyObject *self, PyObject *args) { - PyObject *ret = NULL; - TRY { record_stop (0); - ret = Py_None; - Py_INCREF (Py_None); } CATCH (except, RETURN_MASK_ALL) { - gdbpy_convert_exception (except); + GDB_PY_HANDLE_EXCEPTION (except); } END_CATCH - return ret; + Py_RETURN_NONE; }