Drop checks for virURIFormat() retval

The virURIFormat() function either returns a string, or aborts
(on OOM). There's no way this function can return NULL (as of
v7.2.0-rc1~277). Therefore, it doesn't make sense to check its
retval against NULL.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/admin/libvirt-admin.c b/src/admin/libvirt-admin.c
index 6baaea4ff2c7d5c78bb62509bf1f33f96ff2d94c..1786a283e5850dad36acf5988c9acc5e06cdf598 100644 (file)
--- a/src/admin/libvirt-admin.c
+++ b/src/admin/libvirt-admin.c
@@ -427,17 +427,13 @@ virAdmConnectIsAlive(virAdmConnectPtr conn)
 char *
 virAdmConnectGetURI(virAdmConnectPtr conn)
 {
-    char *uri = NULL;
     VIR_DEBUG("conn=%p", conn);
 
     virResetLastError();
 
     virCheckAdmConnectReturn(conn, NULL);
 
-    if (!(uri = virURIFormat(conn->uri)))
-        virDispatchError(NULL);
-
-    return uri;
+    return virURIFormat(conn->uri);
 }
 
 /**

diff --git a/src/libvirt-host.c b/src/libvirt-host.c
index c02222346cf6a7737ea91fa807a47e2af8012ab2..a2ba347d5476fb64978e8303d5b11a5e68d81e1b 100644 (file)
--- a/src/libvirt-host.c
+++ b/src/libvirt-host.c
@@ -313,21 +313,13 @@ virConnectGetHostname(virConnectPtr conn)
 char *
 virConnectGetURI(virConnectPtr conn)
 {
-    char *name;
     VIR_DEBUG("conn=%p", conn);
 
     virResetLastError();
 
     virCheckConnectReturn(conn, NULL);
 
-    if (!(name = virURIFormat(conn->uri)))
-        goto error;
-
-    return name;
-
- error:
-    virDispatchError(conn);
-    return NULL;
+    return virURIFormat(conn->uri);
 }
 
 

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index c218262691dedfac4a06a53e089069983dedaee3..4c06565e0fb57b990d2854be4595ab23751c92a9 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -407,8 +407,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSource *src,
     if (!(uri = qemuBlockStorageSourceGetURI(src)))
         return NULL;
 
-    if (!(uristr = virURIFormat(uri)))
-        return NULL;
+    uristr = virURIFormat(uri);
 
     if (!onlytarget) {
         if (src->auth) {

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index f36bb49be59e6121fb2ed48e9770bcee1b666199..2720f0b0839571e924193b5753a686278e29aa17 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3777,8 +3777,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriver *driver,
                 /* Send well-formed URI only if uri_in was well-formed */
                 if (well_formed_uri) {
                     uri->port = port;
-                    if (!(*uri_out = virURIFormat(uri)))
-                        goto cleanup;
+                    *uri_out = virURIFormat(uri);
                 } else {
                     *uri_out = g_strdup_printf("%s:%d", uri_in, port);
                 }

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 9fc73f6d888f22607a8484e31e2a6b8c1bc79575..2e08ff246fbe98a9a4a75b3679fd16e1b14bc332 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -843,9 +843,6 @@ doRemoteOpen(virConnectPtr conn,
                 name = virURIFormat(&tmpuri);
 
                 VIR_FREE(tmpuri.query);
-
-                if (!name)
-                    goto failed;
             }
         }
     } else {

diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c
index 1fe21b4a2b35136ae0a3d6b6825b0643a7638800..bdf91e8bd50632f88511c0c5f6de73a21156f9db 100644 (file)
--- a/src/storage/storage_backend_gluster.c
+++ b/src/storage/storage_backend_gluster.c
@@ -195,11 +195,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterState *state,
 
     tmp = state->uri->path;
     state->uri->path = g_strdup_printf("/%s", path);
-    if (!(vol->target.path = virURIFormat(state->uri))) {
-        VIR_FREE(state->uri->path);
-        state->uri->path = tmp;
-        return -1;
-    }
+    vol->target.path = virURIFormat(state->uri);
     VIR_FREE(state->uri->path);
     state->uri->path = tmp;
 

diff --git a/src/util/viruri.c b/src/util/viruri.c
index 4afdd30c59a378429a5b418f8ddf2d9d1f2cbafb..54db0bda06edf2c43838c991b90faec25e67a6fa 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -194,7 +194,7 @@ virURIParse(const char *uri)
  * Wrapper for xmlSaveUri
  *
  * This function constructs back everything that @ref virURIParse
- * changes after parsing
+ * changes after parsing. It aborts on error.
  *
  * @returns the constructed uri as a string
  */

diff --git a/tests/viruritest.c b/tests/viruritest.c
index cd6ce57371faf3104e9811cf2058cb0833f3d208..705e0d5c6e6408b8f9c4eb3bc233363cd8475cec 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -118,8 +118,7 @@ static int testURIParse(const void *args)
     VIR_FREE(uri->query);
     uri->query = virURIFormatParams(uri);
 
-    if (!(uristr = virURIFormat(uri)))
-        return -1;
+    uristr = virURIFormat(uri);
 
     if (STRNEQ(uristr, data->uri_out)) {
         VIR_TEST_DEBUG("URI did not roundtrip, expect '%s', actual '%s'",