[libvirt] [PATCH 04/10] conf: Clean up virDomain{Memory, Shmem}DefParseXML()

[Peter Krempa]

On Thu, Jun 29, 2017 at 20:03:57 +0200, Andrea Bolognani wrote:
> Follow the same style as other similar functions.
> 
> Signed-off-by: Andrea Bolognani <abologna at redhat.com>
> ---
>  src/conf/domain_conf.c | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index ccd3c27..fdb919d 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c

[...]

> @@ -13219,20 +13218,21 @@ virDomainShmemDefParseXML(xmlNodePtr node,
>      if (def->msi.enabled && !def->server.enabled) {
>          virReportError(VIR_ERR_XML_ERROR, "%s",
>                         _("msi option is only supported with a server"));
> -        goto cleanup;
> +        goto error;
>      }
>  
>      if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0)
> -        goto cleanup;
> -
> +        goto error;
>  
> -    ret = def;
> -    def = NULL;
>   cleanup:
> -    ctxt->node = save;
>      VIR_FREE(tmp);
> +    ctxt->node = save;
> +    return def;
> +
> + error:
>      virDomainShmemDefFree(def);
> -    return ret;
> +    def = NULL;
> +    goto cleanup;

I don't see how this is better than it was before.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20170630/5aabf206/attachment-0001.sig>