python: use simpler methods

* python/libvirt-override.c (libvirt_virDomainGetVcpus)
(libvirt_virDomainGetVcpuPinInfo): Use Py_XDECREF instead of
open-coding it.
This commit is contained in:
Eric Blake 2012-06-11 14:32:47 -06:00
parent 86032b2276
commit 8566618f65

View File

@ -1415,15 +1415,9 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED,
cleanup: cleanup:
VIR_FREE(cpuinfo); VIR_FREE(cpuinfo);
VIR_FREE(cpumap); VIR_FREE(cpumap);
/* NB, Py_DECREF is a badly defined macro, so we require Py_XDECREF(pyretval);
* braces here to avoid 'ambiguous else' warnings from Py_XDECREF(pycpuinfo);
* the compiler. Py_XDECREF(pycpumap);
* NB. this comment is true at of time of writing wrt to
* at least python2.5.
*/
if (pyretval) { Py_DECREF(pyretval); }
if (pycpuinfo) { Py_DECREF(pycpuinfo); }
if (pycpumap) { Py_DECREF(pycpumap); }
return VIR_PY_NONE; return VIR_PY_NONE;
} }
@ -1584,7 +1578,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED,
cleanup: cleanup:
VIR_FREE(cpumaps); VIR_FREE(cpumaps);
if (pycpumaps) { Py_DECREF(pycpumaps);} Py_XDECREF(pycpumaps);
return VIR_PY_NONE; return VIR_PY_NONE;
} }