On 11/13/2014 07:37 AM, Martin Kletzander wrote: NACK. IFS is one of those things that even though on paper the POSIX standard says order doesn't matter for anything besides the first character, in practice, changing it to anything other than space-tab-newline is liable to break things. Rather, reading cfg.mk, I see: # Like the above, but prohibit a newline at the end of a diagnostic. # This is subject to false positives partly because it naively looks for # `\n"', which may not be the end of the string, and also because it takes # two lines of context (the -A2) after the line with the function name. It looks like the reason you wrote this patch is because once the _previous_ vah_error() call gets turned into a one-line if body, then the setenv() call starts to be part of the -A2 context of the vah_error. But I think you can work around that by creative newlines, as in: if ... vah_error(...); if (setenv("IFS", " \t\n", 1) != 0) { or even creative comments: if ... vah_error(...); /* ensure the traditional IFS setting */ if (setenv("IFS", " \t\n", 1) != 0) { -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- daemon/libvirtd.c | 15 +++++---------- daemon/remote.c | 12 ++++-------- examples/object-events/event-test.c | 3 +-- examples/openauth/openauth.c | 9 +++------ 4 files changed, 13 insertions(+), 26 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 1864bfd..b7f82c5 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -981,9 +981,8 @@ static int migrateProfile(void) if (!(home = virGetUserDirectory())) goto cleanup; - if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) { + if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) goto cleanup; - } /* if the new directory is there or the old one is not: do nothing */ if (!(config_dir = virGetUserConfigDirectory())) @@ -998,21 +997,18 @@ static int migrateProfile(void) } /* test if we already attempted to migrate first */ - if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) { + if (virAsprintf(&updated, "%s/DEPRECATED-DIRECTORY", old_base) < 0) goto cleanup; - } - if (virFileExists(updated)) { + if (virFileExists(updated)) goto cleanup; - } config_home = virGetEnvBlockSUID("XDG_CONFIG_HOME"); if (config_home && config_home[0] != '\0') { if (VIR_STRDUP(xdg_dir, config_home) < 0) goto cleanup; } else { - if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) { + if (virAsprintf(&xdg_dir, "%s/.config", home) < 0) goto cleanup; - } } old_umask = umask(077); @@ -1164,9 +1160,8 @@ int main(int argc, char **argv) { c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); - if (c == -1) { + if (c == -1) break; - } switch (c) { case 0: diff --git a/daemon/remote.c b/daemon/remote.c index c93c97a..1d7082e 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -500,9 +500,8 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, authScheme, callback->callbackID); VIR_DEBUG("Subject %d", subject->nidentity); - for (i = 0; i < subject->nidentity; i++) { + for (i = 0; i < subject->nidentity; i++) VIR_DEBUG(" %s=%s", subject->identities[i].type, subject->identities[i].name); - } /* build return data */ memset(&data, 0, sizeof(data)); @@ -4268,9 +4267,8 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED, cleanup: VIR_FORCE_CLOSE(fd); - if (rv < 0) { + if (rv < 0) virNetMessageSaveError(rerr); - } if (dom) virDomainFree(dom); @@ -5689,9 +5687,8 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UNUSED, rv = 0; cleanup: - for (i = 0; i < nfiles; i++) { + for (i = 0; i < nfiles; i++) VIR_FORCE_CLOSE(files[i]); - } VIR_FREE(files); if (rv < 0) virNetMessageSaveError(rerr); @@ -5741,9 +5738,8 @@ static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTRIBUTE_ rv = 0; cleanup: - for (i = 0; i < nfiles; i++) { + for (i = 0; i < nfiles; i++) VIR_FORCE_CLOSE(files[i]); - } VIR_FREE(files); if (rv < 0) virNetMessageSaveError(rerr); diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 0c6faf4..8987ee5 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -730,9 +730,8 @@ int main(int argc, char **argv) virConnectUnregisterCloseCallback(dconn, connectClose); VIR_DEBUG("Closing connection"); - if (dconn && virConnectClose(dconn) < 0) { + if (dconn && virConnectClose(dconn) < 0) printf("error closing\n"); - } printf("done\n"); return 0; diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c index fae96e0..0be977e 100644 --- a/examples/openauth/openauth.c +++ b/examples/openauth/openauth.c @@ -132,9 +132,8 @@ showDomains(virConnectPtr conn) goto out; } - if (numNames > 0) { + if (numNames > 0) printf("Inactive domains:\n"); - } for (i = 0; i < numNames; i++) { printf(" %s\n", *(nameList + i)); @@ -181,9 +180,8 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) case VIR_CRED_AUTHNAME: cred[i].result = strdup(authData->username); - if (cred[i].result == NULL) { + if (cred[i].result == NULL) return -1; - } cred[i].resultlen = strlen(cred[i].result); break; @@ -191,9 +189,8 @@ authCallback(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata) case VIR_CRED_PASSPHRASE: cred[i].result = strdup(authData->password); - if (cred[i].result == NULL) { + if (cred[i].result == NULL) return -1; - } cred[i].resultlen = strlen(cred[i].result); break; -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/esx/esx_device_monitor.c | 3 +- src/esx/esx_interface_driver.c | 12 +- src/esx/esx_network_driver.c | 57 +++------ src/esx/esx_nwfilter_driver.c | 3 +- src/esx/esx_secret_driver.c | 3 +- src/esx/esx_storage_backend_iscsi.c | 45 +++---- src/esx/esx_storage_backend_vmfs.c | 51 +++----- src/esx/esx_storage_driver.c | 81 ++++-------- src/esx/esx_util.c | 45 +++---- src/esx/esx_vi.c | 249 ++++++++++++------------------------ src/esx/esx_vi_types.c | 45 +++---- 11 files changed, 198 insertions(+), 396 deletions(-) diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 613cef6..bf71145 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -43,9 +43,8 @@ esxNodeDeviceOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5fb9b1a..20c9361 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -46,9 +46,8 @@ esxInterfaceOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } @@ -98,9 +97,8 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) int count = 0; size_t i; - if (maxnames == 0) { + if (maxnames == 0) return 0; - } if (esxVI_EnsureSession(priv->primary) < 0 || esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { @@ -119,9 +117,8 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -234,9 +231,8 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) if (physicalNic->spec->ip) { protocol.family = (char *)"ipv4"; - if (physicalNic->spec->ip->dhcp == esxVI_Boolean_True) { + if (physicalNic->spec->ip->dhcp == esxVI_Boolean_True) protocol.dhcp = 1; - } if (physicalNic->spec->ip->ipAddress && physicalNic->spec->ip->subnetMask && diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 6fae4ff..8defcd6 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -52,9 +52,8 @@ esxNetworkOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } @@ -105,9 +104,8 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) int count = 0; size_t i; - if (maxnames == 0) { + if (maxnames == 0) return 0; - } if (esxVI_EnsureSession(priv->primary) < 0 || esxVI_LookupHostVirtualSwitchList(priv->primary, @@ -127,9 +125,8 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -181,9 +178,8 @@ esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) hostVirtualSwitch = hostVirtualSwitch->_next) { md5_buffer(hostVirtualSwitch->key, strlen(hostVirtualSwitch->key), md5); - if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) break; - } } if (!hostVirtualSwitch) { @@ -265,34 +261,30 @@ esxBandwidthToShapingPolicy(virNetDevBandwidthPtr bandwidth, return 0; } - if (esxVI_HostNetworkTrafficShapingPolicy_Alloc(shapingPolicy) < 0) { + if (esxVI_HostNetworkTrafficShapingPolicy_Alloc(shapingPolicy) < 0) goto cleanup; - } (*shapingPolicy)->enabled = esxVI_Boolean_True; if (bandwidth->in->average > 0) { - if (esxVI_Long_Alloc(&(*shapingPolicy)->averageBandwidth) < 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->averageBandwidth) < 0) goto cleanup; - } /* Scale kilobytes per second to bits per second */ (*shapingPolicy)->averageBandwidth->value = bandwidth->in->average * 8 * 1000; } if (bandwidth->in->peak > 0) { - if (esxVI_Long_Alloc(&(*shapingPolicy)->peakBandwidth) < 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->peakBandwidth) < 0) goto cleanup; - } /* Scale kilobytes per second to bits per second */ (*shapingPolicy)->peakBandwidth->value = bandwidth->in->peak * 8 * 1000; } if (bandwidth->in->burst > 0) { - if (esxVI_Long_Alloc(&(*shapingPolicy)->burstSize) < 0) { + if (esxVI_Long_Alloc(&(*shapingPolicy)->burstSize) < 0) goto cleanup; - } /* Scale kilobytes to bytes */ (*shapingPolicy)->burstSize->value = bandwidth->in->burst * 1024; @@ -301,9 +293,8 @@ esxBandwidthToShapingPolicy(virNetDevBandwidthPtr bandwidth, result = 0; cleanup: - if (result < 0) { + if (result < 0) esxVI_HostNetworkTrafficShapingPolicy_Free(shapingPolicy); - } return result; } @@ -328,16 +319,14 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } /* Parse network XML */ def = virNetworkDefParseString(xml); - if (!def) { + if (!def) return NULL; - } /* Check if an existing HostVirtualSwitch should be edited */ if (esxVI_LookupHostVirtualSwitchByName(priv->primary, def->name, @@ -372,9 +361,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) /* Verify that specified HostPortGroups don't exist already */ if (def->nPortGroups > 0) { - if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) { + if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) goto cleanup; - } for (i = 0; i < def->nPortGroups; ++i) { for (hostPortGroup = hostPortGroupList; hostPortGroup; @@ -405,9 +393,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) (esxVI_HostVirtualSwitchBridge *)hostVirtualSwitchBondBridge; /* Lookup PhysicalNic list and match by name to get key */ - if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) goto cleanup; - } for (i = 0; i < def->forward.nifs; ++i) { bool found = false; @@ -447,9 +434,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) hostVirtualSwitchSpec->numPorts->value = 128; if (def->bandwidth) { - if (esxVI_HostNetworkPolicy_Alloc(&hostVirtualSwitchSpec->policy) < 0) { + if (esxVI_HostNetworkPolicy_Alloc(&hostVirtualSwitchSpec->policy) < 0) goto cleanup; - } if (esxBandwidthToShapingPolicy (def->bandwidth, @@ -530,9 +516,8 @@ esxNetworkUndefine(virNetworkPtr network) esxVI_HostPortGroup *hostPortGroup = NULL; esxVI_HostPortGroupPort *hostPortGroupPort = NULL; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } /* Lookup HostVirtualSwitch and HostPortGroup list*/ if (esxVI_LookupHostVirtualSwitchByName(priv->primary, network->name, @@ -630,9 +615,8 @@ esxShapingPolicyToBandwidth(esxVI_HostNetworkTrafficShapingPolicy *shapingPolicy return -1; } - if (!shapingPolicy || shapingPolicy->enabled != esxVI_Boolean_True) { + if (!shapingPolicy || shapingPolicy->enabled != esxVI_Boolean_True) return 0; - } if (VIR_ALLOC(*bandwidth) < 0 || VIR_ALLOC((*bandwidth)->in) < 0 || @@ -682,9 +666,8 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *networkName = NULL; virNetworkDefPtr def; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } if (VIR_ALLOC(def) < 0) goto cleanup; @@ -718,9 +701,8 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) goto cleanup; /* Find PhysicalNic by key */ - if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) { + if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) goto cleanup; - } for (physicalNicKey = hostVirtualSwitch->pnic; physicalNicKey; physicalNicKey = physicalNicKey->_next) { @@ -781,9 +763,8 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) } /* Find HostPortGroup by key */ - if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) { + if (esxVI_LookupHostPortGroupList(priv->primary, &hostPortGroupList) < 0) goto cleanup; - } for (hostPortGroupKey = hostVirtualSwitch->portgroup; hostPortGroupKey; hostPortGroupKey = hostPortGroupKey->_next) { diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index d7ab60f..705035c 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -43,9 +43,8 @@ esxNWFilterOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index 4ce8ae4..de398af 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -41,9 +41,8 @@ esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 2e2a270..e4d2692 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -104,9 +104,8 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, esxVI_HostInternetScsiHbaStaticTarget *target; size_t i; - if (maxnames == 0) { + if (maxnames == 0) return 0; - } if (esxVI_LookupHostInternetScsiHba(priv->primary, &hostInternetScsiHba) < 0) { @@ -140,9 +139,8 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } } esxVI_HostInternetScsiHba_Free(&hostInternetScsiHba); @@ -222,9 +220,8 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, target; target = target->_next) { md5_buffer(target->iScsiName, strlen(target->iScsiName), md5); - if (memcmp(uuid, md5, VIR_UUID_STRING_BUFLEN) == 0) { + if (memcmp(uuid, md5, VIR_UUID_STRING_BUFLEN) == 0) break; - } } if (!target) { @@ -304,15 +301,13 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) memset(&def, 0, sizeof(def)); - if (esxVI_LookupHostInternetScsiHba(priv->primary, &hostInternetScsiHba)) { + if (esxVI_LookupHostInternetScsiHba(priv->primary, &hostInternetScsiHba)) goto cleanup; - } for (target = hostInternetScsiHba->configuredStaticTarget; target; target = target->_next) { - if (STREQ(target->iScsiName, pool->name)) { + if (STREQ(target->iScsiName, pool->name)) break; - } } if (!target) { @@ -338,9 +333,8 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) def.source.hosts[0].name = target->address; - if (target->port) { + if (target->port) def.source.hosts[0].port = target->port->value; - } /* TODO: add CHAP authentication params */ xml = virStoragePoolDefFormat(&def); @@ -403,9 +397,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, return 0; } - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun && count < maxnames; scsiLun = scsiLun->_next) { @@ -425,9 +418,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -452,9 +444,8 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, unsigned char md5[MD5_DIGEST_SIZE]; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun; scsiLun = scsiLun->_next) { @@ -500,9 +491,8 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) unsigned char md5[MD5_DIGEST_SIZE]; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun; scsiLun = scsiLun->_next) { hostScsiDisk = esxVI_HostScsiDisk_DynamicCast(scsiLun); @@ -548,13 +538,11 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; /* key may be LUN device path */ - if (STRPREFIX(key, "/")) { + if (STRPREFIX(key, "/")) return esxStorageVolLookupByPath(conn, key); - } - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun; scsiLun = scsiLun->_next) { @@ -631,9 +619,8 @@ esxStorageVolGetInfo(virStorageVolPtr volume, esxVI_ScsiLun *scsiLun; esxVI_HostScsiDisk *hostScsiDisk = NULL; - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun; scsiLun = scsiLun->_next) { @@ -687,9 +674,8 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, memset(&pool, 0, sizeof(pool)); memset(&def, 0, sizeof(def)); - if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) goto cleanup; - } for (scsiLun = scsiLunList; scsiLun; scsiLun = scsiLun->_next) { @@ -715,9 +701,8 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, virUUIDFormat(md5, uuid_string); - if (VIR_STRDUP(def.key, uuid_string) < 0) { + if (VIR_STRDUP(def.key, uuid_string) < 0) goto cleanup; - } /* iSCSI LUN exposes a block device */ def.type = VIR_STORAGE_VOL_BLOCK; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 2e163c1..fa423e9 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -120,9 +120,8 @@ esxConnectNumOfStoragePools(virConnectPtr conn) esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *datastore = NULL; - if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) { + if (esxVI_LookupDatastoreList(priv->primary, NULL, &datastoreList) < 0) return -1; - } for (datastore = datastoreList; datastore; datastore = datastore->_next) { @@ -149,9 +148,8 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int count = 0; size_t i; - if (maxnames == 0) { + if (maxnames == 0) return 0; - } if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || @@ -185,9 +183,8 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -295,9 +292,8 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, md5_buffer(hostMount->mountInfo->path, strlen(hostMount->mountInfo->path), md5); - if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) break; - } } if (!datastore) { @@ -580,9 +576,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, return -1; } - if (maxnames == 0) { + if (maxnames == 0) return 0; - } if (esxVI_LookupDatastoreContentByDatastoreName(priv->primary, pool->name, &searchResultsList) < 0) { @@ -626,9 +621,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -807,9 +801,8 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) goto cleanup; } - if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) { + if (esxUtil_ReformatUuid(uuid_string, key_candidate) < 0) goto cleanup; - } if (STREQ(key, key_candidate)) { /* Found matching UUID */ @@ -873,9 +866,8 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, /* Parse config */ def = virStorageVolDefParseString(&poolDef, xmldesc); - if (!def) { + if (!def) goto cleanup; - } if (def->type != VIR_STORAGE_VOL_FILE) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -914,16 +906,14 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - if (!directoryName) { + if (!directoryName) goto cleanup; - } fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + strlen(unescapedDirectoryName) + 1); - if (!fileName) { + if (!fileName) goto cleanup; - } if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, directoryName) < 0) @@ -1012,14 +1002,12 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, goto cleanup; } - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + if (esxUtil_ReformatUuid(uuid_string, key) < 0) goto cleanup; - } } else { /* Fall back to the path as key */ - if (VIR_STRDUP(key, datastorePath) < 0) { + if (VIR_STRDUP(key, datastorePath) < 0) goto cleanup; - } } } else { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1099,9 +1087,8 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, /* Parse config */ def = virStorageVolDefParseString(&poolDef, xmldesc); - if (!def) { + if (!def) goto cleanup; - } if (def->type != VIR_STORAGE_VOL_FILE) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1140,16 +1127,14 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, directoryName = esxUtil_EscapeDatastoreItem(unescapedDirectoryName); - if (!directoryName) { + if (!directoryName) goto cleanup; - } fileName = esxUtil_EscapeDatastoreItem(unescapedDirectoryAndFileName + strlen(unescapedDirectoryName) + 1); - if (!fileName) { + if (!fileName) goto cleanup; - } if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", pool->name, directoryName) < 0) @@ -1204,14 +1189,12 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto cleanup; } - if (esxUtil_ReformatUuid(uuid_string, key) < 0) { + if (esxUtil_ReformatUuid(uuid_string, key) < 0) goto cleanup; - } } else { /* Fall back to the path as key */ - if (VIR_STRDUP(key, datastorePath) < 0) { + if (VIR_STRDUP(key, datastorePath) < 0) goto cleanup; - } } } else { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index ff3f167..b8e2fda 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -60,9 +60,8 @@ esxStorageOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (conn->driver->no != VIR_DRV_ESX) { + if (conn->driver->no != VIR_DRV_ESX) return VIR_DRV_OPEN_DECLINED; - } return VIR_DRV_OPEN_SUCCESS; } @@ -85,16 +84,14 @@ esxConnectNumOfStoragePools(virConnectPtr conn) size_t i; int tmp; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } for (i = 0; i < LAST_BACKEND; ++i) { tmp = backends[i]->connectNumOfStoragePools(conn); - if (tmp < 0) { + if (tmp < 0) return -1; - } count += tmp; } @@ -113,20 +110,17 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) size_t i; int tmp; - if (maxnames == 0) { + if (maxnames == 0) return 0; - } - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } for (i = 0; i < LAST_BACKEND; ++i) { tmp = backends[i]->connectListStoragePools(conn, &names[count], maxnames - count); - if (tmp < 0) { + if (tmp < 0) goto cleanup; - } count += tmp; } @@ -135,9 +129,8 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames) cleanup: if (! success) { - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } count = -1; } @@ -176,16 +169,14 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) virCheckNonNullArgReturn(name, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } for (i = 0; i < LAST_BACKEND; ++i) { pool = backends[i]->storagePoolLookupByName(conn, name); - if (pool) { + if (pool) return pool; - } } virReportError(VIR_ERR_NO_STORAGE_POOL, @@ -204,17 +195,15 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virStoragePoolPtr pool; char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } /* invoke backend drive method to search all known pools */ for (i = 0; i < LAST_BACKEND; ++i) { pool = backends[i]->storagePoolLookupByUUID(conn, uuid); - if (pool) { + if (pool) return pool; - } } virUUIDFormat(uuid, uuid_string); @@ -243,9 +232,8 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) virCheckNonNullArgReturn(pool->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storagePoolRefresh(pool, flags); } @@ -262,9 +250,8 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) memset(info, 0, sizeof(*info)); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storagePoolGetInfo(pool, info); } @@ -279,9 +266,8 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) virCheckNonNullArgReturn(pool->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storagePoolGetXMLDesc(pool, flags); } @@ -326,9 +312,8 @@ esxStoragePoolNumOfVolumes(virStoragePoolPtr pool) virCheckNonNullArgReturn(pool->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storagePoolNumOfVolumes(pool); } @@ -344,9 +329,8 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, virCheckNonNullArgReturn(pool->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storagePoolListVolumes(pool, names, maxnames); } @@ -361,9 +345,8 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, const char *name) virCheckNonNullArgReturn(pool->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storageVolLookupByName(pool, name); } @@ -375,9 +358,8 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) { esxPrivate *priv = conn->privateData; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } /* * FIXME: calling backends blindly may set unwanted error codes @@ -408,16 +390,14 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key) esxPrivate *priv = conn->privateData; size_t i; - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } for (i = 0; i < LAST_BACKEND; ++i) { volume = backends[i]->storageVolLookupByKey(conn, key); - if (volume) { + if (volume) return volume; - } } virReportError(VIR_ERR_NO_STORAGE_VOL, @@ -438,9 +418,8 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc, virCheckNonNullArgReturn(pool->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storageVolCreateXML(pool, xmldesc, flags); } @@ -456,9 +435,8 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, virCheckNonNullArgReturn(pool->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storageVolCreateXMLFrom(pool, xmldesc, sourceVolume, flags); } @@ -473,9 +451,8 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) virCheckNonNullArgReturn(volume->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storageVolDelete(volume, flags); } @@ -490,9 +467,8 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) virCheckNonNullArgReturn(volume->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storageVolWipe(volume, flags); } @@ -507,9 +483,8 @@ esxStorageVolGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) virCheckNonNullArgReturn(volume->privateData, -1); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return -1; - } return backend->storageVolGetInfo(volume, info); } @@ -524,9 +499,8 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, unsigned int flags) virCheckNonNullArgReturn(volume->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storageVolGetXMLDesc(volume, flags); } @@ -541,9 +515,8 @@ esxStorageVolGetPath(virStorageVolPtr volume) virCheckNonNullArgReturn(volume->privateData, NULL); - if (esxVI_EnsureSession(priv->primary) < 0) { + if (esxVI_EnsureSession(priv->primary) < 0) return NULL; - } return backend->storageVolGetPath(volume); } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 9a41241..2dd9f78 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -166,9 +166,8 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) result = 0; cleanup: - if (result < 0) { + if (result < 0) esxUtil_FreeParsedUri(parsedUri); - } return result; } @@ -179,9 +178,8 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri) void esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) { - if (!parsedUri || !(*parsedUri)) { + if (!parsedUri || !(*parsedUri)) return; - } VIR_FREE((*parsedUri)->transport); VIR_FREE((*parsedUri)->vCenter); @@ -197,18 +195,16 @@ int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id) { /* Try to parse an integer from the complete string. */ - if (virStrToLong_i(id_string, NULL, 10, id) == 0) { + if (virStrToLong_i(id_string, NULL, 10, id) == 0) return 0; - } /* * If that fails try to parse an integer from the string tail * assuming the naming scheme Virtual Center seems to use. */ if (STRPREFIX(id_string, "vm-")) { - if (virStrToLong_i(id_string + 3, NULL, 10, id) == 0) { + if (virStrToLong_i(id_string + 3, NULL, 10, id) == 0) return 0; - } } return -1; @@ -234,9 +230,8 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, return -1; } - if (VIR_STRDUP(copyOfDatastorePath, datastorePath) < 0) { + if (VIR_STRDUP(copyOfDatastorePath, datastorePath) < 0) goto cleanup; - } /* Expected format: '[<datastore>] <path>' where <path> is optional */ if (!(tmp = STRSKIP(copyOfDatastorePath, "[")) || *tmp == ']' || @@ -270,30 +265,25 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, /* Split <path> into <directory>/<file> and remove /<file> */ tmp = strrchr(preliminaryDirectoryAndFileName, '/'); - if (tmp) { + if (tmp) *tmp = '\0'; - } - if (VIR_STRDUP(*directoryName, preliminaryDirectoryAndFileName) < 0) { + if (VIR_STRDUP(*directoryName, preliminaryDirectoryAndFileName) < 0) goto cleanup; - } } result = 0; cleanup: if (result < 0) { - if (datastoreName) { + if (datastoreName) VIR_FREE(*datastoreName); - } - if (directoryName) { + if (directoryName) VIR_FREE(*directoryName); - } - if (directoryAndFileName) { + if (directoryAndFileName) VIR_FREE(*directoryAndFileName); - } } VIR_FREE(copyOfDatastorePath); @@ -408,20 +398,17 @@ esxUtil_EscapeBase64(const char *string) virBufferAddChar(&buffer, base64[(c1 >> 2) & 0x3f]); virBufferAddChar(&buffer, base64[((c1 << 4) + (c2 >> 4)) & 0x3f]); - if (length > 1) { + if (length > 1) virBufferAddChar(&buffer, base64[((c2 << 2) + (c3 >> 6)) & 0x3f]); - } - if (length > 2) { + if (length > 2) virBufferAddChar(&buffer, base64[c3 & 0x3f]); - } length -= length > 3 ? 3 : length; } - if (*tmp1 != '\0') { + if (*tmp1 != '\0') virBufferAddChar(&buffer, '-'); - } } } @@ -450,9 +437,8 @@ esxUtil_ReplaceSpecialWindowsPathChars(char *string) --length; } - if (*tmp != '\0') { + if (*tmp != '\0') ++tmp; - } } } @@ -472,9 +458,8 @@ esxUtil_EscapeDatastoreItem(const char *string) escaped1 = virVMXEscapeHexPercent(replaced); - if (!escaped1) { + if (!escaped1) goto cleanup; - } escaped2 = esxUtil_EscapeBase64(escaped1); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index d28b8e0..a87f2c0 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -98,26 +98,22 @@ ESX_VI__TEMPLATE__FREE(CURL, if (shared) { esxVI_SharedCURL_Remove(shared, item); - if (shared->count == 0) { + if (shared->count == 0) esxVI_SharedCURL_Free(&shared); - } } if (multi) { esxVI_MultiCURL_Remove(multi, item); - if (multi->count == 0) { + if (multi->count == 0) esxVI_MultiCURL_Free(&multi); - } } - if (item->handle) { + if (item->handle) curl_easy_cleanup(item->handle); - } - if (item->headers) { + if (item->headers) curl_slist_free_all(item->headers); - } virMutexDestroy(&item->lock); }) @@ -129,19 +125,16 @@ esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *userdata) size_t available = 0; size_t requested = size * nmemb; - if (!content) { + if (!content) return 0; - } available = strlen(content); - if (available == 0) { + if (available == 0) return 0; - } - if (requested > available) { + if (requested > available) requested = available; - } memcpy(data, content, requested); @@ -162,9 +155,8 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) * are meant to download small things such as VMX files, VMDK metadata * files and SOAP responses. */ - if (size * nmemb > INT32_MAX / 2 - virBufferUse(buffer)) { + if (size * nmemb > INT32_MAX / 2 - virBufferUse(buffer)) return 0; - } virBufferAdd(buffer, data, size * nmemb); @@ -193,9 +185,8 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, * To handle this properly in order to pass the info string to VIR_DEBUG * a zero terminated copy of the info string has to be allocated. */ - if (VIR_ALLOC_N(buffer, size + 1) < 0) { + if (VIR_ALLOC_N(buffer, size + 1) < 0) return 0; - } if (!virStrncpy(buffer, info, size, size + 1)) { VIR_FREE(buffer); @@ -204,9 +195,8 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, switch (type) { case CURLINFO_TEXT: - if (size > 0 && buffer[size - 1] == '\n') { + if (size > 0 && buffer[size - 1] == '\n') buffer[size - 1] = '\0'; - } VIR_DEBUG("CURLINFO_TEXT [[[[%s]]]]", buffer); break; @@ -430,9 +420,8 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, if (virBufferCheckError(&buffer) < 0) goto cleanup; - if (length) { + if (length) *length = virBufferUse(&buffer); - } *content = virBufferContentAndReset(&buffer); @@ -557,13 +546,11 @@ ESX_VI__TEMPLATE__FREE(SharedCURL, return; } - if (item->handle) { + if (item->handle) curl_share_cleanup(item->handle); - } - for (i = 0; i < ARRAY_CARDINALITY(item->locks); ++i) { + for (i = 0; i < ARRAY_CARDINALITY(item->locks); ++i) virMutexDestroy(&item->locks[i]); - } }) int @@ -735,9 +722,8 @@ ESX_VI__TEMPLATE__FREE(MultiCURL, return; } - if (item->handle) { + if (item->handle) curl_multi_cleanup(item->handle); - } #if ESX_EMULATE_CURL_MULTI_WAIT VIR_FREE(item->pollfds); @@ -856,9 +842,8 @@ esxVI_MultiCURL_Wait(esxVI_MultiCURL *multi, int *runningHandles) curl_multi_timeout(multi->handle, &timeout); - if (timeout < 0) { + if (timeout < 0) timeout = 1000; /* default to 1 sec timeout */ - } do { rc = poll(multi->pollfds, multi->npollfds, timeout); @@ -980,9 +965,8 @@ ESX_VI__TEMPLATE__ALLOC(Context) /* esxVI_Context_Free */ ESX_VI__TEMPLATE__FREE(Context, { - if (item->sessionLock) { + if (item->sessionLock) virMutexDestroy(item->sessionLock); - } esxVI_CURL_Free(&item->curl); VIR_FREE(item->url); @@ -1036,9 +1020,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, return -1; } - if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) { + if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) return -1; - } if (STRNEQ(ctx->service->about->apiType, "HostAgent") && STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { @@ -1121,9 +1104,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, ctx->hasQueryVirtualDiskUuid = true; } - if (ctx->productLine == esxVI_ProductLine_VPX) { + if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - } if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { @@ -1212,9 +1194,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (folder) { /* It's a folder, use it as new lookup root */ - if (root != ctx->service->rootFolder) { + if (root != ctx->service->rootFolder) esxVI_ManagedObjectReference_Free(&root); - } root = folder->_reference; folder->_reference = NULL; @@ -1227,9 +1208,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) } /* Build datacenter path */ - if (virBufferUse(&buffer) > 0) { + if (virBufferUse(&buffer) > 0) virBufferAddChar(&buffer, '/'); - } virBufferAdd(&buffer, item, -1); @@ -1255,9 +1235,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) goto cleanup; } - if (root != ctx->service->rootFolder) { + if (root != ctx->service->rootFolder) esxVI_ManagedObjectReference_Free(&root); - } root = ctx->datacenter->hostFolder; @@ -1272,9 +1251,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) if (folder) { /* It's a folder, use it as new lookup root */ - if (root != ctx->datacenter->hostFolder) { + if (root != ctx->datacenter->hostFolder) esxVI_ManagedObjectReference_Free(&root); - } root = folder->_reference; folder->_reference = NULL; @@ -1288,9 +1266,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) } /* Build compute resource path */ - if (virBufferUse(&buffer) > 0) { + if (virBufferUse(&buffer) > 0) virBufferAddChar(&buffer, '/'); - } virBufferAdd(&buffer, item, -1); @@ -1355,9 +1332,8 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path) result = 0; cleanup: - if (result < 0) { + if (result < 0) virBufferFreeAndReset(&buffer); - } if (root != ctx->service->rootFolder && (!ctx->datacenter || root != ctx->datacenter->hostFolder)) { @@ -1431,9 +1407,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, return -1; } - if (esxVI_Response_Alloc(response) < 0) { + if (esxVI_Response_Alloc(response) < 0) return -1; - } virMutexLock(&ctx->curl->lock); @@ -1448,9 +1423,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, virMutexUnlock(&ctx->curl->lock); - if ((*response)->responseCode < 0) { + if ((*response)->responseCode < 0) goto cleanup; - } if (virBufferCheckError(&buffer) < 0) goto cleanup; @@ -1462,9 +1436,8 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, _("(esx execute response)"), &xpathContext); - if (!(*response)->document) { + if (!(*response)->document) goto cleanup; - } xmlXPathRegisterNs(xpathContext, BAD_CAST "soapenv", BAD_CAST "http://schemas.xmlsoap.org/soap/envelope/"); @@ -1710,9 +1683,8 @@ esxVI_Enumeration_Deserialize(const esxVI_Enumeration *enumeration, *value = 0; /* undefined */ - if (esxVI_String_DeserializeValue(node, &name) < 0) { + if (esxVI_String_DeserializeValue(node, &name) < 0) return -1; - } for (i = 0; enumeration->values[i].name; ++i) { if (STREQ(name, enumeration->values[i].name)) { @@ -1755,9 +1727,8 @@ esxVI_List_Append(esxVI_List **list, esxVI_List *item) next = *list; - while (next->_next) { + while (next->_next) next = next->_next; - } next->_next = item; @@ -1810,9 +1781,8 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list, return -1; } - if (!anyType) { + if (!anyType) return 0; - } if (! STRPREFIX(anyType->other, "ArrayOf")) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1865,14 +1835,12 @@ esxVI_List_Serialize(esxVI_List *list, const char *element, return -1; } - if (!list) { + if (!list) return 0; - } for (item = list; item; item = item->_next) { - if (serializeFunc(item, element, output) < 0) { + if (serializeFunc(item, element, output) < 0) return -1; - } } return 0; @@ -1890,9 +1858,8 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, return -1; } - if (!node) { + if (!node) return 0; - } for (; node; node = node->next) { if (node->type != XML_ELEMENT_NODE) { @@ -2193,9 +2160,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, return -1; } - if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) { + if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) return -1; - } objectSpec->obj = root; objectSpec->skip = esxVI_Boolean_False; @@ -2254,9 +2220,8 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, } } - if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { + if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) goto cleanup; - } propertySpec->type = (char *)type; propertySpec->pathSet = propertyNameList; @@ -2325,13 +2290,11 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, propertySpec->pathSet = NULL; } - if (!objectSpec_isAppended) { + if (!objectSpec_isAppended) esxVI_ObjectSpec_Free(&objectSpec); - } - if (!propertySpec_isAppended) { + if (!propertySpec_isAppended) esxVI_PropertySpec_Free(&propertySpec); - } esxVI_PropertyFilterSpec_Free(&propertyFilterSpec); @@ -2463,9 +2426,8 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, for (dynamicProperty = objectContent->propSet; dynamicProperty; dynamicProperty = dynamicProperty->_next) { if (STREQ(dynamicProperty->name, propertyName)) { - if (esxVI_Long_CastFromAnyType(dynamicProperty->val, value) < 0) { + if (esxVI_Long_CastFromAnyType(dynamicProperty->val, value) < 0) return -1; - } break; } @@ -2709,9 +2671,8 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine, return 0; failure: - if (name) { + if (name) VIR_FREE(*name); - } return -1; } @@ -2760,9 +2721,8 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, count++; } - if (count >= nameslen) { + if (count >= nameslen) break; - } if (recurse) { result = esxVI_GetSnapshotTreeNames(snapshotTree->childSnapshotList, @@ -2770,9 +2730,8 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, nameslen - count, true, leaves); - if (result < 0) { + if (result < 0) goto failure; - } count += result; } @@ -2781,9 +2740,8 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList, return count; failure: - for (i = 0; i < count; ++i) { + for (i = 0; i < count; ++i) VIR_FREE(names[i]); - } return -1; } @@ -2817,9 +2775,8 @@ esxVI_GetSnapshotTreeByName if (esxVI_GetSnapshotTreeByName(candidate->childSnapshotList, name, snapshotTree, snapshotTreeParent, occurrence) > 0) { - if (snapshotTreeParent && !(*snapshotTreeParent)) { + if (snapshotTreeParent && !(*snapshotTreeParent)) *snapshotTreeParent = candidate; - } return 1; } @@ -2987,13 +2944,11 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name, goto cleanup; } - if (STRNEQ(name, name_candidate)) { + if (STRNEQ(name, name_candidate)) continue; - } - if (esxVI_ObjectContent_DeepCopy(virtualMachine, candidate) < 0) { + if (esxVI_ObjectContent_DeepCopy(virtualMachine, candidate) < 0) goto cleanup; - } break; } @@ -3126,9 +3081,8 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name, } if (STREQ(name_candidate, name)) { - if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) goto cleanup; - } /* Found datastore with matching name */ result = 0; @@ -3199,9 +3153,8 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, } } - if (!datastoreHostMountList) { + if (!datastoreHostMountList) continue; - } for (datastoreHostMount = datastoreHostMountList; datastoreHostMount; @@ -3212,9 +3165,8 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx, } if (STRPREFIX(absolutePath, datastoreHostMount->mountInfo->path)) { - if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) { + if (esxVI_ObjectContent_DeepCopy(datastore, candidate) < 0) goto cleanup; - } /* Found datastore with matching mount path */ result = 0; @@ -3284,13 +3236,11 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, for (candidate = hostMountList; candidate; candidate = candidate->_next) { - if (STRNEQ(ctx->hostSystem->_reference->value, candidate->key->value)) { + if (STRNEQ(ctx->hostSystem->_reference->value, candidate->key->value)) continue; - } - if (esxVI_DatastoreHostMount_DeepCopy(hostMount, candidate) < 0) { + if (esxVI_DatastoreHostMount_DeepCopy(hostMount, candidate) < 0) goto cleanup; - } break; } @@ -3392,9 +3342,8 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine /* Lookup task info for each task */ for (recentTask = recentTaskList; recentTask; recentTask = recentTask->_next) { - if (esxVI_LookupTaskInfoByTask(ctx, recentTask, &taskInfo) < 0) { + if (esxVI_LookupTaskInfoByTask(ctx, recentTask, &taskInfo) < 0) goto cleanup; - } if (taskInfo->state == esxVI_TaskInfoState_Queued || taskInfo->state == esxVI_TaskInfoState_Running) { @@ -3412,9 +3361,8 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine result = 0; cleanup: - if (result < 0) { + if (result < 0) esxVI_TaskInfo_Free(pendingTaskInfoList); - } esxVI_String_Free(&propertyNameList); esxVI_ManagedObjectReference_Free(&recentTaskList); @@ -3509,9 +3457,8 @@ esxVI_LookupRootSnapshotTreeList result = 0; cleanup: - if (result < 0) { + if (result < 0) esxVI_VirtualMachineSnapshotTree_Free(rootSnapshotTreeList); - } esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&virtualMachine); @@ -3651,9 +3598,8 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, datastoreName) < 0) goto cleanup; - if (VIR_STRDUP(fileName, directoryAndFileName) < 0) { + if (VIR_STRDUP(fileName, directoryAndFileName) < 0) goto cleanup; - } } else { if (virAsprintf(&datastorePathWithoutFileName, "[%s] %s", datastoreName, directoryName) < 0) @@ -3669,9 +3615,8 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, goto cleanup; } - if (VIR_STRDUP(fileName, directoryAndFileName + length + 1) < 0) { + if (VIR_STRDUP(fileName, directoryAndFileName + length + 1) < 0) goto cleanup; - } } /* Lookup HostDatastoreBrowser */ @@ -3736,9 +3681,8 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, floppyImageFileQuery = NULL; } - if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) { + if (esxVI_String_Alloc(&searchSpec->matchPattern) < 0) goto cleanup; - } searchSpec->matchPattern->value = fileName; @@ -3786,9 +3730,8 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx, cleanup: /* Don't double free fileName */ - if (searchSpec && searchSpec->matchPattern) { + if (searchSpec && searchSpec->matchPattern) searchSpec->matchPattern->value = NULL; - } VIR_FREE(datastoreName); VIR_FREE(directoryName); @@ -3967,17 +3910,15 @@ esxVI_LookupStorageVolumeKeyByDatastorePath(esxVI_Context *ctx, if (VIR_ALLOC_N(*key, VIR_UUID_STRING_BUFLEN) < 0) goto cleanup; - if (esxUtil_ReformatUuid(uuid_string, *key) < 0) { + if (esxUtil_ReformatUuid(uuid_string, *key) < 0) goto cleanup; - } } } if (!(*key)) { /* Other files don't have a UUID, fall back to the path as key */ - if (VIR_STRDUP(*key, datastorePath) < 0) { + if (VIR_STRDUP(*key, datastorePath) < 0) goto cleanup; - } } result = 0; @@ -4157,17 +4098,15 @@ esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name, return -1; } - if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) { + if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) goto cleanup; - } /* Search for a matching physical NIC */ for (candidate = physicalNicList; candidate; candidate = candidate->_next) { if (STRCASEEQ(candidate->device, name)) { - if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) { + if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) goto cleanup; - } /* Found physical NIC with matching name */ result = 0; @@ -4206,17 +4145,15 @@ esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac, return -1; } - if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) { + if (esxVI_LookupPhysicalNicList(ctx, &physicalNicList) < 0) goto cleanup; - } /* Search for a matching physical NIC */ for (candidate = physicalNicList; candidate; candidate = candidate->_next) { if (STRCASEEQ(candidate->mac, mac)) { - if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) { + if (esxVI_PhysicalNic_DeepCopy(physicalNic, candidate) < 0) goto cleanup; - } /* Found physical NIC with matching MAC address */ result = 0; @@ -4299,9 +4236,8 @@ esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name, return -1; } - if (esxVI_LookupHostVirtualSwitchList(ctx, &hostVirtualSwitchList) < 0) { + if (esxVI_LookupHostVirtualSwitchList(ctx, &hostVirtualSwitchList) < 0) goto cleanup; - } /* Search for a matching HostVirtualSwitch */ for (candidate = hostVirtualSwitchList; candidate; @@ -4421,9 +4357,8 @@ esxVI_HandleVirtualMachineQuestion elementDescription = elementDescription->_next) { virBufferAsprintf(&buffer, "'%s'", elementDescription->label); - if (elementDescription->_next) { + if (elementDescription->_next) virBufferAddLit(&buffer, ", "); - } if (!answerChoice && questionInfo->choice->defaultIndex && @@ -4489,9 +4424,8 @@ esxVI_HandleVirtualMachineQuestion result = 0; cleanup: - if (result < 0) { + if (result < 0) virBufferFreeAndReset(&buffer); - } VIR_FREE(possibleAnswers); @@ -4533,16 +4467,14 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, if (VIR_STRDUP(version, "") < 0) return -1; - if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) { + if (esxVI_ObjectSpec_Alloc(&objectSpec) < 0) goto cleanup; - } objectSpec->obj = task; objectSpec->skip = esxVI_Boolean_False; - if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { + if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) goto cleanup; - } propertySpec->type = task->type; @@ -4581,9 +4513,8 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, * esxVI_LookupTaskInfoByTask() and esxVI_CancelTask() * don't overwrite the actual error */ - if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo)) { + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo)) goto cleanup; - } if (taskInfo->cancelable == esxVI_Boolean_True) { if (esxVI_CancelTask(ctx, task) < 0 && blocked) { @@ -4602,17 +4533,15 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } } - if (esxVI_WaitForUpdates(ctx, version, &updateSet) < 0) { + if (esxVI_WaitForUpdates(ctx, version, &updateSet) < 0) goto cleanup; - } VIR_FREE(version); if (VIR_STRDUP(version, updateSet->version) < 0) goto cleanup; - if (!updateSet->filterSet) { + if (!updateSet->filterSet) continue; - } for (propertyFilterUpdate = updateSet->filterSet; propertyFilterUpdate; @@ -4634,27 +4563,22 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, } } - if (!propertyValue) { + if (!propertyValue) continue; - } - if (esxVI_TaskInfoState_CastFromAnyType(propertyValue, &state) < 0) { + if (esxVI_TaskInfoState_CastFromAnyType(propertyValue, &state) < 0) goto cleanup; - } } - if (esxVI_DestroyPropertyFilter(ctx, propertyFilter) < 0) { + if (esxVI_DestroyPropertyFilter(ctx, propertyFilter) < 0) VIR_DEBUG("DestroyPropertyFilter failed"); - } - if (esxVI_TaskInfoState_CastFromAnyType(propertyValue, finalState) < 0) { + if (esxVI_TaskInfoState_CastFromAnyType(propertyValue, finalState) < 0) goto cleanup; - } if (*finalState != esxVI_TaskInfoState_Success) { - if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo)) { + if (esxVI_LookupTaskInfoByTask(ctx, task, &taskInfo)) goto cleanup; - } if (!taskInfo->error) { if (VIR_STRDUP(*errorMessage, _("Unknown error")) < 0) @@ -4677,21 +4601,17 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx, * Remove values given by the caller from the data structures to prevent * them from being freed by the call to esxVI_PropertyFilterSpec_Free(). */ - if (objectSpec) { + if (objectSpec) objectSpec->obj = NULL; - } - if (propertySpec) { + if (propertySpec) propertySpec->type = NULL; - } - if (!objectSpec_isAppended) { + if (!objectSpec_isAppended) esxVI_ObjectSpec_Free(&objectSpec); - } - if (!propertySpec_isAppended) { + if (!propertySpec_isAppended) esxVI_PropertySpec_Free(&propertySpec); - } esxVI_PropertyFilterSpec_Free(&propertyFilterSpec); esxVI_ManagedObjectReference_Free(&propertyFilter); @@ -4849,9 +4769,8 @@ esxVI_LookupHostInternetScsiHbaStaticTargetByName for (candidate = hostInternetScsiHba->configuredStaticTarget; candidate; candidate = candidate->_next) { - if (STREQ(candidate->iScsiName, name)) { + if (STREQ(candidate->iScsiName, name)) break; - } } if (!candidate) { @@ -4863,9 +4782,8 @@ esxVI_LookupHostInternetScsiHbaStaticTargetByName goto cleanup; } - if (esxVI_HostInternetScsiHbaStaticTarget_DeepCopy(target, candidate) < 0) { + if (esxVI_HostInternetScsiHbaStaticTarget_DeepCopy(target, candidate) < 0) goto cleanup; - } result = 0; @@ -5044,9 +4962,8 @@ esxVI_LookupHostScsiTopologyLunListByTargetName } } - if (!found || !hostScsiTopologyTarget) { + if (!found || !hostScsiTopologyTarget) goto cleanup; - } if (!hostScsiTopologyTarget->lun) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 4c7dc30..1502467 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -944,13 +944,11 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) return -1; } - if (!src) { + if (!src) return 0; - } - if (esxVI_AnyType_Alloc(dest) < 0) { + if (esxVI_AnyType_Alloc(dest) < 0) goto failure; - } (*dest)->_type = src->_type; (*dest)->node = xmlCopyNode(src->node, 1); @@ -1015,9 +1013,8 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) return -1; } - if (esxVI_AnyType_Alloc(anyType) < 0) { + if (esxVI_AnyType_Alloc(anyType) < 0) return -1; - } (*anyType)->node = xmlCopyNode(node, 1); @@ -1151,9 +1148,8 @@ esxVI_String_ListContainsValue(esxVI_String *stringList, const char *value) esxVI_String *string; for (string = stringList; string; string = string->_next) { - if (STREQ(string->value, value)) { + if (STREQ(string->value, value)) return true; - } } return false; @@ -1167,16 +1163,14 @@ esxVI_String_AppendValueToList(esxVI_String **stringList, const char *value) { esxVI_String *string = NULL; - if (esxVI_String_Alloc(&string) < 0) { + if (esxVI_String_Alloc(&string) < 0) return -1; - } if (VIR_STRDUP(string->value, value) < 0) goto failure; - if (esxVI_String_AppendToList(stringList, string) < 0) { + if (esxVI_String_AppendToList(stringList, string) < 0) goto failure; - } return 0; @@ -1194,16 +1188,14 @@ esxVI_String_AppendValueListToList(esxVI_String **stringList, const char *value = valueList; while (value && *value != '\0') { - if (esxVI_String_AppendValueToList(&stringListToAppend, value) < 0) { + if (esxVI_String_AppendValueToList(&stringListToAppend, value) < 0) goto failure; - } value += strlen(value) + 1; } - if (esxVI_String_AppendToList(stringList, stringListToAppend) < 0) { + if (esxVI_String_AppendToList(stringList, stringListToAppend) < 0) goto failure; - } return 0; @@ -1230,9 +1222,8 @@ esxVI_String_DeepCopyValue(char **dest, const char *src) return -1; } - if (!src) { + if (!src) return 0; - } return VIR_STRDUP(*dest, src); } @@ -1263,9 +1254,8 @@ esxVI_String_SerializeValue(const char *value, const char *element, return -1; } - if (!value) { + if (!value) return 0; - } ESV_VI__XML_TAG__OPEN(output, element, "xsd:string"); @@ -1483,9 +1473,8 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime) return -1; } - if (esxVI_DateTime_Alloc(dateTime) < 0) { + if (esxVI_DateTime_Alloc(dateTime) < 0) return -1; - } (*dateTime)->value = (char *)xmlNodeListGetString(node->doc, node->children, 1); @@ -1577,9 +1566,8 @@ esxVI_DateTime_ConvertToCalendarTime(esxVI_DateTime *dateTime, tz_offset = tz_hours * 60 * 60 + tz_minutes * 60; - if (sign == '-') { + if (sign == '-') tz_offset = -tz_offset; - } } else if (STREQ(tmp, "Z")) { /* Z refers to UTC. tz_offset is already initialized to zero */ } else { @@ -1657,9 +1645,8 @@ esxVI_MethodFault_Deserialize(xmlNodePtr node, esxVI_MethodFault **methodFault) return -1; } - if (esxVI_MethodFault_Alloc(methodFault) < 0) { + if (esxVI_MethodFault_Alloc(methodFault) < 0) return -1; - } (*methodFault)->_actualType = (char *)xmlGetNsProp(node, BAD_CAST "type", @@ -1723,9 +1710,8 @@ esxVI_ManagedObjectReference_Serialize return -1; } - if (!managedObjectReference) { + if (!managedObjectReference) return 0; - } virBufferAddLit(output, "<"); virBufferAdd(output, element, -1); @@ -1753,9 +1739,8 @@ esxVI_ManagedObjectReference_Deserialize return -1; } - if (esxVI_ManagedObjectReference_Alloc(managedObjectReference) < 0) { + if (esxVI_ManagedObjectReference_Alloc(managedObjectReference) < 0) return -1; - } (*managedObjectReference)->type = (char *)xmlGetNoNsProp(node, BAD_CAST "type"); -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/conf/capabilities.c | 3 +- src/conf/domain_conf.c | 135 +++++++++++++++----------------------------- src/conf/interface_conf.c | 9 +-- src/conf/network_conf.c | 51 ++++++----------- src/conf/node_device_conf.c | 15 ++--- src/conf/nwfilter_conf.c | 12 ++-- src/conf/object_event.c | 6 +- src/conf/storage_conf.c | 24 +++----- 8 files changed, 85 insertions(+), 170 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index dc2c01a..37d19c1 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -219,9 +219,8 @@ virCapabilitiesDispose(void *object) VIR_FREE(caps->host.migrateTrans[i]); VIR_FREE(caps->host.migrateTrans); - for (i = 0; i < caps->host.nsecModels; i++) { + for (i = 0; i < caps->host.nsecModels; i++) virCapabilitiesClearSecModel(&caps->host.secModels[i]); - } VIR_FREE(caps->host.secModels); VIR_FREE(caps->host.pagesSize); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c65276..5f4b9f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2008,9 +2008,8 @@ virDomainVcpuPinDefArrayFree(virDomainVcpuPinDefPtr *def, if (!def) return; - for (i = 0; i < nvcpupin; i++) { + for (i = 0; i < nvcpupin; i++) virDomainVcpuPinDefFree(def[i]); - } VIR_FREE(def); } @@ -2689,9 +2688,8 @@ virDomainDeviceInfoCopy(virDomainDeviceInfoPtr dst, void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info) { VIR_FREE(info->alias); - if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) VIR_FREE(info->addr.usb.port); - } memset(&info->addr, 0, sizeof(info->addr)); info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; VIR_FREE(info->romfile); @@ -4804,9 +4802,8 @@ virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt, def->info.addr.drive.unit = idx % 15; /* Skip the SCSI controller at unit 7 */ - if (def->info.addr.drive.unit >= 7) { + if (def->info.addr.drive.unit >= 7) ++def->info.addr.drive.unit; - } } else { /* For a narrow SCSI bus we define the default mapping to be * 7 units per bus, 1 bus per controller, many controllers */ @@ -5081,9 +5078,8 @@ virSecurityLabelDefsParseXML(virDomainDefPtr def, error: ctxt->node = saved_node; - for (; i > 0; i--) { + for (; i > 0; i--) virSecurityLabelDefFree(def->seclabels[i - 1]); - } VIR_FREE(def->seclabels); def->nseclabels = 0; VIR_FREE(list); @@ -5187,9 +5183,8 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr **seclabels_rtn, return 0; error: - for (i = 0; i < nseclabels; i++) { + for (i = 0; i < nseclabels; i++) virSecurityDeviceLabelDefFree(seclabels[i]); - } VIR_FREE(seclabels); VIR_FREE(list); return -1; @@ -6143,9 +6138,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } } else { - if (def->bus == VIR_DOMAIN_DISK_BUS_USB) { + if (def->bus == VIR_DOMAIN_DISK_BUS_USB) def->removable = VIR_TRISTATE_SWITCH_ABSENT; - } } if (def->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY && @@ -8329,9 +8323,8 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, if (cur->type == XML_ELEMENT_NODE) { if (xmlStrEqual(cur->name, BAD_CAST "target")) { seenTarget = true; - if (virDomainChrDefParseTargetXML(def, cur) < 0) { + if (virDomainChrDefParseTargetXML(def, cur) < 0) goto error; - } } } cur = cur->next; @@ -9105,9 +9098,8 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if (virDomainGraphicsListenGetType(def, i) == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) { found = virDomainGraphicsListenGetAddress(def, i); - if (STREQ_NULLABLE(found, listenAddr)) { + if (STREQ_NULLABLE(found, listenAddr)) matched = true; - } break; } } @@ -9243,16 +9235,14 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, def->data.rdp.port = 0; if ((replaceUser = virXMLPropString(node, "replaceUser")) != NULL) { - if (STREQ(replaceUser, "yes")) { + if (STREQ(replaceUser, "yes")) def->data.rdp.replaceUser = true; - } VIR_FREE(replaceUser); } if ((multiUser = virXMLPropString(node, "multiUser")) != NULL) { - if (STREQ(multiUser, "yes")) { + if (STREQ(multiUser, "yes")) def->data.rdp.multiUser = true; - } VIR_FREE(multiUser); } @@ -10452,9 +10442,8 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, if (remaining < 0) goto error; - if (def->source.chr.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) { + if (def->source.chr.type == VIR_DOMAIN_CHR_TYPE_SPICEVMC) def->source.chr.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; - } if (virDomainDeviceInfoParseXML(node, bootHash, &def->info, flags | VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) < 0) @@ -10648,9 +10637,8 @@ virDomainRedirFilterDefParseXML(xmlNodePtr node, goto error; ctxt->node = node; - if ((n = virXPathNodeSet("./usbdev", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./usbdev", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->usbdevs, n) < 0) goto error; @@ -11709,9 +11697,8 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, } /* analysis of the boot devices */ - if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./os/boot", ctxt, &nodes)) < 0) goto cleanup; - } if (n > 0 && deviceBoot) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -13250,9 +13237,8 @@ virDomainDefParseXML(xmlDocPtr xml, def->os.init = virXPathString("string(./os/init[1])", ctxt); def->os.cmdline = virXPathString("string(./os/cmdline[1])", ctxt); - if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./os/initarg", ctxt, &nodes)) < 0) goto error; - } if (VIR_ALLOC_N(def->os.initargv, n+1) < 0) goto error; @@ -13392,9 +13378,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the filesystems */ - if ((n = virXPathNodeSet("./devices/filesystem", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/filesystem", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->fss, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13408,9 +13393,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the network devices */ - if ((n = virXPathNodeSet("./devices/interface", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/interface", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->nets, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13437,9 +13421,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the smartcard devices */ - if ((n = virXPathNodeSet("./devices/smartcard", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/smartcard", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->smartcards, n) < 0) goto error; @@ -13455,9 +13438,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the character devices */ - if ((n = virXPathNodeSet("./devices/parallel", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/parallel", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->parallels, n) < 0) goto error; @@ -13531,9 +13513,8 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); - if ((n = virXPathNodeSet("./devices/channel", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/channel", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->channels, n) < 0) goto error; @@ -13571,9 +13552,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the input devices */ - if ((n = virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->inputs, n) < 0) goto error; @@ -13613,9 +13593,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the graphics devices */ - if ((n = virXPathNodeSet("./devices/graphics", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/graphics", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->graphics, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13649,9 +13628,8 @@ virDomainDefParseXML(xmlDocPtr xml, } /* analysis of the sound devices */ - if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/sound", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->sounds, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13666,9 +13644,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the video devices */ - if ((n = virXPathNodeSet("./devices/video", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/video", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->videos, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13723,9 +13700,8 @@ virDomainDefParseXML(xmlDocPtr xml, } /* analysis of the host devices */ - if ((n = virXPathNodeSet("./devices/hostdev", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/hostdev", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_REALLOC_N(def->hostdevs, def->nhostdevs + n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13754,9 +13730,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the watchdog devices */ def->watchdog = NULL; - if ((n = virXPathNodeSet("./devices/watchdog", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/watchdog", ctxt, &nodes)) < 0) goto error; - } if (n > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only a single watchdog device is supported")); @@ -13774,9 +13749,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the memballoon devices */ def->memballoon = NULL; - if ((n = virXPathNodeSet("./devices/memballoon", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/memballoon", ctxt, &nodes)) < 0) goto error; - } if (n > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only a single memory balloon device is supported")); @@ -13824,9 +13798,8 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); - if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) goto error; - } if (n > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -13842,9 +13815,8 @@ virDomainDefParseXML(xmlDocPtr xml, } /* analysis of the hub devices */ - if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->hubs, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13865,9 +13837,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the redirected devices */ - if ((n = virXPathNodeSet("./devices/redirdev", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/redirdev", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->redirdevs, n) < 0) goto error; for (i = 0; i < n; i++) { @@ -13890,9 +13861,8 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); /* analysis of the redirection filter rules */ - if ((n = virXPathNodeSet("./devices/redirfilter", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/redirfilter", ctxt, &nodes)) < 0) goto error; - } if (n > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("only one set of redirection filter rule is supported")); @@ -13911,9 +13881,8 @@ virDomainDefParseXML(xmlDocPtr xml, /* analysis of the panic devices */ def->panic = NULL; - if ((n = virXPathNodeSet("./devices/panic", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/panic", ctxt, &nodes)) < 0) goto error; - } if (n > 1) { virReportError(VIR_ERR_XML_ERROR, "%s", _("only a single panic device is supported")); @@ -13930,9 +13899,8 @@ virDomainDefParseXML(xmlDocPtr xml, } /* analysis of the shmem devices */ - if ((n = virXPathNodeSet("./devices/shmem", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./devices/shmem", ctxt, &nodes)) < 0) goto error; - } if (n && VIR_ALLOC_N(def->shmems, n) < 0) goto error; @@ -14106,9 +14074,8 @@ virDomainObjParseXML(xmlDocPtr xml, } obj->pid = (pid_t)val; - if ((n = virXPathNodeSet("./taint", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./taint", ctxt, &nodes)) < 0) goto error; - } for (i = 0; i < n; i++) { char *str = virXMLPropString(nodes[i], "flag"); if (str) { @@ -15886,9 +15853,8 @@ virDomainEmulatorPinAdd(virDomainDefPtr def, int virDomainEmulatorPinDel(virDomainDefPtr def) { - if (!def->cputune.emulatorpin) { + if (!def->cputune.emulatorpin) return 0; - } virDomainVcpuPinDefFree(def->cputune.emulatorpin); def->cputune.emulatorpin = NULL; @@ -16588,9 +16554,8 @@ virDomainControllerDefFormat(virBufferPtr buf, "<controller type='%s' index='%u'", type, def->idx); - if (model) { + if (model) virBufferEscapeString(buf, " model='%s'", model); - } switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: @@ -17556,9 +17521,8 @@ virDomainChrDefFormat(virBufferPtr buf, } case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: { - if (def->target.name) { + if (def->target.name) virBufferEscapeString(buf, " name='%s'", def->target.name); - } break; } @@ -18114,9 +18078,8 @@ virDomainTimerDefFormat(virBufferPtr buf, } if (def->name == VIR_DOMAIN_TIMER_NAME_TSC) { - if (def->frequency > 0) { + if (def->frequency > 0) virBufferAsprintf(buf, " frequency='%lu'", def->frequency); - } if (def->mode != -1) { const char *mode @@ -18138,15 +18101,12 @@ virDomainTimerDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); virBufferAddLit(buf, "<catchup"); - if (def->catchup.threshold > 0) { + if (def->catchup.threshold > 0) virBufferAsprintf(buf, " threshold='%lu'", def->catchup.threshold); - } - if (def->catchup.slew > 0) { + if (def->catchup.slew > 0) virBufferAsprintf(buf, " slew='%lu'", def->catchup.slew); - } - if (def->catchup.limit > 0) { + if (def->catchup.limit > 0) virBufferAsprintf(buf, " limit='%lu'", def->catchup.limit); - } virBufferAddLit(buf, "/>\n"); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</timer>\n"); @@ -20536,9 +20496,8 @@ virDomainNetGetActualBridgeName(virDomainNetDefPtr iface) return iface->data.bridge.brname; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { + iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) return iface->data.network.actual->data.bridge.brname; - } return NULL; } @@ -20549,9 +20508,8 @@ virDomainNetGetActualDirectDev(virDomainNetDefPtr iface) return iface->data.direct.linkdev; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { + iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) return iface->data.network.actual->data.direct.linkdev; - } return NULL; } @@ -20562,9 +20520,8 @@ virDomainNetGetActualDirectMode(virDomainNetDefPtr iface) return iface->data.direct.mode; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { + iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) return iface->data.network.actual->data.direct.mode; - } return 0; } @@ -20575,9 +20532,8 @@ virDomainNetGetActualHostdev(virDomainNetDefPtr iface) return &iface->data.hostdev.def; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { + iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) return &iface->data.network.actual->data.hostdev.def; - } return NULL; } @@ -20612,9 +20568,8 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface) * its bandwidth rather than the NetDef's bandwidth. */ if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && - iface->data.network.actual) { + iface->data.network.actual) return iface->data.network.actual->bandwidth; - } return iface->bandwidth; } diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 10c7c09..c2eb945 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -60,9 +60,8 @@ void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) if (def == NULL) return; - for (i = 0; i < def->nips; i++) { + for (i = 0; i < def->nips; i++) virInterfaceIpDefFree(def->ips[i]); - } VIR_FREE(def->ips); VIR_FREE(def->family); VIR_FREE(def->gateway); @@ -106,9 +105,8 @@ void virInterfaceDefFree(virInterfaceDefPtr def) } /* free all protos */ - for (pp = 0; pp < def->nprotos; pp++) { + for (pp = 0; pp < def->nprotos; pp++) virInterfaceProtocolDefFree(def->protos[pp]); - } VIR_FREE(def->protos); VIR_FREE(def); } @@ -1081,9 +1079,8 @@ virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def, virInterfaceProtocolDefFormat(buf, def); } - if (def->type != VIR_INTERFACE_TYPE_BRIDGE) { + if (def->type != VIR_INTERFACE_TYPE_BRIDGE) virInterfaceLinkFormat(buf, &def->lnk); - } switch (def->type) { case VIR_INTERFACE_TYPE_ETHERNET: if (def->mac) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 3bad07d..067334e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -218,14 +218,12 @@ virNetworkForwardDefClear(virNetworkForwardDefPtr def) { size_t i; - for (i = 0; i < def->npfs && def->pfs; i++) { + for (i = 0; i < def->npfs && def->pfs; i++) virNetworkForwardPfDefClear(&def->pfs[i]); - } VIR_FREE(def->pfs); - for (i = 0; i < def->nifs && def->ifs; i++) { + for (i = 0; i < def->nifs && def->ifs; i++) virNetworkForwardIfDefClear(&def->ifs[i]); - } VIR_FREE(def->ifs); def->nifs = def->npfs = 0; } @@ -244,19 +242,16 @@ virNetworkDefFree(virNetworkDefPtr def) virNetworkForwardDefClear(&def->forward); - for (i = 0; i < def->nips && def->ips; i++) { + for (i = 0; i < def->nips && def->ips; i++) virNetworkIpDefClear(&def->ips[i]); - } VIR_FREE(def->ips); - for (i = 0; i < def->nroutes && def->routes; i++) { + for (i = 0; i < def->nroutes && def->routes; i++) virNetworkRouteDefClear(&def->routes[i]); - } VIR_FREE(def->routes); - for (i = 0; i < def->nPortGroups && def->portGroups; i++) { + for (i = 0; i < def->nPortGroups && def->portGroups; i++) virPortGroupDefClear(&def->portGroups[i]); - } VIR_FREE(def->portGroups); virNetworkDNSDefClear(&def->dns); @@ -596,9 +591,8 @@ virNetworkDefGetIpByIndex(const virNetworkDef *def, if (!def->ips || n >= def->nips) return NULL; - if (family == AF_UNSPEC) { + if (family == AF_UNSPEC) return &def->ips[n]; - } /* find the nth ip of type "family" */ for (i = 0; i < def->nips; i++) { @@ -1363,9 +1357,8 @@ virNetworkIPDefParseXML(const char *networkName, result = 0; cleanup: - if (result < 0) { + if (result < 0) virNetworkIpDefClear(def); - } VIR_FREE(address); VIR_FREE(netmask); @@ -1589,9 +1582,8 @@ virNetworkRouteDefParseXML(const char *networkName, result = 0; cleanup: - if (result < 0) { + if (result < 0) virNetworkRouteDefClear(def); - } VIR_FREE(address); VIR_FREE(netmask); VIR_FREE(gateway); @@ -1663,9 +1655,8 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def, result = 0; cleanup: - if (result < 0) { + if (result < 0) virPortGroupDefClear(def); - } VIR_FREE(isDefault); VIR_FREE(trustGuestRxFilters); @@ -2483,9 +2474,8 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<ip"); - if (def->family) { + if (def->family) virBufferAsprintf(buf, " family='%s'", def->family); - } if (VIR_SOCKET_ADDR_VALID(&def->address)) { char *addr = virSocketAddrFormat(&def->address); if (!addr) @@ -2500,9 +2490,8 @@ virNetworkIpDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " netmask='%s'", addr); VIR_FREE(addr); } - if (def->prefix > 0) { + if (def->prefix > 0) virBufferAsprintf(buf, " prefix='%u'", def->prefix); - } virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); @@ -2580,9 +2569,8 @@ virNetworkRouteDefFormat(virBufferPtr buf, virBufferAddLit(buf, "<route"); - if (def->family) { + if (def->family) virBufferAsprintf(buf, " family='%s'", def->family); - } if (VIR_SOCKET_ADDR_VALID(&def->address)) { char *addr = virSocketAddrFormat(&def->address); @@ -2599,9 +2587,8 @@ virNetworkRouteDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " netmask='%s'", addr); VIR_FREE(addr); } - if (def->has_prefix) { + if (def->has_prefix) virBufferAsprintf(buf, " prefix='%u'", def->prefix); - } if (VIR_SOCKET_ADDR_VALID(&def->gateway)) { char *addr = virSocketAddrFormat(&def->gateway); if (!addr) @@ -2609,9 +2596,8 @@ virNetworkRouteDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " gateway='%s'", addr); VIR_FREE(addr); } - if (def->has_metric && def->metric > 0) { + if (def->has_metric && def->metric > 0) virBufferAsprintf(buf, " metric='%u'", def->metric); - } virBufferAddLit(buf, "/>\n"); result = 0; @@ -2624,9 +2610,8 @@ virPortGroupDefFormat(virBufferPtr buf, const virPortGroupDef *def) { virBufferAsprintf(buf, "<portgroup name='%s'", def->name); - if (def->isDefault) { + if (def->isDefault) virBufferAddLit(buf, " default='yes'"); - } if (def->trustGuestRxFilters) virBufferAsprintf(buf, " trustGuestRxFilters='%s'", virTristateBoolTypeToString(def->trustGuestRxFilters)); @@ -2703,9 +2688,8 @@ virNetworkDefFormatBuf(virBufferPtr buf, bool shortforward; virBufferAddLit(buf, "<network"); - if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) { + if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) virBufferAsprintf(buf, " connections='%d'", def->connections); - } if (def->ipv6nogw) virBufferAddLit(buf, " ipv6='yes'"); if (def->trustGuestRxFilters) @@ -3326,9 +3310,8 @@ char *virNetworkAllocateBridge(virNetworkObjListPtr nets, do { if (virAsprintf(&newname, template, id) < 0) return NULL; - if (!virNetworkBridgeInUse(nets, newname, NULL)) { + if (!virNetworkBridgeInUse(nets, newname, NULL)) return newname; - } VIR_FREE(newname); id++; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 2a947df..2a609e4 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -669,9 +669,8 @@ virNodeDevCapStorageParseXML(xmlXPathContextPtr ctxt, data->storage.vendor = virXPathString("string(./vendor[1])", ctxt); data->storage.serial = virXPathString("string(./serial[1])", ctxt); - if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) goto out; - } for (i = 0; i < n; i++) { char *type = virXMLPropString(nodes[i], "type"); @@ -841,9 +840,8 @@ virNodeDevCapSCSIHostParseXML(xmlXPathContextPtr ctxt, } } - if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) goto out; - } for (i = 0; i < n; i++) { type = virXMLPropString(nodes[i], "type"); @@ -1453,9 +1451,8 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, /* Parse device capabilities */ nodes = NULL; - if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) { + if ((n = virXPathNodeSet("./capability", ctxt, &nodes)) < 0) goto error; - } if (n == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1656,13 +1653,11 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->pci_dev.product_name); VIR_FREE(data->pci_dev.vendor_name); VIR_FREE(data->pci_dev.physical_function); - for (i = 0; i < data->pci_dev.num_virtual_functions; i++) { + for (i = 0; i < data->pci_dev.num_virtual_functions; i++) VIR_FREE(data->pci_dev.virtual_functions[i]); - } VIR_FREE(data->pci_dev.virtual_functions); - for (i = 0; i < data->pci_dev.nIommuGroupDevices; i++) { + for (i = 0; i < data->pci_dev.nIommuGroupDevices; i++) VIR_FREE(data->pci_dev.iommuGroupDevices[i]); - } VIR_FREE(data->pci_dev.iommuGroupDevices); virPCIEDeviceInfoFree(data->pci_dev.pci_express); break; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 4b22709..074d745 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -535,9 +535,8 @@ checkVlanVlanID(enum attrDatatype datatype, union data *value, int32_t res; res = value->ui; - if (res < 0 || res > 4095) { + if (res < 0 || res > 4095) res = -1; - } if (res != -1) { nwf->p.vlanHdrFilter.dataVlanID.u.u16 = res; @@ -2899,9 +2898,8 @@ static virNWFilterCallbackDriverPtr callbackDrvArray[MAX_CALLBACK_DRIVER]; void virNWFilterRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) { - if (nCallbackDriver < MAX_CALLBACK_DRIVER) { + if (nCallbackDriver < MAX_CALLBACK_DRIVER) callbackDrvArray[nCallbackDriver++] = cbd; - } } void @@ -3141,9 +3139,8 @@ virNWFilterObjLoad(virNWFilterObjListPtr nwfilters, virNWFilterDefPtr def; virNWFilterObjPtr nwfilter; - if (!(def = virNWFilterDefParseFile(path))) { + if (!(def = virNWFilterDefParseFile(path))) return NULL; - } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { virReportError(VIR_ERR_XML_ERROR, @@ -3177,9 +3174,8 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters, int ret = -1; if (!(dir = opendir(configDir))) { - if (errno == ENOENT) { + if (errno == ENOENT) return 0; - } virReportSystemError(errno, _("Failed to open dir '%s'"), configDir); return -1; diff --git a/src/conf/object_event.c b/src/conf/object_event.c index beef3e1..06eedff 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -388,9 +388,8 @@ virObjectEventCallbackListAddID(virConnectPtr conn, callback, opaque, legacy, callbackID, serverFilter); /* Check incoming */ - if (!cbList) { + if (!cbList) return -1; - } /* If there is no additional filtering, then check if we already * have this callback on our list. */ @@ -460,9 +459,8 @@ virObjectEventQueueClear(virObjectEventQueuePtr queue) if (!queue) return; - for (i = 0; i < queue->count; i++) { + for (i = 0; i < queue->count; i++) virObjectUnref(queue->events[i]); - } VIR_FREE(queue->events); queue->count = 0; } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 1251b47..6ad37f8 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -333,9 +333,8 @@ virStorageVolDefFree(virStorageVolDefPtr def) VIR_FREE(def->name); VIR_FREE(def->key); - for (i = 0; i < def->source.nextent; i++) { + for (i = 0; i < def->source.nextent; i++) VIR_FREE(def->source.extents[i].path); - } VIR_FREE(def->source.extents); virStorageSourceClear(&def->target); @@ -370,9 +369,8 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr source) if (!source) return; - for (i = 0; i < source->nhost; i++) { + for (i = 0; i < source->nhost; i++) VIR_FREE(source->hosts[i].name); - } VIR_FREE(source->hosts); for (i = 0; i < source->ndevice; i++) @@ -481,9 +479,8 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, relnode = ctxt->node; ctxt->node = node; - if ((options = virStoragePoolOptionsForPoolType(pool_type)) == NULL) { + if ((options = virStoragePoolOptionsForPoolType(pool_type)) == NULL) goto cleanup; - } source->name = virXPathString("string(./name)", ctxt); if (pool_type == VIR_STORAGE_POOL_RBD && source->name == NULL) { @@ -833,9 +830,8 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto error; } - if ((options = virStoragePoolOptionsForPoolType(ret->type)) == NULL) { + if ((options = virStoragePoolOptionsForPoolType(ret->type)) == NULL) goto error; - } source_node = virXPathNode("./source", ctxt); if (source_node) { @@ -945,13 +941,11 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) * path and permissions */ if (!(options->flags & VIR_STORAGE_POOL_SOURCE_NETWORK)) { if (ret->type == VIR_STORAGE_POOL_LOGICAL) { - if (virAsprintf(&target_path, "/dev/%s", ret->source.name) < 0) { + if (virAsprintf(&target_path, "/dev/%s", ret->source.name) < 0) goto error; - } } else if (ret->type == VIR_STORAGE_POOL_ZFS) { - if (virAsprintf(&target_path, "/dev/zvol/%s", ret->source.name) < 0) { + if (virAsprintf(&target_path, "/dev/zvol/%s", ret->source.name) < 0) goto error; - } } else { target_path = virXPathString("string(./target/path)", ctxt); if (!target_path) { @@ -1814,9 +1808,8 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, virStoragePoolDefPtr def; virStoragePoolObjPtr pool; - if (!(def = virStoragePoolDefParseFile(path))) { + if (!(def = virStoragePoolDefParseFile(path))) return NULL; - } if (!virFileMatchesNameSuffix(file, def->name, ".xml")) { virReportError(VIR_ERR_XML_ERROR, @@ -2006,9 +1999,8 @@ virStoragePoolSourceListFormat(virStoragePoolSourceListPtr def) virBufferAddLit(&buf, "<sources>\n"); virBufferAdjustIndent(&buf, 2); - for (i = 0; i < def->nsources; i++) { + for (i = 0; i < def->nsources; i++) virStoragePoolSourceFormat(&buf, options, &def->sources[i]); - } virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</sources>\n"); -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/node_device/node_device_driver.c | 21 +++------ src/node_device/node_device_hal.c | 6 +-- src/node_device/node_device_udev.c | 87 ++++++++++++------------------------ 3 files changed, 38 insertions(+), 76 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 5d58ca7..5d0efb4 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -48,9 +48,8 @@ static int update_caps(virNodeDeviceObjPtr dev) virNodeDevCapsDefPtr cap = dev->def->caps; while (cap) { - if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) { + if (cap->type == VIR_NODE_DEV_CAP_SCSI_HOST) detect_scsi_host_caps(&dev->def->caps->data); - } if (cap->type == VIR_NODE_DEV_CAP_NET && virNetDevGetLinkInfo(cap->data.net.ifname, &cap->data.net.lnk) < 0) return -1; @@ -494,14 +493,12 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) dev = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0); - if (dev != NULL) { + if (dev != NULL) break; - } sleep(5); - if (get_time(&now) == -1) { + if (get_time(&now) == -1) break; - } } nodeDeviceLock(driver); @@ -527,16 +524,14 @@ nodeDeviceCreateXML(virConnectPtr conn, nodeDeviceLock(driver); def = virNodeDeviceDefParseString(xmlDesc, CREATE_DEVICE, virt_type); - if (def == NULL) { + if (def == NULL) goto cleanup; - } if (virNodeDeviceCreateXMLEnsureACL(conn, def) < 0) goto cleanup; - if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) { + if (virNodeDeviceGetWWNs(def, &wwnn, &wwpn) == -1) goto cleanup; - } if (virNodeDeviceGetParentHost(&driver->devs, def->name, @@ -556,9 +551,8 @@ nodeDeviceCreateXML(virConnectPtr conn, /* We don't check the return value, because one way or another, * we're returning what we get... */ - if (dev == NULL) { + if (dev == NULL) virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); - } cleanup: nodeDeviceUnlock(driver); @@ -590,9 +584,8 @@ nodeDeviceDestroy(virNodeDevicePtr dev) if (virNodeDeviceDestroyEnsureACL(dev->conn, obj->def) < 0) goto out; - if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) == -1) { + if (virNodeDeviceGetWWNs(obj->def, &wwnn, &wwpn) == -1) goto out; - } /* virNodeDeviceGetParentHost will cause the device object's lock to be diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index ec37223..c32b1fe 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -255,9 +255,8 @@ gather_scsi_host_cap(LibHalContext *ctx, const char *udi, retval = detect_scsi_host_caps(d); - if (retval == -1) { + if (retval == -1) goto out; - } out: return retval; @@ -551,9 +550,8 @@ dev_refresh(const char *udi) } nodeDeviceUnlock(driverState); - if (dev) { + if (dev) dev_create(udi); - } } static void diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index f580a9b..343ef85 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -166,9 +166,8 @@ static int udevGetIntProperty(struct udev_device *udev_device, ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); if (ret == PROPERTY_FOUND) { - if (udevStrToLong_i(udev_value, NULL, base, value) != 0) { + if (udevStrToLong_i(udev_value, NULL, base, value) != 0) ret = PROPERTY_ERROR; - } } VIR_FREE(udev_value); @@ -187,9 +186,8 @@ static int udevGetUintProperty(struct udev_device *udev_device, ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); if (ret == PROPERTY_FOUND) { - if (udevStrToLong_ui(udev_value, NULL, base, value) != 0) { + if (udevStrToLong_ui(udev_value, NULL, base, value) != 0) ret = PROPERTY_ERROR; - } } VIR_FREE(udev_value); @@ -266,9 +264,8 @@ static int udevGetIntSysfsAttr(struct udev_device *udev_device, ret = udevGetDeviceSysfsAttr(udev_device, attr_name, &udev_value); if (ret == PROPERTY_FOUND) { - if (udevStrToLong_i(udev_value, NULL, base, value) != 0) { + if (udevStrToLong_i(udev_value, NULL, base, value) != 0) ret = PROPERTY_ERROR; - } } VIR_FREE(udev_value); @@ -287,9 +284,8 @@ static int udevGetUintSysfsAttr(struct udev_device *udev_device, ret = udevGetDeviceSysfsAttr(udev_device, attr_name, &udev_value); if (ret == PROPERTY_FOUND) { - if (udevStrToLong_ui(udev_value, NULL, base, value) != 0) { + if (udevStrToLong_ui(udev_value, NULL, base, value) != 0) ret = PROPERTY_ERROR; - } } VIR_FREE(udev_value); @@ -307,9 +303,8 @@ static int udevGetUint64SysfsAttr(struct udev_device *udev_device, ret = udevGetDeviceSysfsAttr(udev_device, attr_name, &udev_value); if (ret == PROPERTY_FOUND) { - if (udevStrToLong_ull(udev_value, NULL, 0, value) != 0) { + if (udevStrToLong_ull(udev_value, NULL, 0, value) != 0) ret = PROPERTY_ERROR; - } } VIR_FREE(udev_value); @@ -329,9 +324,8 @@ static int udevGenerateDeviceName(struct udev_device *device, udev_device_get_subsystem(device), udev_device_get_sysname(device)); - if (s != NULL) { + if (s != NULL) virBufferAsprintf(&buf, "_%s", s); - } if (virBufferCheckError(&buf) < 0) return -1; @@ -339,9 +333,8 @@ static int udevGenerateDeviceName(struct udev_device *device, def->name = virBufferContentAndReset(&buf); for (i = 0; i < strlen(def->name); i++) { - if (!(c_isalnum(*(def->name + i)))) { + if (!(c_isalnum(*(def->name + i)))) *(def->name + i) = '_'; - } } return ret; @@ -490,9 +483,8 @@ static int udevProcessPCI(struct udev_device *device, goto out; } - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } rc = udevGetIntSysfsAttr(device, "numa_node", @@ -636,9 +628,8 @@ static int udevProcessUSBDevice(struct udev_device *device, } } - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } ret = 0; @@ -681,9 +672,8 @@ static int udevProcessUSBInterface(struct udev_device *device, goto out; } - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } ret = 0; @@ -724,9 +714,8 @@ static int udevProcessNetworkInterface(struct udev_device *device, goto out; } - if (udevGenerateDeviceName(device, def, data->net.address) != 0) { + if (udevGenerateDeviceName(device, def, data->net.address) != 0) goto out; - } if (virNetDevGetLinkInfo(data->net.ifname, &data->net.lnk) < 0) goto out; @@ -762,9 +751,8 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, detect_scsi_host_caps(&def->caps->data); - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } ret = 0; @@ -785,9 +773,8 @@ static int udevProcessSCSITarget(struct udev_device *device ATTRIBUTE_UNUSED, if (VIR_STRDUP(data->scsi_target.name, sysname) < 0) goto out; - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } ret = 0; @@ -864,9 +851,8 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, filename = last_component(def->sysfs_path); - if (udevStrToLong_ui(filename, &p, 10, &data->scsi.host) == -1) { + if (udevStrToLong_ui(filename, &p, 10, &data->scsi.host) == -1) goto out; - } if ((p == NULL) || (udevStrToLong_ui(p+1, &p, @@ -891,9 +877,8 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, switch (udevGetUintSysfsAttr(device, "type", &tmp, 0)) { case PROPERTY_FOUND: - if (udevGetSCSIType(def, tmp, &data->scsi.type) == -1) { + if (udevGetSCSIType(def, tmp, &data->scsi.type) == -1) goto out; - } break; case PROPERTY_MISSING: break; /* No type is not an error */ @@ -903,9 +888,8 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, break; } - if (udevGenerateDeviceName(device, def, NULL) != 0) { + if (udevGenerateDeviceName(device, def, NULL) != 0) goto out; - } ret = 0; @@ -1099,9 +1083,8 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) static void udevStripSpaces(char *s) { - if (s == NULL) { + if (s == NULL) return; - } while (virFileStripSuffix(s, " ")) { /* do nothing */ @@ -1184,9 +1167,8 @@ static int udevProcessStorage(struct udev_device *device, } else { /* If udev doesn't have it, perhaps we can guess it. */ - if (udevKludgeStorageType(def) != 0) { + if (udevKludgeStorageType(def) != 0) goto out; - } } } @@ -1204,9 +1186,8 @@ static int udevProcessStorage(struct udev_device *device, goto out; } - if (udevGenerateDeviceName(device, def, data->storage.serial) != 0) { + if (udevGenerateDeviceName(device, def, data->storage.serial) != 0) goto out; - } out: VIR_DEBUG("Storage ret=%d", ret); @@ -1376,9 +1357,8 @@ static int udevSetParent(struct udev_device *device, do { parent_device = udev_device_get_parent(parent_device); - if (parent_device == NULL) { + if (parent_device == NULL) break; - } parent_sysfs_path = udev_device_get_syspath(parent_device); if (parent_sysfs_path == NULL) { @@ -1434,17 +1414,14 @@ static int udevAddOneDevice(struct udev_device *device) if (VIR_ALLOC(def->caps) != 0) goto out; - if (udevGetDeviceType(device, &def->caps->type) != 0) { + if (udevGetDeviceType(device, &def->caps->type) != 0) goto out; - } - if (udevGetDeviceDetails(device, def) != 0) { + if (udevGetDeviceDetails(device, def) != 0) goto out; - } - if (udevSetParent(device, def) != 0) { + if (udevSetParent(device, def) != 0) goto out; - } /* If this is a device change, the old definition will be freed * and the current definition will take its place. */ @@ -1544,9 +1521,8 @@ static int nodeStateCleanup(void) udev_monitor_unref(udev_monitor); } - if (udev != NULL) { + if (udev != NULL) udev_unref(udev); - } virNodeDeviceObjListFree(&driverState->devs); nodeDeviceUnlock(driverState); @@ -1681,9 +1657,8 @@ udevGetDMIData(union _virNodeDevCapData *data) out: VIR_FREE(tmp); - if (device != NULL) { + if (device != NULL) udev_device_unref(device); - } return; } #endif @@ -1719,9 +1694,8 @@ static int udevSetupSystemDev(void) ret = 0; out: - if (ret == -1) { + if (ret == -1) virNodeDeviceDefFree(def); - } return ret; } @@ -1834,9 +1808,8 @@ static int nodeStateInitialize(bool privileged, nodeDeviceUnlock(driverState); out: - if (ret == -1) { + if (ret == -1) nodeStateCleanup(); - } return ret; } @@ -1853,9 +1826,8 @@ static virDrvOpenStatus nodeDeviceOpen(virConnectPtr conn, { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); - if (driverState == NULL) { + if (driverState == NULL) return VIR_DRV_OPEN_DECLINED; - } conn->nodeDevicePrivateData = driverState; @@ -1896,9 +1868,8 @@ int udevNodeRegister(void) { VIR_DEBUG("Registering udev node device backend"); - if (virRegisterNodeDeviceDriver(&udevNodeDeviceDriver) < 0) { + if (virRegisterNodeDeviceDriver(&udevNodeDeviceDriver) < 0) return -1; - } return virRegisterStateDriver(&udevStateDriver); } -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/storage/parthelper.c | 3 +-- src/storage/storage_backend.c | 9 +++------ src/storage/storage_backend_disk.c | 15 +++++---------- src/storage/storage_backend_fs.c | 6 ++---- src/storage/storage_backend_mpath.c | 27 +++++++++------------------ src/storage/storage_backend_rbd.c | 30 ++++++++++-------------------- src/storage/storage_backend_scsi.c | 6 ++---- src/storage/storage_driver.c | 9 +++------ 8 files changed, 35 insertions(+), 70 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 84e7ba0..8de32fd 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -91,9 +91,8 @@ int main(int argc, char **argv) if (VIR_STRDUP_QUIET(canonical_path, path) < 0) return 2; } else { - if (virFileResolveLink(path, &canonical_path) != 0) { + if (virFileResolveLink(path, &canonical_path) != 0) return 2; - } partsep = *canonical_path && c_isdigit(canonical_path[strlen(canonical_path)-1]) ? "p" : ""; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 00cfe74..98720f6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -182,9 +182,8 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } #ifdef __linux__ - if (ioctl(fd, BLKBSZGET, &wbytes) < 0) { + if (ioctl(fd, BLKBSZGET, &wbytes) < 0) wbytes = 0; - } #endif if ((wbytes == 0) && fstat(fd, &st) == 0) wbytes = st.st_blksize; @@ -395,9 +394,8 @@ createRawFile(int fd, virStorageVolDefPtr vol, (vol->target.allocation < inputvol->target.capacity); ret = virStorageBackendCopyToFD(vol, inputvol, fd, &remain, want_sparse); - if (ret < 0) { + if (ret < 0) goto cleanup; - } } if (remain && need_alloc) { @@ -631,9 +629,8 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, virCommandSetGID(cmd, -1); if (!filecreated) { - if (virCommandRun(cmd, NULL) < 0) { + if (virCommandRun(cmd, NULL) < 0) return -1; - } if (stat(vol->target.path, &st) < 0) { virReportSystemError(errno, _("failed to create %s"), vol->target.path); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index abab1e1..4b05e8c 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -171,9 +171,8 @@ virStorageBackendDiskMakeFreeExtent(virStoragePoolObjPtr pool, return -1; /* Don't bother to re-alloc freeExtents - it'll be free'd shortly */ /* first block reported as free, even if it is not */ - if (dev->freeExtents[dev->nfreeExtent].start == 0) { + if (dev->freeExtents[dev->nfreeExtent].start == 0) dev->freeExtents[dev->nfreeExtent].start = SECTOR_SIZE; - } pool->def->available += (dev->freeExtents[dev->nfreeExtent].end - @@ -349,9 +348,8 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } - if (virStorageBackendDiskReadGeometry(pool) != 0) { + if (virStorageBackendDiskReadGeometry(pool) != 0) return -1; - } return virStorageBackendDiskReadPartitions(pool, NULL); } @@ -467,9 +465,8 @@ virStorageBackendDiskPartTypeToCreate(virStoragePoolObjPtr pool) partType == VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) count++; } - if (count >= 4) { + if (count >= 4) return VIR_STORAGE_VOL_DISK_TYPE_LOGICAL; - } } /* for all other cases, all partitions are primary */ @@ -587,9 +584,8 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObjPtr pool, } /* if we are creating a logical partition, we need one extra block between partitions (or actually move start one block) */ - if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { + if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) size -= SECTOR_SIZE; - } } if (size > neededSize && (smallestSize == 0 || @@ -659,9 +655,8 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; } - if (virStorageBackendDiskPartFormat(pool, vol, &partFormat) != 0) { + if (virStorageBackendDiskPartFormat(pool, vol, &partFormat) != 0) goto cleanup; - } virCommandAddArg(cmd, partFormat); if (virStorageBackendDiskPartBoundaries(pool, &startOffset, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 0f8ceee..f4bf5d6 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -639,9 +639,8 @@ virStorageBackendFileSystemProbe(const char *device, error: VIR_FREE(libblkid_format); - if (probe != NULL) { + if (probe != NULL) blkid_free_probe(probe); - } return ret; } @@ -737,9 +736,8 @@ virStorageBackendMakeFileSystem(virStoragePoolObjPtr pool, ok_to_mkfs = true; } - if (ok_to_mkfs) { + if (ok_to_mkfs) ret = virStorageBackendExecuteMKFS(device, format); - } error: return ret; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index f21ae4c..b67dc2a 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -119,14 +119,12 @@ virStorageBackendIsMultipath(const char *dev_name) goto out; } - if (STREQ(target_type, "multipath")) { + if (STREQ(target_type, "multipath")) ret = 1; - } out: - if (dmt != NULL) { + if (dmt != NULL) dm_task_destroy(dmt); - } return ret; } @@ -138,21 +136,17 @@ virStorageBackendGetMinorNumber(const char *dev_name, uint32_t *minor) struct dm_task *dmt; struct dm_info info; - if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) goto out; - } - if (!dm_task_set_name(dmt, dev_name)) { + if (!dm_task_set_name(dmt, dev_name)) goto out; - } - if (!dm_task_run(dmt)) { + if (!dm_task_run(dmt)) goto out; - } - if (!dm_task_get_info(dmt, &info)) { + if (!dm_task_get_info(dmt, &info)) goto out; - } *minor = info.minor; ret = 0; @@ -177,9 +171,8 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, do { is_mpath = virStorageBackendIsMultipath(names->name); - if (is_mpath < 0) { + if (is_mpath < 0) goto out; - } if (is_mpath == 1) { @@ -193,9 +186,8 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, goto out; } - if (virStorageBackendMpathNewVol(pool, minor, map_device) < 0) { + if (virStorageBackendMpathNewVol(pool, minor, map_device) < 0) goto out; - } VIR_FREE(map_device); } @@ -247,9 +239,8 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool) virStorageBackendCreateVols(pool, names); out: - if (dmt != NULL) { + if (dmt != NULL) dm_task_destroy(dmt); - } return retval; } diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index bddbc1d..5a16eff 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -330,13 +330,11 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn, ptr.cluster = NULL; ptr.ioctx = NULL; - if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) { + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; - } - if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) { + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; - } struct rados_cluster_stat_t clusterstat; r = rados_cluster_stat(ptr.cluster, &clusterstat); @@ -428,17 +426,14 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); - if (flags & VIR_STORAGE_VOL_DELETE_ZEROED) { + if (flags & VIR_STORAGE_VOL_DELETE_ZEROED) VIR_WARN("%s", _("This storage backend does not supported zeroed removal of volumes")); - } - if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) { + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; - } - if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) { + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; - } r = rbd_remove(ptr.ioctx, vol->name); if (r < 0) { @@ -555,17 +550,14 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn, ptr.ioctx = NULL; int ret = -1; - if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) { + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; - } - if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) { + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; - } - if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) { + if (volStorageBackendRBDRefreshVolInfo(vol, pool, &ptr) < 0) goto cleanup; - } ret = 0; @@ -589,13 +581,11 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); - if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) { + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; - } - if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) { + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) goto cleanup; - } r = rbd_open(ptr.ioctx, vol->name, &image, NULL); if (r < 0) { diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 3f61610..c952b71 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -256,9 +256,8 @@ getNewStyleBlockDevice(const char *lun_path, while ((direrr = virDirRead(block_dir, &block_dirent, block_path)) > 0) { - if (STREQLEN(block_dirent->d_name, ".", 1)) { + if (STREQLEN(block_dirent->d_name, ".", 1)) continue; - } if (VIR_STRDUP(*block_device, block_dirent->d_name) < 0) { closedir(block_dir); @@ -397,9 +396,8 @@ processLU(virStoragePoolObjPtr pool, VIR_DEBUG("%u:%u:%u:%u is a Direct-Access LUN", host, bus, target, lun); - if (getBlockDevice(host, bus, target, lun, &block_device) < 0) { + if (getBlockDevice(host, bus, target, lun, &block_device) < 0) goto out; - } if (virStorageBackendSCSINewLun(pool, host, bus, target, lun, diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fe6059a..9b89a67 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -484,9 +484,8 @@ storageConnectListDefinedStoragePools(virConnectPtr conn, cleanup: storageDriverUnlock(); - for (i = 0; i < got; i++) { + for (i = 0; i < got; i++) VIR_FREE(names[i]); - } memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -1650,9 +1649,8 @@ storageVolCreateXML(virStoragePoolPtr obj, /* Wipe any key the user may have suggested, as volume creation * will generate the canonical key. */ VIR_FREE(voldef->key); - if (backend->createVol(obj->conn, pool, voldef) < 0) { + if (backend->createVol(obj->conn, pool, voldef) < 0) goto cleanup; - } pool->volumes.objs[pool->volumes.count++] = voldef; volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, @@ -1830,9 +1828,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, * Wipe any key the user may have suggested, as volume creation * will generate the canonical key. */ VIR_FREE(newvol->key); - if (backend->createVol(obj->conn, pool, newvol) < 0) { + if (backend->createVol(obj->conn, pool, newvol) < 0) goto cleanup; - } pool->volumes.objs[pool->volumes.count++] = newvol; volobj = virGetStorageVol(obj->conn, pool->def->name, newvol->name, -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/util/virauth.c | 12 ++++-------- src/util/virbitmap.c | 6 ++---- src/util/virbuffer.c | 3 +-- src/util/vircommand.c | 9 +++------ src/util/virconf.c | 15 +++++---------- src/util/virdbus.c | 3 +-- src/util/virdnsmasq.c | 3 +-- src/util/vireventpoll.c | 9 +++------ src/util/virfile.c | 6 ++---- src/util/virfirewall.c | 6 ++---- src/util/viriscsi.c | 9 +++------ src/util/virlockspace.c | 6 ++---- src/util/virlog.c | 3 +-- src/util/virnetdev.c | 6 ++---- src/util/virnetdevbridge.c | 3 +-- src/util/virnetdevmacvlan.c | 9 +++------ src/util/virnetdevtap.c | 6 ++---- src/util/virpci.c | 15 +++++---------- src/util/virsexpr.c | 24 ++++++++---------------- src/util/virstorageencryption.c | 3 +-- src/util/virstoragefile.c | 6 ++---- src/util/virsysinfo.c | 3 +-- src/util/virthreadpool.c | 3 +-- src/util/virutil.c | 9 +++------ src/util/virxml.c | 18 ++++++------------ 25 files changed, 65 insertions(+), 130 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index f82e546..adb093e 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -172,15 +172,13 @@ virAuthGetUsernamePath(const char *path, return NULL; } } else { - if (virAsprintf(&prompt, _("Enter username for %s"), hostname) < 0) { + if (virAsprintf(&prompt, _("Enter username for %s"), hostname) < 0) return NULL; - } } for (ncred = 0; ncred < auth->ncredtype; ncred++) { - if (auth->credtype[ncred] != VIR_CRED_AUTHNAME) { + if (auth->credtype[ncred] != VIR_CRED_AUTHNAME) continue; - } cred.type = VIR_CRED_AUTHNAME; cred.prompt = prompt; @@ -189,9 +187,8 @@ virAuthGetUsernamePath(const char *path, cred.result = NULL; cred.resultlen = 0; - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) VIR_FREE(cred.result); - } break; } @@ -261,9 +258,8 @@ virAuthGetPasswordPath(const char *path, cred.result = NULL; cred.resultlen = 0; - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) VIR_FREE(cred.result); - } break; } diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 04a2388..05c50e4 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -640,9 +640,8 @@ virBitmapNextSetBit(virBitmapPtr bitmap, ssize_t pos) bits = bitmap->map[nl] & ~((1UL << nb) - 1); - while (bits == 0 && ++nl < bitmap->map_len) { + while (bits == 0 && ++nl < bitmap->map_len) bits = bitmap->map[nl]; - } if (bits == 0) return -1; @@ -726,9 +725,8 @@ virBitmapNextClearBit(virBitmapPtr bitmap, ssize_t pos) bits = ~bitmap->map[nl] & ~((1UL << nb) - 1); - while (bits == 0 && ++nl < bitmap->map_len) { + while (bits == 0 && ++nl < bitmap->map_len) bits = ~bitmap->map[nl]; - } if (nl == bitmap->map_len - 1) { /* Ensure tail bits are ignored. */ diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 52ffa08..16a81e7 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -368,9 +368,8 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr) buf->content[buf->use] = 0; grow_size = (count + 1 > 1000) ? count + 1 : 1000; - if (virBufferGrow(buf, grow_size) < 0) { + if (virBufferGrow(buf, grow_size) < 0) return; - } size = buf->size - buf->use; if ((count = vsnprintf(&buf->content[buf->use], diff --git a/src/util/vircommand.c b/src/util/vircommand.c index cbe94f8..6527d85 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -558,9 +558,8 @@ virExec(virCommandPtr cmd) pid = virFork(); - if (pid < 0) { + if (pid < 0) goto cleanup; - } if (pid) { /* parent */ VIR_FORCE_CLOSE(null); @@ -3021,9 +3020,8 @@ virCommandRunNul(virCommandPtr cmd, v[i] = NULL; virCommandSetOutputFD(cmd, &fd); - if (virCommandRunAsync(cmd, NULL) < 0) { + if (virCommandRunAsync(cmd, NULL) < 0) goto cleanup; - } if ((fp = VIR_FDOPEN(fd, "r")) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3050,9 +3048,8 @@ virCommandRunNul(virCommandPtr cmd, if (func(n_tok, v, data) < 0) goto cleanup; n_tok = 0; - for (i = 0; i < n_columns; i++) { + for (i = 0; i < n_columns; i++) VIR_FREE(v[i]); - } } } diff --git a/src/util/virconf.c b/src/util/virconf.c index e221fb5..0a17eff 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -502,9 +502,8 @@ virConfParseValue(virConfParserCtxtPtr ctxt) } NEXT; SKIP_BLANKS_AND_EOL; - if (CUR == ']') { + if (CUR == ']') break; - } tmp = virConfParseValue(ctxt); if (tmp == NULL) { virConfFreeList(lst); @@ -529,9 +528,8 @@ virConfParseValue(virConfParserCtxtPtr ctxt) _("numbers not allowed in VMX format")); return NULL; } - if (virConfParseLong(ctxt, &l) < 0) { + if (virConfParseLong(ctxt, &l) < 0) return NULL; - } type = VIR_CONF_LONG; } else { virConfError(ctxt, VIR_ERR_CONF_SYNTAX, _("expecting a value")); @@ -654,9 +652,8 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) char *comm = NULL; SKIP_BLANKS_AND_EOL; - if (CUR == '#') { + if (CUR == '#') return virConfParseComment(ctxt); - } name = virConfParseName(ctxt); if (name == NULL) return -1; @@ -768,9 +765,8 @@ virConfReadFile(const char *filename, unsigned int flags) return NULL; } - if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) { + if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) return NULL; - } conf = virConfParse(filename, content, len, flags); @@ -888,9 +884,8 @@ virConfSetValue(virConfPtr conf, cur = conf->entries; while (cur != NULL) { - if ((cur->name != NULL) && (STREQ(cur->name, setting))) { + if ((cur->name != NULL) && (STREQ(cur->name, setting))) break; - } prev = cur; cur = cur->next; } diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 7c24cbf..8abb247 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -546,9 +546,8 @@ static void virDBusTypeStackFree(virDBusTypeStack **stack, /* The iter in the first level of the stack is the * root iter which must not be freed */ - for (i = 1; i < *nstack; i++) { + for (i = 1; i < *nstack; i++) VIR_FREE((*stack)[i].iter); - } VIR_FREE(*stack); } diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index d2c4aa9..97652c0 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -726,9 +726,8 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) caps->binaryPath); return -1; } - if (!force && caps->mtime == sb.st_mtime) { + if (!force && caps->mtime == sb.st_mtime) return 0; - } caps->mtime = sb.st_mtime; /* Make sure the binary we are about to try exec'ing exists. diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index 13f40dc..ffda206 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -221,9 +221,8 @@ int virEventPollAddTimeout(int frequency, unsigned long long now; int ret; - if (virTimeMillisNow(&now) < 0) { + if (virTimeMillisNow(&now) < 0) return -1; - } virMutexLock(&eventLoop.lock); if (eventLoop.timeoutsCount == eventLoop.timeoutsAlloc) { @@ -270,9 +269,8 @@ void virEventPollUpdateTimeout(int timer, int frequency) return; } - if (virTimeMillisNow(&now) < 0) { + if (virTimeMillisNow(&now) < 0) return; - } virMutexLock(&eventLoop.lock); for (i = 0; i < eventLoop.timeoutsCount; i++) { @@ -643,9 +641,8 @@ int virEventPollRunOnce(void) ret = poll(fds, nfds, timeout); if (ret < 0) { EVENT_DEBUG("Poll got error event %d", errno); - if (errno == EINTR || errno == EAGAIN) { + if (errno == EINTR || errno == EAGAIN) goto retry; - } virReportSystemError(errno, "%s", _("Unable to poll on file handles")); goto error_unlocked; diff --git a/src/util/virfile.c b/src/util/virfile.c index 64f0e5b..b4d762f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1180,9 +1180,8 @@ virBuildPathInternal(char **path, ...) va_end(ap); *path = virBufferContentAndReset(&buf); - if (*path == NULL) { + if (*path == NULL) ret = -1; - } return ret; } @@ -2047,9 +2046,8 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, /* XXX This makes assumptions about errno being < 255, which is * not true on Hurd. */ VIR_FORCE_CLOSE(pair[1]); - if (ret < 0) { + if (ret < 0) VIR_FORCE_CLOSE(fd); - } ret = -ret; if ((ret & 0xff) != ret) { VIR_WARN("unable to pass desired return value %d", ret); diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index bab1634..49afb78 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -321,9 +321,8 @@ virFirewallAddRuleFullV(virFirewallPtr firewall, rule->queryOpaque = opaque; rule->ignoreErrors = ignoreErrors; - while ((str = va_arg(args, char *)) != NULL) { + while ((str = va_arg(args, char *)) != NULL) ADD_ARG(rule, str); - } if (group->addingRollback) { if (VIR_APPEND_ELEMENT_COPY(group->rollback, @@ -529,9 +528,8 @@ void virFirewallRuleAddArgList(virFirewallPtr firewall, va_start(list, rule); - while ((str = va_arg(list, char *)) != NULL) { + while ((str = va_arg(list, char *)) != NULL) ADD_ARG(rule, str); - } va_end(list); diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index 5e29be9..ef8fb59 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -157,9 +157,8 @@ virStorageBackendIQNFound(const char *initiatoriqn, *newline = '\0'; iqn = strrchr(line, ','); - if (iqn == NULL) { + if (iqn == NULL) continue; - } iqn++; if (STREQ(iqn, initiatoriqn)) { @@ -185,9 +184,8 @@ virStorageBackendIQNFound(const char *initiatoriqn, ret = IQN_ERROR; out: - if (ret == IQN_MISSING) { + if (ret == IQN_MISSING) VIR_DEBUG("Could not find interface with IQN '%s'", iqn); - } VIR_FREE(line); VIR_FORCE_FCLOSE(fp); @@ -451,9 +449,8 @@ virISCSIScanTargets(const char *portal, *ntargetsret = list.ntargets; *targetsret = list.targets; } else { - for (i = 0; i < list.ntargets; i++) { + for (i = 0; i < list.ntargets; i++) VIR_FREE(list.targets[i]); - } VIR_FREE(list.targets); } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 8969ab0..2366a74 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -679,9 +679,8 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace, } for (i = 0; i < res->nOwners; i++) { - if (res->owners[i] == owner) { + if (res->owners[i] == owner) break; - } } if (i == res->nOwners) { @@ -723,9 +722,8 @@ virLockSpaceRemoveResourcesForOwner(const void *payload, VIR_DEBUG("res %s owner %lld", res->name, (unsigned long long)data->owner); for (i = 0; i < res->nOwners; i++) { - if (res->owners[i] == data->owner) { + if (res->owners[i] == data->owner) break; - } } if (i == res->nOwners) diff --git a/src/util/virlog.c b/src/util/virlog.c index 286ad9e..14eb129 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -578,9 +578,8 @@ virLogVMessage(virLogSourcePtr source, /* * serialize the error message, add level and timestamp */ - if (virVasprintfQuiet(&str, fmt, vargs) < 0) { + if (virVasprintfQuiet(&str, fmt, vargs) < 0) goto cleanup; - } ret = virLogFormatString(&msg, linenr, funcname, priority, str); if (ret < 0) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 3831009..3514978 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1185,9 +1185,8 @@ virNetDevGetVirtualFunctions(const char *pfname, goto cleanup; } - if (virPCIGetNetName(pci_sysfs_device_link, &((*vfname)[i])) < 0) { + if (virPCIGetNetName(pci_sysfs_device_link, &((*vfname)[i])) < 0) VIR_INFO("VF does not have an interface name"); - } } ret = 0; @@ -1758,9 +1757,8 @@ virNetDevRestoreVfConfig(const char *pflinkdev, int vf, stateDir, pflinkdev, vf) < 0) return rc; - if (virFileReadAll(path, 128, &fileData) < 0) { + if (virFileReadAll(path, 128, &fileData) < 0) goto cleanup; - } if ((vlan = strchr(fileData, '\n'))) { char *endptr; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index d388358..15434de 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -265,9 +265,8 @@ int virNetDevBridgeCreate(const char *brname) goto cleanup; } - if (virNetDevSetName(ifr.ifr_name, brname) == -1) { + if (virNetDevSetName(ifr.ifr_name, brname) == -1) goto cleanup; - } ret = 0; cleanup: diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c83341c..89e221d 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -682,9 +682,8 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, } } - if (!indicate) { + if (!indicate) return; - } VIR_INFO("Re-send 802.1qbg associate request:"); VIR_INFO(" if: %s", calld->cr_ifname); @@ -851,9 +850,8 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, return -1; if (ret) { - if (STRPREFIX(tgifname, prefix)) { + if (STRPREFIX(tgifname, prefix)) goto create_name; - } virReportSystemError(EEXIST, _("Unable to create macvlan device %s"), tgifname); return -1; @@ -983,9 +981,8 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, int ret = 0; int vf = -1; - if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { + if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) ignore_value(virNetDevRestoreMacAddress(linkdev, stateDir)); - } if (ifname) { if (virNetDevVPortProfileDisassociate(ifname, diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 3674f9b..85688ab 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -108,9 +108,8 @@ virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) while (virDirRead(dirp, &dp, "/dev") > 0) { if (STRPREFIX(dp->d_name, "tap")) { struct ifreq ifr; - if (virAsprintf(&devpath, "/dev/%s", dp->d_name) < 0) { + if (virAsprintf(&devpath, "/dev/%s", dp->d_name) < 0) goto cleanup; - } if ((fd = open(devpath, O_RDWR)) < 0) { if (errno == EBUSY) { VIR_FREE(devpath); @@ -444,9 +443,8 @@ int virNetDevTapCreate(char **ifname, VIR_FREE(dev_path); } - if (virNetDevSetName(ifr.ifr_name, *ifname) == -1) { + if (virNetDevSetName(ifr.ifr_name, *ifname) == -1) goto cleanup; - } ret = 0; diff --git a/src/util/virpci.c b/src/util/virpci.c index d8e465f..f60d0fa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1127,9 +1127,8 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) goto reprobe; /* Xen's pciback.ko wants you to use remove_slot on the specific device */ - if (virPCIDriverFile(&path, driver, "remove_slot") < 0) { + if (virPCIDriverFile(&path, driver, "remove_slot") < 0) goto cleanup; - } if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0) { virReportSystemError(errno, @@ -1214,9 +1213,8 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, * is triggered for such a device, it will also be immediately * bound by the stub. */ - if (virPCIDriverFile(&path, stubDriverName, "new_id") < 0) { + if (virPCIDriverFile(&path, stubDriverName, "new_id") < 0) goto cleanup; - } if (virFileWriteStr(path, dev->id, 0) < 0) { virReportSystemError(errno, @@ -1242,9 +1240,8 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, */ if (!virFileLinkPointsTo(driverLink, stubDriverPath)) { /* Xen's pciback.ko wants you to use new_slot first */ - if (virPCIDriverFile(&path, stubDriverName, "new_slot") < 0) { + if (virPCIDriverFile(&path, stubDriverName, "new_slot") < 0) goto remove_id; - } if (virFileExists(path) && virFileWriteStr(path, dev->name, 0) < 0) { virReportSystemError(errno, @@ -1255,9 +1252,8 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev, } dev->remove_slot = true; - if (virPCIDriverFile(&path, stubDriverName, "bind") < 0) { + if (virPCIDriverFile(&path, stubDriverName, "bind") < 0) goto remove_id; - } if (virFileWriteStr(path, dev->name, 0) < 0) { virReportSystemError(errno, @@ -1505,9 +1501,8 @@ virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) char *path = NULL; char *id_str; - if (virPCIFile(&path, dev->name, id_name) < 0) { + if (virPCIFile(&path, dev->name, id_name) < 0) return NULL; - } /* ID string is '0xNNNN\n' ... i.e. 7 bytes */ if (virFileReadAll(path, 7, &id_str) < 0) { diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c index f8a0ccd..885c382 100644 --- a/src/util/virsexpr.c +++ b/src/util/virsexpr.c @@ -65,9 +65,8 @@ sexpr_free(struct sexpr *sexpr) { int serrno = errno; - if (sexpr == NULL) { + if (sexpr == NULL) return; - } switch (sexpr->kind) { case SEXPR_CONS: @@ -163,9 +162,8 @@ append(struct sexpr *lst, const struct sexpr *value) if (nil == NULL) return -1; - while (lst->kind != SEXPR_NIL) { + while (lst->kind != SEXPR_NIL) lst = lst->u.s.cdr; - } lst->kind = SEXPR_CONS; lst->u.s.car = (struct sexpr *) value; @@ -300,9 +298,8 @@ _string2sexpr(const char *buffer, size_t * end) ptr = trim(ptr + tmp_len); } - if (*ptr == ')') { + if (*ptr == ')') ptr++; - } } else { const char *start; @@ -394,13 +391,11 @@ sexpr_lookup_key(const struct sexpr *sexpr, const char *node) ptr = buffer; token = strsep(&ptr, "/"); - if (sexpr->kind != SEXPR_CONS || sexpr->u.s.car->kind != SEXPR_VALUE) { + if (sexpr->kind != SEXPR_CONS || sexpr->u.s.car->kind != SEXPR_VALUE) goto cleanup; - } - if (STRNEQ(sexpr->u.s.car->u.value, token)) { + if (STRNEQ(sexpr->u.s.car->u.value, token)) goto cleanup; - } for (token = strsep(&ptr, "/"); token; token = strsep(&ptr, "/")) { const struct sexpr *i; @@ -419,14 +414,12 @@ sexpr_lookup_key(const struct sexpr *sexpr, const char *node) } } - if (i->kind == SEXPR_NIL) { + if (i->kind == SEXPR_NIL) break; - } } - if (token != NULL) { + if (token != NULL) goto cleanup; - } result = (struct sexpr *) sexpr; @@ -538,9 +531,8 @@ sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...) result = virVasprintf(&node, fmt, ap); va_end(ap); - if (result < 0) { + if (result < 0) return NULL; - } value = sexpr_node(sexpr, node); diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c index b5fed58..ec4a8cb 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -193,9 +193,8 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) ret->format = format; n = virXPathNodeSet("./secret", ctxt, &nodes); - if (n < 0) { + if (n < 0) goto cleanup; - } if (n != 0 && VIR_ALLOC_N(ret->secrets, n) < 0) goto cleanup; ret->nsecrets = n; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8e9d115..aa97f75 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1204,9 +1204,8 @@ int virStorageFileGetLVMKey(const char *path, char *tmp = *key; /* Find first non-space character */ - while (*tmp && c_isspace(*tmp)) { + while (*tmp && c_isspace(*tmp)) tmp++; - } /* Kill leading spaces */ if (tmp != *key) memmove(*key, tmp, strlen(tmp)+1); @@ -1919,9 +1918,8 @@ virStorageSourceInitChainElement(virStorageSourcePtr newelem, { int ret = -1; - if (force) { + if (force) virStorageSourceSeclabelsClear(newelem); - } if (!newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 1bb6392..d644dbc 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -179,9 +179,8 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) eol = strchr(base, '\n'); cur = strchr(base, ':') + 1; - if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { + if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) return -1; - } processor = &ret->processor[ret->nprocessor - 1]; virSkipSpaces(&cur); diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index 4c46f28..98d2124 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -122,9 +122,8 @@ static void virThreadPoolWorker(void *opaque) if (job == pool->jobList.firstPrio) { virThreadPoolJobPtr tmp = job->next; while (tmp) { - if (tmp->priority) { + if (tmp->priority) break; - } tmp = tmp->next; } pool->jobList.firstPrio = tmp; diff --git a/src/util/virutil.c b/src/util/virutil.c index c178515..88c8baf 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -603,9 +603,8 @@ char *virIndexToDiskName(int idx, const char *prefix) strcpy(name, prefix); name[offset + i] = '\0'; - for (i = i - 1, ctr = idx; ctr >= 0; --i, ctr = ctr / 26 - 1) { + for (i = i - 1, ctr = idx; ctr >= 0; --i, ctr = ctr / 26 - 1) name[offset + i] = 'a' + (ctr % 26); - } return name; } @@ -1539,9 +1538,8 @@ virValidateWWN(const char *wwn) size_t i; const char *p = wwn; - if (STRPREFIX(wwn, "0x")) { + if (STRPREFIX(wwn, "0x")) p += 2; - } for (i = 0; p[i]; i++) { if (!c_isxdigit(p[i])) @@ -2563,9 +2561,8 @@ virGetListenFDs(void) VIR_DEBUG("Disabling inheritance of passed FD %d", fd); - if (virSetInherit(fd, false) < 0) { + if (virSetInherit(fd, false) < 0) VIR_WARN("Couldn't disable inheritance of passed FD %d", fd); - } } return nfds; diff --git a/src/util/virxml.c b/src/util/virxml.c index 27ecf14..7f591fb 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -185,9 +185,8 @@ virXPathLongBase(const char *xpath, } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { *value = (long) obj->floatval; - if (*value != obj->floatval) { + if (*value != obj->floatval) ret = -2; - } } else { ret = -1; } @@ -291,9 +290,8 @@ virXPathULongBase(const char *xpath, } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { *value = (unsigned long) obj->floatval; - if (*value != obj->floatval) { + if (*value != obj->floatval) ret = -2; - } } else { ret = -1; } @@ -408,9 +406,8 @@ virXPathULongLong(const char *xpath, } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { *value = (unsigned long long) obj->floatval; - if (*value != obj->floatval) { + if (*value != obj->floatval) ret = -2; - } } else { ret = -1; } @@ -455,9 +452,8 @@ virXPathLongLong(const char *xpath, } else if ((obj != NULL) && (obj->type == XPATH_NUMBER) && (!(isnan(obj->floatval)))) { *value = (long long) obj->floatval; - if (*value != obj->floatval) { + if (*value != obj->floatval) ret = -2; - } } else { ret = -1; } @@ -655,9 +651,8 @@ catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) base = ctxt->input->base; /* skip backwards over any end-of-lines */ - while ((cur > base) && ((*(cur) == '\n') || (*(cur) == '\r'))) { + while ((cur > base) && ((*(cur) == '\n') || (*(cur) == '\r'))) cur--; - } /* search backwards for beginning-of-line (to max buff size) */ while ((cur > base) && (*(cur) != '\n') && (*(cur) != '\r')) @@ -669,9 +664,8 @@ catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) /* search forward for end-of-line (to max buff size) */ /* copy selected text to our buffer */ - while ((*cur != 0) && (*(cur) != '\n') && (*(cur) != '\r')) { + while ((*cur != 0) && (*(cur) != '\n') && (*(cur) != '\r')) virBufferAddChar(&buf, *cur++); - } /* create blank line with problem pointer */ contextstr = virBufferContentAndReset(&buf); -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/access/viraccessdriverstack.c | 3 +-- src/bhyve/bhyve_driver.c | 3 +-- src/datatypes.c | 6 ++---- src/driver.c | 3 +-- src/interface/interface_backend_udev.c | 12 ++++-------- src/libvirt-lxc.c | 3 +-- src/libvirt-nodedev.c | 3 +-- src/libvirt-storage.c | 6 ++---- src/libxl/libxl_driver.c | 12 ++++-------- src/locking/lock_daemon.c | 3 +-- src/locking/lock_driver_sanlock.c | 6 ++---- src/lxc/lxc_container.c | 9 +++------ src/lxc/lxc_driver.c | 9 +++------ src/lxc/lxc_process.c | 6 ++---- src/network/bridge_driver.c | 6 ++---- src/network/bridge_driver_linux.c | 3 +-- src/nwfilter/nwfilter_dhcpsnoop.c | 3 +-- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++-------- src/nwfilter/nwfilter_gentech_driver.c | 9 +++------ src/nwfilter/nwfilter_learnipaddr.c | 3 +-- 20 files changed, 40 insertions(+), 80 deletions(-) diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c index 11ed4f6..b43a743 100644 --- a/src/access/viraccessdriverstack.c +++ b/src/access/viraccessdriverstack.c @@ -54,9 +54,8 @@ static void virAccessDriverStackCleanup(virAccessManagerPtr manager) virAccessDriverStackPrivatePtr priv = virAccessManagerGetPrivateData(manager); size_t i; - for (i = 0; i < priv->managersLen; i++) { + for (i = 0; i < priv->managersLen; i++) virObjectUnref(priv->managers[i]); - } VIR_FREE(priv->managers); } diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 331f310..664e631 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1154,9 +1154,8 @@ bhyveStateInitialize(bool priveleged, return 0; } - if (VIR_ALLOC(bhyve_driver) < 0) { + if (VIR_ALLOC(bhyve_driver) < 0) return -1; - } if (virMutexInit(&bhyve_driver->lock) < 0) { VIR_FREE(bhyve_driver); diff --git a/src/datatypes.c b/src/datatypes.c index 87e3550..b4f6765 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -450,9 +450,8 @@ virStoragePoolDispose(void *obj) virUUIDFormat(pool->uuid, uuidstr); VIR_DEBUG("release pool %p %s %s", pool, pool->name, uuidstr); - if (pool->privateDataFreeFunc) { + if (pool->privateDataFreeFunc) pool->privateDataFreeFunc(pool->privateData); - } VIR_FREE(pool->name); virObjectUnref(pool->conn); @@ -525,9 +524,8 @@ virStorageVolDispose(void *obj) virStorageVolPtr vol = obj; VIR_DEBUG("release vol %p %s", vol, vol->name); - if (vol->privateDataFreeFunc) { + if (vol->privateDataFreeFunc) vol->privateDataFreeFunc(vol->privateData); - } VIR_FREE(vol->key); VIR_FREE(vol->name); diff --git a/src/driver.c b/src/driver.c index 71569e6..1be32ef 100644 --- a/src/driver.c +++ b/src/driver.c @@ -85,9 +85,8 @@ virDriverLoadModule(const char *name) *tmp = c_toupper(*tmp); } - if (virAsprintfQuiet(&regfunc, "%sRegister", fixedname) < 0) { + if (virAsprintfQuiet(&regfunc, "%sRegister", fixedname) < 0) goto cleanup; - } regsym = dlsym(handle, regfunc); if (!regsym) { diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 1dbbfe7..e9fd941 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -845,9 +845,8 @@ udevGetIfaceDefBond(struct udev *udev, return 0; error: - for (i = 0; slave_count != -1 && i < slave_count; i++) { + for (i = 0; slave_count != -1 && i < slave_count; i++) VIR_FREE(slave_list[i]); - } VIR_FREE(slave_list); return -1; @@ -952,9 +951,8 @@ udevGetIfaceDefBridge(struct udev *udev, return 0; error: - for (i = 0; member_count != -1 && i < member_count; i++) { + for (i = 0; member_count != -1 && i < member_count; i++) VIR_FREE(member_list[i]); - } VIR_FREE(member_list); return -1; @@ -1102,14 +1100,12 @@ udevGetIfaceDef(struct udev *udev, const char *name) * to prevent false positives */ vlan_parent_dev = strrchr(name, '.'); - if (vlan_parent_dev) { + if (vlan_parent_dev) ifacedef->type = VIR_INTERFACE_TYPE_VLAN; - } /* Fallback check to see if this is a bond device */ - if (udev_device_get_sysattr_value(dev, "bonding/mode")) { + if (udev_device_get_sysattr_value(dev, "bonding/mode")) ifacedef->type = VIR_INTERFACE_TYPE_BOND; - } } switch (ifacedef->type) { diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index 58892df..8553570 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -145,9 +145,8 @@ virDomainLxcEnterNamespace(virDomainPtr domain, if (virProcessSetNamespaces(nfdlist, fdlist) < 0) { if (oldfdlist && noldfdlist) { - for (i = 0; i < *noldfdlist; i++) { + for (i = 0; i < *noldfdlist; i++) VIR_FORCE_CLOSE((*oldfdlist)[i]); - } VIR_FREE(*oldfdlist); *noldfdlist = 0; } diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index c19aeef..b6c6d1e 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -741,9 +741,8 @@ virNodeDeviceDestroy(virNodeDevicePtr dev) if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->nodeDeviceDestroy) { int retval = dev->conn->nodeDeviceDriver->nodeDeviceDestroy(dev); - if (retval < 0) { + if (retval < 0) goto error; - } return 0; } diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 190c718..54c7332 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1746,9 +1746,8 @@ virStorageVolWipe(virStorageVolPtr vol, if (conn->storageDriver && conn->storageDriver->storageVolWipe) { int ret; ret = conn->storageDriver->storageVolWipe(vol, flags); - if (ret < 0) { + if (ret < 0) goto error; - } return ret; } @@ -1789,9 +1788,8 @@ virStorageVolWipePattern(virStorageVolPtr vol, if (conn->storageDriver && conn->storageDriver->storageVolWipePattern) { int ret; ret = conn->storageDriver->storageVolWipePattern(vol, algorithm, flags); - if (ret < 0) { + if (ret < 0) goto error; - } return ret; } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d2c077c..8cbf3c0 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -246,9 +246,8 @@ libxlDriverShouldLoad(bool privileged) * xenfs to /proc/xen. */ status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); - if (status >= 0) { + if (status >= 0) status = strncmp(output, "control_d", 9); - } VIR_FREE(output); if (status) { VIR_INFO("No Xen capabilities detected, probably not running " @@ -1792,9 +1791,8 @@ libxlDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM) && vm->def->maxvcpus < max) { + if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM) && vm->def->maxvcpus < max) max = vm->def->maxvcpus; - } if (nvcpus > max) { virReportError(VIR_ERR_INVALID_ARG, @@ -1964,9 +1962,8 @@ libxlDomainPinVcpuFlags(virDomainPtr dom, unsigned int vcpu, &flags, &targetDef) < 0) goto endjob; - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) targetDef = vm->def; - } /* Make sure coverity knows targetDef is valid at this point. */ sa_assert(targetDef); @@ -2066,9 +2063,8 @@ libxlDomainGetVcpuPinInfo(virDomainPtr dom, int ncpumaps, &flags, &targetDef) < 0) goto cleanup; - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (flags & VIR_DOMAIN_AFFECT_LIVE) targetDef = vm->def; - } /* Make sure coverity knows targetDef is valid at this point. */ sa_assert(targetDef); diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 75244e8..8cc6979 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1160,9 +1160,8 @@ int main(int argc, char **argv) { c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); - if (c == -1) { + if (c == -1) break; - } switch (c) { case 0: diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 0318f25..d84a419 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -1008,9 +1008,8 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, VIR_DEBUG("Acquire completed fd=%d", sock); if (res_free) { - for (i = 0; i < res_count; i++) { + for (i = 0; i < res_count; i++) VIR_FREE(res_args[i]); - } VIR_FREE(res_args); } @@ -1021,9 +1020,8 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, error: if (res_free) { - for (i = 0; i < res_count; i++) { + for (i = 0; i < res_count; i++) VIR_FREE(res_args[i]); - } VIR_FREE(res_args); } VIR_FREE(opt); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8aba3ba..db823d6 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -396,9 +396,8 @@ int lxcContainerSendContinue(int control) VIR_DEBUG("Send continue on fd %d", control); writeCount = safewrite(control, &msg, sizeof(msg)); - if (writeCount != sizeof(msg)) { + if (writeCount != sizeof(msg)) goto error_out; - } rc = 0; error_out: @@ -858,14 +857,12 @@ static int lxcContainerMountBasicFS(bool userns_enabled, */ if (userns_enabled && netns_disabled && STREQ(mnt->src, "sysfs")) { - if (VIR_STRDUP(mnt_src, "/sys") < 0) { + if (VIR_STRDUP(mnt_src, "/sys") < 0) goto cleanup; - } mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) { + if (VIR_STRDUP(mnt_src, mnt->src) < 0) goto cleanup; - } mnt_mflags = mnt->mflags; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da94cd4..cf2a3c8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1586,9 +1586,8 @@ static int lxcStateInitialize(bool privileged, return 0; } - if (VIR_ALLOC(lxc_driver) < 0) { + if (VIR_ALLOC(lxc_driver) < 0) return -1; - } if (virMutexInit(&lxc_driver->lock) < 0) { VIR_FREE(lxc_driver); return -1; @@ -1972,9 +1971,8 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, vm->def->cputune.period = params[i].value.ul; } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) vmdef->cputune.period = params[i].value.ul; - } } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_VCPU_QUOTA)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { rc = lxcSetVcpuBWLive(priv->cgroup, 0, params[i].value.l); @@ -1985,9 +1983,8 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, vm->def->cputune.quota = params[i].value.l; } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if (flags & VIR_DOMAIN_AFFECT_CONFIG) vmdef->cputune.quota = params[i].value.l; - } } } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6c83fdb..37ddbbc 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -536,9 +536,8 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitorPtr mon, if (vm) virObjectUnlock(vm); - if (event) { + if (event) virObjectEventStateQueue(driver->domainEventState, event); - } } static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED, @@ -826,9 +825,8 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, virCommandAddArgFormat(cmd, "%d", handshakefd); virCommandAddArg(cmd, "--background"); - for (i = 0; i < nveths; i++) { + for (i = 0; i < nveths; i++) virCommandAddArgList(cmd, "--veth", veths[i], NULL); - } virCommandPassFD(cmd, handshakefd, 0); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 12c3b50..6cb421c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1340,9 +1340,8 @@ networkStartDhcpDaemon(virNetworkObjPtr network) goto cleanup; ret = virCommandRun(cmd, NULL); - if (ret < 0) { + if (ret < 0) goto cleanup; - } /* * There really is no race here - when dnsmasq daemonizes, its @@ -2016,9 +2015,8 @@ networkStartNetworkVirtual(virNetworkObjPtr network) v6present = true; /* Add the IP address/netmask to the bridge */ - if (networkAddAddrToBridge(network, ipdef) < 0) { + if (networkAddAddrToBridge(network, ipdef) < 0) goto err2; - } } /* Bring up the bridge interface */ diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index 6b32838..aa2ad10 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -74,9 +74,8 @@ int networkCheckRouteCollision(virNetworkDefPtr def) /* NUL-terminate the line, so sscanf doesn't go beyond a newline. */ char *nl = strchr(cur, '\n'); - if (nl) { + if (nl) *nl++ = '\0'; - } num = sscanf(cur, "%16s %127s %*s %*s %*s %*s %*s %127s", iface, dest, mask); diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index a2f58ba..6da8983 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -315,9 +315,8 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req) virNWFilterSnoopActiveLock(); - if (virHashAddEntry(virNWFilterSnoopState.active, key, (void *)0x1) < 0) { + if (virHashAddEntry(virNWFilterSnoopState.active, key, (void *)0x1) < 0) VIR_FREE(key); - } virNWFilterSnoopActiveUnlock(); diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 2b89439..377b59b 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -3084,14 +3084,12 @@ virNWFilterRuleInstSort(const void *a, const void *b) /* ensure root chain commands appear before all others since we will need them to create the child chains */ if (root_a) { - if (root_b) { + if (root_b) goto normal; - } return -1; /* a before b */ } - if (root_b) { + if (root_b) return 1; /* b before a */ - } normal: /* priorities are limited to range [-1000, 1000] */ return insta->priority - instb->priority; @@ -3165,9 +3163,8 @@ ebtablesGetProtoIdxByFiltername(const char *filtername) enum l3_proto_idx idx; for (idx = 0; idx < L3_PROTO_LAST_IDX; idx++) { - if (STRPREFIX(filtername, l3_protocols[idx].val)) { + if (STRPREFIX(filtername, l3_protocols[idx].val)) return idx; - } } return -1; @@ -3303,9 +3300,8 @@ ebtablesGetSubChainInsts(virHashTablePtr chains, cleanup: VIR_FREE(filter_names); if (ret < 0) { - for (i = 0; i < *ninsts; i++) { + for (i = 0; i < *ninsts; i++) VIR_FREE(*insts[i]); - } VIR_FREE(*insts); *ninsts = 0; } diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 79fc422..701f8d8 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -567,9 +567,8 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, switch (useNewFilter) { case INSTANTIATE_FOLLOW_NEWFILTER: - if (obj->newDef) { + if (obj->newDef) next_filter = obj->newDef; - } break; case INSTANTIATE_ALWAYS: break; @@ -1139,15 +1138,13 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj, break; case STEP_TEAR_NEW: - if (!virHashLookup(cb->skipInterfaces, net->ifname)) { + if (!virHashLookup(cb->skipInterfaces, net->ifname)) ret = virNWFilterRollbackUpdateFilter(net); - } break; case STEP_TEAR_OLD: - if (!virHashLookup(cb->skipInterfaces, net->ifname)) { + if (!virHashLookup(cb->skipInterfaces, net->ifname)) ret = virNWFilterTearOldFilter(net); - } break; case STEP_APPLY_CURRENT: diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 911079e..1b875c3 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -797,9 +797,8 @@ virNWFilterLearnInit(void) threadsTerminate = false; pendingLearnReq = virHashCreate(0, freeLearnReqEntry); - if (!pendingLearnReq) { + if (!pendingLearnReq) return -1; - } ifaceLockMap = virHashCreate(0, virHashValueFree); if (!ifaceLockMap) { -- 2.1.3

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- src/vmware/vmware_conf.c | 3 +-- src/vmware/vmware_driver.c | 6 ++---- src/xen/block_stats.c | 3 +-- src/xen/xen_driver.c | 6 ++---- src/xen/xen_hypervisor.c | 6 ++---- src/xen/xend_internal.c | 18 ++++++------------ src/xen/xm_internal.c | 6 ++---- src/xenapi/xenapi_driver.c | 12 ++++-------- src/xenapi/xenapi_utils.c | 9 +++------ src/xenconfig/xen_common.c | 6 ++---- src/xenconfig/xen_sxpr.c | 6 ++---- 11 files changed, 27 insertions(+), 54 deletions(-) diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 81ac4ae..5c8a7be 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -432,9 +432,8 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) goto cleanup; } - if (vmwareParsePath(src, &directoryName, &fileName) < 0) { + if (vmwareParsePath(src, &directoryName, &fileName) < 0) goto cleanup; - } if (!virFileHasSuffix(fileName, ".vmdk")) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index c3fa2dc..5379876 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -313,9 +313,8 @@ vmwareStopVM(struct vmware_driver *driver, vmwareSetSentinal(cmd, vmwareDriverTypeToString(driver->type)); vmwareSetSentinal(cmd, ((vmwareDomainPtr) vm->privateData)->vmxPath); - if (virRun(cmd, NULL) < 0) { + if (virRun(cmd, NULL) < 0) return -1; - } vm->def->id = -1; virDomainObjSetState(vm, VIR_DOMAIN_SHUTOFF, reason); @@ -345,9 +344,8 @@ vmwareStartVM(struct vmware_driver *driver, virDomainObjPtr vm) else vmwareSetSentinal(cmd, NULL); - if (virRun(cmd, NULL) < 0) { + if (virRun(cmd, NULL) < 0) return -1; - } if ((vm->def->id = vmwareExtractPid(vmxPath)) < 0) { vmwareStopVM(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index 58e796d..e1e10a2 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -107,9 +107,8 @@ read_bd_stat(int device, int domid, const char *str) VIR_FREE(path); - if (r >= 0) { + if (r >= 0) return r; - } } return -1; diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 5f7c98f..7334142 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2550,15 +2550,13 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev) /* Get active domains */ numdomains = xenUnifiedConnectNumOfDomains(conn); - if (numdomains < 0) { + if (numdomains < 0) return ret; - } if (numdomains > 0) { if (VIR_ALLOC_N(ids, numdomains) < 0) goto out; - if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) { + if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) goto out; - } } /* Get pci bdf */ diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 4be8891..2473532 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2258,9 +2258,8 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) if (STREQLEN((const char *)&regs.r_ebx, "AuthcAMDenti", 12)) { if (pread(fd, &regs, sizeof(regs), 0x80000001) == sizeof(regs)) { /* Read secure virtual machine bit (bit 2 of ECX feature ID) */ - if ((regs.r_ecx >> 2) & 1) { + if ((regs.r_ecx >> 2) & 1) *hvm = "svm"; - } if ((regs.r_edx >> 6) & 1) *pae = 1; } @@ -2935,9 +2934,8 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn, else op_sys.u.availheap.node = cell; ret = xenHypervisorDoV2Sys(priv->handle, &op_sys); - if (ret < 0) { + if (ret < 0) return -1; - } if (hv_versions.sys_interface >= 5) freeMems[i] = op_sys.u.availheap5.avail_bytes; else diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index f1322c4..b233b6b 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -147,14 +147,12 @@ wr_sync(int fd, void *buffer, size_t size, int do_read) } /* recoverable error, retry */ - if ((len == -1) && ((errno == EAGAIN) || (errno == EINTR))) { + if ((len == -1) && ((errno == EAGAIN) || (errno == EINTR))) continue; - } /* eof */ - if (len == 0) { + if (len == 0) break; - } /* unrecoverable error */ if (len == -1) { @@ -1759,9 +1757,8 @@ xenDaemonNodeGetTopology(virConnectPtr conn, virCapsPtr caps) struct sexpr *root; root = sexpr_get(conn, "/xend/node/"); - if (root == NULL) { + if (root == NULL) return -1; - } ret = sexpr_to_xend_topology(root, caps); sexpr_free(root); @@ -2078,9 +2075,8 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) names = xenDaemonListDomainsOld(conn); tmp = names; - if (names == NULL) { + if (names == NULL) return NULL; - } while (*tmp != NULL) { id = xenDaemonDomainLookupByName_ids(conn, *tmp, &ident[0]); if (id >= 0) { @@ -2160,9 +2156,8 @@ xenDaemonCreateXML(virConnectPtr conn, virDomainDefPtr def) ret = xenDaemonDomainCreateXML(conn, sexpr); VIR_FREE(sexpr); - if (ret != 0) { + if (ret != 0) goto error; - } /* This comes before wait_for_devices, to ensure that latter cleanup will destroy the domain upon failure */ @@ -2562,9 +2557,8 @@ xenDaemonDomainGetAutostart(virConnectPtr conn, *autostart = 0; tmp = sexpr_node(root, "domain/on_xend_start"); - if (tmp && STREQ(tmp, "start")) { + if (tmp && STREQ(tmp, "start")) *autostart = 1; - } sexpr_free(root); return 0; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 30985d8..293b2ab 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -121,9 +121,8 @@ xenXMConfigReaper(const void *payload, if (entry->refreshedAt != args->now) { const char *olddomname = entry->def->name; char *nameowner = (char *)virHashLookup(args->priv->nameConfigMap, olddomname); - if (nameowner && STREQ(nameowner, key)) { + if (nameowner && STREQ(nameowner, key)) virHashRemoveEntry(args->priv->nameConfigMap, olddomname); - } return 1; } return 0; @@ -231,9 +230,8 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) /* If we currently own the name, then release it and re-acquire it later - just in case it was renamed */ nameowner = (char *)virHashLookup(priv->nameConfigMap, entry->def->name); - if (nameowner && STREQ(nameowner, filename)) { + if (nameowner && STREQ(nameowner, filename)) virHashRemoveEntry(priv->nameConfigMap, entry->def->name); - } /* Clear existing config entry which needs refresh */ virDomainDefFree(entry->def); diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index ed4f7e8..7048556 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1493,16 +1493,13 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } defPtr->maxvcpus = defPtr->vcpus = xenapiDomainGetMaxVcpus(dom); enum xen_on_normal_exit action; - if (xen_vm_get_actions_after_shutdown(session, &action, vm)) { + if (xen_vm_get_actions_after_shutdown(session, &action, vm)) defPtr->onPoweroff = xenapiNormalExitEnum2virDomainLifecycle(action); - } - if (xen_vm_get_actions_after_reboot(session, &action, vm)) { + if (xen_vm_get_actions_after_reboot(session, &action, vm)) defPtr->onReboot = xenapiNormalExitEnum2virDomainLifecycle(action); - } enum xen_on_crash_behaviour crash; - if (xen_vm_get_actions_after_crash(session, &crash, vm)) { + if (xen_vm_get_actions_after_crash(session, &crash, vm)) defPtr->onCrash = xenapiCrashExitEnum2virDomainLifecycle(action); - } xen_vm_get_platform(session, &result, vm); if (result != NULL) { size_t i; @@ -2060,9 +2057,8 @@ call_func(const void *data, size_t len, void *user_handle, fflush(stdout); #endif CURL *curl = curl_easy_init(); - if (!curl) { + if (!curl) return -1; - } xen_comms comms = { .func = result_func, .handle = result_handle diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c71dd15..91bc649 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -84,9 +84,8 @@ xenapiUtil_RequestPassword(virConnectAuthPtr auth, const char *username, cred.result = NULL; cred.resultlen = 0; - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) VIR_FREE(cred.result); - } break; } @@ -105,9 +104,8 @@ xenapiUtil_ParseQuery(virConnectPtr conn, virURIPtr uri, int *noVerify) for (i = 0; i < uri->paramsCount; i++) { virURIParamPtr queryParam = &uri->params[i]; if (STRCASEEQ(queryParam->name, "no_verify")) { - if (noVerify == NULL) { + if (noVerify == NULL) continue; - } if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 || (*noVerify != 0 && *noVerify != 1)) { xenapiSessionErrorHandler(conn, VIR_ERR_INVALID_ARG, @@ -282,9 +280,8 @@ mapDomainPinVcpu(unsigned char *cpumap, int maplen) size_t i, j; for (i = 0; i < maplen; i++) { for (j = 0; j < 8; j++) { - if (cpumap[i] & (1 << j)) { + if (cpumap[i] & (1 << j)) virBufferAsprintf(&buf, "%zu,", (8*i)+j); - } } } if (virBufferCheckError(&buf) < 0) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 32954f3..29c6c34 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -729,9 +729,8 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def) !(chr = xenParseSxprChar(str, NULL))) goto cleanup; if (chr) { - if (VIR_ALLOC_N(def->parallels, 1) < 0) { + if (VIR_ALLOC_N(def->parallels, 1) < 0) goto cleanup; - } chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL; chr->target.port = 0; @@ -762,9 +761,8 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def) goto cleanup; chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; chr->target.port = portnum; - if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) { + if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) goto cleanup; - } value = value->next; } diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 6623ea8..a667814 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1959,16 +1959,14 @@ xenFormatSxprNet(virConnectPtr conn, if (def->model != NULL && STREQ(def->model, "netfront")) { virBufferAddLit(buf, "(type netfront)"); } else { - if (def->model != NULL) { + if (def->model != NULL) virBufferEscapeSexpr(buf, "(model '%s')", def->model); - } /* * apparently (type ioemu) breaks paravirt drivers on HVM so skip * this from XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU */ - if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) { + if (xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU) virBufferAddLit(buf, "(type ioemu)"); - } } } -- 2.1.3

On 11/13/2014 09:37 AM, Martin Kletzander wrote: And this is one where the fears of removing the brackets sets in - inline MACROs that do not have a 'do { ... } while(0)' definition.... I thought perhaps it'd be vbox and the funky macros there, but if you look at the #define for EDIT_NOT_CHANGED it differs within the various virsh-*.c files. For example, in virsh-domain.c there's: #define EDIT_NOT_CHANGED \ vshPrint(ctl, _("Saved image %s XML configuration " \ "not changed.\n"), file); \ ret = true; goto edit_cleanup; So, in effect the second line will always be executed as I'm reading things. there's also : #define EDIT_NOT_CHANGED \ vshPrint(ctl, "%s", _("Metadata not changed")); \ ret = true; \ goto edit_cleanup; and #define EDIT_NOT_CHANGED \ vshPrint(ctl, _("Domain %s XML configuration not changed.\n"), \ virDomainGetName(dom)); \ ret = true; goto edit_cleanup; I think modifying the macros to have the do {...} while(0); syntax will do the trick. John

After recent discussion it looks like curly brackets around one-line bodies are preferred if the preceding condition is, itself, multiline. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- HACKING | 8 ++++---- docs/hacking.html.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HACKING b/HACKING index 8f42e51..0f36405 100644 --- a/HACKING +++ b/HACKING @@ -370,10 +370,10 @@ although use of a semicolon is not currently rejected. Curly braces ============ -Omit the curly braces around an "if", "while", "for" etc. body only when that -body occupies a single line. In every other case we require the braces. This -ensures that it is trivially easy to identify a single-'statement' loop: each -has only one 'line' in its body. +Omit the curly braces around an "if", "while", "for" etc. body only when both +that body and the condition itself occupy a single line. In every other case +we require the braces. This ensures that it is trivially easy to identify a +single-'statement' loop: each has only one 'line' in its body. Omitting braces with a single-line body is fine: diff --git a/docs/hacking.html.in b/docs/hacking.html.in index b1553a5..fac1417 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -462,8 +462,8 @@ <p> Omit the curly braces around an <code>if</code>, <code>while</code>, - <code>for</code> etc. body only - when that body occupies a single line. In every other case we require + <code>for</code> etc. body only when both that body and the condition + itself occupy a single line. In every other case we require the braces. This ensures that it is trivially easy to identify a single-<i>statement</i> loop: each has only one <i>line</i> in its body. </p> -- 2.1.3

In bracket-spacing.pl, the current $line is being modified in $data. That, however, spoils that $data for another check. Introduce new $tmpdata variable that can be used for temporary modifications. The difference between $data and $line is that $data are as much cleaned as possible from non-code blocks and these changes must be kept. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- build-aux/bracket-spacing.pl | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl index ac01a56..5fce2b7 100755 --- a/build-aux/bracket-spacing.pl +++ b/build-aux/bracket-spacing.pl @@ -31,6 +31,8 @@ foreach my $file (@ARGV) { while (defined (my $line = <FILE>)) { my $data = $line; + # For temporary modifications + my $tmpdata; # Kill any quoted , ; = or " $data =~ s/'[";,=]'/'X'/g; @@ -77,12 +79,15 @@ foreach my $file (@ARGV) { # # foo (*bar, wizz); # - while ($data =~ /(\w+)\s\((?!\*)/) { + # We also don't want to spoil the $data so it can be used + # later on. + $tmpdata = $data; + while ($tmpdata =~ /(\w+)\s\((?!\*)/) { my $kw = $1; # Allow space after keywords only if ($kw =~ /^(if|for|while|switch|return)$/) { - $data =~ s/($kw\s\()/XXX(/; + $tmpdata =~ s/($kw\s\()/XXX(/; } else { print "$file:$.: $line"; $ret = 1; @@ -147,9 +152,10 @@ foreach my $file (@ARGV) { # Require spaces around assignment '=', compounds and '==' # with the exception of virAssertCmpInt() - $data =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/; - while ($data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ || - $data =~ /=[^= \\\n]/) { + $tmpdata = $data; + $tmpdata =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/; + while ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ || + $tmpdata =~ /=[^= \\\n]/) { print "$file:$.: $line"; $ret = 1; last; -- 2.1.3

Change while () { smth; last; } to if () { smth; } as 'last' in perl is analogous to 'break' in C. These are probably copy-paste leftovers from creating new syntax-check rules. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- build-aux/bracket-spacing.pl | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl index 5fce2b7..d178703 100755 --- a/build-aux/bracket-spacing.pl +++ b/build-aux/bracket-spacing.pl @@ -97,26 +97,23 @@ foreach my $file (@ARGV) { # Require whitespace immediately after keywords, # but none after the opening bracket - while ($data =~ /\b(if|for|while|switch|return)\(/ || - $data =~ /\b(if|for|while|switch|return)\s+\(\s/) { + if ($data =~ /\b(if|for|while|switch|return)\(/ || + $data =~ /\b(if|for|while|switch|return)\s+\(\s/) { print "$file:$.: $line"; $ret = 1; - last; } # Forbid whitespace between )( of a function typedef - while ($data =~ /\(\*\w+\)\s+\(/) { + if ($data =~ /\(\*\w+\)\s+\(/) { print "$file:$.: $line"; $ret = 1; - last; } # Forbid whitespace following ( or prior to ) - while ($data =~ /\S\s+\)/ || - $data =~ /\(\s+\S/) { + if ($data =~ /\S\s+\)/ || + $data =~ /\(\s+\S/) { print "$file:$.: $line"; $ret = 1; - last; } # Forbid whitespace before ";" or ",". Things like below are allowed: @@ -129,36 +126,32 @@ foreach my $file (@ARGV) { # errno == EINTR) # ; # - while ($data =~ /[^;\s]\s+[;,]/) { + if ($data =~ /[^;\s]\s+[;,]/) { print "$file:$.: $line"; $ret = 1; - last; } # Require EOL, macro line continuation, or whitespace after ";". # Allow "for (;;)" as an exception. - while ($data =~ /;[^ \\\n;)]/) { + if ($data =~ /;[^ \\\n;)]/) { print "$file:$.: $line"; $ret = 1; - last; } # Require EOL, space, or enum/struct end after comma. - while ($data =~ /,[^ \\\n)}]/) { + if ($data =~ /,[^ \\\n)}]/) { print "$file:$.: $line"; $ret = 1; - last; } # Require spaces around assignment '=', compounds and '==' # with the exception of virAssertCmpInt() $tmpdata = $data; $tmpdata =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/; - while ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ || - $tmpdata =~ /=[^= \\\n]/) { + if ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ || + $tmpdata =~ /=[^= \\\n]/) { print "$file:$.: $line"; $ret = 1; - last; } } close FILE; -- 2.1.3

We're looking for three consecutive lines, first one is a if/for/while with a condition and start of body, second one is a body with one and only semicolon and third is end of the body by itself. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- build-aux/bracket-spacing.pl | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl index d178703..eb2d372 100755 --- a/build-aux/bracket-spacing.pl +++ b/build-aux/bracket-spacing.pl @@ -27,6 +27,11 @@ my $ret = 0; my $incomment = 0; foreach my $file (@ARGV) { + # Per-file variables for multiline Curly Bracket (cb_) check + my $cb_linenum = 0; + my $cb_code = ""; + my $cb_scolon = 0; + open FILE, $file; while (defined (my $line = <FILE>)) { @@ -153,6 +158,36 @@ foreach my $file (@ARGV) { print "$file:$.: $line"; $ret = 1; } + + # One line conditional statements with one line bodies should + # not use curly brackets. We also need to use $line instead $data as + if ($data =~ /^\s*(if|while|for)\b.*\{$/) { + $cb_linenum = $.; + $cb_code = $line; + $cb_scolon = 0; + } + + # We need to check for exactly one semicolon inside the body, + # because empty statements (e.g. with comment only) are + # allowed + if ($cb_linenum == $. - 1 && $data =~ /^[^;]*;[^;]*$/) { + $cb_code .= $line; + $cb_scolon = 1; + } + + if ($data =~ /^\s*}\s*$/ && + $cb_linenum == $. - 2 && + $cb_scolon) { + + print "$file:$cb_linenum-$.:\n$cb_code$line"; + $ret = 1; + + # There _should_ be no need to reset the values; but to + # keep my inner piece... + $cb_linenum = 0; + $cb_scolon = 0; + $cb_code = ""; + } } close FILE; } -- 2.1.3