[libvirt] [PATCH 00/29] syntax: Require spaces after casts
There was a discussion some time ago (I don't even have the link to the ML archives) about spaces after casts. The opinions were diverse, however I decided to proceed anyway and make a rule out of it. The decision is explained with the reasoning behind it in the last commit, I don't want to repeat it here. This might cause a lot of collisions, but fear not as all the stuff these patches do can be automated. The way I did it was using this tiny neat command: git ls-files '*.[chx]' | xargs sed -i -E 's/((\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\))(([^ );,]))/\1 \6/g' So in case of a collision, you can run that on your patches, amend them and then rebase on top of this series. Of course this is not a semantic patch that is very precise, but practicality beats perfection. I roughly checked for false hits (both positive and negative) and I haven't found any. Martin Kletzander (29): admin: Add spaces after casts bhyve: Add spaces after casts conf: Add spaces after casts esx: Add spaces after casts hyperv: Add spaces after casts libxl: Add spaces after casts locking: Add spaces after casts logging: Add spaces after casts lxc: Add spaces after casts network: Add spaces after casts node_device: Add spaces after casts nwfilter: Add spaces after casts openvz: Add spaces after casts qemu: Add spaces after casts remote: Add spaces after casts rpc: Add spaces after casts storage: Add spaces after casts uml: Add spaces after casts util: Add spaces after casts vbox: Add spaces after casts vmware: Add spaces after casts vmx: Add spaces after casts vz: Add spaces after casts xenapi: Add spaces after casts xenconfig: Add spaces after casts tests: Add spaces after casts tools: Add spaces after casts libvirt-domain: Add spaces after casts Require space after cast cfg.mk | 6 ++ docs/hacking.html.in | 9 ++ include/libvirt/libvirt-domain.h | 4 +- src/admin/admin_remote.c | 8 +- src/bhyve/bhyve_process.c | 6 +- src/conf/capabilities.c | 4 +- src/conf/domain_audit.c | 6 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 76 +++++++-------- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 6 +- src/conf/nwfilter_params.c | 8 +- src/conf/snapshot_conf.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virsecretobj.c | 6 +- src/conf/virstorageobj.c | 4 +- src/esx/esx_driver.c | 18 ++-- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 6 +- src/esx/esx_stream.c | 2 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 16 ++-- src/esx/esx_vi_types.c | 48 +++++----- src/hyperv/hyperv_driver.c | 60 ++++++------ src/hyperv/hyperv_wmi.c | 12 +-- src/libvirt-domain.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 6 +- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/libxl/libxl_migration.c | 2 +- src/locking/lock_daemon.c | 20 ++-- src/locking/lock_daemon_dispatch.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/logging/log_daemon.c | 16 ++-- src/logging/log_daemon_dispatch.c | 6 +- src/logging/log_manager.c | 18 ++-- src/lxc/lxc_container.c | 4 +- src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_fuse.c | 2 +- src/lxc/lxc_process.c | 10 +- src/network/bridge_driver.c | 10 +- src/node_device/node_device_hal.c | 106 ++++++++++----------- src/nwfilter/nwfilter_dhcpsnoop.c | 14 +-- src/nwfilter/nwfilter_ebiptables_driver.c | 22 ++--- src/nwfilter/nwfilter_gentech_driver.c | 6 +- src/nwfilter/nwfilter_learnipaddr.c | 8 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_capabilities.c | 14 +-- src/qemu/qemu_command.c | 6 +- src/qemu/qemu_domain.c | 14 +-- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 10 +- src/qemu/qemu_monitor_text.c | 6 +- src/qemu/qemu_process.c | 4 +- src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon_dispatch.c | 10 +- src/remote/remote_driver.c | 110 +++++++++++----------- src/rpc/virnetsaslcontext.c | 4 +- src/rpc/virnetserverclient.c | 4 +- src/rpc/virnetservermdns.c | 4 +- src/rpc/virnetsshsession.c | 12 +-- src/rpc/virnettlscontext.c | 4 +- src/storage/storage_backend_disk.c | 4 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 10 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 8 +- src/storage/storage_util.c | 8 +- src/uml/uml_driver.c | 18 ++-- src/util/viralloc.c | 16 ++-- src/util/viralloc.h | 2 +- src/util/virarptable.c | 2 +- src/util/viratomic.h | 64 ++++++------- src/util/vircgroup.c | 4 +- src/util/vircommand.c | 4 +- src/util/virconf.c | 30 +++--- src/util/virdbus.c | 66 ++++++------- src/util/virdnsmasq.c | 6 +- src/util/virfdstream.c | 2 +- src/util/virfile.c | 8 +- src/util/virfilecache.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhash.c | 2 +- src/util/virhostmem.c | 10 +- src/util/viridentity.c | 4 +- src/util/viriscsi.c | 2 +- src/util/virjson.c | 22 ++--- src/util/virlockspace.c | 12 +-- src/util/virlog.c | 14 +-- src/util/virnetdev.c | 20 ++-- src/util/virnetdevbridge.c | 6 +- src/util/virnetdevip.c | 6 +- src/util/virnetdevmacvlan.c | 18 ++-- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virnetlink.c | 18 ++-- src/util/virnodesuspend.c | 4 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 2 +- src/util/virpolkit.c | 4 +- src/util/virprobe.h | 2 +- src/util/virprocess.c | 22 ++--- src/util/virrandom.c | 2 +- src/util/virrotatingfile.c | 4 +- src/util/virstoragefile.c | 16 ++-- src/util/virsystemd.c | 6 +- src/util/virtime.c | 2 +- src/util/viruri.c | 2 +- src/util/virutil.c | 2 +- src/util/virutil.h | 6 +- src/util/virxml.c | 18 ++-- src/vbox/vbox_MSCOMGlue.c | 18 ++-- src/vbox/vbox_common.c | 108 ++++++++++----------- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_snapshot_conf.c | 12 +-- src/vbox/vbox_storage.c | 10 +- src/vbox/vbox_tmpl.c | 26 ++--- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 6 +- src/vz/vz_sdk.c | 20 ++-- src/vz/vz_utils.c | 2 +- src/xenapi/xenapi_driver.c | 86 ++++++++--------- src/xenapi/xenapi_utils.c | 30 +++--- src/xenconfig/xen_common.c | 6 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 6 +- tests/commandtest.c | 2 +- tests/esxutilstest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nwfilterebiptablestest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/securityselinuxhelper.c | 2 +- tests/testutils.c | 14 +-- tests/viralloctest.c | 4 +- tests/vircgroupmock.c | 18 ++-- tests/virdbusmock.c | 2 +- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virnetdaemontest.c | 2 +- tests/virnetmessagetest.c | 12 +-- tests/virnetsockettest.c | 4 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 4 +- tests/virnettlssessiontest.c | 2 +- tests/virpcimock.c | 2 +- tests/virrandommock.c | 2 +- tests/virrotatingfiletest.c | 6 +- tests/virstringtest.c | 4 +- tests/virtypedparamtest.c | 2 +- tests/xml2vmxtest.c | 2 +- tools/nss/libvirt_nss.c | 4 +- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 36 +++---- tools/virsh-host.c | 4 +- tools/virsh-secret.c | 2 +- tools/virsh-volume.c | 2 +- tools/virt-host-validate-qemu.c | 2 +- tools/vsh.c | 4 +- tools/wireshark/src/packet-libvirt.c | 8 +- 165 files changed, 913 insertions(+), 898 deletions(-) -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/admin/admin_remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index b29d109f6a29..56c2e743e45b 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -172,8 +172,8 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) virObjectFreeCallback); if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, - (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, - (xdrproc_t)xdr_void, (char *)NULL) == -1) { + (xdrproc_t)xdr_admin_connect_open_args, (char *) &args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) { goto done; } @@ -193,8 +193,8 @@ remoteAdminConnectClose(virAdmConnectPtr conn) virObjectLock(priv); if (call(conn, 0, ADMIN_PROC_CONNECT_CLOSE, - (xdrproc_t)xdr_void, (char *)NULL, - (xdrproc_t)xdr_void, (char *)NULL) == -1) { + (xdrproc_t)xdr_void, (char *) NULL, + (xdrproc_t)xdr_void, (char *) NULL) == -1) { goto done; } -- 2.17.0
On Mon, Apr 23, 2018 at 14:44:29 +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/admin/admin_remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index b29d109f6a29..56c2e743e45b 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -172,8 +172,8 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) virObjectFreeCallback);
if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, - (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, - (xdrproc_t)xdr_void, (char *)NULL) == -1) { + (xdrproc_t)xdr_admin_connect_open_args, (char *) &args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) {
^^^^^^^^^^^ This also looks like a cast ;)
goto done; }
On Mon, Apr 23, 2018 at 02:52:01PM +0200, Peter Krempa wrote:
On Mon, Apr 23, 2018 at 14:44:29 +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/admin/admin_remote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index b29d109f6a29..56c2e743e45b 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -172,8 +172,8 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) virObjectFreeCallback);
if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, - (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, - (xdrproc_t)xdr_void, (char *)NULL) == -1) { + (xdrproc_t)xdr_admin_connect_open_args, (char *) &args, + (xdrproc_t)xdr_void, (char *) NULL) == -1) {
^^^^^^^^^^^ This also looks like a cast ;)
Oh shoot, it does. And a freakin' obvious one indeed. I remember adding anything that ends with '_t' to the list of types that we cast, so I must've left it somwhere. I'll dig up the differences, add it here, resend the series and then get nacked by jtomko, I guess. Thanks.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/bhyve/bhyve_process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9276d7d364c0..22896e5d7ac6 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -273,7 +273,7 @@ virBhyveProcessStop(bhyveConnPtr driver, if (vm->pid <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid PID %d for VM"), - (int)vm->pid); + (int) vm->pid); return -1; } @@ -322,7 +322,7 @@ virBhyveProcessShutdown(virDomainObjPtr vm) if (vm->pid <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid PID %d for VM"), - (int)vm->pid); + (int) vm->pid); return -1; } @@ -361,7 +361,7 @@ virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, if (kp == NULL || nprocs != 1) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to obtain information about pid: %d"), - (int)vm->pid); + (int) vm->pid); goto cleanup; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/conf/capabilities.c | 4 +- src/conf/domain_audit.c | 6 +-- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 76 +++++++++++++++++----------------- src/conf/network_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_conf.c | 6 +-- src/conf/nwfilter_params.c | 8 ++-- src/conf/snapshot_conf.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virsecretobj.c | 6 +-- src/conf/virstorageobj.c | 4 +- 12 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index c4ee7efb5fe2..46a51e513204 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1578,8 +1578,8 @@ static int virCapsHostCacheBankSorter(const void *a, const void *b) { - virCapsHostCacheBankPtr ca = *(virCapsHostCacheBankPtr *)a; - virCapsHostCacheBankPtr cb = *(virCapsHostCacheBankPtr *)b; + virCapsHostCacheBankPtr ca = *(virCapsHostCacheBankPtr *) a; + virCapsHostCacheBankPtr cb = *(virCapsHostCacheBankPtr *) b; if (ca->level < cb->level) return -1; diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 82868bca76b0..182422e9e8a2 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -804,7 +804,7 @@ virDomainAuditLifecycle(virDomainObjPtr vm, const char *op, VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, success, "virt=%s op=%s reason=%s %s uuid=%s vm-pid=%lld", - virt, op, reason, vmname, uuidstr, (long long)vm->pid); + virt, op, reason, vmname, uuidstr, (long long) vm->pid); VIR_FREE(vmname); } @@ -904,8 +904,8 @@ virDomainAuditInit(virDomainObjPtr vm, VIR_AUDIT(VIR_AUDIT_RECORD_MACHINE_CONTROL, true, "virt=%s op=init %s uuid=%s vm-pid=%lld init-pid=%lld pid-ns=%lld", - virt, vmname, uuidstr, (long long)vm->pid, (long long)initpid, - (long long)pidns); + virt, vmname, uuidstr, (long long) vm->pid, (long long) initpid, + (long long) pidns); VIR_FREE(vmname); } diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index bebbaf44d00e..8ca960d0b548 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -238,7 +238,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels, if (VIR_STRNDUP(nameCopy, name, nameLen) < 0) goto error; - if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0) + if (virStringListCopy(&blockersCopy, (const char **) blockers) < 0) goto error; if (virDomainCapsCPUModelsAddSteal(cpuModels, &nameCopy, diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65b429460a30..73415c16dc94 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1232,9 +1232,9 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, while (node) { if (node->type == XML_ELEMENT_NODE) { if (virXMLNodeNameEqual(node, "path") && !dev->path) { - dev->path = (char *)xmlNodeGetContent(node); + dev->path = (char *) xmlNodeGetContent(node); } else if (virXMLNodeNameEqual(node, "weight")) { - c = (char *)xmlNodeGetContent(node); + c = (char *) xmlNodeGetContent(node); if (virStrToLong_ui(c, NULL, 10, &dev->weight) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse weight %s"), @@ -1243,7 +1243,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, } VIR_FREE(c); } else if (virXMLNodeNameEqual(node, "read_bytes_sec")) { - c = (char *)xmlNodeGetContent(node); + c = (char *) xmlNodeGetContent(node); if (virStrToLong_ull(c, NULL, 10, &dev->rbps) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse read bytes sec %s"), @@ -1252,7 +1252,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, } VIR_FREE(c); } else if (virXMLNodeNameEqual(node, "write_bytes_sec")) { - c = (char *)xmlNodeGetContent(node); + c = (char *) xmlNodeGetContent(node); if (virStrToLong_ull(c, NULL, 10, &dev->wbps) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse write bytes sec %s"), @@ -1261,7 +1261,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, } VIR_FREE(c); } else if (virXMLNodeNameEqual(node, "read_iops_sec")) { - c = (char *)xmlNodeGetContent(node); + c = (char *) xmlNodeGetContent(node); if (virStrToLong_ui(c, NULL, 10, &dev->riops) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse read iops sec %s"), @@ -1270,7 +1270,7 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root, } VIR_FREE(c); } else if (virXMLNodeNameEqual(node, "write_iops_sec")) { - c = (char *)xmlNodeGetContent(node); + c = (char *) xmlNodeGetContent(node); if (virStrToLong_ui(c, NULL, 10, &dev->wiops) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("could not parse write iops sec %s"), @@ -2296,7 +2296,7 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src, if (tgt->type != src->type) return false; - switch ((virDomainChrType)src->type) { + switch ((virDomainChrType) src->type) { case VIR_DOMAIN_CHR_TYPE_FILE: return src->data.file.append == tgt->data.file.append && STREQ_NULLABLE(src->data.file.path, tgt->data.file.path); @@ -8378,10 +8378,10 @@ virDomainLeaseDefParseXML(xmlNodePtr node) while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { if (!key && virXMLNodeNameEqual(cur, "key")) { - key = (char *)xmlNodeGetContent(cur); + key = (char *) xmlNodeGetContent(cur); } else if (!lockspace && virXMLNodeNameEqual(cur, "lockspace")) { - lockspace = (char *)xmlNodeGetContent(cur); + lockspace = (char *) xmlNodeGetContent(cur); } else if (!path && virXMLNodeNameEqual(cur, "target")) { path = virXMLPropString(cur, "path"); @@ -8620,7 +8620,7 @@ virDomainStorageSourceParse(xmlNodePtr node, ctxt->node = node; - switch ((virStorageType)src->type) { + switch ((virStorageType) src->type) { case VIR_STORAGE_TYPE_FILE: src->path = virXMLPropString(node, "file"); break; @@ -9454,16 +9454,16 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } else if (!serial && virXMLNodeNameEqual(cur, "serial")) { - serial = (char *)xmlNodeGetContent(cur); + serial = (char *) xmlNodeGetContent(cur); } else if (!wwn && virXMLNodeNameEqual(cur, "wwn")) { - wwn = (char *)xmlNodeGetContent(cur); + wwn = (char *) xmlNodeGetContent(cur); if (!virValidateWWN(wwn)) goto error; } else if (!vendor && virXMLNodeNameEqual(cur, "vendor")) { - vendor = (char *)xmlNodeGetContent(cur); + vendor = (char *) xmlNodeGetContent(cur); if (strlen(vendor) > VENDOR_LEN) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9478,7 +9478,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } } else if (!product && virXMLNodeNameEqual(cur, "product")) { - product = (char *)xmlNodeGetContent(cur); + product = (char *) xmlNodeGetContent(cur); if (strlen(product) > PRODUCT_LEN) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9535,11 +9535,11 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if ((def->device == VIR_DOMAIN_DISK_DEVICE_DISK || def->device == VIR_DOMAIN_DISK_DEVICE_LUN) && - !STRPREFIX((const char *)target, "hd") && - !STRPREFIX((const char *)target, "sd") && - !STRPREFIX((const char *)target, "vd") && - !STRPREFIX((const char *)target, "xvd") && - !STRPREFIX((const char *)target, "ubd")) { + !STRPREFIX((const char *) target, "hd") && + !STRPREFIX((const char *) target, "sd") && + !STRPREFIX((const char *) target, "vd") && + !STRPREFIX((const char *) target, "xvd") && + !STRPREFIX((const char *) target, "ubd")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid harddisk device name: %s"), target); goto error; @@ -10858,7 +10858,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, type = virXMLPropString(node, "type"); if (type != NULL) { - if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { + if ((int) (def->type = virDomainNetTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface type '%s'"), type); goto error; @@ -11063,16 +11063,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } if (macaddr) { - if (virMacAddrParse((const char *)macaddr, &def->mac) < 0) { + if (virMacAddrParse((const char *) macaddr, &def->mac) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unable to parse mac address '%s'"), - (const char *)macaddr); + (const char *) macaddr); goto error; } if (virMacAddrIsMulticast(&def->mac)) { virReportError(VIR_ERR_XML_ERROR, _("expected unicast mac address, found multicast '%s'"), - (const char *)macaddr); + (const char *) macaddr); goto error; } } else { @@ -12459,7 +12459,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, "exactly three certificates")); goto error; } - def->data.cert.file[i] = (char *)xmlNodeGetContent(cur); + def->data.cert.file[i] = (char *) xmlNodeGetContent(cur); if (!def->data.cert.file[i]) { virReportOOMError(); goto error; @@ -12468,7 +12468,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (cur->type == XML_ELEMENT_NODE && virXMLNodeNameEqual(cur, "database") && !def->data.cert.database) { - def->data.cert.database = (char *)xmlNodeGetContent(cur); + def->data.cert.database = (char *) xmlNodeGetContent(cur); if (!def->data.cert.database) { virReportOOMError(); goto error; @@ -12579,7 +12579,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, model = virXMLPropString(node, "model"); if (model != NULL && - (int)(def->model = virDomainTPMModelTypeFromString(model)) < 0) { + (int) (def->model = virDomainTPMModelTypeFromString(model)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown TPM frontend model '%s'"), model); goto error; @@ -12610,7 +12610,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - if ((int)(def->type = virDomainTPMBackendTypeFromString(backend)) < 0) { + if ((int) (def->type = virDomainTPMBackendTypeFromString(backend)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown TPM backend type '%s'"), backend); @@ -17933,7 +17933,7 @@ virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) for (i = 0; i < def->nhostdevs; i++) { hostdev = def->hostdevs[i]; if (virHostdevIsSCSIDevice(hostdev) && - (int)hostdev->info->addr.drive.controller > maxController) { + (int) hostdev->info->addr.drive.controller > maxController) { virDomainControllerDefPtr cont; maxController = hostdev->info->addr.drive.controller; @@ -18682,7 +18682,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) if (virXPathLong("string(./@id)", ctxt, &id) < 0) id = -1; - def->id = (int)id; + def->id = (int) id; /* Find out what type of virtualization to use */ if (!(tmp = virXMLPropString(ctxt->node, "type"))) { @@ -19257,7 +19257,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; for (i = 0; i < n; i++) { - int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); + int val = virDomainFeatureTypeFromString((const char *) nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected feature '%s'"), nodes[i]->name); @@ -19379,7 +19379,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; for (i = 0; i < n; i++) { - feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); + feature = virDomainHypervTypeFromString((const char *) nodes[i]->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported HyperV Enlightenment feature: %s"), @@ -19480,7 +19480,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; for (i = 0; i < n; i++) { - feature = virDomainKVMTypeFromString((const char *)nodes[i]->name); + feature = virDomainKVMTypeFromString((const char *) nodes[i]->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported KVM feature: %s"), @@ -19522,7 +19522,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; for (i = 0; i < n; i++) { - int val = virDomainCapsFeatureTypeFromString((const char *)nodes[i]->name); + int val = virDomainCapsFeatureTypeFromString((const char *) nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected capability feature '%s'"), nodes[i]->name); @@ -22364,7 +22364,7 @@ virDomainDefAddDiskControllersForType(virDomainDefPtr def, if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) continue; - if ((int)def->disks[i]->info.addr.drive.controller > maxController) + if ((int) def->disks[i]->info.addr.drive.controller > maxController) maxController = def->disks[i]->info.addr.drive.controller; } @@ -22871,7 +22871,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, unsigned int flags, bool skipSeclabels) { - switch ((virStorageType)src->type) { + switch ((virStorageType) src->type) { case VIR_STORAGE_TYPE_FILE: virBufferEscapeString(attrBuf, " file='%s'", src->path); break; @@ -24426,7 +24426,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); - switch ((virDomainChrType)def->type) { + switch ((virDomainChrType) def->type) { case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -27344,7 +27344,7 @@ virDomainObjFormat(virDomainXMLOptionPtr xmlopt, virBufferAsprintf(&buf, "<domstatus state='%s' reason='%s' pid='%lld'>\n", virDomainStateTypeToString(state), virDomainStateReasonToString(state, reason), - (long long)obj->pid); + (long long) obj->pid); virBufferAdjustIndent(&buf, 2); for (i = 0; i < VIR_DOMAIN_TAINT_LAST; i++) { @@ -28605,7 +28605,7 @@ virDomainDefSetMetadata(virDomainDefPtr def, /* create the root node if needed */ if (!def->metadata && - !(def->metadata = xmlNewNode(NULL, (unsigned char *)"metadata"))) { + !(def->metadata = xmlNewNode(NULL, (unsigned char *) "metadata"))) { virReportOOMError(); goto cleanup; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 54109a3d2ef8..d520e27e6642 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -423,7 +423,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, virReportError(VIR_ERR_XML_ERROR, _("expected unicast mac address, found " "multicast '%s' in network '%s'"), - (const char *)mac, networkName); + (const char *) mac, networkName); goto cleanup; } } diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fd8f4e4a94bd..a55e53b0db7d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1959,7 +1959,7 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, } VIR_FREE(tmp); - switch ((virNodeDevDevnodeType)val) { + switch ((virNodeDevDevnodeType) val) { case VIR_NODE_DEV_DEVNODE_DEV: def->devnode = (char*)xmlNodeGetContent(node); break; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index fd42d58c2cd8..57944de361d6 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -1817,7 +1817,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, prop = virXMLPropString(node, att[idx].name); VIR_WARNINGS_NO_CAST_ALIGN - item = (nwItemDesc *)((char *)nwf + att[idx].dataIdx); + item = (nwItemDesc *) ((char *) nwf + att[idx].dataIdx); VIR_WARNINGS_RESET flags = &item->flags; flags_set = match_flag; @@ -2740,7 +2740,7 @@ virNWFilterDefParseNode(xmlDocPtr xml, xmlXPathContextPtr ctxt = NULL; virNWFilterDefPtr def = NULL; - if (STRNEQ((const char *)root->name, "filter")) { + if (STRNEQ((const char *) root->name, "filter")) { virReportError(VIR_ERR_XML_ERROR, "%s", _("unknown root element for nw filter")); @@ -2990,7 +2990,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, while (att[i].name) { VIR_WARNINGS_NO_CAST_ALIGN - item = (nwItemDesc *)((char *)def + att[i].dataIdx); + item = (nwItemDesc *) ((char *) def + att[i].dataIdx); VIR_WARNINGS_RESET virNWFilterEntryItemFlags flags = item->flags; if ((flags & NWFILTER_ENTRY_ITEM_FLAG_EXISTS)) { diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 3a010491826a..04e4965bc79b 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -712,7 +712,7 @@ struct addToTableStruct { static int addToTable(void *payload, const void *name, void *data) { - struct addToTableStruct *atts = (struct addToTableStruct *)data; + struct addToTableStruct *atts = (struct addToTableStruct *) data; virNWFilterVarValuePtr val; if (atts->errOccurred) @@ -724,10 +724,10 @@ addToTable(void *payload, const void *name, void *data) return 0; } - if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0) { + if (virNWFilterHashTablePut(atts->target, (const char *) name, val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not put variable '%s' into hashmap"), - (const char *)name); + (const char *) name); atts->errOccurred = 1; virNWFilterVarValueFree(val); } @@ -896,7 +896,7 @@ virNWFilterFormatParamAttributes(virBufferPtr buf, for (j = 0; j < card; j++) virBufferAsprintf(buf, "<parameter name='%s' value='%s'/>\n", - (const char *)items[i].key, + (const char *) items[i].key, virNWFilterVarValueGetNthValue(value, j)); } diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 787c3d0feb54..d6198b002c95 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -231,7 +231,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, _("a redefined snapshot must have a name")); goto cleanup; } - if (virAsprintf(&def->name, "%lld", (long long)tv.tv_sec) < 0) + if (virAsprintf(&def->name, "%lld", (long long) tv.tv_sec) < 0) goto cleanup; } diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7f6c7f..c09c75e258f6 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -394,7 +394,7 @@ virNetworkObjSearchName(const void *payload, int want = 0; virObjectLock(obj); - if (STREQ(obj->def->name, (const char *)data)) + if (STREQ(obj->def->name, (const char *) data)) want = 1; virObjectUnlock(obj); return want; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 48ce3c814178..384d2240e7aa 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -664,7 +664,7 @@ virSecretObjDeleteData(virSecretObjPtr obj) { /* The configFile will already be removed, so secret won't be * loaded again if this fails */ - (void)unlink(obj->base64File); + (void) unlink(obj->base64File); } @@ -853,7 +853,7 @@ virSecretLoadValue(virSecretObjPtr obj) goto cleanup; } - if ((size_t)st.st_size != st.st_size) { + if ((size_t) st.st_size != st.st_size) { virReportError(VIR_ERR_INTERNAL_ERROR, _("'%s' file does not fit in memory"), obj->base64File); @@ -880,7 +880,7 @@ virSecretLoadValue(virSecretObjPtr obj) if (value == NULL) goto cleanup; - obj->value = (unsigned char *)value; + obj->value = (unsigned char *) value; value = NULL; obj->value_size = value_size; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 6c937f105ca9..4ae5e46be34e 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -466,7 +466,7 @@ virStoragePoolObjListSearchCb(const void *payload, { virStoragePoolObjPtr obj = (virStoragePoolObjPtr) payload; struct _virStoragePoolObjListSearchData *data = - (struct _virStoragePoolObjListSearchData *)opaque; + (struct _virStoragePoolObjListSearchData *) opaque; virObjectLock(obj); if (data->searcher(obj, data->opaque)) @@ -1818,7 +1818,7 @@ virStoragePoolObjSourceFindDuplicateCb(const void *payload, if (STREQ(obj->def->name, data->def->name)) return 0; - switch ((virStoragePoolType)obj->def->type) { + switch ((virStoragePoolType) obj->def->type) { case VIR_STORAGE_POOL_DIR: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_NETFS: -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/esx/esx_driver.c | 18 +++++------ src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 6 ++-- src/esx/esx_stream.c | 2 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 16 +++++----- src/esx/esx_vi_types.c | 48 +++++++++++++++--------------- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c682c800caaf..7bc867b9e8a2 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -168,7 +168,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) goto cleanup; } - tmp = (char *)STRSKIP(fileName, hostMount->mountInfo->path); + tmp = (char *) STRSKIP(fileName, hostMount->mountInfo->path); if (!tmp) continue; @@ -2268,8 +2268,8 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) querySpec->entity = virtualMachine->obj; querySpec->maxSample->value = 1; querySpec->metricId->counterId->value = priv->usedCpuTimeCounterId; - querySpec->metricId->instance = (char *)""; - querySpec->format = (char *)"normal"; + querySpec->metricId->instance = (char *) ""; + querySpec->format = (char *) "normal"; if (esxVI_QueryPerf(priv->host, querySpec, &perfEntityMetricBaseList) < 0) { @@ -2308,7 +2308,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) for (value = perfMetricIntSeries->value; value; value = value->_next) { - VIR_DEBUG("value %lld", (long long int)value->value); + VIR_DEBUG("value %lld", (long long int) value->value); } } } @@ -2757,7 +2757,7 @@ esxConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, } data.ctx = priv->primary; - data.datastorePathWithoutFileName = (char *)"[?] ?"; + data.datastorePathWithoutFileName = (char *) "[?] ?"; ctx.opaque = &data; ctx.parseFileName = esxParseVMXFileName; @@ -3416,9 +3416,9 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart) newPowerInfo->startOrder->value = -1; /* no specific start order */ newPowerInfo->startDelay->value = -1; /* use system default */ newPowerInfo->waitForHeartbeat = esxVI_AutoStartWaitHeartbeatSetting_SystemDefault; - newPowerInfo->startAction = autostart ? (char *)"powerOn" : (char *)"none"; + newPowerInfo->startAction = autostart ? (char *) "powerOn" : (char *) "none"; newPowerInfo->stopDelay->value = -1; /* use system default */ - newPowerInfo->stopAction = (char *)"none"; + newPowerInfo->stopAction = (char *) "none"; if (esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo, newPowerInfo) < 0) { @@ -3865,12 +3865,12 @@ esxDomainMigratePerform(virDomainPtr domain, resourcePool._next = NULL; resourcePool._type = esxVI_Type_ManagedObjectReference; - resourcePool.type = (char *)"ResourcePool"; + resourcePool.type = (char *) "ResourcePool"; resourcePool.value = path_resourcePool; hostSystem._next = NULL; hostSystem._type = esxVI_Type_ManagedObjectReference; - hostSystem.type = (char *)"HostSystem"; + hostSystem.type = (char *) "HostSystem"; hostSystem.value = path_hostSystem; /* Lookup VirtualMachine */ diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index e3b41164e7ba..00affaa27e93 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -205,7 +205,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) /* FIXME: Add support for IPv6, requires to use vSphere API 4.0 */ if (physicalNic->spec->ip) { - protocol.family = (char *)"ipv4"; + protocol.family = (char *) "ipv4"; if (physicalNic->spec->ip->dhcp == esxVI_Boolean_True) protocol.dhcp = 1; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index b19c06a4cbf8..e9a580002458 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -366,7 +366,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) } hostVirtualSwitchSpec->bridge = - (esxVI_HostVirtualSwitchBridge *)hostVirtualSwitchBondBridge; + (esxVI_HostVirtualSwitchBridge *) hostVirtualSwitchBondBridge; /* Lookup PhysicalNic list and match by name to get key */ if (esxVI_LookupPhysicalNicList(priv->primary, &physicalNicList) < 0) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index 940e5d1f0685..8c3a82b020dc 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -951,13 +951,13 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, * "A preallocated disk has all space allocated at creation time * and the space is zeroed on demand as the space is used." */ - virtualDiskSpec->diskType = (char *)"preallocated"; + virtualDiskSpec->diskType = (char *) "preallocated"; } else if (def->target.allocation == 0) { /* * "Space required for thin-provisioned virtual disk is allocated * and zeroed on demand as the space is used." */ - virtualDiskSpec->diskType = (char *)"thin"; + virtualDiskSpec->diskType = (char *) "thin"; } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unsupported capacity-to-allocation relation")); @@ -969,7 +969,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, * way to let the user specify it in the volume XML config. Therefore, * default to 'lsilogic' here. */ - virtualDiskSpec->adapterType = (char *)"lsilogic"; + virtualDiskSpec->adapterType = (char *) "lsilogic"; virtualDiskSpec->capacityKb->value = VIR_DIV_UP(def->target.capacity, 1024); /* Scale from byte to kilobyte */ diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index b820b38ee24b..3bc2e36ee964 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -219,7 +219,7 @@ esxStreamSend(virStreamPtr stream, const char *data, size_t nbytes) virMutexLock(&priv->curl->lock); - priv->buffer = (char *)data; + priv->buffer = (char *) data; priv->buffer_size = nbytes; priv->buffer_used = nbytes; diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 2dd9f7856988..5ad24fb1b76d 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -250,7 +250,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName, preliminaryDirectoryAndFileName = strtok_r(NULL, "", &saveptr); if (!preliminaryDirectoryAndFileName) { - preliminaryDirectoryAndFileName = (char *)""; + preliminaryDirectoryAndFileName = (char *) ""; } else { preliminaryDirectoryAndFileName += strspn(preliminaryDirectoryAndFileName, " "); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 43ff7ea0488d..d922794fdf6b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -42,7 +42,7 @@ VIR_LOG_INIT("esx.esx_vi"); #define ESX_VI__SOAP__RESPONSE_XPATH(_type) \ - ((char *)"/soapenv:Envelope/soapenv:Body/" \ + ((char *) "/soapenv:Envelope/soapenv:Body/" \ "vim:"_type"Response/vim:returnval") @@ -121,7 +121,7 @@ ESX_VI__TEMPLATE__FREE(CURL, static size_t esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *userdata) { - const char *content = *(const char **)userdata; + const char *content = *(const char **) userdata; size_t available = 0; size_t requested = size * nmemb; @@ -138,7 +138,7 @@ esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *userdata) memcpy(data, content, requested); - *(const char **)userdata = content + requested; + *(const char **) userdata = content + requested; return requested; } @@ -483,7 +483,7 @@ esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, size_t i; esxVI_SharedCURL *shared = userptr; - switch ((int)data) { + switch ((int) data) { case CURL_LOCK_DATA_SHARE: i = 0; break; @@ -497,7 +497,7 @@ esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, break; default: - VIR_ERROR(_("Trying to lock unknown SharedCURL lock %d"), (int)data); + VIR_ERROR(_("Trying to lock unknown SharedCURL lock %d"), (int) data); return; } @@ -511,7 +511,7 @@ esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, size_t i; esxVI_SharedCURL *shared = userptr; - switch ((int)data) { + switch ((int) data) { case CURL_LOCK_DATA_SHARE: i = 0; break; @@ -525,7 +525,7 @@ esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, break; default: - VIR_ERROR(_("Trying to unlock unknown SharedCURL lock %d"), (int)data); + VIR_ERROR(_("Trying to unlock unknown SharedCURL lock %d"), (int) data); return; } @@ -2238,7 +2238,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) goto cleanup; - propertySpec->type = (char *)type; + propertySpec->type = (char *) type; propertySpec->pathSet = propertyNameList; if (esxVI_PropertyFilterSpec_Alloc(&propertyFilterSpec) < 0 || diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index ec7fda986570..5ad0d469d073 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -131,7 +131,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); int \ esxVI_##_type##_AppendToList(esxVI_##_type **list, esxVI_##_type *item) \ { \ - return esxVI_List_Append((esxVI_List **)list, (esxVI_List *)item); \ + return esxVI_List_Append((esxVI_List **) list, (esxVI_List *) item); \ } @@ -142,7 +142,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type *srcList) \ { \ return esxVI_List_DeepCopy \ - ((esxVI_List **)destList, (esxVI_List *)srcList, \ + ((esxVI_List **) destList, (esxVI_List *) srcList, \ (esxVI_List_DeepCopyFunc)esxVI_##_type##_DeepCopy, \ (esxVI_List_FreeFunc)esxVI_##_type##_Free); \ } @@ -155,7 +155,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type **list) \ { \ return esxVI_List_CastFromAnyType \ - (anyType, (esxVI_List **)list, \ + (anyType, (esxVI_List **) list, \ (esxVI_List_CastFromAnyTypeFunc) \ esxVI_##_type##_CastFromAnyType, \ (esxVI_List_FreeFunc)esxVI_##_type##_Free); \ @@ -168,7 +168,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type##_SerializeList(esxVI_##_type *list, const char *element, \ virBufferPtr output) \ { \ - return esxVI_List_Serialize((esxVI_List *)list, element, output, \ + return esxVI_List_Serialize((esxVI_List *) list, element, output, \ (esxVI_List_SerializeFunc) \ esxVI_##_type##_Serialize); \ } @@ -180,7 +180,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type##_DeserializeList(xmlNodePtr node, esxVI_##_type **list) \ { \ return esxVI_List_Deserialize \ - (node, (esxVI_List **)list, \ + (node, (esxVI_List **) list, \ (esxVI_List_DeserializeFunc)esxVI_##_type##_Deserialize, \ (esxVI_List_FreeFunc)esxVI_##_type##_Free); \ } @@ -352,7 +352,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); return -1; \ } \ \ - string = (char *)xmlNodeListGetString(node->doc, node->children, 1); \ + string = (char *) xmlNodeListGetString(node->doc, node->children, 1); \ \ if (!string) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ @@ -512,7 +512,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type *value) \ { \ return esxVI_Enumeration_CastFromAnyType \ - (&_esxVI_##_type##_Enumeration, anyType, (int *)value); \ + (&_esxVI_##_type##_Enumeration, anyType, (int *) value); \ } @@ -533,7 +533,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type##_Deserialize(xmlNodePtr node, esxVI_##_type *value) \ { \ return esxVI_Enumeration_Deserialize(&_esxVI_##_type##_Enumeration, \ - node, (int *)value); \ + node, (int *) value); \ } @@ -544,7 +544,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); #define ESX_VI__TEMPLATE__DISPATCH(_actual_type, _actual_type_name, __type, \ _dispatch, _error_return) \ - switch ((int)_actual_type) { \ + switch ((int) _actual_type) { \ _dispatch \ \ case esxVI_Type_##__type: \ @@ -604,7 +604,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); #define ESX_VI__TEMPLATE__DYNAMIC_CAST__ACCEPT(__type) \ - if (((esxVI_Object *)item)->_type == esxVI_Type_##__type) { \ + if (((esxVI_Object *) item)->_type == esxVI_Type_##__type) { \ return item; \ } @@ -690,7 +690,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); return -1; \ } \ \ - switch ((int)type) { \ + switch ((int) type) { \ _dispatch \ \ case esxVI_Type_##__type: \ @@ -719,7 +719,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType, return -1; } - type = (char *)xmlGetNsProp + type = (char *) xmlGetNsProp (node, BAD_CAST "type", BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); @@ -967,7 +967,7 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src) goto failure; } - switch ((int)src->type) { + switch ((int) src->type) { case esxVI_Type_Boolean: (*dest)->boolean = src->boolean; break; @@ -1026,7 +1026,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) } (*anyType)->other = - (char *)xmlGetNsProp + (char *) xmlGetNsProp (node, BAD_CAST "type", BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); @@ -1046,7 +1046,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) } (*anyType)->value = - (char *)xmlNodeListGetString(node->doc, node->children, 1); + (char *) xmlNodeListGetString(node->doc, node->children, 1); if (!(*anyType)->value && VIR_STRDUP((*anyType)->value, "") < 0) goto failure; @@ -1071,7 +1071,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) (*anyType)->_name = number; \ } while (0) - switch ((int)(*anyType)->type) { + switch ((int) (*anyType)->type) { case esxVI_Type_Boolean: if (STREQ((*anyType)->value, "true")) { (*anyType)->boolean = esxVI_Boolean_True; @@ -1299,7 +1299,7 @@ esxVI_String_DeserializeValue(xmlNodePtr node, char **value) return -1; } - *value = (char *)xmlNodeListGetString(node->doc, node->children, 1); + *value = (char *) xmlNodeListGetString(node->doc, node->children, 1); return *value ? 0 : VIR_STRDUP(*value, ""); } @@ -1339,7 +1339,7 @@ ESX_VI__TEMPLATE__LIST__DEEP_COPY(Byte) /* esxVI_Byte_Serialize */ ESX_VI__TEMPLATE__SERIALIZE(Byte, { - virBufferAsprintf(output, "%d", (int)item->value); + virBufferAsprintf(output, "%d", (int) item->value); }) /* esxVI_Byte_SerializeList */ @@ -1383,7 +1383,7 @@ ESX_VI__TEMPLATE__CAST_FROM_ANY_TYPE(Int) /* esxVI_Int_Serialize */ ESX_VI__TEMPLATE__SERIALIZE(Int, { - virBufferAsprintf(output, "%d", (int)item->value); + virBufferAsprintf(output, "%d", (int) item->value); }) /* esxVI_Int_SerializeList */ @@ -1427,7 +1427,7 @@ ESX_VI__TEMPLATE__CAST_FROM_ANY_TYPE(Long) /* esxVI_Long_Serialize */ ESX_VI__TEMPLATE__SERIALIZE(Long, { - virBufferAsprintf(output, "%lld", (long long int)item->value); + virBufferAsprintf(output, "%lld", (long long int) item->value); }) /* esxVI_Long_SerializeList */ @@ -1481,7 +1481,7 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime) return -1; (*dateTime)->value = - (char *)xmlNodeListGetString(node->doc, node->children, 1); + (char *) xmlNodeListGetString(node->doc, node->children, 1); if (!(*dateTime)->value) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1653,7 +1653,7 @@ esxVI_MethodFault_Deserialize(xmlNodePtr node, esxVI_MethodFault **methodFault) return -1; (*methodFault)->_actualType = - (char *)xmlGetNsProp(node, BAD_CAST "type", + (char *) xmlGetNsProp(node, BAD_CAST "type", BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); if (!(*methodFault)->_actualType) { @@ -1747,7 +1747,7 @@ esxVI_ManagedObjectReference_Deserialize return -1; (*managedObjectReference)->type = - (char *)xmlGetNoNsProp(node, BAD_CAST "type"); + (char *) xmlGetNoNsProp(node, BAD_CAST "type"); if (!(*managedObjectReference)->type) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1824,7 +1824,7 @@ ESX_VI__TEMPLATE__LIST__CAST_FROM_ANY_TYPE(Event) ESX_VI__TEMPLATE__DESERIALIZE_EXTRA(Event, /* nothing */, { (*ptrptr)->_actualType = - (char *)xmlGetNsProp(node, BAD_CAST "type", + (char *) xmlGetNsProp(node, BAD_CAST "type", BAD_CAST "http://www.w3.org/2001/XMLSchema-instance"); if (!(*ptrptr)->_actualType) { -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/hyperv/hyperv_driver.c | 60 +++++++++++++++++++------------------- src/hyperv/hyperv_wmi.c | 12 ++++---- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index d02c0ac3734e..e3ea0a0eb559 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -244,7 +244,7 @@ hypervConnectGetHostname(virConnectPtr conn) ignore_value(VIR_STRDUP(hostname, computerSystem->data.common->DNSHostName)); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return hostname; } @@ -339,8 +339,8 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) result = 0; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); - hypervFreeObject(priv, (hypervObject *)processorList); + hypervFreeObject(priv, (hypervObject *) computerSystem); + hypervFreeObject(priv, (hypervObject *) processorList); return result; } @@ -382,7 +382,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids) success = true; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystemList); + hypervFreeObject(priv, (hypervObject *) computerSystemList); return success ? count : -1; } @@ -418,7 +418,7 @@ hypervConnectNumOfDomains(virConnectPtr conn) success = true; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystemList); + hypervFreeObject(priv, (hypervObject *) computerSystemList); return success ? count : -1; } @@ -449,7 +449,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return domain; } @@ -484,7 +484,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return domain; } @@ -516,7 +516,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name) hypervMsvmComputerSystemToDomain(conn, computerSystem, &domain); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return domain; } @@ -544,7 +544,7 @@ hypervDomainSuspend(virDomainPtr domain) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_PAUSED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -572,7 +572,7 @@ hypervDomainResume(virDomainPtr domain) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -603,7 +603,7 @@ hypervDomainDestroyFlags(virDomainPtr domain, unsigned int flags) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -724,10 +724,10 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) result = 0; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); - hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); - hypervFreeObject(priv, (hypervObject *)processorSettingData); - hypervFreeObject(priv, (hypervObject *)memorySettingData); + hypervFreeObject(priv, (hypervObject *) computerSystem); + hypervFreeObject(priv, (hypervObject *) virtualSystemSettingData); + hypervFreeObject(priv, (hypervObject *) processorSettingData); + hypervFreeObject(priv, (hypervObject *) memorySettingData); return result; } @@ -755,7 +755,7 @@ hypervDomainGetState(virDomainPtr domain, int *state, int *reason, result = 0; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -876,7 +876,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) goto cleanup; } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 && virtualSystemSettingData->data.v2->Notes.data != NULL) { - char **notes = (char **)virtualSystemSettingData->data.v2->Notes.data; + char **notes = (char **) virtualSystemSettingData->data.v2->Notes.data; virBuffer buf = VIR_BUFFER_INITIALIZER; size_t i = 0; @@ -919,10 +919,10 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) cleanup: virDomainDefFree(def); - hypervFreeObject(priv, (hypervObject *)computerSystem); - hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); - hypervFreeObject(priv, (hypervObject *)processorSettingData); - hypervFreeObject(priv, (hypervObject *)memorySettingData); + hypervFreeObject(priv, (hypervObject *) computerSystem); + hypervFreeObject(priv, (hypervObject *) virtualSystemSettingData); + hypervFreeObject(priv, (hypervObject *) processorSettingData); + hypervFreeObject(priv, (hypervObject *) memorySettingData); return xml; } @@ -975,7 +975,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn count = -1; } - hypervFreeObject(priv, (hypervObject *)computerSystemList); + hypervFreeObject(priv, (hypervObject *) computerSystemList); return count; } @@ -1011,7 +1011,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn) success = true; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystemList); + hypervFreeObject(priv, (hypervObject *) computerSystemList); return success ? count : -1; } @@ -1040,7 +1040,7 @@ hypervDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_ENABLED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -1113,7 +1113,7 @@ hypervDomainIsActive(virDomainPtr domain) result = hypervIsMsvmComputerSystemActive(computerSystem, NULL) ? 1 : 0; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -1161,7 +1161,7 @@ hypervDomainManagedSave(virDomainPtr domain, unsigned int flags) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_SUSPENDED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -1184,7 +1184,7 @@ hypervDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) MSVM_COMPUTERSYSTEM_ENABLEDSTATE_SUSPENDED ? 1 : 0; cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -1214,7 +1214,7 @@ hypervDomainManagedSaveRemove(virDomainPtr domain, unsigned int flags) (domain, MSVM_COMPUTERSYSTEM_REQUESTEDSTATE_DISABLED); cleanup: - hypervFreeObject(priv, (hypervObject *)computerSystem); + hypervFreeObject(priv, (hypervObject *) computerSystem); return result; } @@ -1344,7 +1344,7 @@ hypervConnectListAllDomains(virConnectPtr conn, VIR_FREE(doms); } - hypervFreeObject(priv, (hypervObject *)computerSystemList); + hypervFreeObject(priv, (hypervObject *) computerSystemList); return ret; } @@ -1367,7 +1367,7 @@ hypervDomainSendKey(virDomainPtr domain, unsigned int codeset, Msvm_Keyboard *keyboard = NULL; virBuffer query = VIR_BUFFER_INITIALIZER; hypervInvokeParamsListPtr params = NULL; - char keycodeStr[INT_BUFSIZE_BOUND(int)]; + char keycodeStr[INT_BUFSIZE_BOUND(int) ]; virCheckFlags(0, -1); diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 5e2b3d7edf5b..37389d0661c0 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -733,7 +733,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, ws_xml_dump_memory_node_tree(xmlNodeInstance, &cdataContent, &len); if (!(xmlNodeCdata = xmlNewCDataBlock((xmlDocPtr) xmlDocCdata, - (xmlChar *)cdataContent, len))) { + (xmlChar *) cdataContent, len))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not create CDATA element")); goto cleanup; @@ -745,7 +745,7 @@ hypervSerializeEmbeddedParam(hypervParamPtr p, const char *resourceUri, * FIXME: there is no openwsman wrapper for xmlNewCDataBlock, so instead * silence clang alignment warnings by casting to a void pointer first */ - if (!(xmlAddChild((xmlNodePtr)(void *)xmlNodeParam, xmlNodeCdata))) { + if (!(xmlAddChild((xmlNodePtr)(void *) xmlNodeParam, xmlNodeCdata))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not add CDATA to doc root")); goto cleanup; @@ -1368,7 +1368,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, goto cleanup; /* Check return value */ - returnValue = ws_xml_get_xpath_value(response, (char *)"/s:Envelope/s:Body/p:RequestStateChange_OUTPUT/p:ReturnValue"); + returnValue = ws_xml_get_xpath_value(response, (char *) "/s:Envelope/s:Body/p:RequestStateChange_OUTPUT/p:ReturnValue"); if (returnValue == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1385,7 +1385,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, if (returnCode == CIM_RETURNCODE_TRANSITION_STARTED) { /* Get concrete job object */ - instanceID = ws_xml_get_xpath_value(response, (char *)"/s:Envelope/s:Body/p:RequestStateChange_OUTPUT/p:Job/a:ReferenceParameters/w:SelectorSet/w:Selector[@Name='InstanceID']"); + instanceID = ws_xml_get_xpath_value(response, (char *) "/s:Envelope/s:Body/p:RequestStateChange_OUTPUT/p:Job/a:ReferenceParameters/w:SelectorSet/w:Selector[@Name='InstanceID']"); if (instanceID == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1415,7 +1415,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, case MSVM_CONCRETEJOB_JOBSTATE_STARTING: case MSVM_CONCRETEJOB_JOBSTATE_RUNNING: case MSVM_CONCRETEJOB_JOBSTATE_SHUTTING_DOWN: - hypervFreeObject(priv, (hypervObject *)concreteJob); + hypervFreeObject(priv, (hypervObject *) concreteJob); concreteJob = NULL; usleep(100 * 1000); @@ -1460,7 +1460,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, VIR_FREE(properties); VIR_FREE(returnValue); VIR_FREE(instanceID); - hypervFreeObject(priv, (hypervObject *)concreteJob); + hypervFreeObject(priv, (hypervObject *) concreteJob); return result; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 6 +++--- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_logger.c | 2 +- src/libxl/libxl_migration.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 452a77f3b8c4..2a9b4e3beae0 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1692,7 +1692,7 @@ libxlDriverConfigNew(void) goto error; } - if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (xentoollog_logger *)cfg->logger)) { + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (xentoollog_logger *) cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); goto error; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d4859d670793..19d91f51ee5e 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -593,7 +593,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) goto error; shutdown_info->driver = driver; - shutdown_info->event = (libxl_event *)event; + shutdown_info->event = (libxl_event *) event; if (virThreadCreate(&thread, false, libxlDomainShutdownThread, shutdown_info) < 0) { /* @@ -611,7 +611,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) error: cfg = libxlDriverConfigGet(driver); /* Cast away any const */ - libxl_event_free(cfg->ctx, (libxl_event *)event); + libxl_event_free(cfg->ctx, (libxl_event *) event); virObjectUnref(cfg); VIR_FREE(shutdown_info); } @@ -891,7 +891,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) if (!cpumask) continue; - if (virBitmapToData(cpumask, &map.map, (int *)&map.size) < 0) + if (virBitmapToData(cpumask, &map.map, (int *) &map.size) < 0) goto cleanup; if (libxl_set_vcpuaffinity(cfg->ctx, vm->def->id, i, &map) != 0) { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 55a93a489beb..5f838945c56c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4452,7 +4452,7 @@ libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) if (nparams) *nparams = 0; - switch ((int)sched_id) { + switch ((int) sched_id) { case LIBXL_SCHEDULER_SEDF: name = "sedf"; break; diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 40404826fc3b..e3fb51af0931 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -66,7 +66,7 @@ libvirt_vmessage(xentoollog_logger *logger_in, const char *format, va_list args) { - xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt *)logger_in; + xentoollog_logger_libvirt *lg = (xentoollog_logger_libvirt *) logger_in; FILE *logFile = lg->defaultLogFile; char timestamp[VIR_TIME_STRING_BUFLEN]; char *message = NULL; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index d7b494b39293..d4ae1946eb0c 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -836,7 +836,7 @@ struct _libxlTunnelMigrationThread { */ static void libxlTunnel3MigrationSrcFunc(void *arg) { - libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *)arg; + libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *) arg; char *buffer = NULL; struct pollfd fds[1]; int timeout = -1; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/locking/lock_daemon.c | 20 ++++++++++---------- src/locking/lock_daemon_dispatch.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 7afff42246eb..49d3bcea2f8f 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -692,8 +692,8 @@ virLockDaemonClientFree(void *opaque) VIR_DEBUG("priv=%p client=%lld owner=%lld", priv, - (unsigned long long)priv->clientPid, - (unsigned long long)priv->ownerPid); + (unsigned long long) priv->clientPid, + (unsigned long long) priv->ownerPid); /* If client & owner match, this is the lock holder */ if (priv->clientPid == priv->ownerPid) { @@ -730,7 +730,7 @@ virLockDaemonClientFree(void *opaque) break; VIR_WARN("Failed to kill off pid %lld", - (unsigned long long)priv->clientPid); + (unsigned long long) priv->clientPid); } usleep(200 * 1000); } @@ -769,21 +769,21 @@ virLockDaemonClientNew(virNetServerClientPtr client, goto error; VIR_DEBUG("New client pid %llu uid %llu", - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); if (!privileged) { if (geteuid() != clientuid) { virReportRestrictedError(_("Disallowing client %llu with uid %llu"), - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); goto error; } } else { if (clientuid != 0) { virReportRestrictedError(_("Disallowing client %llu with uid %llu"), - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); goto error; } } @@ -942,7 +942,7 @@ virLockDaemonGetExecRestartMagic(void) { char *ret; - ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid())); + ignore_value(virAsprintf(&ret, "%lld", (long long int) getpid())); return ret; } diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c index 1b479db55dd4..6d117a2e1a04 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -285,7 +285,7 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr server ATTRIBUTE_UNUSED, priv->ownerId = args->owner.id; priv->ownerPid = args->owner.pid; VIR_DEBUG("ownerName=%s ownerId=%d ownerPid=%lld", - priv->ownerName, priv->ownerId, (unsigned long long)priv->ownerPid); + priv->ownerName, priv->ownerId, (unsigned long long) priv->ownerPid); rv = 0; diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 345cf0a77257..fa8b25e04208 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -1007,7 +1007,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, SANLK_NAME_LEN - 1, SANLK_NAME_LEN)); if (state && STRNEQ(state, "")) { - if ((rv = sanlock_state_to_args((char *)state, + if ((rv = sanlock_state_to_args((char *) state, &res_count, &res_args)) < 0) { char *err = NULL; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/logging/log_daemon.c | 16 ++++++++-------- src/logging/log_daemon_dispatch.c | 6 +++--- src/logging/log_manager.c | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 35d7ebb6d2bb..3d34f6533323 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -595,7 +595,7 @@ virLogDaemonClientFree(void *opaque) VIR_DEBUG("priv=%p client=%lld", priv, - (unsigned long long)priv->clientPid); + (unsigned long long) priv->clientPid); virMutexDestroy(&priv->lock); VIR_FREE(priv); @@ -629,21 +629,21 @@ virLogDaemonClientNew(virNetServerClientPtr client, goto error; VIR_DEBUG("New client pid %llu uid %llu", - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); if (!privileged) { if (geteuid() != clientuid) { virReportRestrictedError(_("Disallowing client %llu with uid %llu"), - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); goto error; } } else { if (clientuid != 0) { virReportRestrictedError(_("Disallowing client %llu with uid %llu"), - (unsigned long long)priv->clientPid, - (unsigned long long)clientuid); + (unsigned long long) priv->clientPid, + (unsigned long long) clientuid); goto error; } } @@ -728,7 +728,7 @@ virLogDaemonGetExecRestartMagic(void) { char *ret; - ignore_value(virAsprintf(&ret, "%lld", (long long int)getpid())); + ignore_value(virAsprintf(&ret, "%lld", (long long int) getpid())); return ret; } diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dispatch.c index ec691127ab70..0ef9e8bffcda 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -54,7 +54,7 @@ virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTRIBUTE_ if ((fd = virLogHandlerDomainOpenLogFile(virLogDaemonGetHandler(logDaemon), args->driver, - (unsigned char *)args->dom.uuid, + (unsigned char *) args->dom.uuid, args->dom.name, args->path, trunc, @@ -121,7 +121,7 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTRIBUTE_ if (args->maxlen > VIR_LOG_MANAGER_PROTOCOL_STRING_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Requested data len %llu is larger than maximum %d"), - (unsigned long long)args->maxlen, + (unsigned long long) args->maxlen, VIR_LOG_MANAGER_PROTOCOL_STRING_MAX); goto cleanup; } @@ -157,7 +157,7 @@ virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server ATTRIBUT if ((rv = virLogHandlerDomainAppendLogFile(virLogDaemonGetHandler(logDaemon), args->driver, - (unsigned char *)args->dom.uuid, + (unsigned char *) args->dom.uuid, args->dom.name, args->path, args->message, diff --git a/src/logging/log_manager.c b/src/logging/log_manager.c index e84abdbef927..067a321e2d03 100644 --- a/src/logging/log_manager.c +++ b/src/logging/log_manager.c @@ -170,10 +170,10 @@ virLogManagerDomainOpenLogFile(virLogManagerPtr mgr, memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); - args.driver = (char *)driver; + args.driver = (char *) driver; memcpy(args.dom.uuid, domuuid, VIR_UUID_BUFLEN); - args.dom.name = (char *)domname; - args.path = (char *)path; + args.dom.name = (char *) domname; + args.path = (char *) path; args.flags = flags; if (virNetClientProgramCall(mgr->program, @@ -227,7 +227,7 @@ virLogManagerDomainGetLogFilePosition(virLogManagerPtr mgr, memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); - args.path = (char *)path; + args.path = (char *) path; args.flags = flags; if (virNetClientProgramCall(mgr->program, @@ -263,7 +263,7 @@ virLogManagerDomainReadLogFile(virLogManagerPtr mgr, memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); - args.path = (char *)path; + args.path = (char *) path; args.flags = flags; args.pos.inode = inode; args.pos.offset = offset; @@ -298,11 +298,11 @@ virLogManagerDomainAppendMessage(virLogManagerPtr mgr, memset(&args, 0, sizeof(args)); - args.driver = (char *)driver; + args.driver = (char *) driver; memcpy(args.dom.uuid, domuuid, VIR_UUID_BUFLEN); - args.dom.name = (char *)domname; - args.path = (char *)path; - args.message = (char *)message; + args.dom.name = (char *) domname; + args.path = (char *) path; + args.message = (char *) message; args.flags = flags; if (virNetClientProgramCall(mgr->program, -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/lxc/lxc_container.c | 4 ++-- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_fuse.c | 2 +- src/lxc/lxc_process.c | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 665b93a0accf..8cd177556af1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -232,7 +232,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, cmd = virCommandNew(vmDef->os.init); if (vmDef->os.initargv && vmDef->os.initargv[0]) - virCommandAddArgSet(cmd, (const char **)vmDef->os.initargv); + virCommandAddArgSet(cmd, (const char **) vmDef->os.initargv); virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); @@ -2104,7 +2104,7 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def ATTRIBUTE_UNUSED, static int lxcAttachNS(int *ns_fd) { if (ns_fd && - virProcessSetNamespaces((size_t)VIR_LXC_DOMAIN_NAMESPACE_LAST, + virProcessSetNamespaces((size_t) VIR_LXC_DOMAIN_NAMESPACE_LAST, ns_fd) < 0) return -1; return 0; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 507bffda09ba..fc16f427fc6b 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1231,7 +1231,7 @@ static void virLXCControllerConsoleIO(int watch, int fd, int events, void *opaqu if (done > 0) { *len += done; } else { - VIR_DEBUG("Read fd %d done %d errno %d", fd, (int)done, errno); + VIR_DEBUG("Read fd %d done %d errno %d", fd, (int) done, errno); } } @@ -1260,7 +1260,7 @@ static void virLXCControllerConsoleIO(int watch, int fd, int events, void *opaqu memmove(buf, buf + done, (*len - done)); *len -= done; } else { - VIR_DEBUG("Write fd %d done %d errno %d", fd, (int)done, errno); + VIR_DEBUG("Write fd %d done %d errno %d", fd, (int) done, errno); } } diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 60d41243a99e..b8f7d17275de 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -356,7 +356,7 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def) int lxcStartFuse(virLXCFusePtr fuse) { if (virThreadCreate(&fuse->thread, false, lxcFuseRun, - (void *)fuse) < 0) { + (void *) fuse) < 0) { lxcFuseDestroy(fuse); return -1; } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index e911d88b5636..5be8732ef422 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -168,7 +168,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); VIR_DEBUG("Cleanup VM name=%s pid=%d reason=%d", - vm->def->name, (int)vm->pid, (int)reason); + vm->def->name, (int) vm->pid, (int) reason); /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { @@ -403,7 +403,7 @@ static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type, cons } if (virAsprintf(&path, "/proc/%lld/ns/%s", - (long long int)priv->initpid, + (long long int) priv->initpid, nsInfoLocal[ns_type]) < 0) goto cleanup; @@ -833,7 +833,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, virLXCDomainObjPrivatePtr priv; VIR_DEBUG("Stopping VM name=%s pid=%d reason=%d", - vm->def->name, (int)vm->pid, (int)reason); + vm->def->name, (int) vm->pid, (int) reason); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); return 0; @@ -890,7 +890,7 @@ int virLXCProcessStop(virLXCDriverPtr driver, * libvirt_lxc process */ if (virProcessKillPainfully(vm->pid, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Processes %d refused to die"), (int)vm->pid); + _("Processes %d refused to die"), (int) vm->pid); return -1; } } @@ -1115,7 +1115,7 @@ virLXCProcessReadLogOutput(virDomainObjPtr vm, if (lseek(fd, pos, SEEK_SET) < 0) { virReportSystemError(errno, _("Unable to seek log file %s to %llu"), - logfile, (unsigned long long)pos); + logfile, (unsigned long long) pos); VIR_FORCE_CLOSE(fd); return -1; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/network/bridge_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 2e9191f75d53..c5ed34f32a81 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -417,7 +417,7 @@ networkBridgeDummyNicName(const char *brname) */ ignore_value(virAsprintf(&nicname, "%.*s%s%s", /* space for last 3 chars + "-nic" + NULL */ - (int)(IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), + (int) (IFNAMSIZ - (3 + sizeof(dummyNicSuffix))), brname, brname + strlen(brname) - 3, dummyNicSuffix)); } else { @@ -1250,8 +1250,8 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, "upgrade dnsmasq, or use a private/local " "subnet range for this network " "(as described in RFC1918/RFC3484/RFC4193)."), - ipaddr, (int)version / 1000000, - (int)(version % 1000000) / 1000); + ipaddr, (int) version / 1000000, + (int) (version % 1000000) / 1000); VIR_FREE(ipaddr); goto cleanup; } @@ -1367,8 +1367,8 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, "IPv6 dhcp range or dhcp host " "specification. Version %d.%d or later " "is required."), - (int)version / 1000000, - (int)(version % 1000000) / 1000, + (int) version / 1000000, + (int) (version % 1000000) / 1000, DNSMASQ_DHCPv6_MAJOR_REQD, DNSMASQ_DHCPv6_MINOR_REQD); goto cleanup; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/node_device/node_device_hal.c | 106 +++++++++++++++--------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 2101101bc691..7440feafe090 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -49,7 +49,7 @@ VIR_LOG_INIT("node_device.node_device_hal"); * Host device enumeration (HAL implementation) */ -#define DRV_STATE_HAL_CTX(ds) ((LibHalContext *)((ds)->privateData)) +#define DRV_STATE_HAL_CTX(ds) ((LibHalContext *) ((ds)->privateData)) static const char * @@ -157,12 +157,12 @@ gather_pci_cap(LibHalContext *ctx, const char *udi, VIR_FREE(sysfs_path); } - (void)get_int_prop(ctx, udi, "pci.vendor_id", (int *)&d->pci_dev.vendor); + (void) get_int_prop(ctx, udi, "pci.vendor_id", (int *) &d->pci_dev.vendor); if (get_str_prop(ctx, udi, "pci.vendor", &d->pci_dev.vendor_name) != 0) - (void)get_str_prop(ctx, udi, "info.vendor", &d->pci_dev.vendor_name); - (void)get_int_prop(ctx, udi, "pci.product_id", (int *)&d->pci_dev.product); + (void) get_str_prop(ctx, udi, "info.vendor", &d->pci_dev.vendor_name); + (void) get_int_prop(ctx, udi, "pci.product_id", (int *) &d->pci_dev.product); if (get_str_prop(ctx, udi, "pci.product", &d->pci_dev.product_name) != 0) - (void)get_str_prop(ctx, udi, "info.product", &d->pci_dev.product_name); + (void) get_str_prop(ctx, udi, "info.product", &d->pci_dev.product_name); return 0; } @@ -172,15 +172,15 @@ static int gather_usb_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { - (void)get_int_prop(ctx, udi, "usb.interface.number", - (int *)&d->usb_if.number); - (void)get_int_prop(ctx, udi, "usb.interface.class", - (int *)&d->usb_if._class); - (void)get_int_prop(ctx, udi, "usb.interface.subclass", - (int *)&d->usb_if.subclass); - (void)get_int_prop(ctx, udi, "usb.interface.protocol", - (int *)&d->usb_if.protocol); - (void)get_str_prop(ctx, udi, "usb.interface.description", + (void) get_int_prop(ctx, udi, "usb.interface.number", + (int *) &d->usb_if.number); + (void) get_int_prop(ctx, udi, "usb.interface.class", + (int *) &d->usb_if._class); + (void) get_int_prop(ctx, udi, "usb.interface.subclass", + (int *) &d->usb_if.subclass); + (void) get_int_prop(ctx, udi, "usb.interface.protocol", + (int *) &d->usb_if.protocol); + (void) get_str_prop(ctx, udi, "usb.interface.description", &d->usb_if.description); return 0; } @@ -190,20 +190,20 @@ static int gather_usb_device_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { - (void)get_int_prop(ctx, udi, "usb_device.bus_number", - (int *)&d->usb_dev.bus); - (void)get_int_prop(ctx, udi, "usb_device.linux.device_number", - (int *)&d->usb_dev.device); - (void)get_int_prop(ctx, udi, "usb_device.vendor_id", - (int *)&d->usb_dev.vendor); + (void) get_int_prop(ctx, udi, "usb_device.bus_number", + (int *) &d->usb_dev.bus); + (void) get_int_prop(ctx, udi, "usb_device.linux.device_number", + (int *) &d->usb_dev.device); + (void) get_int_prop(ctx, udi, "usb_device.vendor_id", + (int *) &d->usb_dev.vendor); if (get_str_prop(ctx, udi, "usb_device.vendor", &d->usb_dev.vendor_name) != 0) - (void)get_str_prop(ctx, udi, "info.vendor", &d->usb_dev.vendor_name); - (void)get_int_prop(ctx, udi, "usb_device.product_id", - (int *)&d->usb_dev.product); + (void) get_str_prop(ctx, udi, "info.vendor", &d->usb_dev.vendor_name); + (void) get_int_prop(ctx, udi, "usb_device.product_id", + (int *) &d->usb_dev.product); if (get_str_prop(ctx, udi, "usb_device.product", &d->usb_dev.product_name) != 0) - (void)get_str_prop(ctx, udi, "info.product", &d->usb_dev.product_name); + (void) get_str_prop(ctx, udi, "info.product", &d->usb_dev.product_name); return 0; } @@ -213,8 +213,8 @@ gather_net_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { unsigned long long dummy; - (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname); - (void)get_str_prop(ctx, udi, "net.address", &d->net.address); + (void) get_str_prop(ctx, udi, "net.interface", &d->net.ifname); + (void) get_str_prop(ctx, udi, "net.address", &d->net.address); if (get_uint64_prop(ctx, udi, "net.80203.mac_address", &dummy) == 0) d->net.subtype = VIR_NODE_DEV_CAP_NET_80203; @@ -234,7 +234,7 @@ gather_scsi_host_cap(LibHalContext *ctx, const char *udi, { int retval = 0; - (void)get_int_prop(ctx, udi, "scsi_host.host", (int *)&d->scsi_host.host); + (void) get_int_prop(ctx, udi, "scsi_host.host", (int *) &d->scsi_host.host); retval = virNodeDeviceGetSCSIHostCaps(&d->scsi_host); @@ -250,11 +250,11 @@ static int gather_scsi_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { - (void)get_int_prop(ctx, udi, "scsi.host", (int *)&d->scsi.host); - (void)get_int_prop(ctx, udi, "scsi.bus", (int *)&d->scsi.bus); - (void)get_int_prop(ctx, udi, "scsi.target", (int *)&d->scsi.target); - (void)get_int_prop(ctx, udi, "scsi.lun", (int *)&d->scsi.lun); - (void)get_str_prop(ctx, udi, "scsi.type", &d->scsi.type); + (void) get_int_prop(ctx, udi, "scsi.host", (int *) &d->scsi.host); + (void) get_int_prop(ctx, udi, "scsi.bus", (int *) &d->scsi.bus); + (void) get_int_prop(ctx, udi, "scsi.target", (int *) &d->scsi.target); + (void) get_int_prop(ctx, udi, "scsi.lun", (int *) &d->scsi.lun); + (void) get_str_prop(ctx, udi, "scsi.type", &d->scsi.type); return 0; } @@ -264,23 +264,23 @@ gather_storage_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { int val; - (void)get_str_prop(ctx, udi, "block.device", &d->storage.block); - (void)get_str_prop(ctx, udi, "storage.bus", &d->storage.bus); - (void)get_str_prop(ctx, udi, "storage.drive_type", &d->storage.drive_type); - (void)get_str_prop(ctx, udi, "storage.model", &d->storage.model); - (void)get_str_prop(ctx, udi, "storage.vendor", &d->storage.vendor); - (void)get_str_prop(ctx, udi, "storage.serial", &d->storage.serial); + (void) get_str_prop(ctx, udi, "block.device", &d->storage.block); + (void) get_str_prop(ctx, udi, "storage.bus", &d->storage.bus); + (void) get_str_prop(ctx, udi, "storage.drive_type", &d->storage.drive_type); + (void) get_str_prop(ctx, udi, "storage.model", &d->storage.model); + (void) get_str_prop(ctx, udi, "storage.vendor", &d->storage.vendor); + (void) get_str_prop(ctx, udi, "storage.serial", &d->storage.serial); if (get_bool_prop(ctx, udi, "storage.removable", &val) == 0 && val) { d->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; if (get_bool_prop(ctx, udi, "storage.removable.media_available", &val) == 0 && val) { d->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; - (void)get_uint64_prop(ctx, udi, "storage.removable.media_size", + (void) get_uint64_prop(ctx, udi, "storage.removable.media_size", &d->storage.removable_media_size); } } else { - (void)get_uint64_prop(ctx, udi, "storage.size", &d->storage.size); + (void) get_uint64_prop(ctx, udi, "storage.size", &d->storage.size); } if (get_bool_prop(ctx, udi, "storage.hotpluggable", &val) == 0 && val) d->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE; @@ -291,7 +291,7 @@ static int gather_scsi_generic_cap(LibHalContext *ctx, const char *udi, virNodeDevCapDataPtr d) { - (void)get_str_prop(ctx, udi, "scsi_generic.device", &d->sg.path); + (void) get_str_prop(ctx, udi, "scsi_generic.device", &d->sg.path); return 0; } @@ -302,22 +302,22 @@ gather_system_cap(LibHalContext *ctx, const char *udi, { char *uuidstr; - (void)get_str_prop(ctx, udi, "system.product", &d->system.product_name); - (void)get_str_prop(ctx, udi, "system.hardware.vendor", + (void) get_str_prop(ctx, udi, "system.product", &d->system.product_name); + (void) get_str_prop(ctx, udi, "system.hardware.vendor", &d->system.hardware.vendor_name); - (void)get_str_prop(ctx, udi, "system.hardware.version", + (void) get_str_prop(ctx, udi, "system.hardware.version", &d->system.hardware.version); - (void)get_str_prop(ctx, udi, "system.hardware.serial", + (void) get_str_prop(ctx, udi, "system.hardware.serial", &d->system.hardware.serial); if (get_str_prop(ctx, udi, "system.hardware.uuid", &uuidstr) == 0) { ignore_value(virUUIDParse(uuidstr, d->system.hardware.uuid)); VIR_FREE(uuidstr); } - (void)get_str_prop(ctx, udi, "system.firmware.vendor", + (void) get_str_prop(ctx, udi, "system.firmware.vendor", &d->system.firmware.vendor_name); - (void)get_str_prop(ctx, udi, "system.firmware.version", + (void) get_str_prop(ctx, udi, "system.firmware.version", &d->system.firmware.version); - (void)get_str_prop(ctx, udi, "system.firmware.release_date", + (void) get_str_prop(ctx, udi, "system.firmware.release_date", &d->system.firmware.release_date); return 0; } @@ -479,7 +479,7 @@ dev_create(const char *udi) goto cleanup; /* Some devices don't have a path in sysfs, so ignore failure */ - (void)get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); + (void) get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); if (!(obj = virNodeDeviceObjListAssignDef(driver->devs, def))) { VIR_FREE(devicePath); @@ -556,7 +556,7 @@ device_cap_added(LibHalContext *ctx, VIR_DEBUG("%s %s", cap, name); if ((obj = virNodeDeviceObjListFindByName(driver->devs, name))) { def = virNodeDeviceObjGetDef(obj); - (void)gather_capability(ctx, udi, cap, &def->caps); + (void) gather_capability(ctx, udi, cap, &def->caps); virNodeDeviceObjEndAPI(&obj); } else { VIR_DEBUG("no device named %s", name); @@ -695,7 +695,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } virNodeDeviceObjListFree(driver->devs); if (hal_ctx) - (void)libhal_ctx_free(hal_ctx); + (void) libhal_ctx_free(hal_ctx); nodeDeviceUnlock(); VIR_FREE(driver); @@ -710,8 +710,8 @@ nodeStateCleanup(void) nodeDeviceLock(); LibHalContext *hal_ctx = DRV_STATE_HAL_CTX(driver); virNodeDeviceObjListFree(driver->devs); - (void)libhal_ctx_shutdown(hal_ctx, NULL); - (void)libhal_ctx_free(hal_ctx); + (void) libhal_ctx_shutdown(hal_ctx, NULL); + (void) libhal_ctx_free(hal_ctx); nodeDeviceUnlock(); virMutexDestroy(&driver->lock); VIR_FREE(driver); -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 14 +++++++------- src/nwfilter/nwfilter_ebiptables_driver.c | 22 +++++++++++----------- src/nwfilter/nwfilter_gentech_driver.c | 6 +++--- src/nwfilter/nwfilter_learnipaddr.c | 8 ++++---- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 6069e7046075..b29d654e4780 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -319,7 +319,7 @@ virNWFilterSnoopActivate(virNWFilterSnoopReqPtr req) virNWFilterSnoopActiveLock(); - if (virHashAddEntry(virNWFilterSnoopState.active, key, (void *)0x1) < 0) + if (virHashAddEntry(virNWFilterSnoopState.active, key, (void *) 0x1) < 0) VIR_FREE(key); virNWFilterSnoopActiveUnlock(); @@ -936,7 +936,7 @@ virNWFilterSnoopDHCPGetOpt(virNWFilterSnoopDHCPHdrPtr pd, int len, goto malformed; if (*pleasetime) return -1; /* duplicate lease time */ - memcpy(&nwint, (char *)pd->d_opts + oind + 2, sizeof(nwint)); + memcpy(&nwint, (char *) pd->d_opts + oind + 2, sizeof(nwint)); *pleasetime = ntohl(nwint); break; case DHCPO_MTYPE: @@ -1017,7 +1017,7 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, */ if (!fromVM) { if (virMacAddrCmpRaw(&req->macaddr, - (unsigned char *)&pd->d_chaddr) != 0) + (unsigned char *) &pd->d_chaddr) != 0) return -2; } @@ -1456,7 +1456,7 @@ virNWFilterDHCPSnoopThread(void *req0) n--; rv = pcap_next_ex(pcapConf[i].handle, &hdr, - (const u_char **)&packet); + (const u_char **) &packet); if (rv < 0) { /* error reading from socket */ @@ -1881,7 +1881,7 @@ virNWFilterSnoopSaveIter(void *payload, void *data) { virNWFilterSnoopReqPtr req = payload; - int tfd = *(int *)data; + int tfd = *(int *) data; virNWFilterSnoopIPLeasePtr ipl; /* protect req->start */ @@ -1925,7 +1925,7 @@ virNWFilterSnoopLeaseFileRefresh(void) virNWFilterSnoopPruneIter, NULL); /* now save them */ virHashForEach(virNWFilterSnoopState.snoopReqs, - virNWFilterSnoopSaveIter, (void *)&tfd); + virNWFilterSnoopSaveIter, (void *) &tfd); } if (VIR_CLOSE(tfd) < 0) { @@ -2147,7 +2147,7 @@ virNWFilterDHCPSnoopEnd(const char *ifname) goto cleanup; if (ifname) { - ifkey = (char *)virHashLookup(virNWFilterSnoopState.ifnameToKey, + ifkey = (char *) virHashLookup(virNWFilterSnoopState.ifnameToKey, ifname); if (!ifkey) goto cleanup; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index b19b07c84548..9914bf3d6bb0 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1188,7 +1188,7 @@ _iptablesCreateRuleInstance(virFirewallPtr fw, PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); - switch ((int)rule->prtclType) { + switch ((int) rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_TCP: case VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6: fwrule = virFirewallAddRule(fw, layer, @@ -1878,7 +1878,7 @@ ebtablesCreateRuleInstance(virFirewallPtr fw, #define INST_ITEM_MASK(S, I, MASK, C) \ INST_ITEM_2PARMS(S, I, MASK, C, "/") - switch ((int)rule->prtclType) { + switch ((int) rule->prtclType) { case VIR_NWFILTER_RULE_PROTOCOL_MAC: fwrule = virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, "-t", "nat", @@ -2682,7 +2682,7 @@ ebtablesCreateTmpSubChainFW(virFirewallPtr fw, fwrule = virFirewallAddRule(fw, VIR_FIREWALL_LAYER_ETHERNET, "-t", "nat", "-A", rootchain, NULL); - switch ((int)protoidx) { + switch ((int) protoidx) { case L2_PROTO_MAC_IDX: break; case L2_PROTO_STP_IDX: @@ -2722,7 +2722,7 @@ ebtablesRemoveSubChainsQuery(virFirewallPtr fw, VIR_DEBUG("Processing chain '%s'", tmp); virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_ETHERNET, false, ebtablesRemoveSubChainsQuery, - (void *)chainprefixes, + (void *) chainprefixes, "-t", "nat", "-L", tmp, NULL); virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_ETHERNET, true, NULL, NULL, @@ -2750,7 +2750,7 @@ _ebtablesRemoveSubChainsFW(virFirewallPtr fw, PRINT_ROOT_CHAIN(rootchain, chainprefixes[i], ifname); virFirewallAddRuleFull(fw, VIR_FIREWALL_LAYER_ETHERNET, false, ebtablesRemoveSubChainsQuery, - (void *)chainprefixes, + (void *) chainprefixes, "-t", "nat", "-L", rootchain, NULL); } } @@ -3195,8 +3195,8 @@ ebiptablesFilterOrderSort(const virHashKeyValuePair *a, const virHashKeyValuePair *b) { /* elements' values has been limited to range [-1000, 1000] */ - return *(virNWFilterChainPriority *)a->value - - *(virNWFilterChainPriority *)b->value; + return *(virNWFilterChainPriority *) a->value - + *(virNWFilterChainPriority *) b->value; } @@ -3336,8 +3336,8 @@ struct ebtablesSubChainInst { static int ebtablesSubChainInstSort(const void *a, const void *b) { - const struct ebtablesSubChainInst **insta = (const struct ebtablesSubChainInst **)a; - const struct ebtablesSubChainInst **instb = (const struct ebtablesSubChainInst **)b; + const struct ebtablesSubChainInst **insta = (const struct ebtablesSubChainInst **) a; + const struct ebtablesSubChainInst **instb = (const struct ebtablesSubChainInst **) b; /* priorities are limited to range [-1000, 1000] */ return (*insta)->priority - (*instb)->priority; @@ -3364,12 +3364,12 @@ ebtablesGetSubChainInsts(virHashTablePtr chains, enum l3_proto_idx idx = ebtablesGetProtoIdxByFiltername( filter_names[i].key); - if ((int)idx < 0) + if ((int) idx < 0) continue; if (VIR_ALLOC(inst) < 0) goto cleanup; - inst->priority = *(const virNWFilterChainPriority *)filter_names[i].value; + inst->priority = *(const virNWFilterChainPriority *) filter_names[i].value; inst->incoming = incoming; inst->protoidx = idx; inst->filtername = filter_names[i].key; diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 5ef26b6afbe0..f0c840bb0ab9 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -225,8 +225,8 @@ printString(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) { struct printString *ps = data; - if ((STREQ((char *)name, NWFILTER_STD_VAR_IP) && !ps->reportIP) || - (STREQ((char *)name, NWFILTER_STD_VAR_MAC) && !ps->reportMAC)) + if ((STREQ((char *) name, NWFILTER_STD_VAR_IP) && !ps->reportIP) || + (STREQ((char *) name, NWFILTER_STD_VAR_MAC) && !ps->reportMAC)) return 0; if (virBufferUse(&ps->buf) && ps->separator) @@ -1078,7 +1078,7 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj, /* filter tree unchanged -- no update needed */ ret = virHashAddEntry(cb->skipInterfaces, net->ifname, - (void *)~0); + (void *) ~0); } break; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 9ca063957651..4e10f7b4a239 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -356,7 +356,7 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, } } dhcp_opts_len -= (2 + dhcpopt->len); - dhcpopt = (struct dhcp_option*)((char *)dhcpopt + 2 + dhcpopt->len); + dhcpopt = (struct dhcp_option*)((char *) dhcpopt + 2 + dhcpopt->len); } } @@ -499,7 +499,7 @@ learnIPAddressThread(void *arg) case ETHERTYPE_VLAN: ethHdrSize = sizeof(struct ether_vlan_header); - vlan_hdr = (struct ether_vlan_header *)packet; + vlan_hdr = (struct ether_vlan_header *) packet; if (ntohs(vlan_hdr->ether_type) != ETHERTYPE_IP || header.len < ethHdrSize) continue; @@ -567,7 +567,7 @@ learnIPAddressThread(void *arg) sizeof(struct udphdr))) { VIR_WARNINGS_NO_CAST_ALIGN struct udphdr *udphdr = (struct udphdr *) - ((char *)iphdr + iphdr->ihl * 4); + ((char *) iphdr + iphdr->ihl * 4); VIR_WARNINGS_RESET if (ntohs(udphdr->source) == 67 && ntohs(udphdr->dest) == 68 && @@ -576,7 +576,7 @@ learnIPAddressThread(void *arg) sizeof(struct udphdr) + sizeof(struct dhcp)) { struct dhcp *dhcp = (struct dhcp *) - ((char *)udphdr + sizeof(udphdr)); + ((char *) udphdr + sizeof(udphdr)); if (dhcp->op == 2 /* BOOTREPLY */ && virMacAddrCmpRaw( &req->macaddr, -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/openvz/openvz_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index c10d6df6633b..fd2f072557f4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -548,7 +548,7 @@ static char *openvzDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { * key value. This lets us declare the argv on the * stack and just splice in the domain name after */ -#define PROGRAM_SENTINEL ((char *)0x1) +#define PROGRAM_SENTINEL ((char *) 0x1) static void openvzSetProgramSentinal(const char **prog, const char *key) { const char **tmp = prog; @@ -1579,7 +1579,7 @@ Version: 2.2 /* convert jiffies to nanoseconds */ *cpuTime = (1000ull * 1000ull * 1000ull * (usertime + nicetime + systime) - / (unsigned long long)sysconf(_SC_CLK_TCK)); + / (unsigned long long) sysconf(_SC_CLK_TCK)); break; } } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/qemu/qemu_capabilities.c | 14 +++++++------- src/qemu/qemu_command.c | 6 +++--- src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_driver.c | 10 +++++----- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 10 +++++----- src/qemu/qemu_monitor_text.c | 6 +++--- src/qemu/qemu_process.c | 4 ++-- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 833c75514c25..441764baf742 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3115,7 +3115,7 @@ virQEMUCapsLoadCache(virArch hostArch, ctxt->node = xmlDocGetRootElement(doc); - if (STRNEQ((const char *)ctxt->node->name, "qemuCaps")) { + if (STRNEQ((const char *) ctxt->node->name, "qemuCaps")) { virReportError(VIR_ERR_XML_ERROR, _("unexpected root element <%s>, " "expecting <qemuCaps>"), @@ -3549,8 +3549,8 @@ virQEMUCapsSaveFile(void *data, VIR_DEBUG("Saved caps '%s' for '%s' with (%lld, %lld)", filename, qemuCaps->binary, - (long long)qemuCaps->ctime, - (long long)qemuCaps->libvirtCtime); + (long long) qemuCaps->ctime, + (long long) qemuCaps->libvirtCtime); ret = 0; cleanup: @@ -3576,10 +3576,10 @@ virQEMUCapsIsValid(void *data, VIR_DEBUG("Outdated capabilities for '%s': libvirt changed " "(%lld vs %lld, %lu vs %lu)", qemuCaps->binary, - (long long)qemuCaps->libvirtCtime, - (long long)virGetSelfLastChanged(), - (unsigned long)qemuCaps->libvirtVersion, - (unsigned long)LIBVIR_VERSION_NUMBER); + (long long) qemuCaps->libvirtCtime, + (long long) virGetSelfLastChanged(), + (unsigned long) qemuCaps->libvirtVersion, + (unsigned long) LIBVIR_VERSION_NUMBER); return false; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b666f3715f55..70e77def49a4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6848,7 +6848,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (cpu_flags && !cpu) { const char *default_model; - switch ((int)def->os.arch) { + switch ((int) def->os.arch) { case VIR_ARCH_I686: default_model = "qemu32"; break; @@ -6894,7 +6894,7 @@ qemuBuildObsoleteAccelArg(virCommandPtr cmd, bool disableKVM = false; bool enableKVM = false; - switch ((int)def->virtType) { + switch ((int) def->virtType) { case VIR_DOMAIN_VIRT_QEMU: if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) disableKVM = true; @@ -8273,7 +8273,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, /* For types whose implementations use a netdev on the host, add * an entry to nicindexes for passing on to systemd. */ - switch ((virDomainNetType)actualType) { + switch ((virDomainNetType) actualType) { case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 326c939c85c0..248ff3e55101 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3624,7 +3624,7 @@ qemuDomainChrSourceReconnectDefValidate(const virDomainChrSourceReconnectDef *de static int qemuDomainChrSourceDefValidate(const virDomainChrSourceDef *def) { - switch ((virDomainChrType)def->type) { + switch ((virDomainChrType) def->type) { case VIR_DOMAIN_CHR_TYPE_TCP: if (qemuDomainChrSourceReconnectDefValidate(&def->data.tcp.reconnect) < 0) return -1; @@ -5227,7 +5227,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, virQEMUCapsPtr qemuCaps, unsigned int parseFlags) { - switch ((virDomainControllerType)cont->type) { + switch ((virDomainControllerType) cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: /* Set the default SCSI controller model if not already set */ if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0) @@ -6755,8 +6755,8 @@ ssize_t qemuDomainLogContextRead(qemuDomainLogContextPtr ctxt, { VIR_DEBUG("Context read %p manager=%p inode=%llu pos=%llu", ctxt, ctxt->manager, - (unsigned long long)ctxt->inode, - (unsigned long long)ctxt->pos); + (unsigned long long) ctxt->inode, + (unsigned long long) ctxt->pos); char *buf; size_t buflen; if (ctxt->manager) { @@ -11097,7 +11097,7 @@ qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, if (i == ndevMountsPath) { if (virProcessRunInMountNamespace(vm->pid, qemuDomainDetachDeviceUnlinkHelper, - (void *)file) < 0) + (void *) file) < 0) goto cleanup; } } @@ -11264,7 +11264,7 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, if (qemuDomainGetHostdevPath(NULL, hostdev, false, &npaths, &paths, NULL) < 0) goto cleanup; - if (qemuDomainNamespaceMknodPaths(vm, (const char **)paths, npaths) < 0) + if (qemuDomainNamespaceMknodPaths(vm, (const char **) paths, npaths) < 0) goto cleanup; ret = 0; @@ -11292,7 +11292,7 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, goto cleanup; if (npaths != 0 && - qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) + qemuDomainNamespaceUnlinkPaths(vm, (const char **) paths, npaths) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7484b00e23c3..cc0da6bf29d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -439,7 +439,7 @@ static int qemuDomainSnapshotLoad(virDomainObjPtr vm, void *data) { - char *baseDir = (char *)data; + char *baseDir = (char *) data; char *snapDir = NULL; DIR *dir = NULL; struct dirent *entry; @@ -1331,9 +1331,9 @@ qemuGetSchedInfo(unsigned long long *cpuWait, /* In general, we cannot assume pid_t fits in int; but /proc parsing * is specific to Linux where int works fine. */ if (tid) - ret = virAsprintf(&proc, "/proc/%d/task/%d/sched", (int)pid, (int)tid); + ret = virAsprintf(&proc, "/proc/%d/task/%d/sched", (int) pid, (int) tid); else - ret = virAsprintf(&proc, "/proc/%d/sched", (int)pid); + ret = virAsprintf(&proc, "/proc/%d/sched", (int) pid); if (ret < 0) goto cleanup; ret = -1; @@ -1376,7 +1376,7 @@ qemuGetSchedInfo(unsigned long long *cpuWait, goto cleanup; } - *cpuWait = (unsigned long long)(val * 1000000); + *cpuWait = (unsigned long long) (val * 1000000); break; } } @@ -1435,7 +1435,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, */ if (cpuTime) *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) - / (unsigned long long)sysconf(_SC_CLK_TCK); + / (unsigned long long) sysconf(_SC_CLK_TCK); if (lastCpu) *lastCpu = cpu; diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index eca1b74d63bc..5c710da85966 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -160,7 +160,7 @@ qemuDomainExtractTLSSubject(const char *certdir) goto error; } - pemdatum.data = (unsigned char *)pemdata; + pemdatum.data = (unsigned char *) pemdata; pemdatum.size = strlen(pemdata); ret = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f642d9a51ab6..c17bc1f45a07 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -431,11 +431,11 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) # if DEBUG_RAW_IO char *str1 = qemuMonitorEscapeNonPrintable(msg ? msg->txBuffer : ""); char *str2 = qemuMonitorEscapeNonPrintable(mon->buffer); - VIR_ERROR(_("Process %d %p %p [[[[%s]]][[[%s]]]"), (int)mon->bufferOffset, mon->msg, msg, str1, str2); + VIR_ERROR(_("Process %d %p %p [[[[%s]]][[[%s]]]"), (int) mon->bufferOffset, mon->msg, msg, str1, str2); VIR_FREE(str1); VIR_FREE(str2); # else - VIR_DEBUG("Process %d", (int)mon->bufferOffset); + VIR_DEBUG("Process %d", (int) mon->bufferOffset); # endif #endif @@ -465,7 +465,7 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) mon->bufferOffset = mon->bufferLength = 0; } #if DEBUG_IO - VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); + VIR_DEBUG("Process done %d used %d", (int) mon->bufferOffset, len); #endif if (msg && msg->finished) virCondBroadcast(&mon->notify); @@ -489,7 +489,7 @@ qemuMonitorIOWriteWithFD(qemuMonitorPtr mon, memset(&msg, 0, sizeof(msg)); memset(control, 0, sizeof(control)); - iov[0].iov_base = (void *)data; + iov[0].iov_base = (void *) data; iov[0].iov_len = len; msg.msg_iov = iov; @@ -617,7 +617,7 @@ qemuMonitorIORead(qemuMonitorPtr mon) } #if DEBUG_IO - VIR_DEBUG("Now read %d bytes of data", (int)mon->bufferOffset); + VIR_DEBUG("Now read %d bytes of data", (int) mon->bufferOffset); #endif return ret; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 7c34ca5b07e2..69b0b3685427 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -104,7 +104,7 @@ int qemuMonitorTextIOProcess(qemuMonitorPtr mon ATTRIBUTE_UNUSED, /* Don't print raw data in debug because its full of control chars */ /*VIR_DEBUG("Process data %d byts of data [%s]", len - used, data + used);*/ #if DEBUG_IO - VIR_DEBUG("Process data %d byts of data", (int)(len - used)); + VIR_DEBUG("Process data %d byts of data", (int) (len - used)); #endif /* Look for a non-zero reply followed by prompt */ @@ -763,7 +763,7 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, p = reply; while (*p) { - p = (char *)qemuAliasDiskDriveSkipPrefix(p); + p = (char *) qemuAliasDiskDriveSkipPrefix(p); eol = strchr(p, '\n'); if (!eol) @@ -1039,7 +1039,7 @@ int qemuMonitorTextSetVNCPassword(qemuMonitorPtr mon, if (qemuMonitorTextCommandWithHandler(mon, "change vnc password", qemuMonitorSendVNCPassphrase, - (char *)password, + (char *) password, -1, &info) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("setting VNC password failed")); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6a5262ae46ab..93001d0c9c36 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5371,8 +5371,8 @@ static int qemuProcessVcpusSortOrder(const void *a, const void *b) { - virDomainVcpuDefPtr vcpua = *((virDomainVcpuDefPtr *)a); - virDomainVcpuDefPtr vcpub = *((virDomainVcpuDefPtr *)b); + virDomainVcpuDefPtr vcpua = *((virDomainVcpuDefPtr *) a); + virDomainVcpuDefPtr vcpub = *((virDomainVcpuDefPtr *) b); return vcpua->order - vcpub->order; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon_dispatch.c | 10 +-- src/remote/remote_driver.c | 110 ++++++++++++++-------------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 31c6ce1b6179..c282f6b9ea56 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -548,7 +548,7 @@ daemonSetupNetworking(virNetServerPtr srv, virObjectUnref(ctxt); } #else - (void)privileged; + (void) privileged; if (config->listen_tls) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("This libvirtd build does not support TLS")); @@ -653,7 +653,7 @@ daemonSetupAccessManager(struct daemonConfig *config) { virAccessManagerPtr mgr; const char *none[] = { "none", NULL }; - const char **drv = (const char **)config->access_drivers; + const char **drv = (const char **) config->access_drivers; if (!drv || !drv[0]) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index a8a5932d7134..b1ba8ba8bee8 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2648,7 +2648,7 @@ remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server ATTRIBUTE_UNUSED, * assumption that unsigned char and char are the same size. */ dst->cpumap.cpumap_len = info[i]->cpumaplen; - dst->cpumap.cpumap_val = (char *)info[i]->cpumap; + dst->cpumap.cpumap_val = (char *) info[i]->cpumap; info[i]->cpumap = NULL; } } else { @@ -3495,7 +3495,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server, goto authfail; if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { - VIR_ERROR(_("sasl start reply data too long %d"), (int)serveroutlen); + VIR_ERROR(_("sasl start reply data too long %d"), (int) serveroutlen); goto authfail; } @@ -3593,7 +3593,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server, if (serveroutlen > REMOTE_AUTH_SASL_DATA_MAX) { VIR_ERROR(_("sasl step reply data too long %d"), - (int)serveroutlen); + (int) serveroutlen); goto authfail; } @@ -3731,7 +3731,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, if (timestamp == 0) { VIR_WARN("Failing polkit auth due to missing client (pid=%lld) start time", - (long long)callerPid); + (long long) callerPid); goto authfail; } @@ -4068,7 +4068,7 @@ remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED, goto cleanup; ret->value.value_len = value_size; - ret->value.value_val = (char *)value; + ret->value.value_val = (char *) value; rv = 0; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 12f7d4738875..ccaf9f2f3bc2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -930,9 +930,9 @@ doRemoteOpen(virConnectPtr conn, priv->is_secure = 1; ATTRIBUTE_FALLTHROUGH; #else - (void)tls_priority; - (void)sanity; - (void)verify; + (void) tls_priority; + (void) sanity; + (void) verify; virReportError(VIR_ERR_INVALID_ARG, "%s", _("GNUTLS support not available in this build")); goto failed; @@ -1686,8 +1686,8 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY, - (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *)&args, - (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1) + (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *) &args, + (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *) &ret) == -1) goto done; for (i = 0; i < ret.cells.cells_len; i++) @@ -2117,7 +2117,7 @@ remoteDomainPinEmulator(virDomainPtr dom, } make_nonnull_domain(&args.dom, dom); - args.cpumap.cpumap_val = (char *)cpumap; + args.cpumap.cpumap_val = (char *) cpumap; args.cpumap.cpumap_len = cpumaplen; args.flags = flags; @@ -2292,9 +2292,9 @@ remoteDomainGetIOThreadInfo(virDomainPtr dom, if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_IOTHREAD_INFO, (xdrproc_t)xdr_remote_domain_get_iothread_info_args, - (char *)&args, + (char *) &args, (xdrproc_t)xdr_remote_domain_get_iothread_info_ret, - (char *)&ret) == -1) + (char *) &ret) == -1) goto done; if (ret.info.info_len > REMOTE_IOTHREAD_INFO_MAX) { @@ -2362,8 +2362,8 @@ remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) memset(seclabel, 0, sizeof(*seclabel)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL, - (xdrproc_t) xdr_remote_domain_get_security_label_args, (char *)&args, - (xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *)&ret) == -1) { + (xdrproc_t) xdr_remote_domain_get_security_label_args, (char *) &args, + (xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *) &ret) == -1) { goto done; } @@ -2380,7 +2380,7 @@ remoteDomainGetSecurityLabel(virDomainPtr domain, virSecurityLabelPtr seclabel) rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *)&ret); + xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -2402,8 +2402,8 @@ remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* secla memset(&ret, 0, sizeof(ret)); if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_SECURITY_LABEL_LIST, - (xdrproc_t) xdr_remote_domain_get_security_label_list_args, (char *)&args, - (xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *)&ret) == -1) { + (xdrproc_t) xdr_remote_domain_get_security_label_list_args, (char *) &args, + (xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *) &ret) == -1) { goto done; } @@ -2426,7 +2426,7 @@ remoteDomainGetSecurityLabelList(virDomainPtr domain, virSecurityLabelPtr* secla rv = ret.ret; cleanup: - xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *)&ret); + xdr_free((xdrproc_t) xdr_remote_domain_get_security_label_list_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -2480,7 +2480,7 @@ remoteNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_SECURITY_MODEL, (xdrproc_t) xdr_void, NULL, - (xdrproc_t) xdr_remote_node_get_security_model_ret, (char *)&ret) == -1) { + (xdrproc_t) xdr_remote_node_get_security_model_ret, (char *) &ret) == -1) { goto done; } @@ -2505,7 +2505,7 @@ remoteNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) rv = 0; cleanup: - xdr_free((xdrproc_t) xdr_remote_node_get_security_model_ret, (char *)&ret); + xdr_free((xdrproc_t) xdr_remote_node_get_security_model_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -2839,14 +2839,14 @@ static int remoteDomainGetBlockJobInfo(virDomainPtr domain, remoteDriverLock(priv); make_nonnull_domain(&args.dom, domain); - args.path = (char *)path; + args.path = (char *) path; args.flags = flags; if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_BLOCK_JOB_INFO, (xdrproc_t)xdr_remote_domain_get_block_job_info_args, - (char *)&args, + (char *) &args, (xdrproc_t)xdr_remote_domain_get_block_job_info_ret, - (char *)&ret) == -1) + (char *) &ret) == -1) goto done; if (ret.found) { @@ -2878,7 +2878,7 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain, remoteDriverLock(priv); make_nonnull_domain(&args.dom, domain); - args.disk = disk ? (char **)&disk : NULL; + args.disk = disk ? (char **) &disk : NULL; args.nparams = *nparams; args.flags = flags; @@ -3508,7 +3508,7 @@ remoteConnectFindStoragePoolSources(virConnectPtr conn, remoteDriverLock(priv); args.type = (char*)type; - args.srcSpec = srcSpec ? (char **)&srcSpec : NULL; + args.srcSpec = srcSpec ? (char **) &srcSpec : NULL; args.flags = flags; memset(&ret, 0, sizeof(ret)); @@ -4113,7 +4113,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv, /* First call is to inquire about supported mechanisms in the server */ memset(&iret, 0, sizeof(iret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_SASL_INIT, - (xdrproc_t) xdr_void, (char *)NULL, + (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_remote_auth_sasl_init_ret, (char *) &iret) != 0) goto cleanup; @@ -4284,7 +4284,7 @@ remoteAuthPolkit(virConnectPtr conn, struct private_data *priv, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_AUTH_POLKIT, - (xdrproc_t) xdr_void, (char *)NULL, + (xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) != 0) { return -1; /* virError already set by call */ } @@ -5886,7 +5886,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_REGISTER_ANY, (xdrproc_t) xdr_remote_connect_domain_event_register_any_args, (char *) &args, - (xdrproc_t) xdr_void, (char *)NULL) == -1) { + (xdrproc_t) xdr_void, (char *) NULL) == -1) { virObjectEventStateDeregisterID(conn, priv->eventState, callbackID, false); goto done; @@ -5969,7 +5969,7 @@ remoteDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, remoteDriverLock(priv); make_nonnull_domain(&args.dom, domain); - args.cmd = (char *)cmd; + args.cmd = (char *) cmd; args.flags = flags; memset(&ret, 0, sizeof(ret)); @@ -6067,7 +6067,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.uri_in = uri_in == NULL ? NULL : (char **) &uri_in; args.flags = flags; @@ -6151,7 +6151,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, st->driver = &remoteStreamDrv; st->privateData = netst; - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; args.dname = dname == NULL ? NULL : (char **) &dname; @@ -6214,7 +6214,7 @@ remoteDomainMigratePerform3(virDomainPtr dom, make_nonnull_domain(&args.dom, dom); args.xmlin = xmlin == NULL ? NULL : (char **) &xmlin; - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; args.dname = dname == NULL ? NULL : (char **) &dname; @@ -6271,7 +6271,7 @@ remoteDomainMigrateFinish3(virConnectPtr dconn, memset(&args, 0, sizeof(args)); memset(&ret, 0, sizeof(ret)); - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.dname = (char *) dname; args.uri = uri == NULL ? NULL : (char **) &uri; @@ -6663,7 +6663,7 @@ remoteDomainGetInterfaceParameters(virDomainPtr domain, remoteDriverLock(priv); make_nonnull_domain(&args.dom, domain); - args.device = (char *)device; + args.device = (char *) device; args.nparams = *nparams; args.flags = flags; @@ -6974,7 +6974,7 @@ remoteDomainMigratePrepare3Params(virConnectPtr dconn, goto cleanup; } - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; @@ -7049,7 +7049,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn, goto cleanup; } - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; @@ -7141,7 +7141,7 @@ remoteDomainMigratePerform3Params(virDomainPtr dom, make_nonnull_domain(&args.dom, dom); args.dconnuri = dconnuri == NULL ? NULL : (char **) &dconnuri; - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; @@ -7213,7 +7213,7 @@ remoteDomainMigrateFinish3Params(virConnectPtr dconn, goto cleanup; } - args.cookie_in.cookie_in_val = (char *)cookiein; + args.cookie_in.cookie_in_val = (char *) cookiein; args.cookie_in.cookie_in_len = cookieinlen; args.flags = flags; args.cancelled = cancelled; @@ -7328,7 +7328,7 @@ remoteDomainCreateXMLWithFiles(virConnectPtr conn, const char *xml_desc, remoteDriverLock(priv); - args.xml_desc = (char *)xml_desc; + args.xml_desc = (char *) xml_desc; args.flags = flags; memset(&ret, 0, sizeof(ret)); @@ -7337,13 +7337,13 @@ remoteDomainCreateXMLWithFiles(virConnectPtr conn, const char *xml_desc, files, nfiles, NULL, NULL, REMOTE_PROC_DOMAIN_CREATE_XML_WITH_FILES, - (xdrproc_t)xdr_remote_domain_create_xml_with_files_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_create_xml_with_files_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_domain_create_xml_with_files_args, (char *) &args, + (xdrproc_t)xdr_remote_domain_create_xml_with_files_ret, (char *) &ret) == -1) { goto done; } rv = get_nonnull_domain(conn, ret.dom); - xdr_free((xdrproc_t)xdr_remote_domain_create_xml_with_files_ret, (char *)&ret); + xdr_free((xdrproc_t)xdr_remote_domain_create_xml_with_files_ret, (char *) &ret); done: remoteDriverUnlock(priv); @@ -7372,8 +7372,8 @@ remoteDomainCreateWithFiles(virDomainPtr dom, files, nfiles, NULL, NULL, REMOTE_PROC_DOMAIN_CREATE_WITH_FILES, - (xdrproc_t)xdr_remote_domain_create_with_files_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_create_with_files_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_domain_create_with_files_args, (char *) &args, + (xdrproc_t)xdr_remote_domain_create_with_files_ret, (char *) &ret) == -1) { goto done; } @@ -7451,8 +7451,8 @@ remoteNodeGetFreePages(virConnectPtr conn, memset(&ret, 0, sizeof(ret)); if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_FREE_PAGES, - (xdrproc_t) xdr_remote_node_get_free_pages_args, (char *)&args, - (xdrproc_t) xdr_remote_node_get_free_pages_ret, (char *)&ret) == -1) + (xdrproc_t) xdr_remote_node_get_free_pages_args, (char *) &args, + (xdrproc_t) xdr_remote_node_get_free_pages_ret, (char *) &ret) == -1) goto done; memcpy(counts, ret.counts.counts_val, ret.counts.counts_len * sizeof(*counts)); @@ -7540,8 +7540,8 @@ remoteNetworkGetDHCPLeases(virNetworkPtr net, memset(&ret, 0, sizeof(ret)); if (call(net->conn, priv, 0, REMOTE_PROC_NETWORK_GET_DHCP_LEASES, - (xdrproc_t)xdr_remote_network_get_dhcp_leases_args, (char *)&args, - (xdrproc_t)xdr_remote_network_get_dhcp_leases_ret, (char *)&ret) == -1) + (xdrproc_t)xdr_remote_network_get_dhcp_leases_args, (char *) &args, + (xdrproc_t)xdr_remote_network_get_dhcp_leases_ret, (char *) &ret) == -1) goto done; if (ret.leases.leases_len > REMOTE_NETWORK_DHCP_LEASES_MAX) { @@ -7619,8 +7619,8 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, remoteDriverLock(priv); if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_ALL_DOMAIN_STATS, - (xdrproc_t)xdr_remote_connect_get_all_domain_stats_args, (char *)&args, - (xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_connect_get_all_domain_stats_args, (char *) &args, + (xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *) &ret) == -1) { remoteDriverUnlock(priv); goto cleanup; } @@ -7743,8 +7743,8 @@ remoteDomainGetFSInfo(virDomainPtr dom, memset(&ret, 0, sizeof(ret)); if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_GET_FSINFO, - (xdrproc_t)xdr_remote_domain_get_fsinfo_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_get_fsinfo_ret, (char *)&ret) == -1) + (xdrproc_t)xdr_remote_domain_get_fsinfo_args, (char *) &args, + (xdrproc_t)xdr_remote_domain_get_fsinfo_ret, (char *) &ret) == -1) goto done; if (ret.info.info_len > REMOTE_DOMAIN_FSINFO_MAX) { @@ -7838,9 +7838,9 @@ remoteDomainInterfaceAddresses(virDomainPtr dom, if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_INTERFACE_ADDRESSES, (xdrproc_t)xdr_remote_domain_interface_addresses_args, - (char *)&args, + (char *) &args, (xdrproc_t)xdr_remote_domain_interface_addresses_ret, - (char *)&ret) == -1) { + (char *) &ret) == -1) { goto done; } @@ -7993,14 +7993,14 @@ remoteDomainRename(virDomainPtr dom, const char *new_name, unsigned int flags) remoteDriverLock(priv); make_nonnull_domain(&args.dom, dom); - args.new_name = new_name ? (char **)&new_name : NULL; + args.new_name = new_name ? (char **) &new_name : NULL; args.flags = flags; memset(&ret, 0, sizeof(ret)); if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_RENAME, - (xdrproc_t)xdr_remote_domain_rename_args, (char *)&args, - (xdrproc_t)xdr_remote_domain_rename_ret, (char *)&ret) == -1) { + (xdrproc_t)xdr_remote_domain_rename_args, (char *) &args, + (xdrproc_t)xdr_remote_domain_rename_ret, (char *) &ret) == -1) { goto done; } @@ -8038,9 +8038,9 @@ remoteStorageVolGetInfoFlags(virStorageVolPtr vol, if (call(vol->conn, priv, 0, REMOTE_PROC_STORAGE_VOL_GET_INFO_FLAGS, (xdrproc_t)xdr_remote_storage_vol_get_info_flags_args, - (char *)&args, + (char *) &args, (xdrproc_t)xdr_remote_storage_vol_get_info_flags_ret, - (char *)&ret) == -1) { + (char *) &ret) == -1) { goto done; } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/rpc/virnetsaslcontext.c | 4 ++-- src/rpc/virnetserverclient.c | 4 ++-- src/rpc/virnetservermdns.c | 4 ++-- src/rpc/virnetsshsession.c | 12 ++++++------ src/rpc/virnettlscontext.c | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index b4db5c40c60f..53a7f076c52b 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -283,7 +283,7 @@ const char *virNetSASLSessionGetIdentity(virNetSASLSessionPtr sasl) _("no client username was found")); goto cleanup; } - VIR_DEBUG("SASL client username %s", (const char *)val); + VIR_DEBUG("SASL client username %s", (const char *) val); cleanup: virObjectUnlock(sasl); @@ -306,7 +306,7 @@ int virNetSASLSessionGetKeySize(virNetSASLSessionPtr sasl) ssf = -1; goto cleanup; } - ssf = *(const int *)val; + ssf = *(const int *) val; cleanup: virObjectUnlock(sasl); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index b373ca1a8b48..52541ee17735 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1202,7 +1202,7 @@ static ssize_t virNetServerClientRead(virNetServerClientPtr client) if (client->rx->bufferLength <= client->rx->bufferOffset) { virReportError(VIR_ERR_RPC, _("unexpected zero/negative length request %lld"), - (long long int)(client->rx->bufferLength - client->rx->bufferOffset)); + (long long int) (client->rx->bufferLength - client->rx->bufferOffset)); client->wantClose = true; return -1; } @@ -1379,7 +1379,7 @@ static ssize_t virNetServerClientWrite(virNetServerClientPtr client) if (client->tx->bufferLength < client->tx->bufferOffset) { virReportError(VIR_ERR_RPC, _("unexpected zero/negative length request %lld"), - (long long int)(client->tx->bufferLength - client->tx->bufferOffset)); + (long long int) (client->tx->bufferLength - client->tx->bufferOffset)); client->wantClose = true; return -1; } diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index 0a2bc87322f8..1d5ef4f4701e 100644 --- a/src/rpc/virnetservermdns.c +++ b/src/rpc/virnetservermdns.c @@ -349,8 +349,8 @@ static AvahiTimeout *virNetServerMDNSTimeoutNew(const AvahiPoll *api ATTRIBUTE_U } VIR_DEBUG("Trigger timed for %d %d %d %d", - (int)now.tv_sec, (int)now.tv_usec, - (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); + (int) now.tv_sec, (int) now.tv_usec, + (int) (tv ? tv->tv_sec : 0), (int) (tv ? tv->tv_usec : 0)); nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll); if (tv) { thenms = (tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll); diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 6566f36ce01c..298de96ffe8a 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -267,7 +267,7 @@ virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED, cleanup: if (askcred) { for (i = 0; i < num_prompts; i++) { - char *prompt = (char *)askcred[i].prompt; + char *prompt = (char *) askcred[i].prompt; VIR_FREE(askcred[i].result); VIR_FREE(prompt); } @@ -373,7 +373,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr = virBufferContentAndReset(&buff); askKey.type = VIR_CRED_ECHOPROMPT; - if (virAsprintf((char **)&askKey.prompt, + if (virAsprintf((char **) &askKey.prompt, _("Accept SSH host key with hash '%s' for " "host '%s:%d' (%s/%s)?"), keyhashstr, @@ -642,7 +642,7 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } - if (virAsprintf((char **)&retr_passphrase.prompt, + if (virAsprintf((char **) &retr_passphrase.prompt, _("Passphrase for key '%s'"), priv->filename) < 0) return -1; @@ -651,12 +651,12 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, virReportError(VIR_ERR_SSH, "%s", _("failed to retrieve private key passphrase: " "callback has failed")); - tmp = (char *)retr_passphrase.prompt; + tmp = (char *) retr_passphrase.prompt; VIR_FREE(tmp); return -1; } - tmp = (char *)retr_passphrase.prompt; + tmp = (char *) retr_passphrase.prompt; VIR_FREE(tmp); ret = libssh2_userauth_publickey_fromfile(sess->session, @@ -1250,7 +1250,7 @@ virNetSSHSessionPtr virNetSSHSessionNew(void) if (!(sess->session = libssh2_session_init_ex(NULL, NULL, NULL, - (void *)sess))) { + (void *) sess))) { virReportError(VIR_ERR_SSH, "%s", _("Failed to initialize libssh2 session")); goto error; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 2c46aebf3169..23975853f5a7 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -505,7 +505,7 @@ static gnutls_x509_crt_t virNetTLSContextLoadCertFromFile(const char *certFile, if (virFileReadAll(certFile, (1<<16), &buf) < 0) goto cleanup; - data.data = (unsigned char *)buf; + data.data = (unsigned char *) buf; data.size = strlen(buf); if (gnutls_x509_crt_import(cert, &data, GNUTLS_X509_FMT_PEM) < 0) { @@ -543,7 +543,7 @@ static int virNetTLSContextLoadCACertListFromFile(const char *certFile, if (virFileReadAll(certFile, (1<<16), &buf) < 0) goto cleanup; - data.data = (unsigned char *)buf; + data.data = (unsigned char *) buf; data.size = strlen(buf); if (gnutls_x509_crt_list_import(certs, &certMax, &data, GNUTLS_X509_FMT_PEM, 0) < 0) { -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/storage/storage_backend_disk.c | 4 ++-- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_gluster.c | 10 +++++----- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 8 ++++---- src/storage/storage_util.c | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 7b4549c34d65..54a6e10e4a19 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -553,7 +553,7 @@ static int virStorageVolNumOfPartTypes(virStorageVolDefPtr def, const void *opaque) { - struct virStorageVolNumData *data = (struct virStorageVolNumData *)opaque; + struct virStorageVolNumData *data = (struct virStorageVolNumData *) opaque; if (def->source.partType == VIR_STORAGE_VOL_DISK_TYPE_PRIMARY || def->source.partType == VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) @@ -670,7 +670,7 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObjPtr pool, unsigned long long alignedAllocation = allocation; virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool); virStoragePoolSourceDevicePtr dev = &def->source.devices[0]; - unsigned long long cylinderSize = (unsigned long long)dev->geometry.heads * + unsigned long long cylinderSize = (unsigned long long) dev->geometry.heads * dev->geometry.sectors * SECTOR_SIZE; VIR_DEBUG("find free area: allocation %llu, cyl size %llu", allocation, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9b0fcf92c5cd..34be92ffebb6 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -735,7 +735,7 @@ virStorageFileBackendFileInit(virStorageSourcePtr src) VIR_DEBUG("initializing FS storage file %p (%s:%s)[%u:%u]", src, virStorageTypeToString(virStorageSourceGetActualType(src)), src->path, - (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); + (unsigned int) src->drv->uid, (unsigned int) src->drv->gid); if (VIR_ALLOC(priv) < 0) return -1; diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index c6cc531e2ff6..030edba078fb 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -404,10 +404,10 @@ virStorageBackendGlusterRefreshPool(virStoragePoolObjPtr pool) goto cleanup; } - def->capacity = ((unsigned long long)sb.f_frsize * - (unsigned long long)sb.f_blocks); - def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_frsize); + def->capacity = ((unsigned long long) sb.f_frsize * + (unsigned long long) sb.f_blocks); + def->available = ((unsigned long long) sb.f_bfree * + (unsigned long long) sb.f_frsize); def->allocation = def->capacity - def->available; ret = 0; @@ -642,7 +642,7 @@ virStorageFileBackendGlusterInit(virStorageSourcePtr src) VIR_DEBUG("initializing gluster storage file %p " "(priv='%p' volume='%s' path='%s') as [%u:%u]", src, priv, src->volume, src->path, - (unsigned int)src->drv->uid, (unsigned int)src->drv->gid); + (unsigned int) src->drv->uid, (unsigned int) src->drv->gid); if (!(priv->vol = glfs_new(src->volume))) { virReportOOMError(); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 7871d1915b11..f75c73ef0e6d 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -311,7 +311,7 @@ virStorageBackendISCSISetAuth(const char *portal, virISCSINodeUpdate(portal, source->devices[0].path, "node.session.auth.password", - (const char *)secret_value) < 0) + (const char *) secret_value) < 0) goto cleanup; ret = 0; diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 5dcc40f601f3..27337cdf19b0 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -195,7 +195,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, * any way to avoid this series of casts. */ VIR_WARNINGS_NO_CAST_ALIGN next = names->next; - names = (struct dm_names *)(((char *)names) + next); + names = (struct dm_names *) (((char *) names) + next); VIR_WARNINGS_RESET } while (next); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 642cacb67362..34a12a19a883 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -303,7 +303,7 @@ virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, int exists, void *arg) { - size_t *used_size = (size_t *)(arg); + size_t *used_size = (size_t *) (arg); if (exists) (*used_size) += len; @@ -847,10 +847,10 @@ virStorageBackendRBDSnapshotFindNoDiff(rbd_image_t image, */ #if LIBRBD_VERSION_CODE > 265 r = rbd_diff_iterate2(image, snaps[i].name, 0, info.size, 0, 1, - virStorageBackendRBDIterateCb, (void *)&diff); + virStorageBackendRBDIterateCb, (void *) &diff); #else r = rbd_diff_iterate(image, snaps[i].name, 0, info.size, - virStorageBackendRBDIterateCb, (void *)&diff); + virStorageBackendRBDIterateCb, (void *) &diff); #endif if (r < 0) { @@ -988,7 +988,7 @@ virStorageBackendRBDCloneImage(rados_ioctx_t io, VIR_DEBUG("No RBD snapshot with zero delta could be found for image %s", origvol); - virBufferAsprintf(&snapname, "libvirt-%d", (int)virRandomInt(65534)); + virBufferAsprintf(&snapname, "libvirt-%d", (int) virRandomInt(65534)); if (virBufferCheckError(&snapname) < 0) goto cleanup; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 897dfdaaee4d..3b675775e249 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3771,10 +3771,10 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) goto cleanup; } - def->capacity = ((unsigned long long)sb.f_frsize * - (unsigned long long)sb.f_blocks); - def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_frsize); + def->capacity = ((unsigned long long) sb.f_frsize * + (unsigned long long) sb.f_blocks); + def->available = ((unsigned long long) sb.f_bfree * + (unsigned long long) sb.f_frsize); def->allocation = def->capacity - def->available; def->target.perms.mode = target->perms->mode; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/uml/uml_driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index b50ba1ba64ab..db24c64f8773 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -360,7 +360,7 @@ umlInotifyEvent(int watch, tmp += e.len; got -= e.len; - name = (char *)&(e.name); + name = (char *) &(e.name); dom = virDomainObjListFindByName(driver->domains, name); @@ -935,7 +935,7 @@ static int umlOpenMonitor(struct uml_driver *driver, snprintf(addr.sun_path + 1, sizeof(addr.sun_path) - 1, "libvirt-uml-%u", vm->pid); VIR_DEBUG("Reply address for monitor is '%s'", addr.sun_path+1); - if (bind(priv->monitor, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + if (bind(priv->monitor, (struct sockaddr *) &addr, sizeof(addr)) < 0) { virReportSystemError(errno, "%s", _("cannot bind socket")); VIR_FORCE_CLOSE(priv->monitor); @@ -1002,7 +1002,7 @@ static int umlMonitorCommand(const struct uml_driver *driver, } if (sendto(priv->monitor, &req, sizeof(req), 0, - (struct sockaddr *)&addr, sizeof(addr)) != sizeof(req)) { + (struct sockaddr *) &addr, sizeof(addr)) != sizeof(req)) { virReportSystemError(errno, _("cannot send command %s"), cmd); @@ -1013,7 +1013,7 @@ static int umlMonitorCommand(const struct uml_driver *driver, ssize_t nbytes; addrlen = sizeof(addr); nbytes = recvfrom(priv->monitor, &res, sizeof(res), 0, - (struct sockaddr *)&addr, &addrlen); + (struct sockaddr *) &addr, &addrlen); if (nbytes < 0) { if (errno == EAGAIN || errno == EINTR) continue; @@ -1317,7 +1317,7 @@ static int umlConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) static char *umlConnectGetCapabilities(virConnectPtr conn) { - struct uml_driver *driver = (struct uml_driver *)conn->privateData; + struct uml_driver *driver = (struct uml_driver *) conn->privateData; char *xml; if (virConnectGetCapabilitiesEnsureACL(conn) < 0) @@ -1361,7 +1361,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) * _SC_CLK_TCK is jiffies per second * So calculate thus.... */ - *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); + *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long) sysconf(_SC_CLK_TCK); umlDebug("Got %llu %llu %llu", usertime, systime, *cpuTime); @@ -1374,7 +1374,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) static virDomainPtr umlDomainLookupByID(virConnectPtr conn, int id) { - struct uml_driver *driver = (struct uml_driver *)conn->privateData; + struct uml_driver *driver = (struct uml_driver *) conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1401,7 +1401,7 @@ static virDomainPtr umlDomainLookupByID(virConnectPtr conn, static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - struct uml_driver *driver = (struct uml_driver *)conn->privateData; + struct uml_driver *driver = (struct uml_driver *) conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; @@ -1421,7 +1421,7 @@ static virDomainPtr umlDomainLookupByUUID(virConnectPtr conn, static virDomainPtr umlDomainLookupByName(virConnectPtr conn, const char *name) { - struct uml_driver *driver = (struct uml_driver *)conn->privateData; + struct uml_driver *driver = (struct uml_driver *) conn->privateData; virDomainObjPtr vm; virDomainPtr dom = NULL; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/util/viralloc.c | 16 ++++---- src/util/viralloc.h | 2 +- src/util/virarptable.c | 2 +- src/util/viratomic.h | 64 +++++++++++++++---------------- src/util/vircgroup.c | 4 +- src/util/vircommand.c | 4 +- src/util/virconf.c | 30 +++++++-------- src/util/virdbus.c | 66 ++++++++++++++++---------------- src/util/virdnsmasq.c | 6 +-- src/util/virfdstream.c | 2 +- src/util/virfile.c | 8 ++-- src/util/virfilecache.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virhash.c | 2 +- src/util/virhostmem.c | 10 ++--- src/util/viridentity.c | 4 +- src/util/viriscsi.c | 2 +- src/util/virjson.c | 22 +++++------ src/util/virlockspace.c | 12 +++--- src/util/virlog.c | 14 +++---- src/util/virnetdev.c | 20 +++++----- src/util/virnetdevbridge.c | 6 +-- src/util/virnetdevip.c | 6 +-- src/util/virnetdevmacvlan.c | 18 ++++----- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 4 +- src/util/virnetlink.c | 18 ++++----- src/util/virnodesuspend.c | 4 +- src/util/virobject.c | 2 +- src/util/virpidfile.c | 2 +- src/util/virpolkit.c | 4 +- src/util/virprobe.h | 2 +- src/util/virprocess.c | 22 +++++------ src/util/virrandom.c | 2 +- src/util/virrotatingfile.c | 4 +- src/util/virstoragefile.c | 16 ++++---- src/util/virsystemd.c | 6 +-- src/util/virtime.c | 2 +- src/util/viruri.c | 2 +- src/util/virutil.c | 2 +- src/util/virutil.h | 6 +-- src/util/virxml.c | 18 ++++----- 42 files changed, 222 insertions(+), 222 deletions(-) diff --git a/src/util/viralloc.c b/src/util/viralloc.c index 81f99d9e1ff4..03b532226da7 100644 --- a/src/util/viralloc.c +++ b/src/util/viralloc.c @@ -133,7 +133,7 @@ int virAlloc(void *ptrptr, { #if TEST_OOM if (virAllocTestFail()) { - *(void **)ptrptr = NULL; + *(void **) ptrptr = NULL; if (report) virReportOOMErrorFull(domcode, filename, funcname, linenr); errno = ENOMEM; @@ -141,8 +141,8 @@ int virAlloc(void *ptrptr, } #endif - *(void **)ptrptr = calloc(1, size); - if (*(void **)ptrptr == NULL) { + *(void **) ptrptr = calloc(1, size); + if (*(void **) ptrptr == NULL) { if (report) virReportOOMErrorFull(domcode, filename, funcname, linenr); return -1; @@ -180,7 +180,7 @@ int virAllocN(void *ptrptr, { #if TEST_OOM if (virAllocTestFail()) { - *(void **)ptrptr = NULL; + *(void **) ptrptr = NULL; if (report) virReportOOMErrorFull(domcode, filename, funcname, linenr); errno = ENOMEM; @@ -294,7 +294,7 @@ int virExpandN(void *ptrptr, ret = virReallocN(ptrptr, size, *countptr + add, report, domcode, filename, funcname, linenr); if (ret == 0) { - memset(*(char **)ptrptr + (size * *countptr), 0, size * add); + memset(*(char **) ptrptr + (size * *countptr), 0, size * add); *countptr += add; } return ret; @@ -557,8 +557,8 @@ int virAllocVar(void *ptrptr, } alloc_size = struct_size + (element_size * count); - *(void **)ptrptr = calloc(1, alloc_size); - if (*(void **)ptrptr == NULL) { + *(void **) ptrptr = calloc(1, alloc_size); + if (*(void **) ptrptr == NULL) { if (report) virReportOOMErrorFull(domcode, filename, funcname, linenr); return -1; @@ -610,7 +610,7 @@ void virDispose(void *ptrptr, count = *countptr; if (*(void**)ptrptr && count > 0) - memset(*(void **)ptrptr, 0, count * element_size); + memset(*(void **) ptrptr, 0, count * element_size); free(*(void**)ptrptr); *(void**)ptrptr = NULL; diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 69d0f904f1e4..69045ecd846b 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -491,7 +491,7 @@ void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *countpt * arithmetic overflow in the allocation size. The check is * essentially the same as that in gnulib's xalloc_oversized. */ -# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t)-1) - (M)) / (S) < (N)) +# define VIR_ALLOC_VAR_OVERSIZED(M, N, S) ((((size_t) -1) - (M)) / (S) < (N)) /** * VIR_ALLOC_VAR: diff --git a/src/util/virarptable.c b/src/util/virarptable.c index c0e90dc4bbf6..6ea5b8c733f8 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -129,7 +129,7 @@ virArpTableGet(void) bzero(&virAddr, sizeof(virAddr)); virAddr.len = sizeof(virAddr.data.inet4); virAddr.data.inet4.sin_family = AF_INET; - virAddr.data.inet4.sin_addr = *(struct in_addr *)addr; + virAddr.data.inet4.sin_addr = *(struct in_addr *) addr; ipstr = virSocketAddrFormat(&virAddr); if (VIR_STRDUP(table->t[num].ipaddr, ipstr) < 0) diff --git a/src/util/viratomic.h b/src/util/viratomic.h index febe401f7704..509852565428 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -158,58 +158,58 @@ VIR_STATIC unsigned int virAtomicIntXor(volatile unsigned int *atomic, # define virAtomicIntGet(atomic) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ *(atomic) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ *(atomic) : 0); \ __sync_synchronize(); \ - (int)*(atomic); \ + (int) *(atomic); \ })) # define virAtomicIntSet(atomic, newval) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ (newval) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ (newval) : 0); \ *(atomic) = (newval); \ __sync_synchronize(); \ })) # define virAtomicIntInc(atomic) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ *(atomic) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ *(atomic) : 0); \ __sync_add_and_fetch((atomic), 1); \ })) # define virAtomicIntDecAndTest(atomic) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ *(atomic) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ *(atomic) : 0); \ __sync_fetch_and_sub((atomic), 1) == 1; \ })) # define virAtomicIntCompareExchange(atomic, oldval, newval) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ (newval) ^ (oldval) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ (newval) ^ (oldval) : 0); \ (bool)__sync_bool_compare_and_swap((atomic), \ (oldval), (newval)); \ })) # define virAtomicIntAdd(atomic, val) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ - (void)(0 ? *(atomic) ^ (val) : 0); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) (0 ? *(atomic) ^ (val) : 0); \ (int) __sync_fetch_and_add((atomic), (val)); \ })) # define virAtomicIntAnd(atomic, val) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ (void) (0 ? *(atomic) ^ (val) : 0); \ (unsigned int) __sync_fetch_and_and((atomic), (val)); \ })) # define virAtomicIntOr(atomic, val) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ (void) (0 ? *(atomic) ^ (val) : 0); \ (unsigned int) __sync_fetch_and_or((atomic), (val)); \ })) # define virAtomicIntXor(atomic, val) \ (__extension__ ({ \ - (void)verify_true(sizeof(*(atomic)) == sizeof(int)); \ + (void) verify_true(sizeof(*(atomic)) == sizeof(int)); \ (void) (0 ? *(atomic) ^ (val) : 0); \ (unsigned int) __sync_fetch_and_xor((atomic), (val)); \ })) @@ -249,13 +249,13 @@ virAtomicIntSet(volatile int *atomic, static inline int virAtomicIntInc(volatile int *atomic) { - return InterlockedIncrement((volatile LONG *)atomic); + return InterlockedIncrement((volatile LONG *) atomic); } static inline bool virAtomicIntDecAndTest(volatile int *atomic) { - return InterlockedDecrement((volatile LONG *)atomic) == 0; + return InterlockedDecrement((volatile LONG *) atomic) == 0; } static inline bool @@ -263,35 +263,35 @@ virAtomicIntCompareExchange(volatile int *atomic, int oldval, int newval) { - return InterlockedCompareExchange((volatile LONG *)atomic, newval, oldval) == oldval; + return InterlockedCompareExchange((volatile LONG *) atomic, newval, oldval) == oldval; } static inline int virAtomicIntAdd(volatile int *atomic, int val) { - return InterlockedExchangeAdd((volatile LONG *)atomic, val); + return InterlockedExchangeAdd((volatile LONG *) atomic, val); } static inline unsigned int virAtomicIntAnd(volatile unsigned int *atomic, unsigned int val) { - return InterlockedAnd((volatile LONG *)atomic, val); + return InterlockedAnd((volatile LONG *) atomic, val); } static inline unsigned int virAtomicIntOr(volatile unsigned int *atomic, unsigned int val) { - return InterlockedOr((volatile LONG *)atomic, val); + return InterlockedOr((volatile LONG *) atomic, val); } static inline unsigned int virAtomicIntXor(volatile unsigned int *atomic, unsigned int val) { - return InterlockedXor((volatile LONG *)atomic, val); + return InterlockedXor((volatile LONG *) atomic, val); } @@ -431,23 +431,23 @@ virAtomicIntXor(volatile unsigned int *atomic, * atomic op helpers. */ # define virAtomicIntGet(atomic) \ - virAtomicIntGet((int *)atomic) + virAtomicIntGet((int *) atomic) # define virAtomicIntSet(atomic, val) \ - virAtomicIntSet((int *)atomic, val) + virAtomicIntSet((int *) atomic, val) # define virAtomicIntInc(atomic) \ - virAtomicIntInc((int *)atomic) + virAtomicIntInc((int *) atomic) # define virAtomicIntDecAndTest(atomic) \ - virAtomicIntDecAndTest((int *)atomic) + virAtomicIntDecAndTest((int *) atomic) # define virAtomicIntCompareExchange(atomic, oldval, newval) \ - virAtomicIntCompareExchange((int *)atomic, oldval, newval) + virAtomicIntCompareExchange((int *) atomic, oldval, newval) # define virAtomicIntAdd(atomic, val) \ - virAtomicIntAdd((int *)atomic, val) + virAtomicIntAdd((int *) atomic, val) # define virAtomicIntAnd(atomic, val) \ - virAtomicIntAnd((unsigned int *)atomic, val) + virAtomicIntAnd((unsigned int *) atomic, val) # define virAtomicIntOr(atomic, val) \ - virAtomicIntOr((unsigned int *)atomic, val) + virAtomicIntOr((unsigned int *) atomic, val) # define virAtomicIntXor(atomic, val) \ - virAtomicIntXor((unsigned int *)atomic, val) + virAtomicIntXor((unsigned int *) atomic, val) # endif diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0a31947b0d54..dc4080b93f65 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1310,7 +1310,7 @@ virCgroupSetPartitionSuffix(const char *path, char **res) goto cleanup; } - if (!(*res = virStringListJoin((const char **)tokens, "/"))) + if (!(*res = virStringListJoin((const char **) tokens, "/"))) goto cleanup; ret = 0; @@ -3623,7 +3623,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids) static uint32_t virCgroupPidCode(const void *name, uint32_t seed) { - long pid_value = (long)(intptr_t)name; + long pid_value = (long) (intptr_t)name; return virHashCodeGen(&pid_value, sizeof(pid_value), seed); } diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6dab105f568d..b8f915e3991b 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -471,7 +471,7 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngroups) if (cmd->uid != (uid_t)-1 || cmd->gid != (gid_t)-1 || cmd->capabilities || (cmd->flags & VIR_EXEC_CLEAR_CAPS)) { VIR_DEBUG("Setting child uid:gid to %d:%d with caps %llx", - (int)cmd->uid, (int)cmd->gid, cmd->capabilities); + (int) cmd->uid, (int) cmd->gid, cmd->capabilities); if (virSetUIDGIDWithCaps(cmd->uid, cmd->gid, groups, ngroups, cmd->capabilities, !!(cmd->flags & VIR_EXEC_CLEAR_CAPS)) < 0) @@ -2476,7 +2476,7 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) VIR_DEBUG("About to run %s", str ? str : cmd->args[0]); ret = virExec(cmd); VIR_DEBUG("Command result %d, with PID %d", - ret, (int)cmd->pid); + ret, (int) cmd->pid); for (i = 0; i < cmd->npassfd; i++) { if (cmd->passfd[i].flags & VIR_COMMAND_PASS_FD_CLOSE_PARENT) diff --git a/src/util/virconf.c b/src/util/virconf.c index e0a3fd12c04f..d811957241d7 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1042,7 +1042,7 @@ int virConfGetValueBool(virConfPtr conf, return -1; } - if (((unsigned long long)cval->l) > 1) { + if (((unsigned long long) cval->l) > 1) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be 0 or 1"), conf->filename, setting); @@ -1098,7 +1098,7 @@ int virConfGetValueInt(virConfPtr conf, return -1; } - *value = (int)cval->l; + *value = (int) cval->l; return 1; } @@ -1139,14 +1139,14 @@ int virConfGetValueUInt(virConfPtr conf, return -1; } - if (((unsigned long long)cval->l) > UINT_MAX) { + if (((unsigned long long) cval->l) > UINT_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range 0:%u"), conf->filename, setting, UINT_MAX); return -1; } - *value = (unsigned int)cval->l; + *value = (unsigned int) cval->l; return 1; } @@ -1188,7 +1188,7 @@ int virConfGetValueSizeT(virConfPtr conf, } #if ULLONG_MAX > SIZE_MAX - if (((unsigned long long)cval->l) > SIZE_MAX) { + if (((unsigned long long) cval->l) > SIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range 0:%zu"), conf->filename, setting, SIZE_MAX); @@ -1196,7 +1196,7 @@ int virConfGetValueSizeT(virConfPtr conf, } #endif - *value = (size_t)cval->l; + *value = (size_t) cval->l; return 1; } @@ -1231,10 +1231,10 @@ int virConfGetValueSSizeT(virConfPtr conf, return 0; if (cval->type == VIR_CONF_ULLONG) { - if (((unsigned long long)cval->l) > SSIZE_MAX) { + if (((unsigned long long) cval->l) > SSIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range %zd:%zd"), - conf->filename, setting, (ssize_t)-SSIZE_MAX - 1, (ssize_t)SSIZE_MAX); + conf->filename, setting, (ssize_t) -SSIZE_MAX - 1, (ssize_t) SSIZE_MAX); return -1; } } else if (cval->type == VIR_CONF_LLONG) { @@ -1242,7 +1242,7 @@ int virConfGetValueSSizeT(virConfPtr conf, if (cval->l < (-SSIZE_MAX - 1) || cval->l > SSIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range %zd:%zd"), - conf->filename, setting, (ssize_t)-SSIZE_MAX - 1, (ssize_t)SSIZE_MAX); + conf->filename, setting, (ssize_t) -SSIZE_MAX - 1, (ssize_t) SSIZE_MAX); return -1; } #endif @@ -1253,7 +1253,7 @@ int virConfGetValueSSizeT(virConfPtr conf, return -1; } - *value = (ssize_t)cval->l; + *value = (ssize_t) cval->l; return 1; } @@ -1288,7 +1288,7 @@ int virConfGetValueLLong(virConfPtr conf, return 0; if (cval->type == VIR_CONF_ULLONG) { - if (((unsigned long long)cval->l) > LLONG_MAX) { + if (((unsigned long long) cval->l) > LLONG_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range %lld:%lld"), conf->filename, setting, LLONG_MIN, LLONG_MAX); @@ -1341,7 +1341,7 @@ int virConfGetValueULLong(virConfPtr conf, return -1; } - *value = (unsigned long long)cval->l; + *value = (unsigned long long) cval->l; return 1; } @@ -1478,7 +1478,7 @@ virConfWriteFile(const char *filename, virConfPtr conf) ret = safewrite(fd, content, use); VIR_FREE(content); VIR_FORCE_CLOSE(fd); - if (ret != (int)use) { + if (ret != (int) use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content")); return -1; } @@ -1522,8 +1522,8 @@ virConfWriteMem(char *memory, int *len, virConfPtr conf) use = virBufferUse(&buf); content = virBufferContentAndReset(&buf); - if ((int)use >= *len) { - *len = (int)use; + if ((int) use >= *len) { + *len = (int) use; VIR_FREE(content); return -1; } diff --git a/src/util/virdbus.c b/src/util/virdbus.c index ba8b684f17f1..a04559170fe9 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -196,7 +196,7 @@ static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, if (events & VIR_EVENT_HANDLE_HANGUP) dbus_flags |= DBUS_WATCH_HANGUP; - (void)dbus_watch_handle(watch, dbus_flags); + (void) dbus_watch_handle(watch, dbus_flags); while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS) /* keep dispatching while data remains */; @@ -243,7 +243,7 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch, fd = dbus_watch_get_fd(watch); # endif dbus_watch_set_data(watch, info, virDBusWatchFree); - info->bus = (DBusConnection *)data; + info->bus = (DBusConnection *) data; info->watch = virEventAddHandle(fd, flags, virDBusWatchCallback, watch, NULL); @@ -263,7 +263,7 @@ static void virDBusRemoveWatch(DBusWatch *watch, info = dbus_watch_get_data(watch); - (void)virEventRemoveHandle(info->watch); + (void) virEventRemoveHandle(info->watch); } @@ -278,7 +278,7 @@ static void virDBusToggleWatch(DBusWatch *watch, info = dbus_watch_get_data(watch); - (void)virEventUpdateHandle(info->watch, flags); + (void) virEventUpdateHandle(info->watch, flags); } # define VIR_DBUS_TYPE_STACK_MAX_DEPTH 32 @@ -510,7 +510,7 @@ static int virDBusTypeStackPush(virDBusTypeStack **stack, (*stack)[(*nstack) - 1].nstruct = nstruct; (*stack)[(*nstack) - 1].narray = narray; VIR_DEBUG("Pushed types='%s' nstruct=%zu narray=%zd", - types, nstruct, (ssize_t)narray); + types, nstruct, (ssize_t) narray); return 0; } @@ -533,7 +533,7 @@ static int virDBusTypeStackPop(virDBusTypeStack **stack, *nstruct = (*stack)[(*nstack) - 1].nstruct; *narray = (*stack)[(*nstack) - 1].narray; VIR_DEBUG("Popped types='%s' nstruct=%zu narray=%zd", - *types, *nstruct, (ssize_t)*narray); + *types, *nstruct, (ssize_t) *narray); VIR_SHRINK_N(*stack, *nstack, 1); return 0; @@ -624,16 +624,16 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, if (!types) return 0; - narray = (size_t)-1; + narray = (size_t) -1; nstruct = strlen(types); for (;;) { const char *t; VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu types='%s'", - nstack, (ssize_t)narray, nstruct, types); + nstack, (ssize_t) narray, nstruct, types); if (narray == 0 || - (narray == (size_t)-1 && + (narray == (size_t) -1 && nstruct == 0)) { DBusMessageIter *thisiter = iter; if (*types != '}') { @@ -662,7 +662,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, } t = types; - if (narray != (size_t)-1) { + if (narray != (size_t) -1) { narray--; } else { types++; @@ -739,7 +739,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } - if (narray == (size_t)-1) { + if (narray == (size_t) -1) { types += skiplen; nstruct -= skiplen; } @@ -761,7 +761,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, newiter = NULL; types = t + 1; nstruct = skiplen; - narray = (size_t)va_arg(args, int); + narray = (size_t) va_arg(args, int); if (arrayref) arrayptr = va_arg(args, void *); break; @@ -788,7 +788,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, newiter = NULL; types = vsig; nstruct = strlen(types); - narray = (size_t)-1; + narray = (size_t) -1; break; case DBUS_STRUCT_BEGIN_CHAR: @@ -804,7 +804,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, DBUS_TYPE_STRUCT : DBUS_TYPE_DICT_ENTRY, NULL, newiter)) goto cleanup; - if (narray == (size_t)-1) { + if (narray == (size_t) -1) { types += skiplen - 1; nstruct -= skiplen - 1; } @@ -820,14 +820,14 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, newiter = NULL; types = t + 1; nstruct = skiplen - 2; - narray = (size_t)-1; + narray = (size_t) -1; break; default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown type '%x' in signature '%s'"), - (int)*t, types); + (int) *t, types); goto cleanup; } } @@ -857,7 +857,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, # define GET_NEXT_VAL(dbustype, member, vargtype, fmt) \ do { \ DBusBasicValue v; \ - dbustype *x = (dbustype *)&v.member; \ + dbustype *x = (dbustype *) &v.member; \ vargtype *y; \ if (arrayref) { \ VIR_DEBUG("Use arrayref"); \ @@ -901,7 +901,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, if (!types) return 0; - narray = (size_t)-1; + narray = (size_t) -1; nstruct = strlen(types); for (;;) { @@ -909,9 +909,9 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, bool advanceiter = true; VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu type='%s'", - nstack, (ssize_t)narray, nstruct, types); + nstack, (ssize_t) narray, nstruct, types); if (narray == 0 || - (narray == (size_t)-1 && + (narray == (size_t) -1 && nstruct == 0)) { DBusMessageIter *thisiter = iter; VIR_DEBUG("Popping iter=%p", iter); @@ -933,10 +933,10 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, narray = 0; else narray = 1; - VIR_DEBUG("Pop set narray=%zd", (ssize_t)narray); + VIR_DEBUG("Pop set narray=%zd", (ssize_t) narray); } if (!(narray == 0 || - (narray == (size_t)-1 && + (narray == (size_t) -1 && nstruct == 0)) && !dbus_message_iter_next(iter)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -947,7 +947,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, } t = types; - if (narray != (size_t)-1) { + if (narray != (size_t) -1) { if (!arrayref) narray--; } else { @@ -1001,10 +1001,10 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, char ***xptrptr = arrayptr; if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) goto cleanup; - x = (char **)(*xptrptr + (*narrayptr - 1)); + x = (char **) (*xptrptr + (*narrayptr - 1)); VIR_DEBUG("Expanded to %zu", *narrayptr); } else { - x = (char **)va_arg(args, char **); + x = (char **) va_arg(args, char **); } char *s; dbus_message_iter_get_basic(iter, &s); @@ -1039,7 +1039,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, goto cleanup; } - if (narray == (size_t)-1) { + if (narray == (size_t) -1) { types += skiplen; nstruct -= skiplen; } @@ -1062,7 +1062,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, narrayptr = va_arg(args, size_t *); arrayptr = va_arg(args, void *); *narrayptr = 0; - *(char **)arrayptr = NULL; + *(char **) arrayptr = NULL; } else { narray = va_arg(args, int); } @@ -1089,7 +1089,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, newiter = NULL; types = vsig; nstruct = strlen(types); - narray = (size_t)-1; + narray = (size_t) -1; break; case DBUS_STRUCT_BEGIN_CHAR: @@ -1103,7 +1103,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, VIR_DEBUG("Dict/struct contsig='%s' skip='%zu' len='%zu' types='%s'", contsig, skiplen, siglen, types); dbus_message_iter_recurse(iter, newiter); - if (narray == (size_t)-1) { + if (narray == (size_t) -1) { types += skiplen - 1; nstruct -= skiplen - 1; } @@ -1117,7 +1117,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, newiter = NULL; types = t + 1; nstruct = skiplen - 2; - narray = (size_t)-1; + narray = (size_t) -1; break; @@ -1129,7 +1129,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, } VIR_DEBUG("After nstack=%zu narray=%zd nstruct=%zu types='%s'", - nstack, (ssize_t)narray, nstruct, types); + nstack, (ssize_t) narray, nstruct, types); if (arrayref) { if (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_INVALID) { @@ -1143,11 +1143,11 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, narray = 1; } } - VIR_DEBUG("Set narray=%zd", (ssize_t)narray); + VIR_DEBUG("Set narray=%zd", (ssize_t) narray); } else { if (advanceiter && !(narray == 0 || - (narray == (size_t)-1 && + (narray == (size_t) -1 && nstruct == 0)) && !dbus_message_iter_next(iter)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 492dcadc96a9..8bb6290b2d5b 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -103,7 +103,7 @@ addnhostsAdd(dnsmasqAddnHostsfile *addnhostsfile, return -1; for (i = 0; i < addnhostsfile->nhosts; i++) { - if (STREQ((const char *)addnhostsfile->hosts[i].ip, (const char *)ipstr)) { + if (STREQ((const char *) addnhostsfile->hosts[i].ip, (const char *) ipstr)) { idx = i; break; } @@ -689,8 +689,8 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) VIR_INFO("dnsmasq version is %d.%d, --bind-dynamic is %spresent, " "SO_BINDTODEVICE is %sin use, --ra-param is %spresent", - (int)caps->version / 1000000, - (int)(caps->version % 1000000) / 1000, + (int) caps->version / 1000000, + (int) (caps->version % 1000000) / 1000, dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC) ? "" : "NOT ", dnsmasqCapsGet(caps, DNSMASQ_CAPS_BINDTODEVICE) ? "" : "NOT ", dnsmasqCapsGet(caps, DNSMASQ_CAPS_RA_PARAM) ? "" : "NOT "); diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index e4973a2bd015..8ac794796ee6 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -1176,7 +1176,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, if (virTimeBackOffStart(&timeout, 1, 3*1000 /* ms */) < 0) goto error; while (virTimeBackOffWait(&timeout)) { - ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); + ret = connect(fd, (struct sockaddr *) &sa, sizeof(sa)); if (ret == 0) break; diff --git a/src/util/virfile.c b/src/util/virfile.c index 5e9bd2007a52..1feea06cc44a 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1048,7 +1048,7 @@ saferead(int fd, void *buf, size_t count) return r; if (r == 0) return nread; - buf = (char *)buf + r; + buf = (char *) buf + r; count -= r; nread += r; } @@ -1073,7 +1073,7 @@ safewrite(int fd, const void *buf, size_t count) return r; if (r == 0) return nwritten; - buf = (const char *)buf + r; + buf = (const char *) buf + r; count -= r; nwritten += r; } @@ -1401,7 +1401,7 @@ virFileReadLimFD(int fd, int maxlen, char **buf) s = saferead_lim(fd, maxlen+1, &len); if (s == NULL) return -1; - if (len > maxlen || (int)len != len) { + if (len > maxlen || (int) len != len) { VIR_FREE(s); /* There was at least one byte more than MAXLEN. Set errno accordingly. */ @@ -3418,7 +3418,7 @@ virFileIsSharedFSType(const char *path, } VIR_DEBUG("Check if path %s with FS magic %lld is shared", - path, (long long int)sb.f_type); + path, (long long int) sb.f_type); if ((fstypes & VIR_FILE_SHFS_NFS) && (sb.f_type == NFS_SUPER_MAGIC)) diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index dab72163ddb4..a5e8011779dd 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -351,7 +351,7 @@ virFileCacheLookupByFunc(virFileCachePtr cache, virObjectLock(cache); - data = virHashSearch(cache->table, iter, iterData, (void **)&name); + data = virHashSearch(cache->table, iter, iterData, (void **) &name); virFileCacheValidate(cache, name, &data); virObjectRef(data); diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 10c370a2aec0..c0c1dc3b4fd6 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -753,7 +753,7 @@ virFirewallApplyRuleFirewallD(virFirewallRulePtr rule, "passthrough", "sa&s", ipv, - (int)rule->argsLen, + (int) rule->argsLen, rule->args) < 0) goto cleanup; diff --git a/src/util/virhash.c b/src/util/virhash.c index ecda55dba514..84c591874465 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -758,7 +758,7 @@ struct virHashEqualData static int virHashEqualSearcher(const void *payload, const void *name, const void *data) { - struct virHashEqualData *vhed = (void *)data; + struct virHashEqualData *vhed = (void *) data; const void *value; value = virHashLookup(vhed->table2, name); diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index 11efe8c5029f..a88a9cb7a819 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -110,7 +110,7 @@ virHostMemGetStatsFreeBSD(virNodeMemoryStatsPtr params, sysctl_map[i].field); return -1; } - param->value = (unsigned long long)value * pagesize; + param->value = (unsigned long long) value * pagesize; } { @@ -128,7 +128,7 @@ virHostMemGetStatsFreeBSD(virNodeMemoryStatsPtr params, VIR_NODE_MEMORY_STATS_BUFFERS); return -1; } - param->value = (unsigned long long)bufpages >> 10; + param->value = (unsigned long long) bufpages >> 10; } return 0; @@ -454,13 +454,13 @@ virHostMemGetParameterValue(const char *field, if (STREQ(field, "pages_to_scan") || STREQ(field, "sleep_millisecs") || STREQ(field, "merge_across_nodes")) - rc = virStrToLong_ui(buf, NULL, 10, (unsigned int *)value); + rc = virStrToLong_ui(buf, NULL, 10, (unsigned int *) value); else if (STREQ(field, "pages_shared") || STREQ(field, "pages_sharing") || STREQ(field, "pages_unshared") || STREQ(field, "pages_volatile") || STREQ(field, "full_scans")) - rc = virStrToLong_ull(buf, NULL, 10, (unsigned long long *)value); + rc = virStrToLong_ull(buf, NULL, 10, (unsigned long long *) value); if (rc < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -635,7 +635,7 @@ virHostMemGetCellsFreeFake(unsigned long long *freeMems, return -1; } - freeMems[0] = (unsigned long long)avail; + freeMems[0] = (unsigned long long) avail; if (!freeMems[0]) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 2f4307bc8284..6116c205e32f 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -463,7 +463,7 @@ int virIdentitySetUNIXUserID(virIdentityPtr ident, { char *val; int ret; - if (virAsprintf(&val, "%d", (int)uid) < 0) + if (virAsprintf(&val, "%d", (int) uid) < 0) return -1; ret = virIdentitySetAttr(ident, VIR_IDENTITY_ATTR_UNIX_USER_ID, @@ -487,7 +487,7 @@ int virIdentitySetUNIXGroupID(virIdentityPtr ident, { char *val; int ret; - if (virAsprintf(&val, "%d", (int)gid) < 0) + if (virAsprintf(&val, "%d", (int) gid) < 0) return -1; ret = virIdentitySetAttr(ident, VIR_IDENTITY_ATTR_UNIX_GROUP_ID, diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index d4c745a1afac..991a66583608 100644 --- a/src/util/viriscsi.c +++ b/src/util/viriscsi.c @@ -211,7 +211,7 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, if (virAsprintf(&temp_ifacename, "libvirt-iface-%08llx", - (unsigned long long)virRandomBits(30)) < 0) + (unsigned long long) virRandomBits(30)) < 0) return -1; VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", diff --git a/src/util/virjson.c b/src/util/virjson.c index dfe00d9280da..2cfcc5ecff6d 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1644,10 +1644,10 @@ virJSONParserHandleString(void *ctx, yajl_size_t stringLen) { virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, + virJSONValuePtr value = virJSONValueNewStringLen((const char *) stringVal, stringLen); - VIR_DEBUG("parser=%p str=%p", parser, (const char *)stringVal); + VIR_DEBUG("parser=%p str=%p", parser, (const char *) stringVal); if (!value) return 0; @@ -1669,7 +1669,7 @@ virJSONParserHandleMapKey(void *ctx, virJSONParserPtr parser = ctx; virJSONParserStatePtr state; - VIR_DEBUG("parser=%p key=%p", parser, (const char *)stringVal); + VIR_DEBUG("parser=%p key=%p", parser, (const char *) stringVal); if (!parser->nstate) return 0; @@ -1677,7 +1677,7 @@ virJSONParserHandleMapKey(void *ctx, state = &parser->state[parser->nstate-1]; if (state->key) return 0; - if (VIR_STRNDUP(state->key, (const char *)stringVal, stringLen) < 0) + if (VIR_STRNDUP(state->key, (const char *) stringVal, stringLen) < 0) return 0; return 1; } @@ -1835,15 +1835,15 @@ virJSONValueFromString(const char *jsonstring) * with no visibility into how much more input remains. Wrapping * things in an array forces yajl to confess the truth. */ # ifdef WITH_YAJL2 - rc = yajl_parse(hand, (const unsigned char *)jsonstring, len); + rc = yajl_parse(hand, (const unsigned char *) jsonstring, len); # else - rc = yajl_parse(hand, (const unsigned char *)"[", 1); + rc = yajl_parse(hand, (const unsigned char *) "[", 1); parser.wrap = 1; if (VIR_YAJL_STATUS_OK(rc)) - rc = yajl_parse(hand, (const unsigned char *)jsonstring, len); + rc = yajl_parse(hand, (const unsigned char *) jsonstring, len); parser.wrap = 0; if (VIR_YAJL_STATUS_OK(rc)) - rc = yajl_parse(hand, (const unsigned char *)"]", 1); + rc = yajl_parse(hand, (const unsigned char *) "]", 1); # endif if (!VIR_YAJL_STATUS_OK(rc) || yajl_complete_parse(hand) != yajl_status_ok) { @@ -1910,7 +1910,7 @@ virJSONValueToStringOne(virJSONValuePtr object, return -1; for (i = 0; i < object->data.object.npairs; i++) { if (yajl_gen_string(g, - (unsigned char *)object->data.object.pairs[i].key, + (unsigned char *) object->data.object.pairs[i].key, strlen(object->data.object.pairs[i].key)) != yajl_gen_status_ok) return -1; @@ -1932,7 +1932,7 @@ virJSONValueToStringOne(virJSONValuePtr object, break; case VIR_JSON_TYPE_STRING: - if (yajl_gen_string(g, (unsigned char *)object->data.string, + if (yajl_gen_string(g, (unsigned char *) object->data.string, strlen(object->data.string)) != yajl_gen_status_ok) return -1; break; @@ -2001,7 +2001,7 @@ virJSONValueToString(virJSONValuePtr object, goto cleanup; } - ignore_value(VIR_STRDUP(ret, (const char *)str)); + ignore_value(VIR_STRDUP(ret, (const char *) str)); cleanup: yajl_gen_free(g); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 41af0cdb6d28..b6d2d5b98604 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -618,7 +618,7 @@ int virLockSpaceAcquireResource(virLockSpacePtr lockspace, virLockSpaceResourcePtr res; VIR_DEBUG("lockspace=%p resname=%s flags=0x%x owner=%lld", - lockspace, resname, flags, (unsigned long long)owner); + lockspace, resname, flags, (unsigned long long) owner); virCheckFlags(VIR_LOCK_SPACE_ACQUIRE_SHARED | VIR_LOCK_SPACE_ACQUIRE_AUTOCREATE, -1); @@ -667,7 +667,7 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace, size_t i; VIR_DEBUG("lockspace=%p resname=%s owner=%lld", - lockspace, resname, (unsigned long long)owner); + lockspace, resname, (unsigned long long) owner); virMutexLock(&lockspace->lock); @@ -686,7 +686,7 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace, if (i == res->nOwners) { virReportError(VIR_ERR_INTERNAL_ERROR, _("owner %lld does not hold the resource lock"), - (unsigned long long)owner); + (unsigned long long) owner); goto cleanup; } @@ -716,10 +716,10 @@ virLockSpaceRemoveResourcesForOwner(const void *payload, const void *opaque) { virLockSpaceResourcePtr res = (virLockSpaceResourcePtr)payload; - struct virLockSpaceRemoveData *data = (struct virLockSpaceRemoveData *)opaque; + struct virLockSpaceRemoveData *data = (struct virLockSpaceRemoveData *) opaque; size_t i; - VIR_DEBUG("res %s owner %lld", res->name, (unsigned long long)data->owner); + 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) @@ -751,7 +751,7 @@ int virLockSpaceReleaseResourcesForOwner(virLockSpacePtr lockspace, owner, 0 }; - VIR_DEBUG("lockspace=%p owner=%lld", lockspace, (unsigned long long)owner); + VIR_DEBUG("lockspace=%p owner=%lld", lockspace, (unsigned long long) owner); virMutexLock(&lockspace->lock); diff --git a/src/util/virlog.c b/src/util/virlog.c index 81a9dc4395c2..3bb542f3936f 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -781,7 +781,7 @@ virLogCloseFd(void *data) static virLogOutputPtr virLogNewOutputToStderr(virLogPriority priority) { - return virLogOutputNew(virLogOutputToFd, NULL, (void *)STDERR_FILENO, + return virLogOutputNew(virLogOutputToFd, NULL, (void *) STDERR_FILENO, priority, VIR_LOG_TO_STDERR, NULL); } @@ -800,7 +800,7 @@ virLogNewOutputToFile(virLogPriority priority, } if (!(ret = virLogOutputNew(virLogOutputToFd, virLogCloseFd, - (void *)(intptr_t)fd, + (void *) (intptr_t)fd, priority, VIR_LOG_TO_FILE, file))) { VIR_LOG_CLOSE(fd); return NULL; @@ -965,11 +965,11 @@ journalAddString(struct journalState *state, const char *field, if (state->iov_end - state->iov < 4) return; /* Silently drop */ IOVEC_SET_STRING(state->iov[0], field); - IOVEC_SET(state->iov[1], (void *)&equals, sizeof(equals)); + IOVEC_SET(state->iov[1], (void *) &equals, sizeof(equals)); state->iov += 2; } IOVEC_SET_STRING(state->iov[0], value); - IOVEC_SET(state->iov[1], (void *)&newline, sizeof(newline)); + IOVEC_SET(state->iov[1], (void *) &newline, sizeof(newline)); state->iov += 2; } @@ -986,9 +986,9 @@ journalAddInt(struct journalState *state, const char *field, int value) num = virFormatIntDecimal(state->bufs[0], sizeof(state->bufs[0]), value); IOVEC_SET_STRING(state->iov[0], field); - IOVEC_SET(state->iov[1], (void *)&equals, sizeof(equals)); + IOVEC_SET(state->iov[1], (void *) &equals, sizeof(equals)); IOVEC_SET_STRING(state->iov[2], num); - IOVEC_SET(state->iov[3], (void *)&newline, sizeof(newline)); + IOVEC_SET(state->iov[3], (void *) &newline, sizeof(newline)); state->bufs++; state->iov += 4; } @@ -1129,7 +1129,7 @@ virLogNewOutputToJournald(int priority) } if (!(ret = virLogOutputNew(virLogOutputToJournald, virLogCloseFd, - (void *)(intptr_t) journalfd, priority, + (void *) (intptr_t) journalfd, priority, VIR_LOG_TO_JOURNALD, NULL))) { VIR_LOG_CLOSE(journalfd); return NULL; diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b250af9e2c10..6ee5833d6f3e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -260,7 +260,7 @@ virNetDevSetMACInternal(const char *ifname, goto cleanup; } - virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + virMacAddrGetRaw(macaddr, (unsigned char *) ifr.ifr_hwaddr.sa_data); if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) { @@ -386,7 +386,7 @@ int virNetDevGetMAC(const char *ifname, goto cleanup; } - virMacAddrSetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + virMacAddrSetRaw(macaddr, (unsigned char *) ifr.ifr_hwaddr.sa_data); ret = 0; @@ -973,7 +973,7 @@ virNetDevGetMaster(const char *ifname, char **master) goto cleanup; if (tb[IFLA_MASTER]) { - if (!(*master = virNetDevGetName(*(int *)RTA_DATA(tb[IFLA_MASTER])))) + if (!(*master = virNetDevGetName(*(int *) RTA_DATA(tb[IFLA_MASTER])))) goto cleanup; } @@ -1092,7 +1092,7 @@ int virNetDevValidateConfig(const char *ifname, } if (virMacAddrCmpRaw(macaddr, - (unsigned char *)ifr.ifr_hwaddr.sa_data) != 0) { + (unsigned char *) ifr.ifr_hwaddr.sa_data) != 0) { ret = 0; goto cleanup; } @@ -1720,7 +1720,7 @@ virNetDevSetVfConfig(const char *ifname, int vf, switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -2656,7 +2656,7 @@ int virNetDevAddMulti(const char *ifname, return -1; ifr.ifr_hwaddr.sa_family = AF_UNSPEC; - virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + virMacAddrGetRaw(macaddr, (unsigned char *) ifr.ifr_hwaddr.sa_data); if (ioctl(fd, SIOCADDMULTI, &ifr) < 0) { char macstr[VIR_MAC_STRING_BUFLEN]; @@ -2705,7 +2705,7 @@ int virNetDevDelMulti(const char *ifname, return -1; ifr.ifr_hwaddr.sa_family = AF_UNSPEC; - virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); + virMacAddrGetRaw(macaddr, (unsigned char *) ifr.ifr_hwaddr.sa_data); if (ioctl(fd, SIOCDELMULTI, &ifr) < 0) { char macstr[VIR_MAC_STRING_BUFLEN]; @@ -2751,7 +2751,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) return -1; } - switch ((virMCastType)ifindex) { + switch ((virMCastType) ifindex) { case VIR_MCAST_TYPE_INDEX_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, @@ -3180,7 +3180,7 @@ static void * virNetDevPutExtraHeader(struct nlmsghdr *nlh, size_t size) { - char *ptr = (char *)nlh + nlh->nlmsg_len; + char *ptr = (char *) nlh + nlh->nlmsg_len; size_t len = NLMSG_ALIGN(size); nlh->nlmsg_len += len; return ptr; @@ -3318,7 +3318,7 @@ virNetDevSwitchdevFeature(const char *ifname, } if (tb[DEVLINK_ATTR_ESWITCH_MODE] && - *(int *)RTA_DATA(tb[DEVLINK_ATTR_ESWITCH_MODE]) == DEVLINK_ESWITCH_MODE_SWITCHDEV) { + *(int *) RTA_DATA(tb[DEVLINK_ATTR_ESWITCH_MODE]) == DEVLINK_ESWITCH_MODE_SWITCHDEV) { ignore_value(virBitmapSetBit(*out, VIR_NET_DEV_FEAT_SWITCHDEV)); } diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index cfb7ebae99c7..d40f5335bc03 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -195,7 +195,7 @@ static int virNetDevBridgeGet(const char *brname, VIR_FREE(valuestr); } else { struct __bridge_info info; - unsigned long args[] = { BRCTL_GET_BRIDGE_INFO, (unsigned long)&info, 0, 0 }; + unsigned long args[] = { BRCTL_GET_BRIDGE_INFO, (unsigned long) &info, 0, 0 }; if ((fd = virNetDevSetupControl(brname, &ifr)) < 0) goto cleanup; @@ -464,7 +464,7 @@ virNetDevBridgeCreate(const char *brname) switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -1123,7 +1123,7 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname, switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; if (err->error) { diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bf98ed8a59e0..b98a582b4ad7 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -415,7 +415,7 @@ virNetDevIPParseDadStatus(struct nlmsghdr *nlh, int len, break; } - ifaddrmsg_ptr = (struct ifaddrmsg *)NLMSG_DATA(nlh); + ifaddrmsg_ptr = (struct ifaddrmsg *) NLMSG_DATA(nlh); if (!(ifaddrmsg_ptr->ifa_flags & IFA_F_TENTATIVE)) { /* Not tentative: we are not interested in this entry. */ continue; @@ -563,7 +563,7 @@ virNetDevIPCheckIPv6ForwardingCallback(const struct nlmsghdr *resp, for (rta = RTM_RTA(rtmsg); RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) { VIR_WARNINGS_RESET if (rta->rta_type == RTA_OIF) { - oif = *(int *)RTA_DATA(rta); + oif = *(int *) RTA_DATA(rta); /* Should never happen: netlink message would be broken */ if (ifname) { @@ -856,7 +856,7 @@ virNetDevGetIPv4AddressIoctl(const char *ifname, if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) return -1; - if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) { + if (ioctl(fd, SIOCGIFADDR, (char *) &ifr) < 0) { virReportSystemError(errno, _("Unable to get IPv4 address for interface %s via ioctl"), ifname); diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index fb41bf934cf9..0d6c0d0abe12 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -371,7 +371,7 @@ virNetDevMacVLanCreate(const char *ifname, switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -685,15 +685,15 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, case RTM_GETLINK: VIR_DEBUG(" IFINFOMSG"); VIR_DEBUG(" ifi_family = 0x%02x", - ((struct ifinfomsg *)data)->ifi_family); + ((struct ifinfomsg *) data)->ifi_family); VIR_DEBUG(" ifi_type = 0x%x", - ((struct ifinfomsg *)data)->ifi_type); + ((struct ifinfomsg *) data)->ifi_type); VIR_DEBUG(" ifi_index = %i", - ((struct ifinfomsg *)data)->ifi_index); + ((struct ifinfomsg *) data)->ifi_index); VIR_DEBUG(" ifi_flags = 0x%04x", - ((struct ifinfomsg *)data)->ifi_flags); + ((struct ifinfomsg *) data)->ifi_flags); VIR_DEBUG(" ifi_change = 0x%04x", - ((struct ifinfomsg *)data)->ifi_change); + ((struct ifinfomsg *) data)->ifi_change); } /* DEBUG end */ @@ -703,7 +703,7 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, ifinfo.ifi_family, ifinfo.ifi_type, ifinfo.ifi_index, ifinfo.ifi_flags, ifinfo.ifi_change); if (nlmsg_parse(hdr, sizeof(ifinfo), - (struct nlattr **)&tb, IFLA_MAX, NULL)) { + (struct nlattr **) &tb, IFLA_MAX, NULL)) { VIR_DEBUG("error parsing request..."); return; } @@ -753,12 +753,12 @@ virNetDevMacVLanVPortProfileCallback(struct nlmsghdr *hdr, } if (tb[IFLA_IFNAME]) { - ifname = (char *)RTA_DATA(tb[IFLA_IFNAME]); + ifname = (char *) RTA_DATA(tb[IFLA_IFNAME]); VIR_DEBUG("IFLA_IFNAME = %s", ifname); } if (tb[IFLA_OPERSTATE]) { - rem = *(unsigned short *)RTA_DATA(tb[IFLA_OPERSTATE]); + rem = *(unsigned short *) RTA_DATA(tb[IFLA_OPERSTATE]); VIR_DEBUG("IFLA_OPERSTATE = %d", rem); } diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index a3ed59da8502..0a1011694773 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -126,7 +126,7 @@ virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) goto cleanup; } - if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) { + if (ioctl(fd, TAPGIFNAME, (void *) &ifr) < 0) { virReportSystemError(errno, "%s", _("Unable to query tap interface name")); goto cleanup; @@ -793,7 +793,7 @@ virNetDevTapInterfaceStats(const char *ifname, continue; if (STREQ(ifa->ifa_name, ifname)) { - ifd = (struct if_data *)ifa->ifa_data; + ifd = (struct if_data *) ifa->ifa_data; if (swapped) { stats->tx_bytes = ifd->ifi_ibytes; stats->tx_packets = ifd->ifi_ipackets; diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 133d962db6b2..491a9cd74526 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -807,7 +807,7 @@ virNetDevVPortProfileOpSetLink(const char *ifname, int ifindex, switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -896,7 +896,7 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int } if (tb[IFLA_LINK]) { - ifindex = *(int *)RTA_DATA(tb[IFLA_LINK]); + ifindex = *(int *) RTA_DATA(tb[IFLA_LINK]); ifname = NULL; } else { end = true; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index fa1ba3e2a166..f8f520b306cc 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -312,7 +312,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, protocol, groups))) goto cleanup; - len = nl_recv(nlhandle, &nladdr, (unsigned char **)resp, NULL); + len = nl_recv(nlhandle, &nladdr, (unsigned char **) resp, NULL); if (len == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nl_recv failed - returned 0 bytes")); @@ -360,7 +360,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, goto cleanup; while (!end) { - len = nl_recv(nlhandle, &nladdr, (unsigned char **)&resp, NULL); + len = nl_recv(nlhandle, &nladdr, (unsigned char **) &resp, NULL); VIR_WARNINGS_NO_CAST_ALIGN for (msg = resp; NLMSG_OK(msg, len); msg = NLMSG_NEXT(msg, len)) { VIR_WARNINGS_RESET @@ -461,7 +461,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -552,7 +552,7 @@ virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback) switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -638,7 +638,7 @@ virNetlinkGetNeighbor(void **nlData, uint32_t src_pid, uint32_t dst_pid) switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -686,7 +686,7 @@ virNetlinkGetErrorCode(struct nlmsghdr *resp, unsigned int recvbuflen) switch (resp->nlmsg_type) { case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); + err = (struct nlmsgerr *) NLMSG_DATA(resp); if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) goto malformed_resp; @@ -775,7 +775,7 @@ virNetlinkEventCallback(int watch, bool handled = false; length = nl_recv(srv->netlinknh, &peer, - (unsigned char **)&msg, &creds); + (unsigned char **) &msg, &creds); if (length == 0) return; @@ -788,7 +788,7 @@ virNetlinkEventCallback(int watch, virNetlinkEventServerLock(srv); VIR_DEBUG("dispatching to max %d clients, called from event watch %d", - (int)srv->handlesCount, watch); + (int) srv->handlesCount, watch); for (i = 0; i < srv->handlesCount; i++) { if (srv->handles[i].deleted != VIR_NETLINK_HANDLE_VALID) @@ -910,7 +910,7 @@ int virNetlinkEventServiceLocalPid(unsigned int protocol) _("netlink event service not running")); return -1; } - return (int)nl_socket_get_local_port(server[protocol]->netlinknh); + return (int) nl_socket_get_local_port(server[protocol]->netlinknh); } diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 0af0908e4ae1..c2340cb9b0f9 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -109,7 +109,7 @@ static int virNodeSuspendSetNodeWakeup(unsigned long long alarmTime) */ static void virNodeSuspendHelper(void *cmdString) { - virCommandPtr suspendCmd = virCommandNew((const char *)cmdString); + virCommandPtr suspendCmd = virCommandNew((const char *) cmdString); /* * Delay for sometime so that the function virNodeSuspend() @@ -221,7 +221,7 @@ int virNodeSuspend(unsigned int target, if (virThreadCreate(&thread, false, virNodeSuspendHelper, - (void *)cmdString) < 0) { + (void *) cmdString) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to create thread to suspend the host")); goto cleanup; diff --git a/src/util/virobject.c b/src/util/virobject.c index 9fb0328d5879..6a2ab967a094 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -630,7 +630,7 @@ virObjectListFreeCount(void *list, return; for (i = 0; i < count; i++) - virObjectUnref(((void **)list)[i]); + virObjectUnref(((void **) list)[i]); VIR_FREE(list); } diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 58ab29f77f2c..9253d2c4ce88 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -252,7 +252,7 @@ int virPidFileReadPathIfAlive(const char *path, goto cleanup; } - if (virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid) < 0) { + if (virAsprintf(&procPath, "/proc/%lld/exe", (long long) retPid) < 0) { ret = -ENOMEM; goto cleanup; } diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 198439cea291..d937a1f7faf2 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -87,9 +87,9 @@ int virPolkitCheckAuth(const char *actionid, "(sa{sv})sa&{ss}us", "unix-process", 3, - "pid", "u", (unsigned int)pid, + "pid", "u", (unsigned int) pid, "start-time", "t", startTime, - "uid", "i", (int)uid, + "uid", "i", (int) uid, actionid, virStringListLength(details) / 2, details, diff --git a/src/util/virprobe.h b/src/util/virprobe.h index 88cda2104f08..afc966d06a07 100644 --- a/src/util/virprobe.h +++ b/src/util/virprobe.h @@ -48,7 +48,7 @@ * can safely go to intptr_t and back to void *, which collapses * arrays into pointers; while any integer can be widened to intptr_t * then cast to void *. */ -# define VIR_ADD_CAST(a) ((void *)(intptr_t)(a)) +# define VIR_ADD_CAST(a) ((void *) (intptr_t)(a)) # define VIR_ADD_CAST1(a) \ VIR_ADD_CAST(a) # define VIR_ADD_CAST2(a, b) \ diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3a279f..43ef0fc16c7d 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -207,7 +207,7 @@ void virProcessAbort(pid_t pid) { /* Not yet ported to mingw. Any volunteers? */ - VIR_DEBUG("failed to reap child %lld, abandoning it", (long long)pid); + VIR_DEBUG("failed to reap child %lld, abandoning it", (long long) pid); } #endif @@ -352,7 +352,7 @@ virProcessKillPainfully(pid_t pid, bool force) int ret = -1; const char *signame = "TERM"; - VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force); + VIR_DEBUG("vpid=%lld force=%d", (long long) pid, force); /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -368,7 +368,7 @@ virProcessKillPainfully(pid_t pid, bool force) signum = SIGTERM; /* kindly suggest it should exit */ } else if (i == 50 && force) { VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, " - "sending SIGKILL", (long long)pid); + "sending SIGKILL", (long long) pid); /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our * virProcessKill proc will handle more or less like SIGKILL */ #ifdef WIN32 @@ -386,7 +386,7 @@ virProcessKillPainfully(pid_t pid, bool force) if (errno != ESRCH) { virReportSystemError(errno, _("Failed to terminate process %lld with SIG%s"), - (long long)pid, signame); + (long long) pid, signame); goto cleanup; } ret = signum == SIGTERM ? 0 : 1; @@ -398,7 +398,7 @@ virProcessKillPainfully(pid_t pid, bool force) virReportSystemError(EBUSY, _("Failed to terminate process %lld with SIG%s"), - (long long)pid, signame); + (long long) pid, signame); cleanup: return ret; @@ -410,7 +410,7 @@ virProcessKillPainfully(pid_t pid, bool force) int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; - VIR_DEBUG("Set process affinity on %lld", (long long)pid); + VIR_DEBUG("Set process affinity on %lld", (long long) pid); # ifdef CPU_ALLOC /* New method dynamically allocates cpu mask, allowing unlimted cpus */ int numcpus = 1024; @@ -768,7 +768,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) virReportSystemError(errno, _("cannot limit locked memory " "of process %lld to %llu"), - (long long int)pid, bytes); + (long long int) pid, bytes); return -1; } } @@ -864,7 +864,7 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs) virReportSystemError(errno, _("cannot limit number of subprocesses " "of process %lld to %u"), - (long long int)pid, procs); + (long long int) pid, procs); return -1; } } @@ -912,7 +912,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files) virReportSystemError(errno, _("cannot limit number of open files " "of process %lld to %u"), - (long long int)pid, files); + (long long int) pid, files); return -1; } } @@ -949,7 +949,7 @@ virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes) virReportSystemError(errno, _("cannot limit core file size " "of process %lld to %llu"), - (long long int)pid, bytes); + (long long int) pid, bytes); return -1; } } @@ -1055,7 +1055,7 @@ int virProcessGetStartTime(pid_t pid, return -1; } - *timestamp = (unsigned long long)p.ki_start.tv_sec; + *timestamp = (unsigned long long) p.ki_start.tv_sec; return 0; diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 41daa404b273..817c8d9968e2 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -235,7 +235,7 @@ virRandomGenerateWWN(char **wwn, } if (virAsprintf(wwn, "5" "%s%09llx", oui, - (unsigned long long)virRandomBits(36)) < 0) + (unsigned long long) virRandomBits(36)) < 0) return -1; return 0; } diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index ca62a8e02641..096c9ef92f36 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -533,7 +533,7 @@ virRotatingFileReaderSeek(virRotatingFileReaderPtr file, if (ret == (off_t)-1) { virReportSystemError(errno, _("Unable to seek to inode %llu offset %llu"), - (unsigned long long)inode, (unsigned long long)offset); + (unsigned long long) inode, (unsigned long long) offset); return -1; } @@ -546,7 +546,7 @@ virRotatingFileReaderSeek(virRotatingFileReaderPtr file, if (ret == (off_t)-1) { virReportSystemError(errno, _("Unable to seek to inode %llu offset %llu"), - (unsigned long long)inode, (unsigned long long)offset); + (unsigned long long) inode, (unsigned long long) offset); return -1; } return 0; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 531540ac9184..bfedaf8fa87b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -460,7 +460,7 @@ qcow2GetBackingStoreFormat(int *format, if (buf[offset+len] != '\0') break; *format = virStorageFileFormatTypeFromString( - ((const char *)buf)+offset); + ((const char *) buf)+offset); if (*format <= VIR_STORAGE_FILE_NONE) return -1; } @@ -2475,7 +2475,7 @@ virStorageSourceRBDAddHost(virStorageSourcePtr src, parts = virStringSplit(hostport, "\\:", 0); if (!parts) goto error; - src->hosts[src->nhosts-1].name = virStringListJoin((const char **)parts, ":"); + src->hosts[src->nhosts-1].name = virStringListJoin((const char **) parts, ":"); virStringListFree(parts); if (!src->hosts[src->nhosts-1].name) goto error; @@ -3510,8 +3510,8 @@ virStorageSourceUpdateBackingSizes(virStorageSourcePtr src, /* Get info for normal formats */ if (S_ISREG(sb->st_mode) || fd == -1) { #ifndef WIN32 - src->allocation = (unsigned long long)sb->st_blocks * - (unsigned long long)DEV_BSIZE; + src->allocation = (unsigned long long) sb->st_blocks * + (unsigned long long) DEV_BSIZE; #else src->allocation = sb->st_size; #endif @@ -4452,7 +4452,7 @@ virStorageFileChown(const virStorageSource *src, } VIR_DEBUG("chown of storage file %p to %u:%u", - src, (unsigned int)uid, (unsigned int)gid); + src, (unsigned int) uid, (unsigned int) gid); return src->drv->backend->storageFileChown(src, uid, gid); } @@ -4523,7 +4523,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, VIR_DEBUG("path=%s format=%d uid=%u gid=%u probe=%d", src->path, src->format, - (unsigned int)uid, (unsigned int)gid, allow_probe); + (unsigned int) uid, (unsigned int) gid, allow_probe); /* exit if we can't load information about the current image */ if (!virStorageFileSupportsBackingChainTraversal(src)) @@ -4547,7 +4547,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, goto cleanup; } - if (virHashAddEntry(cycle, uniqueName, (void *)1) < 0) + if (virHashAddEntry(cycle, uniqueName, (void *) 1) < 0) goto cleanup; if ((headerLen = virStorageFileRead(src, 0, VIR_STORAGE_MAX_HEADER, @@ -4628,7 +4628,7 @@ virStorageFileGetMetadata(virStorageSourcePtr src, bool report_broken) { VIR_DEBUG("path=%s format=%d uid=%u gid=%u probe=%d, report_broken=%d", - src->path, src->format, (unsigned int)uid, (unsigned int)gid, + src->path, src->format, (unsigned int) uid, (unsigned int) gid, allow_probe, report_broken); virHashTablePtr cycle = NULL; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3be963d704ea..28af95066d1e 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -338,7 +338,7 @@ int virSystemdCreateMachine(const char *name, uuid[12], uuid[13], uuid[14], uuid[15], creatorname, iscontainer ? "container" : "vm", - (unsigned int)pidleader, + (unsigned int) pidleader, rootdir ? rootdir : "", nnicindexes, nicindexes, 3, @@ -380,7 +380,7 @@ int virSystemdCreateMachine(const char *name, uuid[12], uuid[13], uuid[14], uuid[15], creatorname, iscontainer ? "container" : "vm", - (unsigned int)pidleader, + (unsigned int) pidleader, rootdir ? rootdir : "", 3, "Slice", "s", slicename, @@ -464,7 +464,7 @@ virSystemdNotifyStartup(void) .sun_family = AF_UNIX, }; struct iovec iov = { - .iov_base = (char *)msg, + .iov_base = (char *) msg, .iov_len = strlen(msg), }; struct msghdr mh = { diff --git a/src/util/virtime.c b/src/util/virtime.c index 640eb5a1d12c..84879bf19502 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -395,7 +395,7 @@ virTimeBackOffStart(virTimeBackOffVar *var, /** * virTimeBackOffWait - * @var: Timeout variable (with type virTimeBackOffVar *). + * @var: Timeout variable (with type virTimeBackOffVar *) . * * You must initialize @var first by calling the following function, * which also starts the timer: diff --git a/src/util/viruri.c b/src/util/viruri.c index b80d9249e638..595a696a78dd 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -253,7 +253,7 @@ virURIFormat(virURIPtr uri) if (!xmluri.server && !xmluri.port) xmluri.port = -1; - ret = (char *)xmlSaveUri(&xmluri); + ret = (char *) xmlSaveUri(&xmluri); if (!ret) { virReportOOMError(); goto cleanup; diff --git a/src/util/virutil.c b/src/util/virutil.c index cd6fbf2f306a..2a65b73230bd 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1904,7 +1904,7 @@ void virUpdateSelfLastChanged(const char *path) if (sb.st_ctime > selfLastChanged) { VIR_DEBUG("Setting self last changed to %lld for '%s'", - (long long)sb.st_ctime, path); + (long long) sb.st_ctime, path); selfLastChanged = sb.st_ctime; } } diff --git a/src/util/virutil.h b/src/util/virutil.h index be0f6b0ea855..08d65136b647 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,9 +202,9 @@ virTristateSwitch virTristateSwitchFromBool(bool val); /* the two enums must be in sync to be able to use helpers interchangeably in * some special cases */ -verify((int)VIR_TRISTATE_BOOL_YES == (int)VIR_TRISTATE_SWITCH_ON); -verify((int)VIR_TRISTATE_BOOL_NO == (int)VIR_TRISTATE_SWITCH_OFF); -verify((int)VIR_TRISTATE_BOOL_ABSENT == (int)VIR_TRISTATE_SWITCH_ABSENT); +verify((int) VIR_TRISTATE_BOOL_YES == (int) VIR_TRISTATE_SWITCH_ON); +verify((int) VIR_TRISTATE_BOOL_NO == (int) VIR_TRISTATE_SWITCH_OFF); +verify((int) VIR_TRISTATE_BOOL_ABSENT == (int) VIR_TRISTATE_SWITCH_ABSENT); unsigned int virGetListenFDs(void); char *virGetUNIXSocketPath(int fd); diff --git a/src/util/virxml.c b/src/util/virxml.c index 6e87605ea5e4..9d35e8073228 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -507,7 +507,7 @@ char * virXMLPropString(xmlNodePtr node, const char *name) { - return (char *)xmlGetProp(node, BAD_CAST name); + return (char *) xmlGetProp(node, BAD_CAST name); } @@ -528,7 +528,7 @@ virXMLPropStringLimit(xmlNodePtr node, const char *name, size_t maxlen) { - char *tmp = (char *)xmlGetProp(node, BAD_CAST name); + char *tmp = (char *) xmlGetProp(node, BAD_CAST name); return virXMLStringLimitInternal(tmp, maxlen, name); } @@ -546,7 +546,7 @@ virXMLPropStringLimit(xmlNodePtr node, char * virXMLNodeContentString(xmlNodePtr node) { - return (char *)xmlNodeGetContent(node); + return (char *) xmlNodeGetContent(node); } @@ -986,7 +986,7 @@ virXMLNodeToString(xmlDocPtr doc, goto cleanup; } - ignore_value(VIR_STRDUP(ret, (const char *)xmlBufferContent(xmlbuf))); + ignore_value(VIR_STRDUP(ret, (const char *) xmlBufferContent(xmlbuf))); cleanup: xmlBufferFree(xmlbuf); @@ -1043,7 +1043,7 @@ virXMLRemoveElementNamespace(xmlNodePtr node, const char *uri = opaque; if (node->ns && - STREQ_NULLABLE((const char *)node->ns->href, uri)) + STREQ_NULLABLE((const char *) node->ns->href, uri)) xmlSetNs(node, NULL); return 0; } @@ -1097,12 +1097,12 @@ virXMLExtractNamespaceXML(xmlNodePtr root, } virXMLForeachNode(nodeCopy, virXMLRemoveElementNamespace, - (void *)uri); + (void *) uri); /* remove the namespace declaration * - it's only a single linked list ... doh */ for (actualNs = nodeCopy->nsDef; actualNs; actualNs = actualNs->next) { - if (STREQ_NULLABLE((const char *)actualNs->href, uri)) { + if (STREQ_NULLABLE((const char *) actualNs->href, uri)) { /* unlink */ if (prevNs) @@ -1153,13 +1153,13 @@ virXMLInjectNamespace(xmlNodePtr node, { xmlNsPtr ns; - if (xmlValidateNCName((const unsigned char *)key, 1) != 0) { + if (xmlValidateNCName((const unsigned char *) key, 1) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to validate prefix for a new XML namespace")); return -1; } - if (!(ns = xmlNewNs(node, (const unsigned char *)uri, (const unsigned char *)key))) { + if (!(ns = xmlNewNs(node, (const unsigned char *) uri, (const unsigned char *) key))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create a new XML namespace")); return -1; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vbox/vbox_MSCOMGlue.c | 18 +++--- src/vbox/vbox_common.c | 108 +++++++++++++++++----------------- src/vbox/vbox_common.h | 4 +- src/vbox/vbox_snapshot_conf.c | 12 ++-- src/vbox/vbox_storage.c | 10 ++-- src/vbox/vbox_tmpl.c | 26 ++++---- 6 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 7208d73b534d..10a260495989 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -538,7 +538,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, if (FAILED(hrc)) { VIR_ERROR(_("Could not parse IID from '%s', rc = 0x%08x"), - pszVirtualBoxIID, (unsigned int)hrc); + pszVirtualBoxIID, (unsigned int) hrc); goto cleanup; } @@ -546,7 +546,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, if (FAILED(hrc)) { VIR_ERROR(_("Could not parse IID from '%s', rc = 0x%08x"), - pszVirtualBoxIID, (unsigned int)hrc); + pszVirtualBoxIID, (unsigned int) hrc); goto cleanup; } @@ -555,7 +555,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, if (FAILED(hrc)) { VIR_ERROR(_("Could not create VirtualBox instance, rc = 0x%08x"), - (unsigned int)hrc); + (unsigned int) hrc); goto cleanup; } @@ -564,7 +564,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, if (FAILED(hrc)) { VIR_ERROR(_("Could not create Session instance, rc = 0x%08x"), - (unsigned int)hrc); + (unsigned int) hrc); goto cleanup; } @@ -576,12 +576,12 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVirtualBox **ppVirtualBox, cleanup: if (result < 0) { if (vboxVirtualBox != NULL) { - vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *)vboxVirtualBox); + vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *) vboxVirtualBox); vboxVirtualBox = NULL; } if (vboxSession != NULL) { - vboxSession->vtbl->nsisupports.Release((nsISupports *)vboxSession); + vboxSession->vtbl->nsisupports.Release((nsISupports *) vboxSession); vboxSession = NULL; } } @@ -601,12 +601,12 @@ static void vboxComUninitialize(void) { if (vboxVirtualBox != NULL) { - vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *)vboxVirtualBox); + vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *) vboxVirtualBox); vboxVirtualBox = NULL; } if (vboxSession != NULL) { - vboxSession->vtbl->nsisupports.Release((nsISupports *)vboxSession); + vboxSession->vtbl->nsisupports.Release((nsISupports *) vboxSession); vboxSession = NULL; } @@ -703,7 +703,7 @@ vboxArrayGetHelper(vboxArray *array, HRESULT hrc, SAFEARRAY *safeArray) if (FAILED(hrc)) return hrc; - hrc = SafeArrayAccessData(safeArray, (void **)&items); + hrc = SafeArrayAccessData(safeArray, (void **) &items); if (FAILED(hrc)) { SafeArrayDestroy(safeArray); diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 72a24a34642d..0f6623bd9604 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -697,7 +697,7 @@ static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of Domains, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -738,7 +738,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get number of Domains, rc=%08x"), (unsigned)rc); + _("Could not get number of Domains, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -792,7 +792,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr conn, int id) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); return NULL; } @@ -858,7 +858,7 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); return NULL; } @@ -930,7 +930,7 @@ vboxDomainLookupByName(virConnectPtr conn, const char *name) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); return NULL; } @@ -1888,7 +1888,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not define a domain, rc=%08x"), (unsigned)rc); + _("could not define a domain, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -1898,7 +1898,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the memory size of the domain to: %llu Kb, " "rc=%08x"), - def->mem.cur_balloon, (unsigned)rc); + def->mem.cur_balloon, (unsigned) rc); } if (virDomainDefHasVcpusOffline(def)) { @@ -1909,7 +1909,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the number of virtual CPUs to: %u, rc=%08x"), - virDomainDefGetVcpusMax(def), (unsigned)rc); + virDomainDefGetVcpusMax(def), (unsigned) rc); } rc = gVBoxAPI.UIMachine.SetCPUProperty(machine, CPUPropertyType_PAE, @@ -1919,7 +1919,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change PAE status to: %s, rc=%08x"), (def->features[VIR_DOMAIN_FEATURE_PAE] == VIR_TRISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } gVBoxAPI.UIMachine.GetBIOSSettings(machine, &bios); @@ -1931,7 +1931,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change ACPI status to: %s, rc=%08x"), (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } rc = gVBoxAPI.UIBIOSSettings.SetIOAPICEnabled(bios, def->features[VIR_DOMAIN_FEATURE_APIC] == @@ -1940,7 +1940,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change APIC status to: %s, rc=%08x"), (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_TRISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } VBOX_RELEASE(bios); } @@ -1949,7 +1949,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags rc = gVBoxAPI.UIVirtualBox.RegisterMachine(data->vboxObj, machine); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not define a domain, rc=%08x"), (unsigned)rc); + _("could not define a domain, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -2053,7 +2053,7 @@ static int vboxDomainUndefineFlags(virDomainPtr dom, unsigned int flags) ret = 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not delete the domain, rc=%08x"), (unsigned)rc); + _("could not delete the domain, rc=%08x"), (unsigned) rc); } vboxIIDUnalloc(&iid); @@ -2243,7 +2243,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -2345,7 +2345,7 @@ static int vboxDomainIsActive(virDomainPtr dom) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); return ret; } @@ -2761,7 +2761,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the memory size of the " "domain to: %lu Kb, rc=%08x"), - memory, (unsigned)rc); + memory, (unsigned) rc); } } gVBoxAPI.UISession.Close(data->vboxSession); @@ -2788,7 +2788,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -2919,7 +2919,7 @@ static int vboxDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the number of cpus of the domain " "to: %u, rc=%08x"), - CPUCount, (unsigned)rc); + CPUCount, (unsigned) rc); } VBOX_RELEASE(machine); } else { @@ -4205,7 +4205,7 @@ static int vboxConnectListDefinedDomains(virConnectPtr conn, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of Defined Domains, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -4265,7 +4265,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectPtr conn) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get number of Defined Domains, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -4357,7 +4357,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not attach shared folder '%s', rc=%08x"), - dev->data.fs->dst, (unsigned)rc); + dev->data.fs->dst, (unsigned) rc); ret = -1; } else { ret = 0; @@ -4476,7 +4476,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not detach shared folder '%s', rc=%08x"), - dev->data.fs->dst, (unsigned)rc); + dev->data.fs->dst, (unsigned) rc); } else { ret = 0; } @@ -4534,7 +4534,7 @@ static int vboxCloseDisksRecursively(virDomainPtr dom, char *location) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } rc = gVBoxAPI.UIMedium.GetChildren(medium, &childrenSize, &children); @@ -4568,7 +4568,7 @@ static int vboxCloseDisksRecursively(virDomainPtr dom, char *location) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -4733,7 +4733,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VBOX_UTF16_FREE(locationUtf); goto cleanup; } @@ -4789,7 +4789,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -4841,7 +4841,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VBOX_UTF16_FREE(locationUtf); goto cleanup; } @@ -4880,7 +4880,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get hard disk id, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VIR_FREE(uuid); goto cleanup; } @@ -4891,7 +4891,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VIR_FREE(uuid); VIR_FREE(parentUuid); goto cleanup; @@ -4927,7 +4927,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to unregister machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_RELEASE(machine); @@ -4959,7 +4959,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to delete medium, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VIR_FREE(locationUtf8); goto cleanup; } @@ -5103,7 +5103,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -5136,7 +5136,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_UTF16_FREE(locationUtf16); @@ -5221,7 +5221,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -5253,7 +5253,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VBOX_UTF16_FREE(locationUtf16); goto cleanup; } @@ -5263,7 +5263,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get hardDisk Id, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIID.vboxIIDToUtf8(data, &parentiid, &parentUuid); @@ -5282,7 +5282,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to create HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -5312,7 +5312,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get medium uuid, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIID.vboxIIDToUtf8(data, &iid, &uuid); @@ -5361,7 +5361,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close the new medium, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -5409,14 +5409,14 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } rc = gVBoxAPI.UIMedium.Close(medium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_UTF16_FREE(locationUtf16); @@ -5435,7 +5435,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open Machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -5443,7 +5443,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to register Machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -7035,7 +7035,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -7043,7 +7043,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get hardDisk Id, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIID.vboxIIDToUtf8(data, &parentiid, &parentUuid); @@ -7062,7 +7062,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to create HardDisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_UTF16_FREE(formatUtf16); @@ -7093,7 +7093,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get medium uuid, rc=%08x"), - (unsigned)rc); + (unsigned) rc); VIR_FREE(disk); goto cleanup; } @@ -7145,7 +7145,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close the new medium, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -7227,7 +7227,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to unregister machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_RELEASE(machine); @@ -7249,7 +7249,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to delete medium, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIProgress.WaitForCompletion(progress, -1); @@ -7307,7 +7307,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open Machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -7315,7 +7315,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to register Machine, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -7604,7 +7604,7 @@ vboxConnectListAllDomains(virConnectPtr conn, rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of domains, rc=%08x"), (unsigned)rc); + _("Could not get list of domains, rc=%08x"), (unsigned) rc); goto cleanup; } @@ -7794,7 +7794,7 @@ vboxDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) rc = gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GET_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=%08x"), (unsigned)rc); + _("Could not get list of machines, rc=%08x"), (unsigned) rc); return ret; } diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index 5709ff8b4aba..bbffe0a6233a 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -395,12 +395,12 @@ typedef nsISupports IKeyboard; # define VBOX_UTF16_TO_UTF8(arg1, arg2) gVBoxAPI.UPFN.Utf16ToUtf8(data->pFuncs, arg1, arg2) # define VBOX_UTF8_TO_UTF16(arg1, arg2) gVBoxAPI.UPFN.Utf8ToUtf16(data->pFuncs, arg1, arg2) -# define VBOX_ADDREF(arg) gVBoxAPI.nsUISupports.AddRef((void *)(arg)) +# define VBOX_ADDREF(arg) gVBoxAPI.nsUISupports.AddRef((void *) (arg)) # define VBOX_RELEASE(arg) \ do { \ if (arg) { \ - gVBoxAPI.nsUISupports.Release((void *)arg); \ + gVBoxAPI.nsUISupports.Release((void *) arg); \ (arg) = NULL; \ } \ } while (0) diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index c3b2855a2dc7..890661138382 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -419,7 +419,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, /*hardware*/ parseError = xmlParseInNodeContext(node, snapshot->hardware, - (int)strlen(snapshot->hardware), + (int) strlen(snapshot->hardware), 0, &hardwareNode); if (parseError != XML_ERR_OK) { @@ -431,7 +431,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, /*storageController*/ if (xmlParseInNodeContext(node, snapshot->storageController, - (int)strlen(snapshot->storageController), + (int) strlen(snapshot->storageController), 0, &storageControllerNode) != XML_ERR_OK) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -1136,7 +1136,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, for (i = 0; i < machine->mediaRegistry->notherMedia; i++) { parseError = xmlParseInNodeContext(mediaRegistryNode, machine->mediaRegistry->otherMedia[i], - (int)strlen(machine->mediaRegistry->otherMedia[i]), + (int) strlen(machine->mediaRegistry->otherMedia[i]), 0, &cur); if (parseError != XML_ERR_OK) { @@ -1160,7 +1160,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, parseError = xmlParseInNodeContext(machineNode, machine->hardware, - (int)strlen(machine->hardware), + (int) strlen(machine->hardware), 0, &cur); if (parseError != XML_ERR_OK) { @@ -1173,7 +1173,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, if (machine->extraData != NULL) { parseError = xmlParseInNodeContext(xmlDocGetRootElement(xml), machine->extraData, - (int)strlen(machine->extraData), + (int) strlen(machine->extraData), 0, &cur); if (parseError != XML_ERR_OK) { @@ -1186,7 +1186,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMachinePtr machine, parseError = xmlParseInNodeContext(machineNode, machine->storageController, - (int)strlen(machine->storageController), + (int) strlen(machine->storageController), 0, &cur); if (parseError != XML_ERR_OK) { diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 672caa6f9220..05e713eec017 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -101,7 +101,7 @@ static int vboxStoragePoolNumOfVolumes(virStoragePoolPtr pool) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get number of volumes in the pool: %s, rc=%08x"), - pool->name, (unsigned)rc); + pool->name, (unsigned) rc); return ret; } @@ -142,7 +142,7 @@ vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int nname if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get the volume list in the pool: %s, rc=%08x"), - pool->name, (unsigned)rc); + pool->name, (unsigned) rc); return ret; } @@ -460,7 +460,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create harddisk, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -473,7 +473,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (NS_FAILED(rc) || !progress) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create base storage, rc=%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } @@ -482,7 +482,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (RC_FAILED(resultCode)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create base storage, rc=%08x"), - (unsigned)resultCode.uResultCode); + (unsigned) resultCode.uResultCode); goto cleanup; } diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88792c992897..c585d9fa35d4 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -112,7 +112,7 @@ VIR_LOG_INIT("vbox.vbox_tmpl"); #define VBOX_RELEASE(arg) \ do { \ if (arg) { \ - (arg)->vtbl->nsisupports.Release((nsISupports *)(arg)); \ + (arg)->vtbl->nsisupports.Release((nsISupports *) (arg)); \ (arg) = NULL; \ } \ } while (0) @@ -133,17 +133,17 @@ if (strUtf16) {\ #define DEBUGUUID(msg, iid) \ {\ VIR_DEBUG("%s: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", msg,\ - (unsigned)(iid)->m0,\ - (unsigned)(iid)->m1,\ - (unsigned)(iid)->m2,\ - (unsigned)(iid)->m3[0],\ - (unsigned)(iid)->m3[1],\ - (unsigned)(iid)->m3[2],\ - (unsigned)(iid)->m3[3],\ - (unsigned)(iid)->m3[4],\ - (unsigned)(iid)->m3[5],\ - (unsigned)(iid)->m3[6],\ - (unsigned)(iid)->m3[7]);\ + (unsigned) (iid)->m0,\ + (unsigned) (iid)->m1,\ + (unsigned) (iid)->m2,\ + (unsigned) (iid)->m3[0],\ + (unsigned) (iid)->m3[1],\ + (unsigned) (iid)->m3[2],\ + (unsigned) (iid)->m3[3],\ + (unsigned) (iid)->m3[4],\ + (unsigned) (iid)->m3[5],\ + (unsigned) (iid)->m3[6],\ + (unsigned) (iid)->m3[7]);\ }\ #define VBOX_IID_INITIALIZER { NULL, true } @@ -1901,7 +1901,7 @@ static nsresult _mediumDeleteStorage(IMedium *medium, static nsresult _mediumRelease(IMedium *medium) { - return medium->vtbl->nsisupports.Release((nsISupports *)medium); + return medium->vtbl->nsisupports.Release((nsISupports *) medium); } static nsresult _mediumClose(IMedium *medium) { -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vmware/vmware_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index b3f8cdf253eb..19f489210c74 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -30,7 +30,7 @@ # include "virthread.h" # define VIR_FROM_THIS VIR_FROM_VMWARE -# define PROGRAM_SENTINEL ((char *)0x1) +# define PROGRAM_SENTINEL ((char *) 0x1) enum vmwareDriverType { VMWARE_DRIVER_PLAYER = 0, /* VMware Player */ -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vmx/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 8027a7bba629..244015df6609 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -640,7 +640,7 @@ virVMXEscapeHex(const char *string, char escape, const char *special) if (*tmp1 == escape || strspn(tmp1, special) > 0) { *tmp2++ = escape; - snprintf(tmp2, 3, "%02x", (unsigned int)*tmp1); + snprintf(tmp2, 3, "%02x", (unsigned int) *tmp1); tmp2 += 2; } else { @@ -699,7 +699,7 @@ virVMXConvertToUTF8(const char *encoding, const char *string) return NULL; } - input = xmlBufferCreateStatic((char *)string, strlen(string)); + input = xmlBufferCreateStatic((char *) string, strlen(string)); utf8 = xmlBufferCreate(); if (xmlCharEncInFunc(handler, utf8, input) < 0) { @@ -708,7 +708,7 @@ virVMXConvertToUTF8(const char *encoding, const char *string) goto cleanup; } - result = (char *)utf8->content; + result = (char *) utf8->content; utf8->content = NULL; cleanup: -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/vz/vz_sdk.c | 20 ++++++++++---------- src/vz/vz_utils.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index bb8f15e4fed1..ffd619705f4e 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -714,7 +714,7 @@ prlsdkGetDiskInfo(vzDriverPtr driver, pret = PrlVmDevHd_GetDiskSize(prldisk, &size); prlsdkCheckRetGoto(pret, cleanup); /* from MiB to bytes */ - disk->src->capacity = ((unsigned long long)size) << 20; + disk->src->capacity = ((unsigned long long) size) << 20; } ret = 0; @@ -1103,7 +1103,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt) pret = PrlVmDevNet_GetAdapterType(netAdapter, &type); prlsdkCheckRetGoto(pret, cleanup); - switch ((int)type) { + switch ((int) type) { case PNT_RTL: if (VIR_STRDUP(net->model, "rtl8139") < 0) goto cleanup; @@ -1695,10 +1695,10 @@ prlsdkBootOrderCheck(PRL_HANDLE sdkdom, PRL_DEVICE_TYPE sdkType, int sdkIndex, return -1; } - switch ((int)sdkType) { + switch ((int) sdkType) { case PDE_OPTICAL_DISK: case PDE_HARD_DISK: - switch ((int)sdkType) { + switch ((int) sdkType) { case PDE_OPTICAL_DISK: device = VIR_DOMAIN_DISK_DEVICE_CDROM; break; @@ -1810,7 +1810,7 @@ prlsdkConvertBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) continue; } - switch ((int)sdkType) { + switch ((int) sdkType) { case PDE_OPTICAL_DISK: type = VIR_DOMAIN_BOOT_CDROM; break; @@ -2106,7 +2106,7 @@ prlsdkNewStateToEvent(VIRTUAL_MACHINE_STATE domainState, /* We skip all intermediate states here, because * libvirt doesn't have correspoding event types for * them */ - switch ((int)domainState) { + switch ((int) domainState) { case VMS_STOPPED: case VMS_MOUNTED: *lvEventType = VIR_DOMAIN_EVENT_STOPPED; @@ -2320,7 +2320,7 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) goto cleanup; } - switch ((int)prlEventType) { + switch ((int) prlEventType) { case PET_DSP_EVT_VM_STATE_CHANGED: prlsdkHandleVmStateEvent(driver, prlEvent, uuid); break; @@ -3893,7 +3893,7 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDefPtr def) for (i = 0; i < def->os.nBootDevs; ++i) { virType = def->os.bootDevs[i]; - switch ((int)virType) { + switch ((int) virType) { case VIR_DOMAIN_BOOT_CDROM: sdkType = PDE_OPTICAL_DISK; break; @@ -3983,7 +3983,7 @@ prlsdkDoApplyConfig(vzDriverPtr driver, prlsdkCheckRetGoto(pret, error); VIR_FREE(mask); - switch ((int)def->os.arch) { + switch ((int) def->os.arch) { case VIR_ARCH_X86_64: pret = PrlVmCfg_SetCpuMode(sdkdom, PCM_CPU_MODE_64); break; @@ -4539,7 +4539,7 @@ prlsdkGetVcpuStats(PRL_HANDLE sdkstats, int idx, unsigned long long *vtime) long long ptime = 0; int ret = -1; - if (virAsprintf(&name, "guest.vcpu%u.time", (unsigned int)idx) < 0) + if (virAsprintf(&name, "guest.vcpu%u.time", (unsigned int) idx) < 0) goto cleanup; if (prlsdkExtractStatsParam(sdkstats, name, &ptime) < 0) goto cleanup; diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 13f5deeaa5e8..732d0c2a3609 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -470,7 +470,7 @@ vzCheckUnsupportedControllers(const virDomainDef *def, vzCapabilitiesPtr vzCaps) int vzGetDefaultSCSIModel(vzDriverPtr driver, PRL_CLUSTERED_DEVICE_SUBTYPE *scsiModel) { - switch ((int)driver->vzCaps.scsiControllerModel) { + switch ((int) driver->vzCaps.scsiControllerModel) { case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: *scsiModel = PCD_VIRTIO_SCSI; break; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/xenapi/xenapi_driver.c | 86 +++++++++++++++++++------------------- src/xenapi/xenapi_utils.c | 30 ++++++------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 42b305d3169c..0f4bcf788cd9 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -319,7 +319,7 @@ static int xenapiConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) { xen_host host; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_string_string_map *result = NULL; size_t i; int ret = -1; @@ -372,7 +372,7 @@ xenapiConnectGetHostname(virConnectPtr conn) { char *result = NULL; xen_host host; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; if (!(xen_session_get_this_host(session, &host, session))) { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL); return NULL; @@ -413,14 +413,14 @@ xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) xen_host_cpu host_cpu; xen_host_metrics_set *xen_met_set; char *modelname; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; info->nodes = 1; info->threads = 1; info->sockets = 1; if (xen_host_metrics_get_all(session, &xen_met_set)) { xen_host_metrics_get_memory_total(session, &memory, xen_met_set->contents[0]); - info->memory = (unsigned long)(memory / 1024); + info->memory = (unsigned long) (memory / 1024); xen_host_metrics_set_free(xen_met_set); } else { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, @@ -437,7 +437,7 @@ xenapiNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) return -1; } xen_host_cpu_get_speed(session, &mhz, host_cpu); - info->mhz = (unsigned long)mhz; + info->mhz = (unsigned long) mhz; info->cpus = host_cpu_set->size; info->cores = host_cpu_set->size; @@ -460,7 +460,7 @@ static char * xenapiConnectGetCapabilities(virConnectPtr conn) { - virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps; + virCapsPtr caps = ((struct _xenapiPrivate *) (conn->privateData))->caps; if (caps) return virCapabilitiesFormatXML(caps); @@ -484,7 +484,7 @@ xenapiConnectListDomains(virConnectPtr conn, int *ids, int maxids) xen_vm_set *result = NULL; int64_t t0; size_t i; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; if (xen_session_get_this_host(session, &host, session)) { xen_host_get_resident_vms(session, &result, host); xen_host_free(host); @@ -500,7 +500,7 @@ xenapiConnectListDomains(virConnectPtr conn, int *ids, int maxids) xen_vm_set_free(result); return -1; } - ids[i] = (int)t0; + ids[i] = (int) t0; } xen_vm_set_free(result); return i; @@ -521,7 +521,7 @@ xenapiConnectNumOfDomains(virConnectPtr conn) xen_vm_set *result = NULL; xen_host host = NULL; int numDomains = -1; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_session_get_this_host(session, &host, session); if (host != NULL) { @@ -613,7 +613,7 @@ xenapiDomainLookupByID(virConnectPtr conn, int id) xen_vm_record *record; unsigned char raw_uuid[VIR_UUID_BUFLEN]; virDomainPtr domP = NULL; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_session_get_this_host(session, &host, session); if (host != NULL && session->ok) { @@ -664,7 +664,7 @@ xenapiDomainLookupByUUID(virConnectPtr conn, xen_vm_record *record; char uuidStr[VIR_UUID_STRING_BUFLEN]; virDomainPtr domP = NULL; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; virUUIDFormat(uuid, uuidStr); if (xen_vm_get_by_uuid(session, &vm, uuidStr)) { xen_vm_get_record(session, &record, vm); @@ -701,8 +701,8 @@ xenapiDomainLookupByName(virConnectPtr conn, char *uuid = NULL; unsigned char raw_uuid[VIR_UUID_BUFLEN]; virDomainPtr domP = NULL; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; - if (xen_vm_get_by_name_label(session, &vms, (char *)name) && vms->size > 0) { + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; + if (xen_vm_get_by_name_label(session, &vms, (char *) name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, _("Domain name is not unique")); @@ -748,7 +748,7 @@ xenapiDomainSuspend(virDomainPtr dom) /* vm.pause() */ xen_vm vm; xen_vm_set *vms = NULL; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -784,7 +784,7 @@ xenapiDomainResume(virDomainPtr dom) /* vm.unpause() */ xen_vm vm; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -820,7 +820,7 @@ xenapiDomainShutdownFlags(virDomainPtr dom, unsigned int flags) /* vm.clean_shutdown */ xen_vm vm; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; virCheckFlags(0, -1); @@ -865,7 +865,7 @@ xenapiDomainReboot(virDomainPtr dom, unsigned int flags) /* vm.clean_reboot */ xen_vm vm; struct xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; virCheckFlags(0, -1); @@ -909,7 +909,7 @@ xenapiDomainDestroyFlags(virDomainPtr dom, /* vm.hard_shutdown */ xen_vm vm; struct xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; virCheckFlags(0, -1); @@ -960,7 +960,7 @@ xenapiDomainGetOSType(virDomainPtr dom) xen_vm_set *vms; char *ostype = NULL; char *boot_policy = NULL; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { @@ -998,7 +998,7 @@ xenapiDomainGetMaxMemory(virDomainPtr dom) int64_t mem_static_max = 0; xen_vm vm; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -1030,7 +1030,7 @@ xenapiDomainSetMaxMemory(virDomainPtr dom, unsigned long memory) /* vm.set_memory_static_max */ xen_vm vm; struct xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -1067,7 +1067,7 @@ xenapiDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) xen_vm vm; xen_vm_record *record; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; info->cpuTime = 0; /* CPU time is not advertised */ if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { @@ -1161,7 +1161,7 @@ xenapiDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, /* vm.set_vcpus_max */ xen_vm vm; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (flags != VIR_DOMAIN_VCPU_LIVE) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), @@ -1213,7 +1213,7 @@ xenapiDomainPinVcpu(virDomainPtr dom, unsigned int vcpu ATTRIBUTE_UNUSED, char *value = NULL; xen_vm vm; xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -1223,8 +1223,8 @@ xenapiDomainPinVcpu(virDomainPtr dom, unsigned int vcpu ATTRIBUTE_UNUSED, } vm = vms->contents[0]; if ((value = mapDomainPinVcpu(cpumap, maplen))) { - xen_vm_remove_from_vcpus_params(session, vm, (char *)"mask"); - if (xen_vm_add_to_vcpus_params(session, vm, (char *)"mask", value)) { + xen_vm_remove_from_vcpus_params(session, vm, (char *) "mask"); + if (xen_vm_add_to_vcpus_params(session, vm, (char *) "mask", value)) { xen_vm_set_free(vms); VIR_FREE(value); return 0; @@ -1262,7 +1262,7 @@ xenapiDomainGetVcpus(virDomainPtr dom, virDomainInfo domInfo; virNodeInfo nodeInfo; virVcpuInfoPtr ifptr; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; char *mask = NULL; if (cpumaps != NULL && maplen < 1) return -1; @@ -1333,7 +1333,7 @@ xenapiDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) xen_vm_set *vms; int64_t maxvcpu = 0; enum xen_vm_power_state state; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (flags != (VIR_DOMAIN_VCPU_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported flags: (0x%x)"), @@ -1356,7 +1356,7 @@ xenapiDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) maxvcpu = xenapiConnectGetMaxVcpus(dom->conn, NULL); } xen_vm_set_free(vms); - return (int)maxvcpu; + return (int) maxvcpu; } if (vms) xen_vm_set_free(vms); @@ -1558,7 +1558,7 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } xen_vif_get_record(session, &vif_rec, vif); if (vif_rec != NULL) { - if (virMacAddrParse((const char *)vif_rec->mac, + if (virMacAddrParse((const char *) vif_rec->mac, &defPtr->nets[i]->mac) < 0) xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Unable to parse given mac address")); @@ -1592,7 +1592,7 @@ xenapiConnectListDefinedDomains(virConnectPtr conn, char **const names, int doms; xen_vm_set *result; xen_vm_record *record; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_vm_get_all(session, &result); memset(names, 0, sizeof(names[0])*maxnames); if (result != NULL) { @@ -1641,7 +1641,7 @@ xenapiConnectNumOfDefinedDomains(virConnectPtr conn) xen_vm_record *record; int DomNum = 0; size_t i; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_vm_get_all(session, &result); if (result != NULL) { for (i = 0; i < result->size; i++) { @@ -1675,7 +1675,7 @@ xenapiDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) { xen_vm_set *vms; xen_vm vm; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; int64_t domid = -1; virCheckFlags(0, -1); @@ -1793,7 +1793,7 @@ xenapiDomainUndefineFlags(virDomainPtr dom, unsigned int flags) { struct xen_vm_set *vms; xen_vm vm; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; virCheckFlags(0, -1); if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { @@ -1839,7 +1839,7 @@ xenapiDomainGetAutostart(virDomainPtr dom, int *autostart) xen_vm_set *vms; xen_vm vm; xen_string_string_map *result; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -1887,7 +1887,7 @@ xenapiDomainSetAutostart(virDomainPtr dom, int autostart) xen_vm_set *vms; xen_vm vm; char *value; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; if (xen_vm_get_by_name_label(session, &vms, dom->name) && vms->size > 0) { if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, @@ -1896,12 +1896,12 @@ xenapiDomainSetAutostart(virDomainPtr dom, int autostart) return -1; } vm = vms->contents[0]; - xen_vm_remove_from_other_config(session, vm, (char *)"auto_poweron"); + xen_vm_remove_from_other_config(session, vm, (char *) "auto_poweron"); if (autostart == 1) - value = (char *)"true"; + value = (char *) "true"; else - value = (char *)"false"; - if (!xen_vm_add_to_other_config(session, vm, (char *)"auto_poweron", value)) { + value = (char *) "false"; + if (!xen_vm_add_to_other_config(session, vm, (char *) "auto_poweron", value)) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL); xen_vm_set_free(vms); return -1; @@ -1937,7 +1937,7 @@ xenapiNodeGetFreeMemory(virConnectPtr conn) { xen_host_metrics_set *xen_met_set; unsigned long long freeMem = 0; - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_host_metrics_get_all(session, &xen_met_set); if (xen_met_set != NULL) { if (!xen_host_metrics_get_memory_free(session, (int64_t *)&freeMem, xen_met_set->contents[0])) { @@ -1993,7 +1993,7 @@ static int xenapiDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { struct xen_vm_set *vms; - xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (dom->conn->privateData))->session; virCheckFlags(0, -1); @@ -2112,7 +2112,7 @@ int call_func(const void *data, size_t len, void *user_handle, void *result_handle, xen_result_func result_func) { - struct _xenapiPrivate *priv = (struct _xenapiPrivate *)user_handle; + struct _xenapiPrivate *priv = (struct _xenapiPrivate *) user_handle; #ifdef PRINT_XML printf("\n\n---Data to server: -----------------------\n"); printf("%s\n", (char*) data); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index cf5bf66732f5..e78d6b79d3a7 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -51,7 +51,7 @@ xenSessionFree(xen_session *session) VIR_FREE(session->error_description); } /* The session_id member is type of 'const char *'. Sigh. */ - tmp = (char *)session->session_id; + tmp = (char *) session->session_id; VIR_FREE(tmp); VIR_FREE(session); } @@ -167,13 +167,13 @@ createXenAPIBootOrderString(int nboot, int *bootDevs) size_t i; for (i = 0; i < nboot; i++) { if (bootDevs[i] == VIR_DOMAIN_BOOT_FLOPPY) - val = (char *)"a"; + val = (char *) "a"; else if (bootDevs[i] == VIR_DOMAIN_BOOT_DISK) - val = (char *)"c"; + val = (char *) "c"; else if (bootDevs[i] == VIR_DOMAIN_BOOT_CDROM) - val = (char *)"d"; + val = (char *) "d"; else if (bootDevs[i] == VIR_DOMAIN_BOOT_NET) - val = (char *)"n"; + val = (char *) "n"; if (val) virBufferEscapeString(&ret, "%s", val); } @@ -242,14 +242,14 @@ getStorageVolumeType(char *type) STREQ(type, "iso") || STREQ(type, "ext") || STREQ(type, "nfs")) - return (int)VIR_STORAGE_VOL_FILE; + return (int) VIR_STORAGE_VOL_FILE; else if (STREQ(type, "iscsi") || STREQ(type, "equal") || STREQ(type, "hba") || STREQ(type, "cslg") || STREQ(type, "udev") || STREQ(type, "netapp")) - return (int)VIR_STORAGE_VOL_BLOCK; + return (int) VIR_STORAGE_VOL_BLOCK; return -1; } @@ -384,7 +384,7 @@ static int createVifNetwork(virConnectPtr conn, xen_vm vm, int device, char *bridge, char *mac) { - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + xen_session *session = ((struct _xenapiPrivate *) (conn->privateData))->session; xen_vm xvm = NULL; char *uuid = NULL; xen_vm_get_uuid(session, &uuid, vm); @@ -472,7 +472,7 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, boot_order = createXenAPIBootOrderString(def->os.nBootDevs, &def->os.bootDevs[0]); if (boot_order != NULL) { xen_string_string_map *hvm_boot_params = NULL; - allocStringMap(&hvm_boot_params, (char *)"order", boot_order); + allocStringMap(&hvm_boot_params, (char *) "order", boot_order); (*record)->hvm_boot_params = hvm_boot_params; VIR_FREE(boot_order); } @@ -516,15 +516,15 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, (*record)->actions_after_crash = actionCrashLibvirt2XenapiEnum(def->onCrash); if (def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON) - allocStringMap(&strings, (char *)"acpi", (char *)"true"); + allocStringMap(&strings, (char *) "acpi", (char *) "true"); if (def->features[VIR_DOMAIN_FEATURE_APIC] == VIR_TRISTATE_SWITCH_ON) - allocStringMap(&strings, (char *)"apic", (char *)"true"); + allocStringMap(&strings, (char *) "apic", (char *) "true"); if (def->features[VIR_DOMAIN_FEATURE_PAE] == VIR_TRISTATE_SWITCH_ON) - allocStringMap(&strings, (char *)"pae", (char *)"true"); + allocStringMap(&strings, (char *) "pae", (char *) "true"); if (def->features[VIR_DOMAIN_FEATURE_HAP] == VIR_TRISTATE_SWITCH_ON) - allocStringMap(&strings, (char *)"hap", (char *)"true"); + allocStringMap(&strings, (char *) "hap", (char *) "true"); if (def->features[VIR_DOMAIN_FEATURE_VIRIDIAN] == VIR_TRISTATE_SWITCH_ON) - allocStringMap(&strings, (char *)"viridian", (char *)"true"); + allocStringMap(&strings, (char *) "viridian", (char *) "true"); if (strings != NULL) (*record)->platform = strings; @@ -533,7 +533,7 @@ createVMRecordFromXml(virConnectPtr conn, virDomainDefPtr def, (*record)->last_boot_cpu_flags = xen_string_string_map_alloc(0); (*record)->xenstore_data = xen_string_string_map_alloc(0); (*record)->hvm_shadow_multiplier = 1.000; - if (!xen_vm_create(((struct _xenapiPrivate *)(conn->privateData))->session, + if (!xen_vm_create(((struct _xenapiPrivate *) (conn->privateData))->session, vm, *record)) { xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, NULL); return -1; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- src/xenconfig/xen_common.c | 6 +++--- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index bc4318536305..307823a251d7 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -337,7 +337,7 @@ xenParseTimeOffset(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetULong(conf, "rtc_timeoffset", &rtc_timeoffset, 0) < 0) return -1; - def->clock.data.variable.adjustment = (int)rtc_timeoffset; + def->clock.data.variable.adjustment = (int) rtc_timeoffset; def->clock.data.variable.basis = vmlocaltime ? VIR_DOMAIN_CLOCK_BASIS_LOCALTIME : VIR_DOMAIN_CLOCK_BASIS_UTC; @@ -612,7 +612,7 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def) unsigned long vncdisplay; if (xenConfigGetULong(conf, "vncdisplay", &vncdisplay, 0) < 0) goto cleanup; - graphics->data.vnc.port = (int)vncdisplay + 5900; + graphics->data.vnc.port = (int) vncdisplay + 5900; } if (xenConfigCopyStringOpt(conf, "vnclisten", &listenAddr) < 0) @@ -1429,7 +1429,7 @@ xenFormatTimeOffset(virConfPtr conf, virDomainDefPtr def) switch (def->clock.offset) { case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: - vmlocaltime = (int)def->clock.data.variable.basis; + vmlocaltime = (int) def->clock.data.variable.basis; rtc_timeoffset = def->clock.data.variable.adjustment; break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index e868c05695e3..e085d9755966 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -2405,7 +2405,7 @@ xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def) int rtc_timeoffset; switch (def->clock.offset) { case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: - vmlocaltime = (int)def->clock.data.variable.basis; + vmlocaltime = (int) def->clock.data.variable.basis; rtc_timeoffset = def->clock.data.variable.adjustment; break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 6dcaba98a439..d8aeefd38942 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -364,12 +364,12 @@ xenParseXLSpice(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetULong(conf, "spicetls_port", &port, 0) < 0) goto cleanup; - graphics->data.spice.tlsPort = (int)port; + graphics->data.spice.tlsPort = (int) port; if (xenConfigGetULong(conf, "spiceport", &port, 0) < 0) goto cleanup; - graphics->data.spice.port = (int)port; + graphics->data.spice.port = (int) port; if (!graphics->data.spice.tlsPort && !graphics->data.spice.port) @@ -1376,7 +1376,7 @@ xenFormatXLCPUID(virConfPtr conf, virDomainDefPtr def) cpuid_pairs[j] = NULL; if (j > 1) { - cpuid_string = virStringListJoin((const char **)cpuid_pairs, ","); + cpuid_string = virStringListJoin((const char **) cpuid_pairs, ","); if (!cpuid_string) goto cleanup; -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tests/commandtest.c | 2 +- tests/esxutilstest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nwfilterebiptablestest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvmock.c | 2 +- tests/securityselinuxhelper.c | 2 +- tests/testutils.c | 14 +++++++------- tests/viralloctest.c | 4 ++-- tests/vircgroupmock.c | 18 +++++++++--------- tests/virdbusmock.c | 2 +- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virnetdaemontest.c | 2 +- tests/virnetmessagetest.c | 12 ++++++------ tests/virnetsockettest.c | 4 ++-- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 4 ++-- tests/virnettlssessiontest.c | 2 +- tests/virpcimock.c | 2 +- tests/virrandommock.c | 2 +- tests/virrotatingfiletest.c | 6 +++--- tests/virstringtest.c | 4 ++-- tests/virtypedparamtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index ad81c2a71219..8e7925bd95b9 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1258,7 +1258,7 @@ mymain(void) test->running = true; virMutexUnlock(&test->lock); - environ = (char **)newenv; + environ = (char **) newenv; # define DO_TEST(NAME) \ if (virTestRun("Command Exec " #NAME " test", \ diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 7941f89b9a38..e051ed712714 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -130,7 +130,7 @@ testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED) long long calendarTime; for (i = 0; i < ARRAY_CARDINALITY(times); ++i) { - dateTime.value = (char *)times[i].dateTime; + dateTime.value = (char *) times[i].dateTime; if (esxVI_DateTime_ConvertToCalendarTime(&dateTime, &calendarTime) < 0) { diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index d9287b59a811..b8d4121fa857 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -73,7 +73,7 @@ testCompareXMLToDomConfig(const char *xmlfile, cfg->caps = caps; - if (!(log = (xentoollog_logger *)xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) + if (!(log = (xentoollog_logger *) xtl_createlogger_stdiostream(stderr, XTL_DEBUG, 0))) goto cleanup; /* for testing nested HVM */ diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 607342330458..a17744f060ac 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -414,7 +414,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED) .valType = NWFILTER_VALUE_TYPE_ARRAY, .u = { .array = { - .values = (char **)servers, + .values = (char **) servers, .nValues = 3, } } diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 62f68ee69992..4b6682914634 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1153,7 +1153,7 @@ qemuMonitorCommonTestNew(virDomainXMLOptionPtr xmlopt, memset(src, 0, sizeof(*src)); src->type = VIR_DOMAIN_CHR_TYPE_UNIX; - src->data.nix.path = (char *)path; + src->data.nix.path = (char *) path; src->data.nix.listen = false; path = NULL; diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index adab5c91117f..371483d5e1d1 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -79,7 +79,7 @@ char * virTPMCreateCancelPath(const char *devpath) { char *path; - (void)devpath; + (void) devpath; ignore_value(VIR_STRDUP(path, "/sys/class/misc/tpm0/device/cancel")); diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 22b6709554b4..e1e29648dc7e 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -308,7 +308,7 @@ selabel_open(unsigned int backend, /* struct selabel_handle is opaque; fake it */ if (VIR_ALLOC(fake_handle) < 0) return NULL; - return (struct selabel_handle *)fake_handle; + return (struct selabel_handle *) fake_handle; } void selabel_close(struct selabel_handle *handle) diff --git a/tests/testutils.c b/tests/testutils.c index 4b13d112788a..641ef6f5418e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -132,8 +132,8 @@ virTestShowTrace(void) strstr(info.dli_fname, ".so")) { if (virAsprintf(&cmd, ADDR2LINE " -f -e %s %p", info.dli_fname, - ((void*)((unsigned long long)testAllocStack[j] - - (unsigned long long)info.dli_fbase))) < 0) + ((void*)((unsigned long long) testAllocStack[j] + - (unsigned long long) info.dli_fbase))) < 0) continue; } else { if (virAsprintf(&cmd, ADDR2LINE " -f -e %s %p", @@ -753,18 +753,18 @@ int virTestDifferenceBin(FILE *stream, end = length - 1; /* Show the trimmed differences */ - fprintf(stream, "\nExpect [ Region %d-%d", (int)start, (int)end); + fprintf(stream, "\nExpect [ Region %d-%d", (int) start, (int) end); for (i = start; i < end; i++) { if ((i % 4) == 0) fprintf(stream, "\n "); - fprintf(stream, "0x%02x, ", ((int)expect[i])&0xff); + fprintf(stream, "0x%02x, ", ((int) expect[i])&0xff); } fprintf(stream, "]\n"); - fprintf(stream, "Actual [ Region %d-%d", (int)start, (int)end); + fprintf(stream, "Actual [ Region %d-%d", (int) start, (int) end); for (i = start; i < end; i++) { if ((i % 4) == 0) fprintf(stream, "\n "); - fprintf(stream, "0x%02x, ", ((int)actual[i])&0xff); + fprintf(stream, "0x%02x, ", ((int) actual[i])&0xff); } fprintf(stream, "]\n"); @@ -1122,7 +1122,7 @@ int virTestMain(int argc, virResetLastError(); if (!virTestGetVerbose() && ret != EXIT_AM_SKIP) { if (testCounter == 0 || testCounter % 40) - fprintf(stderr, "%*s", 40 - (int)(testCounter % 40), ""); + fprintf(stderr, "%*s", 40 - (int) (testCounter % 40), ""); fprintf(stderr, " %-3zu %s\n", testCounter, ret == 0 ? "OK" : "FAIL"); } virLogReset(); diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 27cbdcbbe46f..ba184997762d 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -331,7 +331,7 @@ testInsertArray(const void *opaque ATTRIBUTE_UNUSED) testDummyStruct **t; size_t nt = 10, i; int ret = -1; - testDummyStruct *n = (void *)0xff; + testDummyStruct *n = (void *) 0xff; if (VIR_ALLOC_N(t, nt) < 0) return -1; @@ -361,7 +361,7 @@ testInsertArray(const void *opaque ATTRIBUTE_UNUSED) } for (i = 0; i < nt; i++) { - void *expect = i == 3 ? (void *)0xff : (void*)0x50; + void *expect = i == 3 ? (void *) 0xff : (void*)0x50; if (t[i] != expect) { fprintf(stderr, "Expecting %p at offset %zu not %p\n", expect, i, t[i]); diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index 56337c2f3e09..96659ecd6a55 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -467,13 +467,13 @@ FILE *fopen(const char *path, const char *mode) if (STREQ(path, "/proc/mounts")) { if (STREQ(mode, "r")) { if (allinone) - return fmemopen((void *)procmountsallinone, + return fmemopen((void *) procmountsallinone, strlen(procmountsallinone), mode); else if (logind) - return fmemopen((void *)procmountslogind, + return fmemopen((void *) procmountslogind, strlen(procmountslogind), mode); else - return fmemopen((void *)procmounts, strlen(procmounts), mode); + return fmemopen((void *) procmounts, strlen(procmounts), mode); } else { errno = EACCES; return NULL; @@ -482,13 +482,13 @@ FILE *fopen(const char *path, const char *mode) if (STREQ(path, "/proc/cgroups")) { if (STREQ(mode, "r")) { if (allinone) - return fmemopen((void *)proccgroupsallinone, + return fmemopen((void *) proccgroupsallinone, strlen(proccgroupsallinone), mode); else if (logind) - return fmemopen((void *)proccgroupslogind, + return fmemopen((void *) proccgroupslogind, strlen(proccgroupslogind), mode); else - return fmemopen((void *)proccgroups, strlen(proccgroups), mode); + return fmemopen((void *) proccgroups, strlen(proccgroups), mode); } else { errno = EACCES; return NULL; @@ -497,13 +497,13 @@ FILE *fopen(const char *path, const char *mode) if (STREQ(path, "/proc/self/cgroup")) { if (STREQ(mode, "r")) { if (allinone) - return fmemopen((void *)procselfcgroupsallinone, + return fmemopen((void *) procselfcgroupsallinone, strlen(procselfcgroupsallinone), mode); else if (logind) - return fmemopen((void *)procselfcgroupslogind, + return fmemopen((void *) procselfcgroupslogind, strlen(procselfcgroupslogind), mode); else - return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode); + return fmemopen((void *) procselfcgroups, strlen(procselfcgroups), mode); } else { errno = EACCES; return NULL; diff --git a/tests/virdbusmock.c b/tests/virdbusmock.c index a62689e91d5b..8786262e52ca 100644 --- a/tests/virdbusmock.c +++ b/tests/virdbusmock.c @@ -31,7 +31,7 @@ VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_change_sigpipe, VIR_MOCK_STUB_RET_ARGS(dbus_bus_get, - DBusConnection *, (DBusConnection *)0x1, + DBusConnection *, (DBusConnection *) 0x1, DBusBusType, type, DBusError *, error) diff --git a/tests/virhashtest.c b/tests/virhashtest.c index e9c03c1afbbc..40c1d327fb98 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -38,7 +38,7 @@ testHashInit(int size) if (virHashTableSize(hash) != oldsize) { VIR_TEST_DEBUG("hash grown from %zd to %zd", - (size_t)oldsize, (size_t)virHashTableSize(hash)); + (size_t) oldsize, (size_t) virHashTableSize(hash)); } } diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 5b03cb6aee5e..cc7fdf8be68f 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -53,7 +53,7 @@ VIR_LOG_INIT("tests.hostdevtest"); static const char *drv_name = "test_driver"; static const char *dom_name = "test_domain"; static const unsigned char *uuid = - (unsigned char *)("f92360b0-2541-8791-fb32-d1f838811541"); + (unsigned char *) ("f92360b0-2541-8791-fb32-d1f838811541"); static int nhostdevs = 3; static virDomainHostdevDefPtr hostdevs[] = {NULL, NULL, NULL}; static virPCIDevicePtr dev[] = {NULL, NULL, NULL}; diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index ef869b16e363..3cc388bceafa 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -328,7 +328,7 @@ static int testExecRestart(const void *opaque) data->nservers, data->serverNames, testNewServerPostExecRestart, - (void *)data))) + (void *) data))) goto cleanup; for (i = 0; i < data->nservers; i++) { diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index be7d019c310a..8d63b268d031 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -123,13 +123,13 @@ static int testMessageHeaderDecode(const void *args ATTRIBUTE_UNUSED) if (msg->bufferOffset != 0x4) { VIR_DEBUG("Expecting offset %zu got %zu", - (size_t)4, msg->bufferOffset); + (size_t) 4, msg->bufferOffset); goto cleanup; } if (msg->bufferLength != 0x1c) { VIR_DEBUG("Expecting length %zu got %zu", - (size_t)0x1c, msg->bufferLength); + (size_t) 0x1c, msg->bufferLength); goto cleanup; } @@ -346,13 +346,13 @@ static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) if (msg->bufferOffset != 0x4) { VIR_DEBUG("Expecting offset %zu got %zu", - (size_t)4, msg->bufferOffset); + (size_t) 4, msg->bufferOffset); goto cleanup; } if (msg->bufferLength != 0x74) { VIR_DEBUG("Expecting length %zu got %zu", - (size_t)0x74, msg->bufferLength); + (size_t) 0x74, msg->bufferLength); goto cleanup; } @@ -365,13 +365,13 @@ static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) if (msg->bufferOffset != 28) { VIR_DEBUG("Expect message offset %zu got %zu", - msg->bufferOffset, (size_t)28); + msg->bufferOffset, (size_t) 28); goto cleanup; } if (msg->bufferLength != 0x74) { VIR_DEBUG("Expecting length %zu got %zu", - (size_t)0x1c, msg->bufferLength); + (size_t) 0x1c, msg->bufferLength); goto cleanup; } diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 9f9a24348449..638e05127834 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -81,7 +81,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, in6.sin6_port = htons(BASE_PORT + i); in6.sin6_addr = in6addr_loopback; - if (bind(s4, (struct sockaddr *)&in4, sizeof(in4)) < 0) { + if (bind(s4, (struct sockaddr *) &in4, sizeof(in4)) < 0) { if (errno == EADDRINUSE) { VIR_FORCE_CLOSE(s4); VIR_FORCE_CLOSE(s6); @@ -91,7 +91,7 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, } if (*hasIPv6) { - if (bind(s6, (struct sockaddr *)&in6, sizeof(in6)) < 0) { + if (bind(s6, (struct sockaddr *) &in6, sizeof(in6)) < 0) { if (errno == EADDRINUSE) { VIR_FORCE_CLOSE(s4); VIR_FORCE_CLOSE(s6); diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 86647f3014b0..9205d05724a8 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -62,7 +62,7 @@ struct testTLSContextData { */ static int testTLSContextInit(const void *opaque) { - struct testTLSContextData *data = (struct testTLSContextData *)opaque; + struct testTLSContextData *data = (struct testTLSContextData *) opaque; virNetTLSContextPtr ctxt = NULL; int ret = -1; diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index 5c94f899774a..3f5cc7ae416a 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -74,7 +74,7 @@ gnutls_x509_privkey_t privkey; static gnutls_x509_privkey_t testTLSLoadKey(void) { gnutls_x509_privkey_t key; - const gnutls_datum_t data = { (unsigned char *)PRIVATE_KEY, strlen(PRIVATE_KEY) }; + const gnutls_datum_t data = { (unsigned char *) PRIVATE_KEY, strlen(PRIVATE_KEY) }; int err; if ((err = gnutls_x509_privkey_init(&key)) < 0) { @@ -137,7 +137,7 @@ static void testTLSDerEncode(ASN1_TYPE src, asn1_der_coding(src, src_name, data, &size, NULL); - res->data = (unsigned char *)data; + res->data = (unsigned char *) data; res->size = size; } diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 7e856071817d..f2501661f41e 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -80,7 +80,7 @@ static ssize_t testRead(char *buf, size_t len, void *opaque) */ static int testTLSSessionInit(const void *opaque) { - struct testTLSSessionData *data = (struct testTLSSessionData *)opaque; + struct testTLSSessionData *data = (struct testTLSSessionData *) opaque; virNetTLSContextPtr clientCtxt = NULL; virNetTLSContextPtr serverCtxt = NULL; virNetTLSSessionPtr clientSess = NULL; diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 176c64d65435..773cc16840ca 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -844,7 +844,7 @@ init_env(void) # define MAKE_PCI_DEVICE(Id, Vendor, Device, ...) \ do { \ - struct pciDevice dev = {.id = (char *)Id, .vendor = Vendor, \ + struct pciDevice dev = {.id = (char *) Id, .vendor = Vendor, \ .device = Device, __VA_ARGS__}; \ pci_device_new_from_stub(&dev); \ } while (0) diff --git a/tests/virrandommock.c b/tests/virrandommock.c index fd1a61f67321..52211644e4c6 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -46,7 +46,7 @@ int virRandomGenerateWWN(char **wwn, const char *virt_type ATTRIBUTE_UNUSED) { return virAsprintf(wwn, "5100000%09llx", - (unsigned long long)virRandomBits(36)); + (unsigned long long) virRandomBits(36)); } diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index 89ceda8e49bd..f1d4699e5cac 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -58,8 +58,8 @@ static int testRotatingFileWriterAssertOneFileSize(const char *filename, return -1; } else if (sb.st_size != size) { fprintf(stderr, "File %s should be %llu bytes not %llu\n", - filename, (unsigned long long)size, - (unsigned long long)sb.st_size); + filename, (unsigned long long) size, + (unsigned long long) sb.st_size); return -1; } else { return 0; @@ -127,7 +127,7 @@ static int testRotatingFileInitOne(const char *filename, VIR_DEBUG("Deleting %s", filename); unlink(filename); } else { - VIR_DEBUG("Creating %s size %zu", filename, (size_t)size); + VIR_DEBUG("Creating %s size %zu", filename, (size_t) size); char buf[1024]; int fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0700); if (fd < 0) { diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 1230aba5b7a3..18558d3356b2 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -179,7 +179,7 @@ static int testAdd(const void *args) size_t i; for (i = 0; data->tokens[i]; i++) { - char **tmp = virStringListAdd((const char **)list, data->tokens[i]); + char **tmp = virStringListAdd((const char **) list, data->tokens[i]); if (!tmp) goto cleanup; virStringListFree(list); @@ -191,7 +191,7 @@ static int testAdd(const void *args) VIR_ALLOC(list) < 0) goto cleanup; - if (!(got = virStringListJoin((const char **)list, data->delim))) { + if (!(got = virStringListJoin((const char **) list, data->delim))) { VIR_DEBUG("Got no result"); goto cleanup; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index fbacfa85ad44..cd79bbe63736 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -48,7 +48,7 @@ static int testTypedParamsValidate(const void *opaque) { int rv; - TypedParameterTest *test = (TypedParameterTest *)opaque; + TypedParameterTest *test = (TypedParameterTest *) opaque; virErrorPtr errptr; rv = virTypedParamsValidate( diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index f6bcd7b01282..90110b2d24bd 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -167,7 +167,7 @@ testFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) directoryAndFileName = strtok_r(NULL, "", &saveptr); if (directoryAndFileName == NULL) { - directoryAndFileName = (char *)""; + directoryAndFileName = (char *) ""; } else { directoryAndFileName += strspn(directoryAndFileName, " "); } -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- tools/nss/libvirt_nss.c | 4 ++-- tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-domain.c | 36 ++++++++++++++-------------- tools/virsh-host.c | 4 ++-- tools/virsh-secret.c | 2 +- tools/virsh-volume.c | 2 +- tools/virt-host-validate-qemu.c | 2 +- tools/vsh.c | 4 ++-- tools/wireshark/src/packet-libvirt.c | 8 +++---- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 62fe589bed7e..afabaf20fc05 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -681,7 +681,7 @@ _nss_compat_getaddrinfo(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list ap) h_errno = HOST_NOT_FOUND; return NS_NOTFOUND; } - *((struct addrinfo **)retval) = sentinel.ai_next; + *((struct addrinfo **) retval) = sentinel.ai_next; return NS_SUCCESS; } @@ -708,7 +708,7 @@ _nss_compat_gethostbyname2_r(void *retval, void *mdata ATTRIBUTE_UNUSED, va_list herrnop = va_arg(ap, int *); ret = NSS_NAME(gethostbyname2)(name, af, result, buffer, buflen, errnop, herrnop); - *(struct hostent **)retval = (ret == NS_SUCCESS) ? result : NULL; + *(struct hostent **) retval = (ret == NS_SUCCESS) ? result : NULL; return ret; } diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8e071779b4ef..15133def92a6 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1150,7 +1150,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) return false; id = virDomainGetID(dom); - if (id == ((unsigned int)-1)) + if (id == ((unsigned int) -1)) vshPrint(ctl, "%-15s %s\n", _("Id:"), "-"); else vshPrint(ctl, "%-15s %d\n", _("Id:"), id); @@ -1795,7 +1795,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd) bool ret = false; virshDomainListPtr list = NULL; virDomainPtr dom; - char id_buf[INT_BUFSIZE_BOUND(unsigned int)]; + char id_buf[INT_BUFSIZE_BOUND(unsigned int) ]; unsigned int id; unsigned int flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2b775fc4cca6..7ebe4dc30cac 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -370,7 +370,7 @@ static int str2PCIAddress(const char *str, struct PCIAddress *pciAddr) if (!str) return -1; - domain = (char *)str; + domain = (char *) str; if (virStrToLong_uip(domain, &bus, 16, &pciAddr->domain) != 0) return -1; @@ -399,7 +399,7 @@ static int str2SCSIAddress(const char *str, struct SCSIAddress *scsiAddr) if (!str) return -1; - controller = (char *)str; + controller = (char *) str; if (virStrToLong_uip(controller, &bus, 10, &scsiAddr->controller) != 0) return -1; @@ -424,7 +424,7 @@ static int str2IDEAddress(const char *str, struct IDEAddress *ideAddr) if (!str) return -1; - controller = (char *)str; + controller = (char *) str; if (virStrToLong_uip(controller, &bus, 10, &ideAddr->controller) != 0) return -1; @@ -449,7 +449,7 @@ static int str2CCWAddress(const char *str, struct CCWAddress *ccwAddr) if (!str) return -1; - cssid = (char *)str; + cssid = (char *) str; if (virStrToLong_uip(cssid, &ssid, 16, &ccwAddr->cssid) != 0) return -1; @@ -480,7 +480,7 @@ static int str2DiskAddress(const char *str, struct DiskAddress *diskAddr) if (!str) return -1; - type = (char *)str; + type = (char *) str; addr = strchr(type, ':'); if (!addr) return -1; @@ -625,7 +625,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (STRPREFIX((const char *)target, "vd")) { + if (STRPREFIX((const char *) target, "vd")) { if (diskAddr.type == DISK_ADDR_TYPE_PCI) { virBufferAsprintf(&buf, "<address type='pci' domain='0x%04x'" @@ -646,7 +646,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) _("expecting a pci:0000.00.00.00 or ccw:00.0.0000 address.")); goto cleanup; } - } else if (STRPREFIX((const char *)target, "sd")) { + } else if (STRPREFIX((const char *) target, "sd")) { if (diskAddr.type == DISK_ADDR_TYPE_SCSI) { virBufferAsprintf(&buf, "<address type='drive' controller='%u'" @@ -657,7 +657,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("expecting a scsi:00.00.00 address.")); goto cleanup; } - } else if (STRPREFIX((const char *)target, "hd")) { + } else if (STRPREFIX((const char *) target, "hd")) { if (diskAddr.type == DISK_ADDR_TYPE_IDE) { virBufferAsprintf(&buf, "<address type='drive' controller='%u'" @@ -862,7 +862,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) goto cleanup; /* check interface type */ - if ((int)(typ = virDomainNetTypeFromString(type)) < 0) { + if ((int) (typ = virDomainNetTypeFromString(type)) < 0) { vshError(ctl, _("No support for %s in command 'attach-interface'"), type); goto cleanup; @@ -1604,7 +1604,7 @@ virshPrintJobProgress(const char *label, unsigned long long remaining, progress = 100; } else { /* use float to avoid overflow */ - progress = (int)(100.0 - remaining * 100.0 / total); + progress = (int) (100.0 - remaining * 100.0 / total); if (progress >= 100) { /* migration has not completed, do not print [100 %] */ progress = 99; @@ -4021,7 +4021,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) VIRSH_BYNAME | VIRSH_BYUUID))) return false; - if (virDomainGetID(dom) != (unsigned int)-1) { + if (virDomainGetID(dom) != (unsigned int) -1) { vshError(ctl, "%s", _("Domain is already active")); goto cleanup; } @@ -4226,7 +4226,7 @@ virshWatchJob(vshControl *ctl, GETTIMEOFDAY(&start); while (1) { - ret = poll((struct pollfd *)&pollfd, npollfd, 500); + ret = poll((struct pollfd *) &pollfd, npollfd, 500); if (ret > 0) { if (pollfd[1].revents & POLLIN && saferead(STDIN_FILENO, &retchar, sizeof(retchar)) > 0) { @@ -4259,8 +4259,8 @@ virshWatchJob(vshControl *ctl, } GETTIMEOFDAY(&curr); - if (timeout_ms && (((int)(curr.tv_sec - start.tv_sec) * 1000 + - (int)(curr.tv_usec - start.tv_usec) / 1000) > + if (timeout_ms && (((int) (curr.tv_sec - start.tv_sec) * 1000 + + (int) (curr.tv_usec - start.tv_usec) / 1000) > timeout_ms)) { /* suspend the domain when migration timeouts. */ vshDebug(ctl, VSH_ERR_DEBUG, "%s timeout", label); @@ -7859,7 +7859,7 @@ cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) } result = virConnectBaselineCPU(priv->conn, - (const char **)list, count, flags); + (const char **) list, count, flags); if (result) { vshPrint(ctl, "%s", result); @@ -10326,7 +10326,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) return false; id = virDomainGetID(dom); - if (id == ((unsigned int)-1)) + if (id == ((unsigned int) -1)) vshPrint(ctl, "%s\n", "-"); else vshPrint(ctl, "%d\n", id); @@ -10626,7 +10626,7 @@ doMigrate(void *opaque) &nparams, &maxparams, VIR_MIGRATE_PARAM_MIGRATE_DISKS, - (const char **)val) < 0) { + (const char **) val) < 0) { VIR_FREE(val); goto save_error; } @@ -10643,7 +10643,7 @@ doMigrate(void *opaque) &nparams, &maxparams, VIR_MIGRATE_PARAM_COMPRESSION, - (const char **)val) < 0) { + (const char **) val) < 0) { VIR_FREE(val); goto save_error; } diff --git a/tools/virsh-host.c b/tools/virsh-host.c index ecaf830e350d..91c0e57272c9 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -290,8 +290,8 @@ static const vshCmdOptDef opts_freepages[] = { static int vshPageSizeSorter(const void *a, const void *b) { - unsigned int pa = *(unsigned int *)a; - unsigned int pb = *(unsigned int *)b; + unsigned int pa = *(unsigned int *) a; + unsigned int pb = *(unsigned int *) b; return pa - pb; } diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 9e4ec61a8807..e2b097e3f733 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -214,7 +214,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - res = virSecretSetValue(secret, (unsigned char *)value, value_size, 0); + res = virSecretSetValue(secret, (unsigned char *) value, value_size, 0); memset(value, 0, value_size); VIR_FREE(value); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 9d6ebd2325a5..2a590d7dd826 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -536,7 +536,7 @@ virshMakeCloneXML(const char *origxml, const char *newname) obj->nodesetval->nodeTab == NULL) goto cleanup; - xmlNodeSetContent(obj->nodesetval->nodeTab[0], (const xmlChar *)newname); + xmlNodeSetContent(obj->nodesetval->nodeTab[0], (const xmlChar *) newname); xmlDocDumpMemory(doc, &newxml, &size); cleanup: diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index d7573ea8b3dd..22b92a5d1d19 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -40,7 +40,7 @@ int virHostValidateQEMU(void) if (!(flags = virHostValidateGetCPUFlags())) return -1; - switch ((int)arch) { + switch ((int) arch) { case VIR_ARCH_I686: case VIR_ARCH_X86_64: hasVirtFlag = true; diff --git a/tools/vsh.c b/tools/vsh.c index 73ec007e5622..babdbb542e45 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -162,7 +162,7 @@ _vshStrdup(vshControl *ctl, const char *s, const char *filename, int line) if (VIR_STRDUP(x, s) >= 0) return x; vshError(ctl, _("%s: %d: failed to allocate %lu bytes"), - filename, line, (unsigned long)strlen(s)); + filename, line, (unsigned long) strlen(s)); exit(EXIT_FAILURE); } @@ -373,7 +373,7 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) case VSH_OT_ALIAS: { size_t j; - char *name = (char *)opt->help; /* cast away const */ + char *name = (char *) opt->help; /* cast away const */ char *p; if (opt->flags || !opt->help) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index 71f0f6114a68..421f116f77e3 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -95,7 +95,7 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, start = xdr_getpos(xdrs); if (xdr_string(xdrs, &val, maxlen)) { proto_tree_add_string(tree, hf, tvb, start, xdr_getpos(xdrs) - start, val); - xdr_free((xdrproc_t)xdr_string, (char *)&val); + xdr_free((xdrproc_t)xdr_string, (char *) &val); return TRUE; } else { proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA); @@ -151,7 +151,7 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf, guint32 length; start = xdr_getpos(xdrs); - if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) { + if (xdr_bytes(xdrs, (char **) &val, &length, maxlen)) { proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start, NULL, "%s", format_xdr_bytes(val, length)); /* Seems I can't call xdr_free() for this case. @@ -374,7 +374,7 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree, if (status == VIR_NET_OK) { vir_xdr_dissector_t xd = find_payload_dissector(proc, type, get_program_data(prog, VIR_PROGRAM_DISSECTORS), - *(gsize *)get_program_data(prog, VIR_PROGRAM_DISSECTORS_LEN)); + *(gsize *) get_program_data(prog, VIR_PROGRAM_DISSECTORS_LEN)); if (xd == NULL) goto unknown; dissect_libvirt_payload_xdr_data(tvb, tree, payload_length, status, xd); @@ -445,7 +445,7 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(libvirt_tree, hf_libvirt_program, tvb, offset, 4, ENC_NA); offset += 4; proto_tree_add_item(libvirt_tree, hf_libvirt_version, tvb, offset, 4, ENC_NA); offset += 4; - hf_proc = (int *)get_program_data(prog, VIR_PROGRAM_PROCHFVAR); + hf_proc = (int *) get_program_data(prog, VIR_PROGRAM_PROCHFVAR); if (hf_proc != NULL && *hf_proc != -1) { proto_tree_add_item(libvirt_tree, *hf_proc, tvb, offset, 4, ENC_NA); } else { -- 2.17.0
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- include/libvirt/libvirt-domain.h | 4 ++-- src/libvirt-domain.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd34037e5d..8dfcda967295 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -447,7 +447,7 @@ int virDomainSetSchedulerParametersFlags (virDomainPtr domain, * * Block device stats for virDomainBlockStats. * - * Hypervisors may return a field set to ((long long)-1) which indicates + * Hypervisors may return a field set to ((long long) -1) which indicates * that the hypervisor does not support that statistic. * * NB. Here 'long long' means 64 bit integer. @@ -554,7 +554,7 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; * * Network interface stats for virDomainInterfaceStats. * - * Hypervisors may return a field set to ((long long)-1) which indicates + * Hypervisors may return a field set to ((long long) -1) which indicates * that the hypervisor does not support that statistic. * * NB. Here 'long long' means 64 bit integer. diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2d86e48979d3..67c70e27efe7 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -1728,7 +1728,7 @@ virDomainGetID(virDomainPtr domain) virResetLastError(); - virCheckDomainReturn(domain, (unsigned int)-1); + virCheckDomainReturn(domain, (unsigned int) -1); return domain->id; } -- 2.17.0
Let's make a rule out of it and document it. This is based on few sources: 1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller 2) I asked the first libvirt developer on my left when deciding, they preferred spaces 3) My own preference. 4) The fact that this is clearly the superior way of casting =D [1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- cfg.mk | 6 ++++++ docs/hacking.html.in | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/cfg.mk b/cfg.mk index 902178dd1c3a..967f99202481 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1050,6 +1050,12 @@ sc_prohibit_backslash_alignment: halt='Do not attempt to right-align backslashes' \ $(_sc_search_regexp) +sc_require_space_after_cast: + @prohibit='(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\)([^ );,])' \ + in_vc_files='*\.[chx]$$' \ + halt='Use space after cast' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/docs/hacking.html.in b/docs/hacking.html.in index fbeea3eb751d..df3821aa3084 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -579,6 +579,15 @@ int foo(int wizz); // Good </pre> + <p> + There must be a single whitespace immediately following a cast to any + type. E.g. + </p> + <pre> + foo = (int)bar; // Bad + foo = (int) bar; // Good +</pre> + <h2><a id="comma">Commas</a></h2> <p> -- 2.17.0
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
Just because it's popular does not mean it's right.
2) I asked the first libvirt developer on my left when deciding, they preferred spaces
Selection bias.
3) My own preference.
De gustibus non est disputandum.
4) The fact that this is clearly the superior way of casting =D
[citation needed]
[1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
ACK if you forbid spaces after casts instead. Jano
On Mon, 2018-04-23 at 15:04 +0200, Ján Tomko wrote:
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
Just because it's popular does not mean it's right.
I don't think there's a right or wrong in this case: it's a pure matter of preference, which makes the popularity relevant as it's as good an indicator as any as to how many people will be annoyed by the change ;)
ACK if you forbid spaces after casts instead.
I'd rather have all spaces removed, even though that wouldn't be my personal preference, than keep mixing up the two approaches. -- Andrea Bolognani / Red Hat / Virtualization
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
2) I asked the first libvirt developer on my left when deciding, they preferred spaces
3) My own preference.
4) The fact that this is clearly the superior way of casting =D
[1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up.
I'm surprised that is the case, but if you'll show the command you used to extract that stat I could be convinced... Personally I'm not a fan of adding the extra space - the cast is associated with the variable, so I don't think it needs it. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Mon, Apr 23, 2018 at 02:25:26PM +0100, Daniel P. Berrangé wrote:
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
2) I asked the first libvirt developer on my left when deciding, they preferred spaces
3) My own preference.
4) The fact that this is clearly the superior way of casting =D
[1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up.
I'm surprised that is the case, but if you'll show the command you used to extract that stat I could be convinced...
with_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ([^ );,])' | wc -l) without_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\)([^ );,])' | wc -l) total=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ?([^ );,])' | wc -l) printf "Casts with spaces: %.2f%%\nCasts without spaces: %.2f%%\n" $((with_spaces * 100.0 / total)) $((without_spaces * 100.0 / total)) It's kinda hairy, but it works. Except the xdrproc_t cast that Peter pointed out. With that fixed it is actually 52.94% instead of 54.85%. That also shows that the first time I did it, I certainly included the *_t in the regex.
Personally I'm not a fan of adding the extra space - the cast is associated with the variable, so I don't think it needs it.
I know we've discussed it earlier, and I don't want to repeat myself, but for the sake of keeping it in the conversation; there are spaces around everything except function calls, but in the end it's just a clearer separation. I used to prefer non-spaced casts too, but then I misread some and realized it's similar to arithmetics for example. And before anyone starts shouting at me that it is very subjective and it all depeds on x, y, and z, including your terminal font, I agree, it for sure is. And I also agree that we should not be spending almost any of out time with something that's very close to bikeshedding =) I just want this to be unified across the codebase, and if the consensus is that there should be no spaces, then I'll resend the series with the spaces removed. Just let me know so that I don't send ton of patches for no reason. Have a nice day, Martin
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On 04/23/2018 10:16 AM, Martin Kletzander wrote:
On Mon, Apr 23, 2018 at 02:25:26PM +0100, Daniel P. Berrangé wrote:
Personally I'm not a fan of adding the extra space - the cast is associated with the variable, so I don't think it needs it.
I know we've discussed it earlier, and I don't want to repeat myself, but for the sake of keeping it in the conversation; there are spaces around everything except function calls, but in the end it's just a clearer separation. I used to prefer non-spaced casts too, but then I misread some and realized it's similar to arithmetics for example.
And before anyone starts shouting at me that it is very subjective and it all depeds on x, y, and z, including your terminal font, I agree, it for sure is. And I also agree that we should not be spending almost any of out time with something that's very close to bikeshedding =) I just want this to be unified across the codebase, and if the consensus is that there should be no spaces, then I'll resend the series with the spaces removed.
Just let me know so that I don't send ton of patches for no reason.
I would also vote for no spaces - I've always seen "lack of a space after a single word in parens" as the "this is a typecast" operator (it makes sense in my addled brain).
On Mon, Apr 23, 2018 at 04:16:11PM +0200, Martin Kletzander wrote:
On Mon, Apr 23, 2018 at 02:25:26PM +0100, Daniel P. Berrangé wrote:
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
2) I asked the first libvirt developer on my left when deciding, they preferred spaces
3) My own preference.
4) The fact that this is clearly the superior way of casting =D
[1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up.
I'm surprised that is the case, but if you'll show the command you used to extract that stat I could be convinced...
with_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ([^ );,])' | wc -l) without_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\)([^ );,])' | wc -l) total=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ?([^ );,])' | wc -l) printf "Casts with spaces: %.2f%%\nCasts without spaces: %.2f%%\n" $((with_spaces * 100.0 / total)) $((without_spaces * 100.0 / total))
It's kinda hairy, but it works. Except the xdrproc_t cast that Peter pointed out. With that fixed it is actually 52.94% instead of 54.85%. That also shows that the first time I did it, I certainly included the *_t in the regex.
Ah, so the reason why the with spaces count is much higher than I expected is almost entirely down to one file - the remote driver. Without spaces $ git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch+\(\(vir[a-zA-Z]*Type)\)([^ );,])' | awk '{print $1}' | uniq -c | sort -n | tail 18 tools/virsh-domain.c: 24 src/esx/esx_vi_types.c: 30 src/hyperv/hyperv_driver.c: 32 src/util/viratomic.h: 33 src/util/virdbus.c: 34 src/conf/domain_conf.c: 43 src/xenapi/xenapi_driver.c: 52 src/node_device/node_device_hal.c: 54 src/vbox/vbox_common.c: 56 src/remote/remote_driver.c: With spaces $ git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch+\(\(vir[a-zA-Z]*Type)\) ([^ );,])' | awk '{print $1}' | uniq -c | sort -n | tail 14 src/security/security_dac.c: 15 src/util/virxml.c: 17 tools/virsh-pool.c: 20 src/admin/admin_remote.c: 21 tests/qemumonitorjsontest.c: 21 tests/virstoragetest.c: 24 src/qemu/qemu_driver.c: 25 src/remote/remote_daemon_dispatch.c: 44 tests/testutilshostcpus.h: 238 src/remote/remote_driver.c: Amuzingly the remote driver has both styles on the very same line in many cases ! Anyway, this just makes me prefer the without-spaces style more because remote driver is an outlier
Personally I'm not a fan of adding the extra space - the cast is associated with the variable, so I don't think it needs it.
I know we've discussed it earlier, and I don't want to repeat myself, but for the sake of keeping it in the conversation; there are spaces around everything except function calls, but in the end it's just a clearer separation. I used to prefer non-spaced casts too, but then I misread some and realized it's similar to arithmetics for example.
And before anyone starts shouting at me that it is very subjective and it all depeds on x, y, and z, including your terminal font, I agree, it for sure is. And I also agree that we should not be spending almost any of out time with something that's very close to bikeshedding =) I just want this to be unified across the codebase, and if the consensus is that there should be no spaces, then I'll resend the series with the spaces removed.
Yes, I totally agree that - it is subjective and we should unify it. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
On Wed, Apr 25, 2018 at 08:48:29AM +0100, Daniel P. Berrangé wrote:
On Mon, Apr 23, 2018 at 04:16:11PM +0200, Martin Kletzander wrote:
On Mon, Apr 23, 2018 at 02:25:26PM +0100, Daniel P. Berrangé wrote:
On Mon, Apr 23, 2018 at 02:44:57PM +0200, Martin Kletzander wrote:
Let's make a rule out of it and document it. This is based on few sources:
1) Most of the code [1] used spaces after casts, so the patch to change it this way rather than the other way around is smaller
2) I asked the first libvirt developer on my left when deciding, they preferred spaces
3) My own preference.
4) The fact that this is clearly the superior way of casting =D
[1] 54.85% is more than 50%, plus it is increasing as it was 52.96% during the first draft of this clean-up.
I'm surprised that is the case, but if you'll show the command you used to extract that stat I could be convinced...
with_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ([^ );,])' | wc -l) without_spaces=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\)([^ );,])' | wc -l) total=$(git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch \(\(vir[a-zA-Z]*Type)\) ?([^ );,])' | wc -l) printf "Casts with spaces: %.2f%%\nCasts without spaces: %.2f%%\n" $((with_spaces * 100.0 / total)) $((without_spaces * 100.0 / total))
It's kinda hairy, but it works. Except the xdrproc_t cast that Peter pointed out. With that fixed it is actually 52.94% instead of 54.85%. That also shows that the first time I did it, I certainly included the *_t in the regex.
Ah, so the reason why the with spaces count is much higher than I expected is almost entirely down to one file - the remote driver.
Without spaces
$ git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch+\(\(vir[a-zA-Z]*Type)\)([^ );,])' | awk '{print $1}' | uniq -c | sort -n | tail 18 tools/virsh-domain.c: 24 src/esx/esx_vi_types.c: 30 src/hyperv/hyperv_driver.c: 32 src/util/viratomic.h: 33 src/util/virdbus.c: 34 src/conf/domain_conf.c: 43 src/xenapi/xenapi_driver.c: 52 src/node_device/node_device_hal.c: 54 src/vbox/vbox_common.c: 56 src/remote/remote_driver.c:
With spaces
$ git ls-files '*.[chx]' | xargs grep -E '(\([a-zA-Z _]+ \*+|\(((signed|unsigned|long|short|int|char|s?size_t|void) ?)+|switch+\(\(vir[a-zA-Z]*Type)\) ([^ );,])' | awk '{print $1}' | uniq -c | sort -n | tail 14 src/security/security_dac.c: 15 src/util/virxml.c: 17 tools/virsh-pool.c: 20 src/admin/admin_remote.c: 21 tests/qemumonitorjsontest.c: 21 tests/virstoragetest.c: 24 src/qemu/qemu_driver.c: 25 src/remote/remote_daemon_dispatch.c: 44 tests/testutilshostcpus.h: 238 src/remote/remote_driver.c:
Amuzingly the remote driver has both styles on the very same line in many cases !
Anyway, this just makes me prefer the without-spaces style more because remote driver is an outlier
Great, I'll do that.
Personally I'm not a fan of adding the extra space - the cast is associated with the variable, so I don't think it needs it.
I know we've discussed it earlier, and I don't want to repeat myself, but for the sake of keeping it in the conversation; there are spaces around everything except function calls, but in the end it's just a clearer separation. I used to prefer non-spaced casts too, but then I misread some and realized it's similar to arithmetics for example.
And before anyone starts shouting at me that it is very subjective and it all depeds on x, y, and z, including your terminal font, I agree, it for sure is. And I also agree that we should not be spending almost any of out time with something that's very close to bikeshedding =) I just want this to be unified across the codebase, and if the consensus is that there should be no spaces, then I'll resend the series with the spaces removed.
Yes, I totally agree that - it is subjective and we should unify it.
Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (6)
-
Andrea Bolognani -
Daniel P. Berrangé -
Ján Tomko -
Laine Stump -
Martin Kletzander -
Peter Krempa