Re: [libvirt] [PATCH v3 10/10] conf: Rework virDomainKeyWrapDefParseXML

Rewrite the code to make usage of some VIR_AUTOFREE logic. Suggested-by: Erik Skultety <eskultet(a)redhat.com&gt; Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- src/conf/domain_conf.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be6e223e78..05c2c9f34e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1170,31 +1170,25 @@ static int virDomainKeyWrapDefParseXML(virDomainDefPtr def, xmlXPathContextPtr ctxt) { size_t i; - int ret = -1; int n; VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; + VIR_AUTOFREE(virDomainKeyWrapDefPtr) keywrap = NULL; if ((n = virXPathNodeSet("./keywrap/cipher", ctxt, &nodes)) < 0) return n; - if (VIR_ALLOC(def->keywrap) < 0) - goto cleanup; + if (VIR_ALLOC(keywrap) < 0) + return -1; for (i = 0; i < n; i++) { - if (virDomainKeyWrapCipherDefParseXML(def->keywrap, nodes[i]) < 0) - goto cleanup; + if (virDomainKeyWrapCipherDefParseXML(keywrap, nodes[i]) < 0) + return -1; } - if (!def->keywrap->aes && - !def->keywrap->dea) - VIR_FREE(def->keywrap); + if (keywrap->aes || keywrap->dea) + VIR_STEAL_PTR(def->keywrap, keywrap);

- ret = 0; - - cleanup: - if (ret < 0) - VIR_FREE(def->keywrap); - return ret; + return 0;