Commit b06b22a4 authored by Stefan Behnel's avatar Stefan Behnel

fix compiler warnings and error handling code in __Pyx_unpack_tuple2() utility code

--HG--
extra : transplant_source : %7D%F5%F9%9Eq%8E%EA%1B%27%88Q%9E%85%C25qE%A2%F8%C3
parent 58911b72
...@@ -123,8 +123,7 @@ static CYTHON_INLINE int __Pyx_unpack_tuple2(PyObject* tuple, PyObject** pvalue1 ...@@ -123,8 +123,7 @@ static CYTHON_INLINE int __Pyx_unpack_tuple2(PyObject* tuple, PyObject** pvalue1
if (!is_tuple && unlikely(!PyTuple_Check(tuple))) { if (!is_tuple && unlikely(!PyTuple_Check(tuple))) {
iter = PyObject_GetIter(tuple); iter = PyObject_GetIter(tuple);
if (unlikely(!iter)) goto bad; if (unlikely(!iter)) goto bad;
if (decref_tuple) if (decref_tuple) { Py_DECREF(tuple); tuple = NULL; }
Py_DECREF(tuple);
value1 = __Pyx_UnpackItem(iter, 0); value1 = __Pyx_UnpackItem(iter, 0);
if (unlikely(!value1)) goto bad; if (unlikely(!value1)) goto bad;
value2 = __Pyx_UnpackItem(iter, 1); value2 = __Pyx_UnpackItem(iter, 1);
...@@ -140,8 +139,7 @@ static CYTHON_INLINE int __Pyx_unpack_tuple2(PyObject* tuple, PyObject** pvalue1 ...@@ -140,8 +139,7 @@ static CYTHON_INLINE int __Pyx_unpack_tuple2(PyObject* tuple, PyObject** pvalue1
value2 = PyTuple_GET_ITEM(tuple, 1); value2 = PyTuple_GET_ITEM(tuple, 1);
Py_INCREF(value1); Py_INCREF(value1);
Py_INCREF(value2); Py_INCREF(value2);
if (decref_tuple) if (decref_tuple) { Py_DECREF(tuple); }
Py_DECREF(tuple);
} }
*pvalue1 = value1; *pvalue1 = value1;
*pvalue2 = value2; *pvalue2 = value2;
...@@ -150,7 +148,7 @@ bad: ...@@ -150,7 +148,7 @@ bad:
Py_XDECREF(iter); Py_XDECREF(iter);
Py_XDECREF(value1); Py_XDECREF(value1);
Py_XDECREF(value2); Py_XDECREF(value2);
if (decref_tuple) Py_DECREF(tuple); if (decref_tuple) { Py_XDECREF(tuple); }
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment