Re: [PATCH] Fix gcc 4.6 warnings in vbox_tmpl.c

[Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>]

2011/4/14 Christophe Fergeau <cfergeau@xxxxxxxxxx>:
> ---
> Âsrc/vbox/vbox_tmpl.c | Â 11 ++++++++---
> Â1 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
> index 0fbfba5..a7d78df 100644
> --- a/src/vbox/vbox_tmpl.c
> +++ b/src/vbox/vbox_tmpl.c
> @@ -3915,7 +3915,9 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
> Â Â Â Â Â Â PRUnichar *mediumFileUtf16 = NULL;
>       PRUint32  storageBus   Â= StorageBus_Null;
>       PRUint32  deviceType   Â= DeviceType_Null;
> +# if VBOX_API_VERSION >= 4000
>       PRUint32  accessMode   Â= AccessMode_ReadOnly;
> +#endif
>       PRInt32  ÂdeviceInst   Â= 0;
>       PRInt32  ÂdevicePort   Â= 0;
>       PRInt32  ÂdeviceSlot   Â= 0;
> @@ -3924,24 +3926,27 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
>
> Â Â Â Â Â Â if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
> Â Â Â Â Â Â Â Â deviceType = DeviceType_HardDisk;
> - Â Â Â Â Â Â Â ÂaccessMode = AccessMode_ReadWrite;
> Â# if VBOX_API_VERSION < 4000
> Â Â Â Â Â Â Â Â data->vboxObj->vtbl->FindHardDisk(data->vboxObj,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â mediumFileUtf16, &medium);
> +#else

This else is not indented properly. make syntax-check should have
caught that if you have cppi installed.

> + Â Â Â Â Â Â Â ÂaccessMode = AccessMode_ReadWrite;
> Â# endif

ACK.

If fixed the minor indentation errors and pushed the result.

Matthias

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list