From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 23 Jan 2023 15:41:55 +0000 (+0100)
Subject: virnetsshsession: Don't check return value of 'virNetSSHSessionAuthMethodNew'
X-Git-Tag: v9.1.0-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c68a07eeb3b02b37904efe1b091730e9ab731a7c;p=thirdparty%2Flibvirt.git

virnetsshsession: Don't check return value of 'virNetSSHSessionAuthMethodNew'

The function can't return NULL to the callers so it doesn't make sense
to check it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 73e65d9371..a3dd60f5a3 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -981,17 +981,11 @@ virNetSSHSessionAuthAddPasswordAuth(virNetSSHSession *sess,
         }
     }
 
-    if (!(auth = virNetSSHSessionAuthMethodNew(sess)))
-        goto error;
-
+    auth = virNetSSHSessionAuthMethodNew(sess);
     auth->method = VIR_NET_SSH_AUTH_PASSWORD;
 
     virObjectUnlock(sess);
     return 0;
-
- error:
-    virObjectUnlock(sess);
-    return -1;
 }
 
 int
@@ -1001,17 +995,11 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSession *sess)
 
     virObjectLock(sess);
 
-    if (!(auth = virNetSSHSessionAuthMethodNew(sess)))
-        goto error;
-
+    auth = virNetSSHSessionAuthMethodNew(sess);
     auth->method = VIR_NET_SSH_AUTH_AGENT;
 
     virObjectUnlock(sess);
     return 0;
-
- error:
-    virObjectUnlock(sess);
-    return -1;
 }
 
 int
@@ -1028,11 +1016,7 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
 
     virObjectLock(sess);
 
-    if (!(auth = virNetSSHSessionAuthMethodNew(sess))) {
-        virObjectUnlock(sess);
-        return -1;
-    }
-
+    auth = virNetSSHSessionAuthMethodNew(sess);
     auth->filename = g_strdup(keyfile);
     auth->method = VIR_NET_SSH_AUTH_PRIVKEY;
 
@@ -1048,19 +1032,12 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSession *sess,
 
     virObjectLock(sess);
 
-    if (!(auth = virNetSSHSessionAuthMethodNew(sess)))
-        goto error;
-
+    auth = virNetSSHSessionAuthMethodNew(sess);
     auth->tries = tries;
     auth->method = VIR_NET_SSH_AUTH_KEYBOARD_INTERACTIVE;
 
     virObjectUnlock(sess);
     return 0;
-
- error:
-    virObjectUnlock(sess);
-    return -1;
-
 }
 
 void