From 8dbcee674ea4a8daa55f880ad7ade96efca96951 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 20 Nov 2016 11:16:41 -0700 Subject: [PATCH] Remove make_cleanup_py_decref and make_cleanup_py_xdecref make_cleanup_py_decref and make_cleanup_py_xdecref are now unused, so this patch removes themm. Future Python changes should use gdbpy_ref instead. 2017-01-10 Tom Tromey * python/python-internal.h (make_cleanup_py_decref) (make_cleanup_py_xdecref): Don't declare. * python/py-utils.c (py_decref, make_cleanup_py_decref) (py_xdecref, make_cleanup_py_xdecref): Remove. --- gdb/ChangeLog | 7 ++++++ gdb/python/py-utils.c | 42 ------------------------------------ gdb/python/python-internal.h | 3 --- 3 files changed, 7 insertions(+), 45 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6bae94a0505..e3e46323a89 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2017-01-10 Tom Tromey + + * python/python-internal.h (make_cleanup_py_decref) + (make_cleanup_py_xdecref): Don't declare. + * python/py-utils.c (py_decref, make_cleanup_py_decref) + (py_xdecref, make_cleanup_py_xdecref): Remove. + 2017-01-10 Tom Tromey * python/py-framefilter.c (py_mi_print_variables): Use gdbpy_ref. diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 2cbf29eff1f..e26de41604a 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -23,48 +23,6 @@ #include "python-internal.h" #include "py-ref.h" -/* This is a cleanup function which decrements the refcount on a - Python object. */ - -static void -py_decref (void *p) -{ - PyObject *py = (PyObject *) p; - - Py_DECREF (py); -} - -/* Return a new cleanup which will decrement the Python object's - refcount when run. */ - -struct cleanup * -make_cleanup_py_decref (PyObject *py) -{ - return make_cleanup (py_decref, (void *) py); -} - -/* This is a cleanup function which decrements the refcount on a - Python object. This function accounts appropriately for NULL - references. */ - -static void -py_xdecref (void *p) -{ - PyObject *py = (PyObject *) p; - - Py_XDECREF (py); -} - -/* Return a new cleanup which will decrement the Python object's - refcount when run. Account for and operate on NULL references - correctly. */ - -struct cleanup * -make_cleanup_py_xdecref (PyObject *py) -{ - return make_cleanup (py_xdecref, py); -} - /* Converts a Python 8-bit string to a unicode string object. Assumes the 8-bit string is in the host charset. If an error occurs during conversion, returns NULL with a python exception set. diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 1d0ce0b4caa..908a8780959 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -498,9 +498,6 @@ int gdbpy_initialize_xmethods (void) int gdbpy_initialize_unwind (void) CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION; -struct cleanup *make_cleanup_py_decref (PyObject *py); -struct cleanup *make_cleanup_py_xdecref (PyObject *py); - /* Called before entering the Python interpreter to install the current language and architecture to be used for Python values. Also set the active extension language for GDB so that SIGINT's -- 2.30.2