[libvirt PATCH] secretxml2xmltest: refactor testCompareXMLToXMLFiles (glib chronicles)
Use g_auto where possible and remove the pointless label.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
tests/secretxml2xmltest.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c
index 48f48416b5..99aaa9db15 100644
--- a/tests/secretxml2xmltest.c
+++ b/tests/secretxml2xmltest.c
@@ -10,25 +10,19 @@
static int
testCompareXMLToXMLFiles(const char *inxml, const char *outxml)
{
- char *actual = NULL;
- int ret = -1;
- virSecretDef *secret = NULL;
+ g_autofree char *actual = NULL;
+ g_autoptr(virSecretDef) secret = NULL;
if (!(secret = virSecretDefParseFile(inxml)))
- goto fail;
+ return -1;
if (!(actual = virSecretDefFormat(secret)))
- goto fail;
+ return -1;
if (virTestCompareToFile(actual, outxml) < 0)
- goto fail;
+ return -1;
- ret = 0;
-
- fail:
- VIR_FREE(actual);
- virSecretDefFree(secret);
- return ret;
+ return 0;
}
struct testInfo {
--
2.31.1