[libvirt] [PATCH v2 25/41] util: usb: use VIR_AUTOPTR for aggregate types

[Erik Skultety]

On Tue, Jul 24, 2018 at 09:22:26PM +0530, Sukrit Bhatnagar wrote:
> By making use of GNU C's cleanup attribute handled by the
> VIR_AUTOPTR macro for declaring aggregate pointer variables,
> majority of the calls to *Free functions can be dropped, which
> in turn leads to getting rid of most of our cleanup sections.
>
> Signed-off-by: Sukrit Bhatnagar <skrtbhtngr at gmail.com>
> ---
>  src/util/virusb.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/src/util/virusb.c b/src/util/virusb.c
> index 47b407b..df94959 100644
> --- a/src/util/virusb.c
> +++ b/src/util/virusb.c
> @@ -123,8 +123,10 @@ virUSBDeviceSearch(unsigned int vendor,
>      bool found = false;
>      char *ignore = NULL;
>      struct dirent *de;
> -    virUSBDeviceListPtr list = NULL, ret = NULL;
> -    virUSBDevicePtr usb;
> +    virUSBDeviceListPtr list = NULL;
> +    virUSBDeviceListPtr ret = NULL;
> +    VIR_AUTOPTR(virUSBDevice) usb = NULL;
> +    virUSBDevicePtr *ptr = NULL;
>      int direrr;
>
>      if (!(list = virUSBDeviceListNew()))
> @@ -173,13 +175,13 @@ virUSBDeviceSearch(unsigned int vendor,
>          }
>
>          usb = virUSBDeviceNew(found_bus, found_devno, vroot);
> +        ptr = &usb;

I don't see a reason for the @ptr variable, you can work with @usb directly,
I'll make the change before pushing.

Reviewed-by: Erik Skultety <eskultet at redhat.com>

> +
>          if (!usb)
>              goto cleanup;
>
> -        if (virUSBDeviceListAdd(list, &usb) < 0) {
> -            virUSBDeviceFree(usb);
> +        if (virUSBDeviceListAdd(list, ptr) < 0)
>              goto cleanup;
> -        }
>
>          if (found)
>              break;
> @@ -508,8 +510,7 @@ void
>  virUSBDeviceListDel(virUSBDeviceListPtr list,
>                      virUSBDevicePtr dev)
>  {
> -    virUSBDevicePtr ret = virUSBDeviceListSteal(list, dev);
> -    virUSBDeviceFree(ret);
> +    VIR_AUTOPTR(virUSBDevice) ret = virUSBDeviceListSteal(list, dev);
>  }
>
>  virUSBDevicePtr
> --
> 1.8.3.1
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list