From 8566618f65d983b31efb8efec13c25c6410b1718 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 11 Jun 2012 14:32:47 -0600 Subject: [PATCH] python: use simpler methods * python/libvirt-override.c (libvirt_virDomainGetVcpus) (libvirt_virDomainGetVcpuPinInfo): Use Py_XDECREF instead of open-coding it. --- python/libvirt-override.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 130e702d84..da5cb9ac20 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1415,15 +1415,9 @@ libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, cleanup: VIR_FREE(cpuinfo); VIR_FREE(cpumap); - /* NB, Py_DECREF is a badly defined macro, so we require - * braces here to avoid 'ambiguous else' warnings from - * the compiler. - * 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); } + Py_XDECREF(pyretval); + Py_XDECREF(pycpuinfo); + Py_XDECREF(pycpumap); return VIR_PY_NONE; } @@ -1584,7 +1578,7 @@ libvirt_virDomainGetVcpuPinInfo(PyObject *self ATTRIBUTE_UNUSED, cleanup: VIR_FREE(cpumaps); - if (pycpumaps) { Py_DECREF(pycpumaps);} + Py_XDECREF(pycpumaps); return VIR_PY_NONE; }