Introduce virXMLValidatorFree

Split out the code cleaning up the validator.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f197f55d3593e4834c216d623a6a21faff7a0fe7..53a7a9780da47759ff835dfda2e7338e48a0c996 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2565,6 +2565,7 @@ virXMLPickShellSafeComment;
 virXMLPropString;
 virXMLSaveFile;
 virXMLValidateAgainstSchema;
+virXMLValidatorFree;
 virXPathBoolean;
 virXPathInt;
 virXPathLong;

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 7842273972c9b24c6d83d2ca19919a8e8126a87b..49aed7d7770f79860b3fc4b3e27ae9f444a93a29 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -1161,11 +1161,21 @@ virXMLValidateAgainstSchema(const char *schemafile,
     ret = 0;
 
  cleanup:
+    virXMLValidatorFree(validator);
+    return ret;
+}
+
+
+void
+virXMLValidatorFree(virXMLValidatorPtr validator)
+{
+    if (!validator)
+        return;
+
     VIR_FREE(validator->schemafile);
     virBufferFreeAndReset(&validator->buf);
     xmlRelaxNGFreeParserCtxt(validator->rngParser);
     xmlRelaxNGFreeValidCtxt(validator->rngValid);
     xmlRelaxNGFree(validator->rng);
     VIR_FREE(validator);
-    return ret;
 }

diff --git a/src/util/virxml.h b/src/util/virxml.h
index 9803be53609aad7d3747608ed3b2dc244706a5a8..21ca578691c412d50d4d0fdb04eb5cc93804fe2e 100644 (file)
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -192,5 +192,7 @@ typedef virXMLValidator *virXMLValidatorPtr;
 int
 virXMLValidateAgainstSchema(const char *schemafile,
                             xmlDocPtr xml);
+void
+virXMLValidatorFree(virXMLValidatorPtr validator);
 
 #endif                          /* __VIR_XML_H__ */