From 3267ce58cf92a6b9892b18d695b3afeccc5b8289 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 8 Dec 2022 14:18:16 +0100 Subject: [PATCH] virNetSSHSessionAuthAddPrivKeyAuth: Refactor cleanup With g_strdup not failing we can remove all of the 'error' section. Signed-off-by: Peter Krempa Reviewed-by: Jonathon Jongsma --- src/rpc/virnetsshsession.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 08f246be61..82cb44a358 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -1060,9 +1060,6 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess, { virNetSSHAuthMethod *auth; - char *user = NULL; - char *file = NULL; - if (!username || !keyfile) { virReportError(VIR_ERR_SSH, "%s", _("Username and key file path must be provided " @@ -1072,24 +1069,17 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess, virObjectLock(sess); - user = g_strdup(username); - file = g_strdup(keyfile); + if (!(auth = virNetSSHSessionAuthMethodNew(sess))) { + virObjectUnlock(sess); + return -1; + } - if (!(auth = virNetSSHSessionAuthMethodNew(sess))) - goto error; - - auth->username = user; - auth->filename = file; + auth->username = g_strdup(username); + auth->filename = g_strdup(keyfile); auth->method = VIR_NET_SSH_AUTH_PRIVKEY; virObjectUnlock(sess); return 0; - - error: - VIR_FREE(user); - VIR_FREE(file); - virObjectUnlock(sess); - return -1; } int