Avoid using Py_IncRef/Py_DecRef for consistency.

We currently use a mix of Py_IncRef/Py_DecRef and Py_XINCREF/Py_XDECREF
or Py_INCREF/Py_DECREF in the code-base. Only use the latter variants
for the time being (for consistency).

diff --git a/instance.c b/instance.c
index fc03174c9779bcba6d9390140d10b4f7c9c9f3a8..2859493194d724f7ea775cead7e6cba740742808 100644 (file)
--- a/instance.c
+++ b/instance.c
@@ -695,7 +695,7 @@ SRD_PRIV int srd_inst_start(struct srd_decoder_inst *di)
                PyGILState_Release(gstate);
                return SRD_ERR_PYTHON;
        }
                PyGILState_Release(gstate);
                return SRD_ERR_PYTHON;
        }

-       Py_DecRef(py_res);
+       Py_DECREF(py_res);

 
        /* Set self.samplenum to 0. */
        py_samplenum = PyLong_FromLong(0);
 
        /* Set self.samplenum to 0. */
        py_samplenum = PyLong_FromLong(0);


@@ -1046,7 +1046,7 @@ static gpointer di_thread(gpointer data)
         * Call self.decode(). Only returns if the PD throws an exception.
         * "Regular" termination of the decode() method is not expected.
         */
         * Call self.decode(). Only returns if the PD throws an exception.
         * "Regular" termination of the decode() method is not expected.
         */

-       Py_IncRef(di->py_inst);
+       Py_INCREF(di->py_inst);

        srd_dbg("%s: Calling decode().", di->inst_id);
        py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
        srd_dbg("%s: decode() terminated.", di->inst_id);
        srd_dbg("%s: Calling decode().", di->inst_id);
        py_res = PyObject_CallMethod(di->py_inst, "decode", NULL);
        srd_dbg("%s: decode() terminated.", di->inst_id);


@@ -1102,7 +1102,7 @@ static gpointer di_thread(gpointer data)
         * decode() will re-start another thread transparently.
         */
        srd_dbg("%s: decode() terminated (req %d).", di->inst_id, wanted_term);
         * decode() will re-start another thread transparently.
         */
        srd_dbg("%s: decode() terminated (req %d).", di->inst_id, wanted_term);

-       Py_DecRef(py_res);
+       Py_DECREF(py_res);

        PyErr_Clear();
 
        PyGILState_Release(gstate);
        PyErr_Clear();
 
        PyGILState_Release(gstate);


@@ -1311,7 +1311,7 @@ SRD_PRIV void srd_inst_free(struct srd_decoder_inst *di)
        srd_inst_reset_state(di);
 
        gstate = PyGILState_Ensure();
        srd_inst_reset_state(di);
 
        gstate = PyGILState_Ensure();

-       Py_DecRef(di->py_inst);
+       Py_DECREF(di->py_inst);

        PyGILState_Release(gstate);
 
        g_free(di->inst_id);
        PyGILState_Release(gstate);
 
        g_free(di->inst_id);

diff --git a/type_decoder.c b/type_decoder.c
index cde2900b01a22f083539d0f751e82a7fa9633212..17204f069fa6bf866c2e1fb29c344b5c52444620 100644 (file)
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -753,14 +753,14 @@ static int set_new_condition_list(PyObject *self, PyObject *args)
                num_conditions = PyList_Size(py_conditionlist);
                if (num_conditions == 0)
                        goto ret_9999; /* The PD invoked self.wait([]). */
                num_conditions = PyList_Size(py_conditionlist);
                if (num_conditions == 0)
                        goto ret_9999; /* The PD invoked self.wait([]). */

-               Py_IncRef(py_conditionlist);
+               Py_INCREF(py_conditionlist);

        } else if (PyDict_Check(py_conds)) {
                /* 'py_conds' is a dict. */
                if (PyDict_Size(py_conds) == 0)
                        goto ret_9999; /* The PD invoked self.wait({}). */
                /* Make a list and put the dict in there for convenience. */
                py_conditionlist = PyList_New(1);
        } else if (PyDict_Check(py_conds)) {
                /* 'py_conds' is a dict. */
                if (PyDict_Size(py_conds) == 0)
                        goto ret_9999; /* The PD invoked self.wait({}). */
                /* Make a list and put the dict in there for convenience. */
                py_conditionlist = PyList_New(1);

-               Py_IncRef(py_conds);
+               Py_INCREF(py_conds);

                PyList_SetItem(py_conditionlist, 0, py_conds);
                num_conditions = 1;
        } else {
                PyList_SetItem(py_conditionlist, 0, py_conds);
                num_conditions = 1;
        } else {