Use virURIFree instead of xmlFreeURI

Since we defined a custom virURIPtr type, we should use a
virURIFree method instead of assuming it will always be
a typedef for xmlURIPtr

* src/util/viruri.c, src/util/viruri.h, src/libvirt_private.syms:
  Add a virURIFree method
* src/datatypes.c, src/esx/esx_driver.c, src/libvirt.c,
  src/qemu/qemu_migration.c, src/vmx/vmx.c, src/xen/xend_internal.c,
  tests/viruritest.c: s/xmlFreeURI/virURIFree/

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/src/datatypes.c b/src/datatypes.c
index f0b50259f9c3f12afdc514ea4108e321332a7eb3..5ad988bd24e704461321473860d06d65cc83e754 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -117,7 +117,7 @@ virReleaseConnect(virConnectPtr conn) {
 
     virResetError(&conn->err);
 
-    xmlFreeURI(conn->uri);
+    virURIFree(conn->uri);
 
     virMutexUnlock(&conn->lock);
     virMutexDestroy(&conn->lock);

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 69435344be13fdd80284ecc85552da3c7dcc2713..dbf95f44840732c04e1b7f1b55bce5d3ede37f9b 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -4072,7 +4072,7 @@ esxDomainMigratePerform(virDomainPtr domain,
     result = 0;
 
   cleanup:
-    xmlFreeURI(parsedUri);
+    virURIFree(parsedUri);
     esxVI_ObjectContent_Free(&virtualMachine);
     esxVI_Event_Free(&eventList);
     esxVI_ManagedObjectReference_Free(&task);

diff --git a/src/libvirt.c b/src/libvirt.c
index 99b263efc1b7e656631f923a254ab5b7b673f97e..f674ecb46b200d4abecc628160dbbe6263adc668 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -5071,10 +5071,10 @@ virDomainMigratePeer2Peer (virDomainPtr domain,
     if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) {
         virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
         virDispatchError(domain->conn);
-        xmlFreeURI(tempuri);
+        virURIFree(tempuri);
         return -1;
     }
-    xmlFreeURI(tempuri);
+    virURIFree(tempuri);
 
     /* Perform the migration.  The driver isn't supposed to return
      * until the migration is complete.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 9a718b412f6dd1e9c1e777b1c1efeb3490449e0a..dcfe5ab88086f082fe48ee012bd107121f0afaeb 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1472,6 +1472,7 @@ virTypedParameterAssign;
 
 # viruri.h
 virURIFormat;
+virURIFree;
 virURIParse;
 
 

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 12ce10c86fc1aaa3bb7fce717c3ad978912bdb76..e380bc08c3257b2bcba0893d114a00835e577f88 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1956,7 +1956,7 @@ static int doNativeMigrate(struct qemud_driver *driver,
     if (spec.destType == MIGRATION_DEST_FD)
         VIR_FORCE_CLOSE(spec.dest.fd.qemu);
 
-    xmlFreeURI(uribits);
+    virURIFree(uribits);
 
     return ret;
 }

diff --git a/src/util/viruri.c b/src/util/viruri.c
index 6c4dfe3c082ce5c2c9cd6c961a57b4910a4716c5..0b256793940bda29121f947d501a1773484c6d97 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -91,3 +91,15 @@ virURIFormat(xmlURIPtr uri)
 
     return ret;
 }
+
+
+/**
+ * virURIFree:
+ * @uri: uri to free
+ *
+ * Frees the URI
+ */
+void virURIFree(virURIPtr uri)
+{
+    xmlFreeURI(uri);
+}

diff --git a/src/util/viruri.h b/src/util/viruri.h
index 5215e42d4faeed863c529b3a75392f1931e7ad11..80369beab2c4cf0e6ab1d30b3547600632b42498 100644 (file)
--- a/src/util/viruri.h
+++ b/src/util/viruri.h
@@ -19,4 +19,6 @@ typedef xmlURIPtr virURIPtr;
 virURIPtr virURIParse(const char *uri);
 char *virURIFormat(virURIPtr uri);
 
+void virURIFree(virURIPtr uri);
+
 #endif /* __VIR_URI_H__ */

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index cc426da665fb3051b74e4f3664fbb3575a732d41..3179688f75f7beccdb4725269a25dbba5f481040 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2696,7 +2696,7 @@ virVMXParseSerial(virVMXContext *ctx, virConfPtr conf, int port,
     VIR_FREE(fileType);
     VIR_FREE(fileName);
     VIR_FREE(network_endPoint);
-    xmlFreeURI(parsedUri);
+    virURIFree(parsedUri);
 
     return result;
 

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index a19d055125ddb2bdd5b3253d4bd7d2366aa70f23..df6b1bb31bc6e1a9a1a3fee7d1968eb21620e3f6 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -3234,25 +3234,25 @@ xenDaemonDomainMigratePerform (virDomainPtr domain,
             virXendError(VIR_ERR_INVALID_ARG,
                           "%s", _("xenDaemonDomainMigrate: only xenmigr://"
                             " migrations are supported by Xen"));
-            xmlFreeURI (uriptr);
+            virURIFree (uriptr);
             return -1;
         }
         if (!uriptr->server) {
             virXendError(VIR_ERR_INVALID_ARG,
                           "%s", _("xenDaemonDomainMigrate: a hostname must be"
                             " specified in the URI"));
-            xmlFreeURI (uriptr);
+            virURIFree (uriptr);
             return -1;
         }
         hostname = strdup (uriptr->server);
         if (!hostname) {
             virReportOOMError();
-            xmlFreeURI (uriptr);
+            virURIFree (uriptr);
             return -1;
         }
         if (uriptr->port)
             snprintf (port, sizeof port, "%d", uriptr->port);
-        xmlFreeURI (uriptr);
+        virURIFree (uriptr);
     }
     else if ((p = strrchr (uri, ':')) != NULL) { /* "hostname:port" */
         int port_nr, n;

diff --git a/tests/viruritest.c b/tests/viruritest.c
index 39cb3d240cfd729e7fbff0e6e93a05f1b719dae6..91da6e6ef59bc5d8437ed0d0ad48b2d60ffd28e1 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -105,7 +105,7 @@ static int testURIParse(const void *args)
     ret = 0;
 cleanup:
     VIR_FREE(uristr);
-    xmlFreeURI(uri);
+    virURIFree(uri);
     return ret;
 }