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

virnetlibsshsession: Don't check return value of 'virNetLibsshSessionAuthMethodNew'

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/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
index d2e9e20ff2..bba37210df 100644
--- a/src/rpc/virnetlibsshsession.c
+++ b/src/rpc/virnetlibsshsession.c
@@ -843,7 +843,6 @@ int
 virNetLibsshSessionAuthAddPasswordAuth(virNetLibsshSession *sess,
                                        virURI *uri)
 {
-    int ret;
     virNetLibsshAuthMethod *auth;
 
     virObjectLock(sess);
@@ -857,43 +856,27 @@ virNetLibsshSessionAuthAddPasswordAuth(virNetLibsshSession *sess,
         }
     }
 
-
-    if (!(auth = virNetLibsshSessionAuthMethodNew(sess))) {
-        ret = -1;
-        goto cleanup;
-    }
-
+    auth = virNetLibsshSessionAuthMethodNew(sess);
     auth->method = VIR_NET_LIBSSH_AUTH_PASSWORD;
     auth->ssh_flags = SSH_AUTH_METHOD_PASSWORD;
 
-    ret = 0;
-
- cleanup:
     virObjectUnlock(sess);
-    return ret;
+    return 0;
 }
 
 int
 virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess)
 {
-    int ret;
     virNetLibsshAuthMethod *auth;
 
     virObjectLock(sess);
 
-    if (!(auth = virNetLibsshSessionAuthMethodNew(sess))) {
-        ret = -1;
-        goto cleanup;
-    }
-
+    auth = virNetLibsshSessionAuthMethodNew(sess);
     auth->method = VIR_NET_LIBSSH_AUTH_AGENT;
     auth->ssh_flags = SSH_AUTH_METHOD_PUBLICKEY;
 
-    ret = 0;
-
- cleanup:
     virObjectUnlock(sess);
-    return ret;
+    return 0;
 }
 
 int
@@ -910,11 +893,7 @@ virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess,
 
     virObjectLock(sess);
 
-    if (!(auth = virNetLibsshSessionAuthMethodNew(sess))) {
-        virObjectUnlock(sess);
-        return -1;
-    }
-
+    auth = virNetLibsshSessionAuthMethodNew(sess);
     auth->filename = g_strdup(keyfile);
     auth->method = VIR_NET_LIBSSH_AUTH_PRIVKEY;
     auth->ssh_flags = SSH_AUTH_METHOD_PUBLICKEY;
@@ -927,26 +906,18 @@ int
 virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSession *sess,
                                        int tries)
 {
-    int ret;
     virNetLibsshAuthMethod *auth;
 
     virObjectLock(sess);
 
-    if (!(auth = virNetLibsshSessionAuthMethodNew(sess))) {
-        ret = -1;
-        goto cleanup;
-    }
+    auth = virNetLibsshSessionAuthMethodNew(sess);
 
     auth->tries = tries;
     auth->method = VIR_NET_LIBSSH_AUTH_KEYBOARD_INTERACTIVE;
     auth->ssh_flags = SSH_AUTH_METHOD_INTERACTIVE;
 
-    ret = 0;
-
- cleanup:
     virObjectUnlock(sess);
-    return ret;
-
+    return 0;
 }
 
 void