From nobody Tue Feb 10 07:41:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1594007046; cv=none; d=zohomail.com; s=zohoarc; b=Be69qWtVn94zimkEs5p6HS0CpGic+8oMrfiuvR2Atu/2gpbC2gAXFv01NDRzdLTmyFjo+DPy2FhL1SNvA+ler9XzC7vAWUscRYHLSiSX61+zoCDg2kfb2fULTypTTITsedOxxVd4itNb32dpT5VAzePt1a5TSkoQY+aHWKXfP0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594007046; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=InDbBmc5knTRhr3WeS87hOwxvHJbkhh5uI33+bfdlUs=; b=Km1AHTux+Y5PhPw+bQEMnI0/UDKDqUyDJp+Ll3r1VdpmKAtz9q3RzDUX9nDDFtcZ7/k+wu22Yh63o1lXAC94KpVPmdxM2aY7wkALbkgKqA/O3p5uo6zPhowx9ZaeDlNom1UXCJ+QB4xmVU81PMwL5yUH4A67PRMF2AENGhvpJOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1594007046809512.3697461762405; Sun, 5 Jul 2020 20:44:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-DjVQoNxXNHq6h_r0QiII7A-1; Sun, 05 Jul 2020 23:42:28 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBF25100960F; Mon, 6 Jul 2020 03:42:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA72561981; Mon, 6 Jul 2020 03:42:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9E2011800456; Mon, 6 Jul 2020 03:42:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0663fkCr004507 for ; Sun, 5 Jul 2020 23:41:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6352871678; Mon, 6 Jul 2020 03:41:46 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-194.phx2.redhat.com [10.3.112.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16BAD275E20 for ; Mon, 6 Jul 2020 03:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594007045; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=InDbBmc5knTRhr3WeS87hOwxvHJbkhh5uI33+bfdlUs=; b=ViKroQ5JX26xTSo7BycgiVYLtqlJ+4k7MYq76avzedVgNmVlbnAbbAj+6nVmQaRnjZznsc c3bqowb0z0nRZSYXRkjsJl84Fo87jeUtkPLRk71tsevLWFLQhcPxWI6XYhjBfmjp9jcF02 ADunZ4hZ24q0aQojqPYeBD2yoW1i6U4= X-MC-Unique: DjVQoNxXNHq6h_r0QiII7A-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH 12/32] rpc: use g_auto() for all virBuffers Date: Sun, 5 Jul 2020 23:41:07 -0400 Message-Id: <20200706034127.1117504-13-laine@redhat.com> In-Reply-To: <20200706034127.1117504-1-laine@redhat.com> References: <20200706034127.1117504-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Laine Stump Reviewed-by: J=C3=A1n Tomko --- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnetlibsshsession.c | 7 ++----- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 1c5bef86a1..441f1502a6 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -428,7 +428,7 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host, { virNetSocketPtr sock =3D NULL; =20 - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *nc =3D NULL; g_autofree char *command =3D NULL; =20 @@ -518,7 +518,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, { virNetSocketPtr sock =3D NULL; =20 - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; g_autofree char *nc =3D NULL; g_autofree char *command =3D NULL; =20 diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 0a566eaa54..c9b31e9462 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -664,7 +664,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibss= hSessionPtr sess, while (ret =3D=3D SSH_AUTH_INFO) { const char *name, *instruction; int nprompts, iprompt; - virBuffer buff =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buff =3D VIR_BUFFER_INITIALIZER; =20 name =3D ssh_userauth_kbdint_getname(sess->session); instruction =3D ssh_userauth_kbdint_getinstruction(sess->session); @@ -706,7 +706,7 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibss= hSessionPtr sess, * buffer if specified */ if (virBufferUse(&buff) > 0) { - virBuffer prompt_buff =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) prompt_buff =3D VIR_BUFFER_INITIALIZER; =20 virBufferAddBuffer(&prompt_buff, &buff); virBufferAdd(&prompt_buff, promptStr, promptStrLen); @@ -750,12 +750,9 @@ virNetLibsshAuthenticateKeyboardInteractive(virNetLibs= shSessionPtr sess, =20 prompt_error: VIR_FREE(prompt); - virBufferFreeAndReset(&buff); return SSH_AUTH_ERROR; } =20 - virBufferFreeAndReset(&buff); - ret =3D ssh_userauth_kbdint(sess->session, NULL, NULL); ++try; if (ret =3D=3D SSH_AUTH_DENIED && (priv->tries < 0 || try < priv->= tries)) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 3ea863f625..d1f4c531aa 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -849,7 +849,7 @@ int virNetSocketNewConnectSSH(const char *nodename, { char *quoted; virCommandPtr cmd; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 *retsock =3D NULL; =20 diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index b4dea15452..490e9d5c5d 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -287,7 +287,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) int keyType; size_t keyLength; char *errmsg; - virBuffer buff =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buff =3D VIR_BUFFER_INITIALIZER; virConnectCredential askKey; struct libssh2_knownhost *knownHostEntry =3D NULL; size_t i; --=20 2.25.4