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

qemuMonitorAddObject: Refactor cleanup

Browse Source 
Remove freeing/clearing of @props as the function doesn't guarantee that
it happens on success, rename the variable hodling copy of the alias and
use g_autofree to automatically free it and remove the cleanup label as
well as 'ret' variable.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-30 16:23:55 +01:00
parent 64cf9b0fa7
commit 521aef329c
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/qemu/qemu_monitor.c
View File

@ -3052,13 +3052,12 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
{
const char *type = NULL;
const char *id = NULL;
char *tmp = NULL;
int ret = -1;
g_autofree char *aliasCopy = NULL;
if (!*props) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("object props can't be NULL"));
goto cleanup;
return -1;
}
type = virJSONValueObjectGetString(*props, "qom-type");
@ -3066,31 +3065,25 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
VIR_DEBUG("type=%s id=%s", NULLSTR(type), NULLSTR(id));
QEMU_CHECK_MONITOR_GOTO(mon, cleanup);
QEMU_CHECK_MONITOR(mon);
if (!id || !type) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("missing alias or qom-type for qemu object '%s'"),
NULLSTR(type));
goto cleanup;
return -1;
}
if (alias)
tmp = g_strdup(id);
aliasCopy = g_strdup(id);
if (qemuMonitorJSONAddObject(mon, props) < 0)
goto cleanup;
return -1;
if (alias)
*alias = g_steal_pointer(&tmp);
*alias = g_steal_pointer(&aliasCopy);
ret = 0;
cleanup:
VIR_FREE(tmp);
virJSONValueFree(*props);
*props = NULL;
return ret;
return 0;
}