From 5f13df4cf4b4b9dd8cfd71bbd74b73777fd2f37c Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 8 Mar 2019 16:10:07 +0100 Subject: [PATCH] tests: Use full force of our VIR_AUTO* machinery in testBackingXMLjsonXML MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/qemublocktest.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index 4cd15a1dff..9e4af075b7 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -43,14 +43,14 @@ static int testBackingXMLjsonXML(const void *args) { const struct testBackingXMLjsonXMLdata *data = args; - xmlDocPtr xml = NULL; - xmlXPathContextPtr ctxt = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - virJSONValuePtr backendprops = NULL; - virJSONValuePtr wrapper = NULL; - char *propsstr = NULL; - char *protocolwrapper = NULL; - char *actualxml = NULL; + VIR_AUTOPTR(xmlDoc) xml = NULL; + VIR_AUTOPTR(xmlXPathContext) ctxt = NULL; + VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER; + VIR_AUTOPTR(virJSONValue) backendprops = NULL; + VIR_AUTOPTR(virJSONValue) wrapper = NULL; + VIR_AUTOFREE(char *) propsstr = NULL; + VIR_AUTOFREE(char *) protocolwrapper = NULL; + VIR_AUTOFREE(char *) actualxml = NULL; int ret = -1; VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL; @@ -104,15 +104,6 @@ testBackingXMLjsonXML(const void *args) ret = 0; cleanup: - VIR_FREE(propsstr); - VIR_FREE(protocolwrapper); - VIR_FREE(actualxml); - virJSONValueFree(backendprops); - virJSONValueFree(wrapper); - virBufferFreeAndReset(&buf); - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); - return ret; } -- GitLab