External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: qapi: Use automatic memory cleanup

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-04-09 10:36:16 +02:00
parent ec0483ae0b
commit 432452eb0d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_qapi.c
View File

@ -207,7 +207,7 @@ virQEMUQAPISchemaPathGet(const char *query,
virHashTablePtr schema,
virJSONValuePtr *entry)
{
char **elems = NULL;
VIR_AUTOSTRINGLIST elems = NULL;
*entry = NULL;
@ -216,13 +216,11 @@ virQEMUQAPISchemaPathGet(const char *query,
if (!*elems) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed query string"));
virStringListFree(elems);
return -1;
}
*entry = virQEMUQAPISchemaTraverse(*elems, elems + 1, schema);
virStringListFree(elems);
return 0;
}
@ -270,21 +268,16 @@ virQEMUQAPISchemaEntryProcess(size_t pos ATTRIBUTE_UNUSED,
virHashTablePtr
virQEMUQAPISchemaConvert(virJSONValuePtr schemareply)
{
virHashTablePtr schema;
virHashTablePtr ret = NULL;
VIR_AUTOPTR(virHashTable) schema = NULL;
VIR_AUTOPTR(virJSONValue) schemajson = schemareply;
if (!(schema = virHashCreate(512, virJSONValueHashFree)))
goto cleanup;
return NULL;
if (virJSONValueArrayForeachSteal(schemareply,
if (virJSONValueArrayForeachSteal(schemajson,
virQEMUQAPISchemaEntryProcess,
schema) < 0)
goto cleanup;
return NULL;
VIR_STEAL_PTR(ret, schema);
cleanup:
virJSONValueFree(schemareply);
virHashFree(schema);
return ret;
VIR_RETURN_PTR(schema);
}