Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tests/bhyveargv2xmltest.c | 16 +++++----------- tests/bhyvexml2argvtest.c | 21 +++++++-------------- tests/bhyvexml2xmltest.c | 6 ++---- 3 files changed, 14 insertions(+), 29 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index 735cc4b338..e58a36d17c 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -28,9 +28,9 @@ testCompareXMLToArgvFiles(const char *xmlfile, unsigned int flags) { - char *actualxml = NULL; - char *cmd = NULL; - char *log = NULL; + g_autofree char *actualxml = NULL; + g_autofree char *cmd = NULL; + g_autofree char *log = NULL; int ret = -1; virDomainDefPtr vmdef = NULL; @@ -86,9 +86,6 @@ testCompareXMLToArgvFiles(const char *xmlfile, ret = 0; fail: - VIR_FREE(actualxml); - VIR_FREE(cmd); - VIR_FREE(log); virDomainDefFree(vmdef); return ret; } @@ -103,8 +100,8 @@ testCompareXMLToArgvHelper(const void *data) { int result = -1; const struct testInfo *info = data; - char *xml = NULL; - char *args = NULL; + g_autofree char *xml = NULL; + g_autofree char *args = NULL; xml = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.xml", abs_srcdir, info->name); @@ -112,9 +109,6 @@ testCompareXMLToArgvHelper(const void *data) abs_srcdir, info->name); result = testCompareXMLToArgvFiles(xml, args, info->flags); - - VIR_FREE(xml); - VIR_FREE(args); return result; } diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index f7ae1db26d..ce2af08d4c 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -26,9 +26,9 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *dmcmdline, unsigned int flags) { - char *actualargv = NULL; - char *actualld = NULL; - char *actualdm = NULL; + g_autofree char *actualargv = NULL; + g_autofree char *actualld = NULL; + g_autofree char *actualdm = NULL; virDomainDefPtr vmdef = NULL; virCommandPtr cmd = NULL; virCommandPtr ldcmd = NULL; @@ -99,9 +99,6 @@ static int testCompareXMLToArgvFiles(const char *xml, vmdef->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) virPortAllocatorRelease(vmdef->graphics[0]->data.vnc.port); - VIR_FREE(actualargv); - VIR_FREE(actualld); - VIR_FREE(actualdm); virCommandFree(cmd); virCommandFree(ldcmd); virDomainDefFree(vmdef); @@ -119,10 +116,10 @@ testCompareXMLToArgvHelper(const void *data) { int ret = -1; const struct testInfo *info = data; - char *xml = NULL; - char *args = NULL; - char *ldargs = NULL; - char *dmargs = NULL; + g_autofree char *xml = NULL; + g_autofree char *args = NULL; + g_autofree char *ldargs = NULL; + g_autofree char *dmargs = NULL; xml = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.xml", abs_srcdir, info->name); @@ -135,10 +132,6 @@ testCompareXMLToArgvHelper(const void *data) ret = testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); - VIR_FREE(xml); - VIR_FREE(args); - VIR_FREE(ldargs); - VIR_FREE(dmargs); return ret; } diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index a0c20a14c1..2ac102b8e3 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -26,8 +26,8 @@ static int testCompareXMLToXMLHelper(const void *data) { const struct testInfo *info = data; - char *xml_in = NULL; - char *xml_out = NULL; + g_autofree char *xml_in = NULL; + g_autofree char *xml_out = NULL; bool is_different = info->flags & FLAG_IS_DIFFERENT; int ret = -1; @@ -48,8 +48,6 @@ testCompareXMLToXMLHelper(const void *data) virResetLastError(); } - VIR_FREE(xml_in); - VIR_FREE(xml_out); return ret; } -- 2.26.2

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- tests/bhyveargv2xmltest.c | 28 +++++++++++----------------- tests/bhyvexml2argvtest.c | 5 +---- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index e7ec3ae020..2a497f48e8 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -31,11 +31,10 @@ testCompareXMLToArgvFiles(const char *xmlfile, g_autofree char *actualxml = NULL; g_autofree char *cmd = NULL; g_autofree char *log = NULL; - int ret = -1; g_autoptr(virDomainDef) vmdef = NULL; if (virTestLoadFile(cmdfile, &cmd) < 0) - goto fail; + return -1; if (!(vmdef = bhyveParseCommandLineString(cmd, driver.bhyvecaps, driver.xmlopt))) { @@ -43,16 +42,16 @@ testCompareXMLToArgvFiles(const char *xmlfile, VIR_TEST_DEBUG("Got expected failure from " "bhyveParseCommandLineString."); } else { - goto fail; + return -1; } } else if ((flags & FLAG_EXPECT_FAILURE)) { VIR_TEST_DEBUG("Did not get expected failure from " "bhyveParseCommandLineString."); - goto fail; + return -1; } if ((log = virTestLogContentAndReset()) == NULL) - goto fail; + return -1; if (flags & FLAG_EXPECT_WARNING) { if (*log) { VIR_TEST_DEBUG("Got expected warning from " @@ -61,32 +60,29 @@ testCompareXMLToArgvFiles(const char *xmlfile, } else { VIR_TEST_DEBUG("bhyveParseCommandLineString " "should have logged a warning"); - goto fail; + return -1; } } else { /* didn't expect a warning */ if (*log) { VIR_TEST_DEBUG("Got unexpected warning from " "bhyveParseCommandLineString:\n%s", log); - goto fail; + return -1; } } if (vmdef && !virDomainDefCheckABIStability(vmdef, vmdef, driver.xmlopt)) { VIR_TEST_DEBUG("ABI stability check failed on %s", xmlfile); - goto fail; + return -1; } if (vmdef && !(actualxml = virDomainDefFormat(vmdef, driver.xmlopt, 0))) - goto fail; + return -1; if (vmdef && virTestCompareToFile(actualxml, xmlfile) < 0) - goto fail; + return -1; - ret = 0; - - fail: - return ret; + return 0; } struct testInfo { @@ -97,7 +93,6 @@ struct testInfo { static int testCompareXMLToArgvHelper(const void *data) { - int result = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -107,8 +102,7 @@ testCompareXMLToArgvHelper(const void *data) args = g_strdup_printf("%s/bhyveargv2xmldata/bhyveargv2xml-%s.args", abs_srcdir, info->name); - result = testCompareXMLToArgvFiles(xml, args, info->flags); - return result; + return testCompareXMLToArgvFiles(xml, args, info->flags); } static int diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 33e7ac5772..7ce4dc6e58 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -110,7 +110,6 @@ struct testInfo { static int testCompareXMLToArgvHelper(const void *data) { - int ret = -1; const struct testInfo *info = data; g_autofree char *xml = NULL; g_autofree char *args = NULL; @@ -126,9 +125,7 @@ testCompareXMLToArgvHelper(const void *data) dmargs = g_strdup_printf("%s/bhyvexml2argvdata/bhyvexml2argv-%s.devmap", abs_srcdir, info->name); - ret = testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); - - return ret; + return testCompareXMLToArgvFiles(xml, args, ldargs, dmargs, info->flags); } static int -- 2.26.2