External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

testutils: use g_autoptr

Browse Source 
Use g_autoptr where possible.

virTestCapsBuildNUMATopology is not converted completely,
because while the VIR_FREE call on cell_cpus is technically
wrong, neither VIR_ALLOC_N nor virBitmapNew can return
an allocation error now so it is effectively dead code.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Ján Tomko 2020-02-09 01:51:37 +01:00
parent 40656ff758
commit f11e9abe88
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/testutils.c
View File

@ -418,7 +418,7 @@ virTestRewrapFile(const char *filename)
{
int ret = -1;
g_autofree char *script = NULL;
virCommandPtr cmd = NULL;
g_autoptr(virCommand) cmd = NULL;
if (!(virStringHasSuffix(filename, ".args") ||
virStringHasSuffix(filename, ".ldargs")))
@ -432,7 +432,6 @@ virTestRewrapFile(const char *filename)
ret = 0;
cleanup:
virCommandFree(cmd);
return ret;
}
@ -1001,7 +1000,7 @@ void virTestClearCommandPath(char *cmdset)
virCapsPtr virTestGenericCapsInit(void)
{
virCapsPtr caps;
g_autoptr(virCaps) caps = NULL;
virCapsGuestPtr guest;
if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64,
@ -1047,10 +1046,9 @@ virCapsPtr virTestGenericCapsInit(void)
VIR_TEST_DEBUG("Generic driver capabilities:\n%s", caps_str);
}
return caps;
return g_steal_pointer(&caps);
error:
virObjectUnref(caps);
return NULL;
}
@ -1066,7 +1064,7 @@ virCapsPtr virTestGenericCapsInit(void)
virCapsHostNUMAPtr
virTestCapsBuildNUMATopology(int seq)
{
virCapsHostNUMAPtr caps = virCapabilitiesHostNUMANew();
g_autoptr(virCapsHostNUMA) caps = virCapabilitiesHostNUMANew();
virCapsHostNUMACellCPUPtr cell_cpus = NULL;
int core_id, cell_id;
int id;
@ -1096,10 +1094,9 @@ virTestCapsBuildNUMATopology(int seq)
cell_cpus = NULL;
}
return caps;
return g_steal_pointer(&caps);
error:
virCapabilitiesHostNUMAUnref(caps);
VIR_FREE(cell_cpus);
return NULL;
}