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 <[email protected]>
> ---
...
> @@ -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.
Erik
--
libvir-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/libvir-list
