Use g_auto for xmlXPathContext everywhere

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 44e62712c5f092862d7d8beae3c4eab614807da1..dac7af4bf47969e5a56bafee618bb4abd38f74e0 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -282,7 +282,7 @@ virCPUDefParseXMLString(const char *xml,
                         bool validateXML)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     int ret = -1;
 
     if (!xml) {
@@ -300,7 +300,6 @@ virCPUDefParseXMLString(const char *xml,
 
  cleanup:
     xmlFreeDoc(doc);
-    xmlXPathFreeContext(ctxt);
     return ret;
 }
 

diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c
index 9c2a6298d213efefaca977803363cbfc66d0b4bf..8da05353b727f8560ce1243fec672cab2d9c9de0 100644 (file)
--- a/src/conf/virnetworkportdef.c
+++ b/src/conf/virnetworkportdef.c
@@ -268,7 +268,7 @@ virNetworkPortDef *
 virNetworkPortDefParseNode(xmlDocPtr xml,
                            xmlNodePtr root)
 {
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     virNetworkPortDef *def = NULL;
 
     if (STRNEQ((const char *)root->name, "networkport")) {
@@ -285,7 +285,6 @@ virNetworkPortDefParseNode(xmlDocPtr xml,
     def = virNetworkPortDefParseXML(ctxt);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     return def;
 }
 

diff --git a/src/conf/virnwfilterbindingdef.c b/src/conf/virnwfilterbindingdef.c
index 4079fcdba4e4b93fa55c81953ab398e9e57c8e67..45fa51a56ce5fa83b748021cb42221faf229cbe9 100644 (file)
--- a/src/conf/virnwfilterbindingdef.c
+++ b/src/conf/virnwfilterbindingdef.c
@@ -159,7 +159,7 @@ virNWFilterBindingDef *
 virNWFilterBindingDefParseNode(xmlDocPtr xml,
                                xmlNodePtr root)
 {
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     virNWFilterBindingDef *def = NULL;
 
     if (STRNEQ((const char *)root->name, "filterbinding")) {
@@ -176,7 +176,6 @@ virNWFilterBindingDefParseNode(xmlDocPtr xml,
     def = virNWFilterBindingDefParseXML(ctxt);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     return def;
 }
 

diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
index 11426e0a4db822379372f11bb058a23ad647c28d..20f33506fd0d8600ccb31aa264d044119443b832 100644 (file)
--- a/src/conf/virnwfilterbindingobj.c
+++ b/src/conf/virnwfilterbindingobj.c
@@ -236,7 +236,7 @@ static virNWFilterBindingObj *
 virNWFilterBindingObjParseNode(xmlDocPtr doc,
                                xmlNodePtr root)
 {
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     virNWFilterBindingObj *obj = NULL;
 
     if (STRNEQ((const char *)root->name, "filterbindingstatus")) {
@@ -253,7 +253,6 @@ virNWFilterBindingObjParseNode(xmlDocPtr doc,
     obj = virNWFilterBindingObjParseXML(doc, ctxt);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     return obj;
 }
 

diff --git a/src/conf/virsavecookie.c b/src/conf/virsavecookie.c
index 0e67bf1477ee911e3992926732a2115bfccf7cca..b7e1e7df93f1ad5b07a2df688746964c5be3cb4c 100644 (file)
--- a/src/conf/virsavecookie.c
+++ b/src/conf/virsavecookie.c
@@ -80,7 +80,7 @@ virSaveCookieParseString(const char *xml,
                          virSaveCookieCallbacks *saveCookie)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     int ret = -1;
 
     *obj = NULL;
@@ -96,7 +96,6 @@ virSaveCookieParseString(const char *xml,
     ret = virSaveCookieParseNode(ctxt, obj, saveCookie);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return ret;
 }

diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 18a7718de952958bf27b7d282af3af36ba0f0a4c..91c63b2c45cd31ded321a4fc3a99622ed5bd22c5 100644 (file)
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -1644,7 +1644,7 @@ virStoragePoolObjLoadState(virStoragePoolObjList *pools,
     char *stateFile = NULL;
     virStoragePoolObj *obj = NULL;
     xmlDocPtr xml = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     xmlNodePtr node = NULL;
     g_autoptr(virStoragePoolDef) def = NULL;
 
@@ -1688,7 +1688,6 @@ virStoragePoolObjLoadState(virStoragePoolObjList *pools,
  cleanup:
     VIR_FREE(stateFile);
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
     return obj;
 }
 

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index ebc6d9eb69bb5a11e910a500f6253f8a2882fa85..6f964cc470d14e1f6bef2314fe78a2d5fd11bfbe 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1224,7 +1224,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
     g_auto(virBuffer) buffer = VIR_BUFFER_INITIALIZER;
     esxVI_Fault *fault = NULL;
     g_autofree char *xpathExpression = NULL;
-    xmlXPathContextPtr xpathContext = NULL;
+    g_autoptr(xmlXPathContext) xpathContext = NULL;
     xmlNodePtr responseNode = NULL;
 
     if (!request || !response || *response) {
@@ -1385,8 +1385,6 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
         esxVI_Fault_Free(&fault);
     }
 
-    xmlXPathFreeContext(xpathContext);
-
     return result;
 }
 

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 4677f798fc1c677c29ad549944b97f8c48d76452..817252bce9ae95402676d85bc7e3fab6770e8f16 100644 (file)
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -149,7 +149,7 @@ libxlMigrationEatCookie(const char *cookiein,
 {
     libxlMigrationCookie *mig = NULL;
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     g_autofree char *uuidstr = NULL;
     int ret = -1;
 
@@ -216,7 +216,6 @@ libxlMigrationEatCookie(const char *cookiein,
     libxlMigrationCookieFree(mig);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return ret;
 }

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 95589388661166bc035b252c2cae6c1f8defa541..cecacb051b91136b8f0845a50eeb17d67b12f022 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4196,7 +4196,7 @@ virQEMUCapsLoadCache(virArch hostArch,
     size_t i;
     int n;
     xmlNodePtr *nodes = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     char *str = NULL;
     long long int l;
     unsigned long lu;
@@ -4421,7 +4421,6 @@ virQEMUCapsLoadCache(virArch hostArch,
  cleanup:
     VIR_FREE(str);
     VIR_FREE(nodes);
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return ret;
 }

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index 52998ddd1b7a9a27b54ba9986148ec2cfd360310..b4081b17e264ff43f3bbba7024b87447f0a55f85 100644 (file)
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -1432,7 +1432,7 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *mig,
                                unsigned int flags)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     int ret = -1;
 
     VIR_DEBUG("xml=%s", NULLSTR(xml));
@@ -1443,7 +1443,6 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookie *mig,
     ret = qemuMigrationCookieXMLParse(mig, driver, qemuCaps, doc, ctxt, flags);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
 
     return ret;

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index e21557c810a9daf9cb78eceb5e4a23b46bc196bf..2ba2a4a2b874d0e5ec4c0859fc82be4f690a60f7 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -569,7 +569,7 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
 {
     int rc = -1;
     xmlDocPtr xml = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     char *arch;
 
     if (!(xml = virXMLParseStringCtxt(xmlStr, _("(domain_definition)"),
@@ -608,7 +608,6 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
 
  cleanup:
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
 
     return rc;
 }

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index a7c9355bf9a7dbf9039dfa4fdb53cac9c6c9c3e1..1beff7726a04975e27f0486186d08f33b132c32e 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -2893,7 +2893,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
                                         virStoragePoolType pooltype)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     virStoragePoolSource *src = NULL;
     size_t i;
     int nnodes;
@@ -2940,7 +2940,6 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
     ret = nnodes;
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
 
     return ret;

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 00cc13511af104fe93857ec66209792b87371395..6bb52e9302e16ebc1610a45ec79ae0eed07ead11 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -1334,7 +1334,7 @@ static int
 testOpenFromFile(virConnectPtr conn, const char *file)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     testDriver *privconn;
 
     if (!(privconn = testDriverNew()))
@@ -1355,14 +1355,12 @@ testOpenFromFile(virConnectPtr conn, const char *file)
     if (testOpenParse(privconn, file, ctxt) < 0)
         goto error;
 
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     virObjectUnlock(privconn);
 
     return VIR_DRV_OPEN_SUCCESS;
 
  error:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     virObjectUnref(privconn);
     conn->privateData = NULL;
@@ -1378,7 +1376,7 @@ testOpenDefault(virConnectPtr conn)
     int ret = VIR_DRV_OPEN_ERROR;
     testDriver *privconn = NULL;
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     size_t i;
 
     virMutexLock(&defaultLock);
@@ -1426,7 +1424,6 @@ testOpenDefault(virConnectPtr conn)
     ret = VIR_DRV_OPEN_SUCCESS;
  cleanup:
     virMutexUnlock(&defaultLock);
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return ret;
 

diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c
index 7fb97d49d963b8fb59dc600bd33d0107b3a8ecc9..0f30aef108085099a4d8b80af7f374055992defb 100644 (file)
--- a/src/vbox/vbox_snapshot_conf.c
+++ b/src/vbox/vbox_snapshot_conf.c
@@ -578,7 +578,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
     xmlDocPtr xml = NULL;
     xmlNodePtr machineNode = NULL;
     xmlNodePtr cur = NULL;
-    xmlXPathContextPtr xPathContext = NULL;
+    g_autoptr(xmlXPathContext) xPathContext = NULL;
     char *currentStateModifiedString = NULL;
 
     char **searchResultTab = NULL;
@@ -716,7 +716,6 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath,
     ret = 0;
 
  cleanup:
-    xmlXPathFreeContext(xPathContext);
     xmlFreeDoc(xml);
 
     VIR_FREE(currentStateModifiedString);
@@ -1221,7 +1220,7 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(const char *filePath,
     size_t i = 0;
     char **ret = NULL;
     xmlDocPtr xml = NULL;
-    xmlXPathContextPtr xPathContext = NULL;
+    g_autoptr(xmlXPathContext) xPathContext = NULL;
     xmlNodePtr *nodes = NULL;
     int nodeSize = 0;
     *rwDisksPath = NULL;
@@ -1260,7 +1259,6 @@ virVBoxSnapshotConfGetRWDisksPathsFromLibvirtXML(const char *filePath,
 
  cleanup:
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(xPathContext);
     if (result < 0) {
         g_strfreev(ret);
         nodeSize = -1;
@@ -1284,7 +1282,7 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath,
     size_t i = 0;
     char **ret = NULL;
     xmlDocPtr xml = NULL;
-    xmlXPathContextPtr xPathContext = NULL;
+    g_autoptr(xmlXPathContext) xPathContext = NULL;
     xmlNodePtr *nodes = NULL;
     int nodeSize = 0;
     if (filePath == NULL) {
@@ -1322,7 +1320,6 @@ virVBoxSnapshotConfGetRODisksPathsFromLibvirtXML(const char *filePath,
 
  cleanup:
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(xPathContext);
     if (result < 0) {
         g_strfreev(ret);
         nodeSize = -1;

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index a9cd3d90c9e8b7bb2752c97f31edcc8235cc4295..edc43275501da001033250e1fd67ac1d78d19636 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -2790,7 +2790,7 @@ static vzMigrationCookie *
 vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctx = NULL;
+    g_autoptr(xmlXPathContext) ctx = NULL;
     vzMigrationCookie *mig = NULL;
 
     mig = g_new0(vzMigrationCookie, 1);
@@ -2838,7 +2838,6 @@ vzEatCookie(const char *cookiein, int cookieinlen, unsigned int flags)
     }
 
  cleanup:
-    xmlXPathFreeContext(ctx);
     xmlFreeDoc(doc);
     return mig;
 

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 7871b04005fa6f4114a7c82db3fcb6a39b926aa1..5a747913b5a05a93bd4d28d859df2e3810529ca9 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -4579,7 +4579,7 @@ prlsdkParseSnapshotTree(const char *treexml)
 {
     virDomainSnapshotObjList *ret = NULL;
     xmlDocPtr xml = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     xmlNodePtr root;
     xmlNodePtr *nodes = NULL;
     virDomainSnapshotDef *def = NULL;
@@ -4696,7 +4696,6 @@ prlsdkParseSnapshotTree(const char *treexml)
     virDomainSnapshotObjListFree(snapshots);
     VIR_FREE(nodes);
     VIR_FREE(xmlstr);
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(xml);
     VIR_FREE(def);
 

diff --git a/tests/cputest.c b/tests/cputest.c
index 18de84e0501de4800902cfaf648e2dd4b4fb85b5..34d9e8ddb04ad3593a7d706b843cb03e935147af 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -72,7 +72,7 @@ cpuTestLoadXML(virArch arch, const char *name)
 {
     char *xml = NULL;
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     virCPUDef *cpu = NULL;
 
     xml = g_strdup_printf("%s/cputestdata/%s-%s.xml", abs_srcdir,
@@ -84,7 +84,6 @@ cpuTestLoadXML(virArch arch, const char *name)
     virCPUDefParseXML(ctxt, NULL, VIR_CPU_TYPE_AUTO, &cpu, false);
 
  cleanup:
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     VIR_FREE(xml);
     return cpu;
@@ -98,7 +97,7 @@ cpuTestLoadMultiXML(virArch arch,
 {
     char *xml = NULL;
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     xmlNodePtr *nodes = NULL;
     virCPUDef **cpus = NULL;
     int n;
@@ -130,7 +129,6 @@ cpuTestLoadMultiXML(virArch arch,
  cleanup:
     VIR_FREE(xml);
     VIR_FREE(nodes);
-    xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
     return cpus;
 

diff --git a/tests/metadatatest.c b/tests/metadatatest.c
index a9080b32d7fa221efca90427788583d052d7bf26..ceb683028c7ece773aa8015fb697ceb0d94dd2e7 100644 (file)
--- a/tests/metadatatest.c
+++ b/tests/metadatatest.c
@@ -57,7 +57,7 @@ static char *
 getMetadataFromXML(virDomainPtr dom)
 {
     xmlDocPtr doc = NULL;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     xmlNodePtr node;
 
     char *xml = NULL;
@@ -77,7 +77,6 @@ getMetadataFromXML(virDomainPtr dom)
  cleanup:
     VIR_FREE(xml);
     xmlFreeDoc(doc);
-    xmlXPathFreeContext(ctxt);
 
     return ret;
 }

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 68bbf07ec2a54227a8c281b05b25ede6f7be5acf..35eb27c1fb645649b8ba164c72a99807a2e7a8f5 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -52,7 +52,7 @@ testQemuGetCaps(char *caps)
 {
     virQEMUCaps *qemuCaps = NULL;
     xmlDocPtr xml;
-    xmlXPathContextPtr ctxt = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     ssize_t i, n;
     g_autofree xmlNodePtr *nodes = NULL;
 
@@ -80,13 +80,11 @@ testQemuGetCaps(char *caps)
     }
 
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
     return qemuCaps;
 
  error:
     virObjectUnref(qemuCaps);
     xmlFreeDoc(xml);
-    xmlXPathFreeContext(ctxt);
     return NULL;
 }
 

diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index f399c95da036f43d4b616dab6656278524ba5f45..51ceae5a6a9cb541628c00cb2b3fcb63b29b9b47 100644 (file)
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -43,7 +43,7 @@ struct testSetStruct {
     do { \
         int rc; \
         xmlDocPtr doc; \
-        xmlXPathContextPtr ctxt = NULL; \
+        g_autoptr(xmlXPathContext) ctxt = NULL; \
  \
         if (!xml) \
             break; \
@@ -58,7 +58,6 @@ struct testSetStruct {
                                      ctxt->node, \
                                      true); \
         xmlFreeDoc(doc); \
-        xmlXPathFreeContext(ctxt); \
         if (rc < 0) \
             goto cleanup; \
     } while (0)