]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
src: stop checking virIdentityNew return value
authorDaniel P. Berrangé <berrange@redhat.com>
Thu, 5 Aug 2021 18:03:19 +0000 (19:03 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Fri, 6 Aug 2021 11:11:58 +0000 (12:11 +0100)
This method will always succeed.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/remote/remote_daemon_dispatch.c
src/rpc/virnetserverclient.c
src/util/viridentity.c

index 69d0a015baff59e5e368534487604effd07accce..0e38b314a2ddd04ac4461df839ac993e1ca5a909 100644 (file)
@@ -2192,7 +2192,7 @@ remoteDispatchConnectSetIdentity(virNetServer *server G_GNUC_UNUSED,
     int nparams = 0;
     int rv = -1;
     virConnectPtr conn = remoteGetHypervisorConn(client);
-    g_autoptr(virIdentity) ident = NULL;
+    g_autoptr(virIdentity) ident = virIdentityNew();
     if (!conn)
         goto cleanup;
 
@@ -2209,9 +2209,6 @@ remoteDispatchConnectSetIdentity(virNetServer *server G_GNUC_UNUSED,
     if (virConnectSetIdentityEnsureACL(conn) < 0)
         goto cleanup;
 
-    if (!(ident = virIdentityNew()))
-        goto cleanup;
-
     if (virIdentitySetParameters(ident, params, nparams) < 0)
         goto cleanup;
 
index 236702ced6cb4a510c3588b9f55e645f7ab92c22..7050430e171a359fe3c048d99713668a1ccfc4e7 100644 (file)
@@ -747,10 +747,7 @@ virNetServerClientCreateIdentity(virNetServerClient *client)
     g_autofree char *username = NULL;
     g_autofree char *groupname = NULL;
     g_autofree char *seccontext = NULL;
-    g_autoptr(virIdentity) ret = NULL;
-
-    if (!(ret = virIdentityNew()))
-        return NULL;
+    g_autoptr(virIdentity) ret = virIdentityNew();
 
     if (client->sock && virNetSocketIsLocal(client->sock)) {
         gid_t gid;
index c18326c8cb78df019f47c012f36adad39ba90507..e36e54ae4b9abc1d00246f68692261daee330508 100644 (file)
@@ -313,15 +313,12 @@ virIdentity *virIdentityGetSystem(void)
     g_autofree char *username = NULL;
     g_autofree char *groupname = NULL;
     unsigned long long startTime;
-    g_autoptr(virIdentity) ret = NULL;
+    g_autoptr(virIdentity) ret = virIdentityNew();
 #if WITH_SELINUX
     char *con;
 #endif
     g_autofree char *token = NULL;
 
-    if (!(ret = virIdentityNew()))
-        return NULL;
-
     if (virIdentitySetProcessID(ret, getpid()) < 0)
         return NULL;