From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 24 May 2021 11:21:32 +0000 (+0100)
Subject: remote: stop checking for errors from socket allocations
X-Git-Tag: v7.4.0-rc2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ea6fc1ae8fff363ce4ccf38d0252b3fc9142d0;p=thirdparty%2Flibvirt.git

remote: stop checking for errors from socket allocations

The remoteGetUNIXSocketHelper method always returns a non-NULL string.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/remote_sockets.c b/src/remote/remote_sockets.c
index 43f78023fe..e9d865213f 100644
--- a/src/remote/remote_sockets.c
+++ b/src/remote/remote_sockets.c
@@ -155,12 +155,10 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
 
     legacy_daemon = g_strdup("libvirtd");
 
-    if (driver &&
-        !(direct_sock_name = remoteGetUNIXSocketHelper(transport, direct_daemon, ro, session)))
-        return NULL;
+    if (driver)
+        direct_sock_name = remoteGetUNIXSocketHelper(transport, direct_daemon, ro, session);
 
-    if (!(legacy_sock_name = remoteGetUNIXSocketHelper(transport, "libvirt", ro, session)))
-        return NULL;
+    legacy_sock_name = remoteGetUNIXSocketHelper(transport, "libvirt", ro, session);
 
     if (mode == REMOTE_DRIVER_MODE_AUTO) {
         if (transport == REMOTE_DRIVER_TRANSPORT_UNIX) {