From fbf8e4c35c292620f8d25096b4341c3b5caa90ee Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 27 Aug 2024 09:20:18 +0200 Subject: [PATCH] [gdb/python] Use GDB_PY_SET_HANDLE_EXCEPTION more often I found a few more places where we can use GDB_PY_SET_HANDLE_EXCEPTION. Tested on x86_64-linux. Approved-By: Tom Tromey --- gdb/python/py-breakpoint.c | 3 +-- gdb/python/py-cmd.c | 3 +-- gdb/python/py-finishbreakpoint.c | 3 +-- gdb/python/py-param.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c index 19e244f7998..013c3fadabf 100644 --- a/gdb/python/py-breakpoint.c +++ b/gdb/python/py-breakpoint.c @@ -1054,8 +1054,7 @@ bppy_init (PyObject *self, PyObject *args, PyObject *kwargs) catch (const gdb_exception &except) { bppy_pending_object = NULL; - gdbpy_convert_exception (except); - return -1; + GDB_PY_SET_HANDLE_EXCEPTION (except); } BPPY_SET_REQUIRE_VALID ((gdbpy_breakpoint_object *) self); diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c index f83b45dd210..2ce2c90d805 100644 --- a/gdb/python/py-cmd.c +++ b/gdb/python/py-cmd.c @@ -541,8 +541,7 @@ cmdpy_init (PyObject *self, PyObject *args, PyObject *kw) } catch (const gdb_exception &except) { - gdbpy_convert_exception (except); - return -1; + GDB_PY_SET_HANDLE_EXCEPTION (except); } return 0; diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index 78030be9abf..ed3c4a5d90e 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -217,8 +217,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) } catch (const gdb_exception &except) { - gdbpy_convert_exception (except); - return -1; + GDB_PY_SET_HANDLE_EXCEPTION (except); } if (PyErr_Occurred ()) diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c index 621f85da3f8..e7032f7758c 100644 --- a/gdb/python/py-param.c +++ b/gdb/python/py-param.c @@ -885,8 +885,7 @@ parmpy_init (PyObject *self, PyObject *args, PyObject *kwds) catch (const gdb_exception &except) { Py_DECREF (self); - gdbpy_convert_exception (except); - return -1; + GDB_PY_SET_HANDLE_EXCEPTION (except); } return 0; -- 2.39.5