From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 4 Aug 2022 08:39:53 +0000 (+0200)
Subject: util: xml: Refactor cleanup in virXMLValidateAgainstSchema
X-Git-Tag: v8.10.0-rc1~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868ffe3b90ea6b9be072b64fbb0417feab4d831c;p=thirdparty%2Flibvirt.git

util: xml: Refactor cleanup in virXMLValidateAgainstSchema

Use automatic freeing of the validator context to remove
'ret'/'cleanup:'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virxml.c b/src/util/virxml.c
index ea43331dcc..870ba194b0 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1567,19 +1567,15 @@ int
 virXMLValidateAgainstSchema(const char *schemafile,
                             xmlDocPtr doc)
 {
-    virXMLValidator *validator = NULL;
-    int ret = -1;
+    g_autoptr(virXMLValidator) validator = NULL;
 
     if (!(validator = virXMLValidatorInit(schemafile)))
         return -1;
 
     if (virXMLValidatorValidate(validator, doc) < 0)
-        goto cleanup;
+        return -1;
 
-    ret = 0;
- cleanup:
-    virXMLValidatorFree(validator);
-    return ret;
+    return 0;
 }