From e28f5ddc563e7ab0ae57367d632be138a108e2b5 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 30 Nov 2021 11:49:24 +0100 Subject: [PATCH] qemumonitorjsontest: testBlockNodeNameDetect: Automatically free GHashTable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Additionally we no longer need the cleanup section. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Martin Kletzander --- tests/qemumonitorjsontest.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index bcf5caa9a4..91a9193f2a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2490,24 +2490,23 @@ testBlockNodeNameDetect(const void *opaque) g_autofree char *actual = NULL; g_autoptr(virJSONValue) namedNodesJson = NULL; g_autoptr(virJSONValue) blockstatsJson = NULL; - GHashTable *nodedata = NULL; + g_autoptr(GHashTable) nodedata = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - int ret = -1; resultFile = g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefix, testname); if (!(namedNodesJson = virTestLoadFileJSON(pathprefix, testname, "-named-nodes.json", NULL))) - goto cleanup; + return -1; if (!(blockstatsJson = virTestLoadFileJSON(pathprefix, testname, "-blockstats.json", NULL))) - goto cleanup; + return -1; if (!(nodedata = qemuBlockNodeNameGetBackingChain(namedNodesJson, blockstatsJson))) - goto cleanup; + return -1; virHashForEachSorted(nodedata, testBlockNodeNameDetectFormat, &buf); @@ -2516,14 +2515,9 @@ testBlockNodeNameDetect(const void *opaque) actual = virBufferContentAndReset(&buf); if (virTestCompareToFile(actual, resultFile) < 0) - goto cleanup; + return -1; - ret = 0; - - cleanup: - virHashFree(nodedata); - - return ret; + return 0; }