]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
python: use simpler methods
authorEric Blake <eblake@redhat.com>
Mon, 11 Jun 2012 20:32:47 +0000 (14:32 -0600)
committerEric Blake <eblake@redhat.com>
Tue, 12 Jun 2012 12:37:59 +0000 (06:37 -0600)
* python/libvirt-override.c (libvirt_virDomainGetVcpus)
(libvirt_virDomainGetVcpuPinInfo): Use Py_XDECREF instead of
open-coding it.

python/libvirt-override.c

index 130e702d84785e171c71a8e1acb38a1b4d75cb44..da5cb9ac203e75ec5cd604b73201eb1aa9eff735 100644 (file)
@@ -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;
 }