mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
tests: use g_auto in testQemuGetCaps
Refactor testQemuGetCaps to use g_auto for cleanup, remove the error label and use g_steal_pointer for the successful return path. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
@@ -50,22 +50,22 @@ testQemuDataInit(testQemuData *data)
|
|||||||
static virQEMUCaps *
|
static virQEMUCaps *
|
||||||
testQemuGetCaps(char *caps)
|
testQemuGetCaps(char *caps)
|
||||||
{
|
{
|
||||||
virQEMUCaps *qemuCaps = NULL;
|
g_autoptr(virQEMUCaps) qemuCaps = NULL;
|
||||||
g_autoptr(xmlDoc) xml = NULL;
|
g_autoptr(xmlDoc) xml = NULL;
|
||||||
g_autoptr(xmlXPathContext) ctxt = NULL;
|
g_autoptr(xmlXPathContext) ctxt = NULL;
|
||||||
ssize_t i, n;
|
ssize_t i, n;
|
||||||
g_autofree xmlNodePtr *nodes = NULL;
|
g_autofree xmlNodePtr *nodes = NULL;
|
||||||
|
|
||||||
if (!(xml = virXMLParseStringCtxt(caps, "(test caps)", &ctxt)))
|
if (!(xml = virXMLParseStringCtxt(caps, "(test caps)", &ctxt)))
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
if ((n = virXPathNodeSet("/qemuCaps/flag", ctxt, &nodes)) < 0) {
|
if ((n = virXPathNodeSet("/qemuCaps/flag", ctxt, &nodes)) < 0) {
|
||||||
fprintf(stderr, "failed to parse qemu capabilities flags");
|
fprintf(stderr, "failed to parse qemu capabilities flags");
|
||||||
goto error;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(qemuCaps = virQEMUCapsNew()))
|
if (!(qemuCaps = virQEMUCapsNew()))
|
||||||
goto error;
|
return NULL;
|
||||||
|
|
||||||
for (i = 0; i < n; i++) {
|
for (i = 0; i < n; i++) {
|
||||||
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
g_autofree char *str = virXMLPropString(nodes[i], "name");
|
||||||
@@ -73,17 +73,13 @@ testQemuGetCaps(char *caps)
|
|||||||
int flag = virQEMUCapsTypeFromString(str);
|
int flag = virQEMUCapsTypeFromString(str);
|
||||||
if (flag < 0) {
|
if (flag < 0) {
|
||||||
fprintf(stderr, "Unknown qemu capabilities flag %s", str);
|
fprintf(stderr, "Unknown qemu capabilities flag %s", str);
|
||||||
goto error;
|
return NULL;
|
||||||
}
|
}
|
||||||
virQEMUCapsSet(qemuCaps, flag);
|
virQEMUCapsSet(qemuCaps, flag);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return qemuCaps;
|
return g_steal_pointer(&qemuCaps);
|
||||||
|
|
||||||
error:
|
|
||||||
virObjectUnref(qemuCaps);
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static virCaps *
|
static virCaps *
|
||||||
|
|||||||
Reference in New Issue
Block a user