From nobody Wed May 14 14:02:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524487597265996.8005198926863; Mon, 23 Apr 2018 05:46:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7E034E4C5; Mon, 23 Apr 2018 12:46:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 888EC2CFC4; Mon, 23 Apr 2018 12:46:35 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EFDF25BBED; Mon, 23 Apr 2018 12:46:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3NCjCsm011964 for ; Mon, 23 Apr 2018 08:45:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 925F010FFE72; Mon, 23 Apr 2018 12:45:12 +0000 (UTC) Received: from caroline.localdomain (unknown [10.43.2.67]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 17BE81102E2A for ; Mon, 23 Apr 2018 12:45:12 +0000 (UTC) Received: from caroline.brq.redhat.com (caroline.usersys.redhat.com [127.0.0.1]) by caroline.localdomain (Postfix) with ESMTP id 65A8C120080 for ; Mon, 23 Apr 2018 14:45:08 +0200 (CEST) From: Martin Kletzander To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 14:44:48 +0200 Message-Id: <877840f58c171c1926cb021a01c5fb20a8134f86.1524487472.git.mkletzan@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 20/29] vbox: Add spaces after casts X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 23 Apr 2018 12:46:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Martin Kletzander --- 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, IVir= tualBox **ppVirtualBox, =20 if (FAILED(hrc)) { VIR_ERROR(_("Could not parse IID from '%s', rc =3D 0x%08x"), - pszVirtualBoxIID, (unsigned int)hrc); + pszVirtualBoxIID, (unsigned int) hrc); goto cleanup; } =20 @@ -546,7 +546,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVir= tualBox **ppVirtualBox, =20 if (FAILED(hrc)) { VIR_ERROR(_("Could not parse IID from '%s', rc =3D 0x%08x"), - pszVirtualBoxIID, (unsigned int)hrc); + pszVirtualBoxIID, (unsigned int) hrc); goto cleanup; } =20 @@ -555,7 +555,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVir= tualBox **ppVirtualBox, =20 if (FAILED(hrc)) { VIR_ERROR(_("Could not create VirtualBox instance, rc =3D 0x%08x"), - (unsigned int)hrc); + (unsigned int) hrc); goto cleanup; } =20 @@ -564,7 +564,7 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IVir= tualBox **ppVirtualBox, =20 if (FAILED(hrc)) { VIR_ERROR(_("Could not create Session instance, rc =3D 0x%08x"), - (unsigned int)hrc); + (unsigned int) hrc); goto cleanup; } =20 @@ -576,12 +576,12 @@ vboxComInitialize_v2(const char *pszVirtualBoxIID, IV= irtualBox **ppVirtualBox, cleanup: if (result < 0) { if (vboxVirtualBox !=3D NULL) { - vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *)vboxV= irtualBox); + vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *) vbox= VirtualBox); vboxVirtualBox =3D NULL; } =20 if (vboxSession !=3D NULL) { - vboxSession->vtbl->nsisupports.Release((nsISupports *)vboxSess= ion); + vboxSession->vtbl->nsisupports.Release((nsISupports *) vboxSes= sion); vboxSession =3D NULL; } } @@ -601,12 +601,12 @@ static void vboxComUninitialize(void) { if (vboxVirtualBox !=3D NULL) { - vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *)vboxVirtu= alBox); + vboxVirtualBox->vtbl->nsisupports.Release((nsISupports *) vboxVirt= ualBox); vboxVirtualBox =3D NULL; } =20 if (vboxSession !=3D NULL) { - vboxSession->vtbl->nsisupports.Release((nsISupports *)vboxSession); + vboxSession->vtbl->nsisupports.Release((nsISupports *) vboxSession= ); vboxSession =3D NULL; } =20 @@ -703,7 +703,7 @@ vboxArrayGetHelper(vboxArray *array, HRESULT hrc, SAFEA= RRAY *safeArray) if (FAILED(hrc)) return hrc; =20 - hrc =3D SafeArrayAccessData(safeArray, (void **)&items); + hrc =3D SafeArrayAccessData(safeArray, (void **) &items); =20 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, i= nt *ids, int nids) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of Domains, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -738,7 +738,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get number of Domains, rc=3D%08x"), (u= nsigned)rc); + _("Could not get number of Domains, rc=3D%08x"), (u= nsigned) rc); goto cleanup; } =20 @@ -792,7 +792,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr = conn, int id) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); return NULL; } =20 @@ -858,7 +858,7 @@ virDomainPtr vboxDomainLookupByUUID(virConnectPtr conn, rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); return NULL; } =20 @@ -930,7 +930,7 @@ vboxDomainLookupByName(virConnectPtr conn, const char *= name) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); return NULL; } =20 @@ -1888,7 +1888,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags =20 if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not define a domain, rc=3D%08x"), (unsigne= d)rc); + _("could not define a domain, rc=3D%08x"), (unsigne= d) rc); goto cleanup; } =20 @@ -1898,7 +1898,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the memory size of the domain to: = %llu Kb, " "rc=3D%08x"), - def->mem.cur_balloon, (unsigned)rc); + def->mem.cur_balloon, (unsigned) rc); } =20 if (virDomainDefHasVcpusOffline(def)) { @@ -1909,7 +1909,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the number of virtual CPUs to: %u,= rc=3D%08x"), - virDomainDefGetVcpusMax(def), (unsigned)rc); + virDomainDefGetVcpusMax(def), (unsigned) rc); } =20 rc =3D gVBoxAPI.UIMachine.SetCPUProperty(machine, CPUPropertyType_PAE, @@ -1919,7 +1919,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change PAE status to: %s, rc=3D%08x"), (def->features[VIR_DOMAIN_FEATURE_PAE] =3D=3D VIR_T= RISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } =20 gVBoxAPI.UIMachine.GetBIOSSettings(machine, &bios); @@ -1931,7 +1931,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change ACPI status to: %s, rc=3D%0= 8x"), (def->features[VIR_DOMAIN_FEATURE_ACPI] =3D=3D = VIR_TRISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } rc =3D gVBoxAPI.UIBIOSSettings.SetIOAPICEnabled(bios, def->features[VIR_DO= MAIN_FEATURE_APIC] =3D=3D @@ -1940,7 +1940,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags virReportError(VIR_ERR_INTERNAL_ERROR, _("could not change APIC status to: %s, rc=3D%0= 8x"), (def->features[VIR_DOMAIN_FEATURE_APIC] =3D=3D = VIR_TRISTATE_SWITCH_ON) - ? _("Enabled") : _("Disabled"), (unsigned)rc); + ? _("Enabled") : _("Disabled"), (unsigned) rc); } VBOX_RELEASE(bios); } @@ -1949,7 +1949,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags rc =3D gVBoxAPI.UIVirtualBox.RegisterMachine(data->vboxObj, machine); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not define a domain, rc=3D%08x"), (unsigne= d)rc); + _("could not define a domain, rc=3D%08x"), (unsigne= d) rc); goto cleanup; } =20 @@ -2053,7 +2053,7 @@ static int vboxDomainUndefineFlags(virDomainPtr dom, = unsigned int flags) ret =3D 0; } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not delete the domain, rc=3D%08x"), (unsig= ned)rc); + _("could not delete the domain, rc=3D%08x"), (unsig= ned) rc); } =20 vboxIIDUnalloc(&iid); @@ -2243,7 +2243,7 @@ static int vboxDomainCreateWithFlags(virDomainPtr dom= , unsigned int flags) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); goto cleanup; } =20 @@ -2345,7 +2345,7 @@ static int vboxDomainIsActive(virDomainPtr dom) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); return ret; } =20 @@ -2761,7 +2761,7 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsi= gned long memory) virReportError(VIR_ERR_INTERNAL_ERROR, _("could not set the memory size of the " "domain to: %lu Kb, rc=3D%08x"), - memory, (unsigned)rc); + memory, (unsigned) rc); } } gVBoxAPI.UISession.Close(data->vboxSession); @@ -2788,7 +2788,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDom= ainInfoPtr info) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); goto cleanup; } =20 @@ -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=3D%08x"), - CPUCount, (unsigned)rc); + CPUCount, (unsigned) rc); } VBOX_RELEASE(machine); } else { @@ -4205,7 +4205,7 @@ static int vboxConnectListDefinedDomains(virConnectPt= r conn, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get list of Defined Domains, rc=3D%08x= "), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -4265,7 +4265,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectP= tr conn) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not get number of Defined Domains, rc=3D%0= 8x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -4357,7 +4357,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr do= m, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not attach shared folder '%s', rc= =3D%08x"), - dev->data.fs->dst, (unsigned)rc); + dev->data.fs->dst, (unsigned) rc); ret =3D -1; } else { ret =3D 0; @@ -4476,7 +4476,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not detach shared folder '%s', rc= =3D%08x"), - dev->data.fs->dst, (unsigned)rc); + dev->data.fs->dst, (unsigned) rc); } else { ret =3D 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=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } rc =3D 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=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -4733,7 +4733,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%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=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -5312,7 +5312,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get medium uuid, rc=3D%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=3D%08= x"), - (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=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } rc =3D gVBoxAPI.UIMedium.Close(medium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close HardDisk, rc=3D%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=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -5443,7 +5443,7 @@ vboxSnapshotRedefine(virDomainPtr dom, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to register Machine, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -7035,7 +7035,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open HardDisk, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -7043,7 +7043,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get hardDisk Id, rc=3D%08x= "), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIID.vboxIIDToUtf8(data, &parentiid, &parentUuid); @@ -7062,7 +7062,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to create HardDisk, rc=3D%08x= "), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_UTF16_FREE(formatUtf16); @@ -7093,7 +7093,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get medium uuid, rc=3D%08x= "), - (unsigned)rc); + (unsigned) rc); VIR_FREE(disk); goto cleanup; } @@ -7145,7 +7145,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to close the new medium, rc= =3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } } @@ -7227,7 +7227,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to unregister machine, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } VBOX_RELEASE(machine); @@ -7249,7 +7249,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to delete medium, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } gVBoxAPI.UIProgress.WaitForCompletion(progress, -1); @@ -7307,7 +7307,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to open Machine, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -7315,7 +7315,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to register Machine, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -7604,7 +7604,7 @@ vboxConnectListAllDomains(virConnectPtr conn, rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of domains, rc=3D%08x"), (uns= igned)rc); + _("Could not get list of domains, rc=3D%08x"), (uns= igned) rc); goto cleanup; } =20 @@ -7794,7 +7794,7 @@ vboxDomainHasManagedSaveImage(virDomainPtr dom, unsig= ned int flags) rc =3D gVBoxAPI.UArray.vboxArrayGet(&machines, data->vboxObj, ARRAY_GE= T_MACHINES); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not get list of machines, rc=3D%08x"), (un= signed)rc); + _("Could not get list of machines, rc=3D%08x"), (un= signed) rc); return ret; } =20 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->p= Funcs, arg1, arg2) # define VBOX_UTF8_TO_UTF16(arg1, arg2) gVBoxAPI.UPFN.Utf8ToUtf16(data->p= Funcs, arg1, arg2) =20 -# define VBOX_ADDREF(arg) gVBoxAPI.nsUISupports.AddRef((voi= d *)(arg)) +# define VBOX_ADDREF(arg) gVBoxAPI.nsUISupports.AddRef((voi= d *) (arg)) =20 # define VBOX_RELEASE(arg) \ do { \ if (arg) { \ - gVBoxAPI.nsUISupports.Release((void *)arg); \ + gVBoxAPI.nsUISupports.Release((void *) arg); \ (arg) =3D 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 =3D xmlParseInNodeContext(node, snapshot->hardware, - (int)strlen(snapshot->hardware), + (int) strlen(snapshot->hardware), 0, &hardwareNode); if (parseError !=3D XML_ERR_OK) { @@ -431,7 +431,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, =20 /*storageController*/ if (xmlParseInNodeContext(node, snapshot->storageController, - (int)strlen(snapshot->storageController), + (int) strlen(snapshot->storageController), 0, &storageControllerNode) !=3D XML_ERR_OK) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -1136,7 +1136,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, for (i =3D 0; i < machine->mediaRegistry->notherMedia; i++) { parseError =3D xmlParseInNodeContext(mediaRegistryNode, machine->mediaRegistry->otherMedia[i], - (int)strlen(machine->mediaRegistry->otherMed= ia[i]), + (int) strlen(machine->mediaRegistry->otherMe= dia[i]), 0, &cur); if (parseError !=3D XML_ERR_OK) { @@ -1160,7 +1160,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, =20 parseError =3D xmlParseInNodeContext(machineNode, machine->hardware, - (int)strlen(machine->hardware), + (int) strlen(machine->hardware), 0, &cur); if (parseError !=3D XML_ERR_OK) { @@ -1173,7 +1173,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, if (machine->extraData !=3D NULL) { parseError =3D xmlParseInNodeContext(xmlDocGetRootElement(xml), machine->extraData, - (int)strlen(machine->extraData), + (int) strlen(machine->extraData= ), 0, &cur); if (parseError !=3D XML_ERR_OK) { @@ -1186,7 +1186,7 @@ virVBoxSnapshotConfSaveVboxFile(virVBoxSnapshotConfMa= chinePtr machine, =20 parseError =3D xmlParseInNodeContext(machineNode, machine->storageController, - (int)strlen(machine->storageControl= ler), + (int) strlen(machine->storageContro= ller), 0, &cur); if (parseError !=3D 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(virStoragePoolPt= r pool) if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not get number of volumes in the pool: %s,= rc=3D%08x"), - pool->name, (unsigned)rc); + pool->name, (unsigned) rc); return ret; } =20 @@ -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, r= c=3D%08x"), - pool->name, (unsigned)rc); + pool->name, (unsigned) rc); return ret; } =20 @@ -460,7 +460,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create harddisk, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -473,7 +473,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (NS_FAILED(rc) || !progress) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create base storage, rc=3D%08x"), - (unsigned)rc); + (unsigned) rc); goto cleanup; } =20 @@ -482,7 +482,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, if (RC_FAILED(resultCode)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create base storage, rc=3D%08x"), - (unsigned)resultCode.uResultCode); + (unsigned) resultCode.uResultCode); goto cleanup; } =20 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) =3D 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}", ms= g,\ - (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]);\ }\ =20 #define VBOX_IID_INITIALIZER { NULL, true } @@ -1901,7 +1901,7 @@ static nsresult _mediumDeleteStorage(IMedium *medium, =20 static nsresult _mediumRelease(IMedium *medium) { - return medium->vtbl->nsisupports.Release((nsISupports *)medium); + return medium->vtbl->nsisupports.Release((nsISupports *) medium); } static nsresult _mediumClose(IMedium *medium) { --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list