提交 5f13df4c 编写于 作者: P Peter Krempa

tests: Use full force of our VIR_AUTO* machinery in testBackingXMLjsonXML

Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 0973dbd8
...@@ -43,14 +43,14 @@ static int ...@@ -43,14 +43,14 @@ static int
testBackingXMLjsonXML(const void *args) testBackingXMLjsonXML(const void *args)
{ {
const struct testBackingXMLjsonXMLdata *data = args; const struct testBackingXMLjsonXMLdata *data = args;
xmlDocPtr xml = NULL; VIR_AUTOPTR(xmlDoc) xml = NULL;
xmlXPathContextPtr ctxt = NULL; VIR_AUTOPTR(xmlXPathContext) ctxt = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf = VIR_BUFFER_INITIALIZER;
virJSONValuePtr backendprops = NULL; VIR_AUTOPTR(virJSONValue) backendprops = NULL;
virJSONValuePtr wrapper = NULL; VIR_AUTOPTR(virJSONValue) wrapper = NULL;
char *propsstr = NULL; VIR_AUTOFREE(char *) propsstr = NULL;
char *protocolwrapper = NULL; VIR_AUTOFREE(char *) protocolwrapper = NULL;
char *actualxml = NULL; VIR_AUTOFREE(char *) actualxml = NULL;
int ret = -1; int ret = -1;
VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) xmlsrc = NULL;
VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL; VIR_AUTOUNREF(virStorageSourcePtr) jsonsrc = NULL;
...@@ -104,15 +104,6 @@ testBackingXMLjsonXML(const void *args) ...@@ -104,15 +104,6 @@ testBackingXMLjsonXML(const void *args)
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(propsstr);
VIR_FREE(protocolwrapper);
VIR_FREE(actualxml);
virJSONValueFree(backendprops);
virJSONValueFree(wrapper);
virBufferFreeAndReset(&buf);
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册