[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH v1 17/32] util: netdevopenvswitch: use VIR_AUTOFREE instead of VIR_FREE for scalar types



On Fri, 3 Aug 2018 at 19:02, Erik Skultety <eskultet redhat com> wrote:
>
> On Sat, Jul 28, 2018 at 11:31:32PM +0530, Sukrit Bhatnagar wrote:
> > By making use of GNU C's cleanup attribute handled by the
> > VIR_AUTOFREE macro for declaring scalar variables, majority
> > of the VIR_FREE calls can be dropped, which in turn leads to
> > getting rid of most of our cleanup sections.
> >
> > Signed-off-by: Sukrit Bhatnagar <skrtbhtngr gmail com>
> > ---
> ...
>
> > @@ -424,7 +419,6 @@ int
> >  virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master)
> >  {
> >      virCommandPtr cmd = NULL;
> > -    int ret = -1;
> >      int exitstatus;
> >
> >      *master = NULL;
> > @@ -438,7 +432,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master)
> >          virReportError(VIR_ERR_INTERNAL_ERROR,
> >                         _("Unable to run command to get OVS master for "
> >                           "interface %s"), ifname);
> > -        goto cleanup;
> > +        return -1;
> >      }
> >
> >      /* non-0 exit code just means that the interface has no master in OVS */
> > @@ -454,9 +448,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master)
> >
> >      VIR_DEBUG("OVS master for %s is %s", ifname, *master ? *master : "(none)");
> >
> > -    ret = 0;
> > - cleanup:
> > -    return ret;
> > +    return 0;
>
> Probably should be a separate patch. The rest is fine.

Another patch just for this function?


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]