mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
virResctrlAllocGetUnused: Use g_autoptr for variables of virResctrlAlloc type
Refactor the handling of variables so that the cleanup section can be sanitized. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
05350e451c
commit
be291cc49d
@ -1874,8 +1874,8 @@ virResctrlAllocNewFromInfo(virResctrlInfoPtr info)
|
||||
virResctrlAllocPtr
|
||||
virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
|
||||
{
|
||||
virResctrlAllocPtr ret = NULL;
|
||||
virResctrlAllocPtr alloc = NULL;
|
||||
g_autoptr(virResctrlAlloc) ret = NULL;
|
||||
g_autoptr(virResctrlAlloc) alloc_default = NULL;
|
||||
struct dirent *ent = NULL;
|
||||
g_autoptr(DIR) dirp = NULL;
|
||||
int rv = -1;
|
||||
@ -1890,17 +1890,18 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
|
||||
if (!ret)
|
||||
return NULL;
|
||||
|
||||
alloc = virResctrlAllocGetDefault(resctrl);
|
||||
if (!alloc)
|
||||
goto error;
|
||||
alloc_default = virResctrlAllocGetDefault(resctrl);
|
||||
if (!alloc_default)
|
||||
return NULL;
|
||||
|
||||
virResctrlAllocSubtract(ret, alloc);
|
||||
virObjectUnref(alloc);
|
||||
virResctrlAllocSubtract(ret, alloc_default);
|
||||
|
||||
if (virDirOpen(&dirp, SYSFS_RESCTRL_PATH) < 0)
|
||||
goto error;
|
||||
return NULL;
|
||||
|
||||
while ((rv = virDirRead(dirp, &ent, SYSFS_RESCTRL_PATH)) > 0) {
|
||||
g_autoptr(virResctrlAlloc) alloc = NULL;
|
||||
|
||||
if (STREQ(ent->d_name, "info"))
|
||||
continue;
|
||||
|
||||
@ -1912,24 +1913,15 @@ virResctrlAllocGetUnused(virResctrlInfoPtr resctrl)
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
_("Could not read schemata file for group %s"),
|
||||
ent->d_name);
|
||||
goto error;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
virResctrlAllocSubtract(ret, alloc);
|
||||
virObjectUnref(alloc);
|
||||
alloc = NULL;
|
||||
}
|
||||
if (rv < 0)
|
||||
goto error;
|
||||
return NULL;
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(alloc);
|
||||
return ret;
|
||||
|
||||
error:
|
||||
virObjectUnref(ret);
|
||||
ret = NULL;
|
||||
goto cleanup;
|
||||
return g_steal_pointer(&ret);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user