[libvirt PATCH 5/6] tests: refactor testSELinuxLoadDef
Since its introduction in
commit 907a39e735d256b8428ed4c77009d1f713aea19b
Add a test suite for validating SELinux labelling
this function did not return NULL on OOM.
Since we abort on OOM now, switch testSELinuxMungePath to void,
return NULL explicitly on XML parsing failure and remove
the (now pointless) cleanup label.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
tests/securityselinuxlabeltest.c | 36 +++++++++++---------------------
1 file changed, 12 insertions(+), 24 deletions(-)
diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
index 3d886fd827..aab1561335 100644
--- a/tests/securityselinuxlabeltest.c
+++ b/tests/securityselinuxlabeltest.c
@@ -83,16 +83,11 @@ testUserXattrEnabled(void)
return ret;
}
-static int
+static void
testSELinuxMungePath(char **path)
{
- char *tmp;
-
- tmp = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir,
*path);
-
- VIR_FREE(*path);
- *path = tmp;
- return 0;
+ g_free(*path);
+ *path = g_strdup_printf("%s/securityselinuxlabeldata%s", abs_builddir,
*path);
}
static int
@@ -162,7 +157,7 @@ testSELinuxLoadFileList(const char *testname,
static virDomainDef *
testSELinuxLoadDef(const char *testname)
{
- char *xmlfile = NULL;
+ g_autofree char *xmlfile = NULL;
virDomainDef *def = NULL;
size_t i;
@@ -171,15 +166,14 @@ testSELinuxLoadDef(const char *testname)
if (!(def = virDomainDefParseFile(xmlfile, driver.xmlopt,
NULL, 0)))
- goto cleanup;
+ return NULL;
for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->src->type != VIR_STORAGE_TYPE_FILE &&
def->disks[i]->src->type != VIR_STORAGE_TYPE_BLOCK)
continue;
- if (testSELinuxMungePath(&def->disks[i]->src->path) < 0)
- goto cleanup;
+ testSELinuxMungePath(&def->disks[i]->src->path);
}
for (i = 0; i < def->nserials; i++) {
@@ -190,23 +184,17 @@ testSELinuxLoadDef(const char *testname)
continue;
if (def->serials[i]->source->type == VIR_DOMAIN_CHR_TYPE_UNIX) {
- if
(testSELinuxMungePath(&def->serials[i]->source->data.nix.path) < 0)
- goto cleanup;
+ testSELinuxMungePath(&def->serials[i]->source->data.nix.path);
} else {
- if
(testSELinuxMungePath(&def->serials[i]->source->data.file.path) < 0)
- goto cleanup;
+ testSELinuxMungePath(&def->serials[i]->source->data.file.path);
}
}
- if (def->os.kernel &&
- testSELinuxMungePath(&def->os.kernel) < 0)
- goto cleanup;
- if (def->os.initrd &&
- testSELinuxMungePath(&def->os.initrd) < 0)
- goto cleanup;
+ if (def->os.kernel < 0)
+ testSELinuxMungePath(&def->os.kernel);
+ if (def->os.initrd < 0)
+ testSELinuxMungePath(&def->os.initrd);
- cleanup:
- VIR_FREE(xmlfile);
return def;
}
--
2.31.1