Use g_auto for stealing virCaps

Convert all the functions that generate virCaps to use g_auto
and g_steal_pointer.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko
2021-12-10 15:07:13 +01:00
parent 4eaa499c8b
commit eb52b9f8af
9 changed files with 18 additions and 27 deletions

View File

@@ -86,7 +86,7 @@ static virCaps *
testGetCaps(char *capsData, const testQemuData *data)
{
g_autoptr(virQEMUCaps) qemuCaps = NULL;
virCaps *caps = NULL;
g_autoptr(virCaps) caps = NULL;
virArch arch = virArchFromString(data->archName);
g_autofree char *binary = NULL;
@@ -110,10 +110,9 @@ testGetCaps(char *capsData, const testQemuData *data)
goto error;
}
return caps;
return g_steal_pointer(&caps);
error:
virObjectUnref(caps);
return NULL;
}

View File

@@ -11,7 +11,7 @@
static virCaps *
testXLInitCaps(void)
{
virCaps *caps;
g_autoptr(virCaps) caps = NULL;
virCapsGuest *guest;
virCapsGuestMachine **machines;
int nmachines;
@@ -68,11 +68,10 @@ testXLInitCaps(void)
virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
NULL, NULL, 0, NULL);
return caps;
return g_steal_pointer(&caps);
cleanup:
virCapabilitiesFreeMachines(machines, nmachines);
virObjectUnref(caps);
return NULL;
}