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>

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)))
+    return virURIFormat(conn->uri);
-        virDispatchError(NULL);
-
-    return uri;
 }
 
 /**

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)))
+    return virURIFormat(conn->uri);
-        goto error;
-
-    return name;
-
- error:
-    virDispatchError(conn);
-    return NULL;
 }
 
 

src/qemu/qemu_block.c

@@ -407,8 +407,7 @@ qemuBlockStorageSourceGetCURLProps(virStorageSource *src,
     if (!(uri = qemuBlockStorageSourceGetURI(src)))
         return NULL;
 
-    if (!(uristr = virURIFormat(uri)))
+    uristr = virURIFormat(uri);
-        return NULL;
 
     if (!onlytarget) {
         if (src->auth) {

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)))
+                    *uri_out = virURIFormat(uri);
-                        goto cleanup;
                 } else {
                     *uri_out = g_strdup_printf("%s:%d", uri_in, port);
                 }

src/remote/remote_driver.c

@@ -843,9 +843,6 @@ doRemoteOpen(virConnectPtr conn,
                 name = virURIFormat(&tmpuri);
 
                 VIR_FREE(tmpuri.query);
-
-                if (!name)
-                    goto failed;
             }
         }
     } else {

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))) {
+    vol->target.path = virURIFormat(state->uri);
-        VIR_FREE(state->uri->path);
-        state->uri->path = tmp;
-        return -1;
-    }
     VIR_FREE(state->uri->path);
     state->uri->path = tmp;
 

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
  */

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)))
+    uristr = virURIFormat(uri);
-        return -1;
 
     if (STRNEQ(uristr, data->uri_out)) {
         VIR_TEST_DEBUG("URI did not roundtrip, expect '%s', actual '%s'",