External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

testParseXMLDocFromFile: Refactor control flow

Browse Source 
Move few variables definitions closer to usage, add comments explaining
what's happening and simplify the control flow.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-09-22 16:22:53 +02:00
parent ed080445a6
commit 880e45e017
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/test_driver.c
View File

@ -841,32 +841,34 @@ testDomainObjCheckTaint(virDomainObj *obj)
}
static xmlNodePtr
testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
testParseXMLDocFromFile(xmlNodePtr node,
const char *file,
const char *type)
{
xmlNodePtr ret = NULL;
g_autoptr(xmlDoc) doc = NULL;
g_autofree char *absFile = NULL;
g_autofree char *relFile = NULL;
if ((relFile = virXMLPropString(node, "file"))) {
absFile = testBuildFilename(file, relFile);
g_autofree char *absFile = testBuildFilename(file, relFile);
xmlNodePtr newnode = NULL;
if (!(doc = virXMLParse(absFile, NULL, type, NULL, NULL, NULL, false)))
return NULL;
ret = xmlCopyNode(xmlDocGetRootElement(doc), 1);
if (!ret) {
if (!(newnode = xmlCopyNode(xmlDocGetRootElement(doc), 1))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to copy XML node"));
return NULL;
}
xmlReplaceNode(node, ret);
/* place 'newnode' in place of 'node' in the original XML document object */
xmlReplaceNode(node, newnode);
/* free the original node */
xmlFreeNode(node);
} else {
ret = node;
return newnode;
}
return ret;
return node;
}
static int