External/libvirt
1
0
Fork 0
Code

rpc: use g_auto() for all virBuffers

Browse Source 
Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Laine Stump 2020-07-02 22:39:19 -04:00
parent 326a6731ea
commit 817519e900
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/virnetclient.c
View File

@ -428,7 +428,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
{ {
virNetSocketPtr sock = NULL; virNetSocketPtr sock = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *nc = NULL; g_autofree char *nc = NULL;
g_autofree char *command = NULL; g_autofree char *command = NULL;
@ -518,7 +518,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
{ {
virNetSocketPtr sock = NULL; virNetSocketPtr sock = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
g_autofree char *nc = NULL; g_autofree char *nc = NULL;
g_autofree char *command = NULL; g_autofree char *command = NULL;

7
src/rpc/virnetlibsshsession.c
View File

@ -664,7 +664,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSessionPtr sess,
while (ret == SSH_AUTH_INFO) { while (ret == SSH_AUTH_INFO) {
const char *name, *instruction; const char *name, *instruction;
int nprompts, iprompt; int nprompts, iprompt;
virBuffer buff = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buff = VIR_BUFFER_INITIALIZER;
name = ssh_userauth_kbdint_getname(sess->session); name = ssh_userauth_kbdint_getname(sess->session);
instruction = ssh_userauth_kbdint_getinstruction(sess->session); instruction = ssh_userauth_kbdint_getinstruction(sess->session);
@ -706,7 +706,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSessionPtr sess,
* buffer if specified * buffer if specified
*/ */
if (virBufferUse(&buff) > 0) { if (virBufferUse(&buff) > 0) {
virBuffer prompt_buff = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) prompt_buff = VIR_BUFFER_INITIALIZER;
virBufferAddBuffer(&prompt_buff, &buff); virBufferAddBuffer(&prompt_buff, &buff);
virBufferAdd(&prompt_buff, promptStr, promptStrLen); virBufferAdd(&prompt_buff, promptStr, promptStrLen);
@ -750,12 +750,9 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibsshSessionPtr sess,
prompt_error: prompt_error:
VIR_FREE(prompt); VIR_FREE(prompt);
virBufferFreeAndReset(&buff);
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
virBufferFreeAndReset(&buff);
ret = ssh_userauth_kbdint(sess->session, NULL, NULL); ret = ssh_userauth_kbdint(sess->session, NULL, NULL);
++try; ++try;
if (ret == SSH_AUTH_DENIED && (priv->tries < 0 || try < priv->tries)) if (ret == SSH_AUTH_DENIED && (priv->tries < 0 || try < priv->tries))

2
src/rpc/virnetsocket.c
View File

@ -849,7 +849,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
{ {
char *quoted; char *quoted;
virCommandPtr cmd; virCommandPtr cmd;
virBuffer buf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
*retsock = NULL; *retsock = NULL;

2
src/rpc/virnetsshsession.c
View File

@ -287,7 +287,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess)
int keyType; int keyType;
size_t keyLength; size_t keyLength;
char *errmsg; char *errmsg;
virBuffer buff = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) buff = VIR_BUFFER_INITIALIZER;
virConnectCredential askKey; virConnectCredential askKey;
struct libssh2_knownhost *knownHostEntry = NULL; struct libssh2_knownhost *knownHostEntry = NULL;
size_t i; size_t i;