summaryrefslogtreecommitdiff
path: root/libvirt-override.c
diff options
context:
space:
mode:
authorPavel Hrdina <phrdina@redhat.com>2018-06-12 07:12:15 +0200
committerPavel Hrdina <phrdina@redhat.com>2018-06-12 10:27:38 +0200
commita950b083177934aebab8c1902699e5ae77033b4d (patch)
tree50158bc611ad923ac9dd4bded6782f0faf48b63f /libvirt-override.c
parent0c2d0c9be9d6bfeaca6acf1d11cf5a16f4e229a8 (diff)
downloadlibvirt-python-a950b083177934aebab8c1902699e5ae77033b4d.tar.gz
libvirt_charPtrUnwrap: remove unnecessary check of returned string
Function libvirt_charPtrUnwrap() either fails or always sets the unwrapped string so there is no need to check it explicitly. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Diffstat (limited to 'libvirt-override.c')
-rw-r--r--libvirt-override.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/libvirt-override.c b/libvirt-override.c
index dac481b..2f2c4ff 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -4639,8 +4639,7 @@ libvirt_virConnectBaselineCPU(PyObject *self ATTRIBUTE_UNUSED,
for (i = 0; i < ncpus; i++) {
if (libvirt_charPtrUnwrap(PyList_GetItem(list, i),
- &(xmlcpus[i])) < 0 ||
- xmlcpus[i] == NULL) {
+ &(xmlcpus[i])) < 0) {
for (j = 0 ; j < i ; j++)
VIR_FREE(xmlcpus[j]);
VIR_FREE(xmlcpus);
@@ -8245,8 +8244,7 @@ libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED,
for (i = 0; i < nmountpoints; i++) {
if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i),
- mountpoints+i) < 0 ||
- mountpoints[i] == NULL)
+ mountpoints+i) < 0)
goto cleanup;
}
}
@@ -8293,8 +8291,7 @@ libvirt_virDomainFSThaw(PyObject *self ATTRIBUTE_UNUSED,
for (i = 0; i < nmountpoints; i++) {
if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i),
- mountpoints+i) < 0 ||
- mountpoints[i] == NULL)
+ mountpoints+i) < 0)
goto cleanup;
}
}
@@ -9743,8 +9740,7 @@ libvirt_virConnectBaselineHypervisorCPU(PyObject *self ATTRIBUTE_UNUSED,
for (i = 0; i < ncpus; i++) {
if (libvirt_charPtrUnwrap(PyList_GetItem(list, i),
- &(xmlCPUs[i])) < 0 ||
- !xmlCPUs[i])
+ &(xmlCPUs[i])) < 0)
goto cleanup;
}
}