From nobody Thu May 15 07:14:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527582326572455.17465040245156; Tue, 29 May 2018 01:25:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39CF430CE82D; Tue, 29 May 2018 08:25:25 +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 04121608F6; Tue, 29 May 2018 08:25:25 +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 94127180BA80; Tue, 29 May 2018 08:25:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4T8PD7P005764 for ; Tue, 29 May 2018 04:25:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22EF563F58; Tue, 29 May 2018 08:25:13 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D98B63536; Tue, 29 May 2018 08:25:12 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 29 May 2018 10:24:38 +0200 Message-Id: <803dd3a3a3b9bb2d29eb897cd1024182a5209103.1527581861.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/10] virCryptoGenerateRandom: rename ret 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 29 May 2018 08:25:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This function allocates a buffer, fills it in with random bytes and then returns it. However, the buffer is held in @buf variable, therefore having @ret variable which does not hold return value of the function is misleading. Signed-off-by: Michal Privoznik Reviewed-by: Eric Blake --- src/util/vircrypto.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 4079013d6d..930fa3b215 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -329,16 +329,16 @@ uint8_t * virCryptoGenerateRandom(size_t nbytes) { uint8_t *buf; - int ret; + int rv; =20 if (VIR_ALLOC_N(buf, nbytes) < 0) return NULL; =20 #if WITH_GNUTLS /* Generate the byte stream using gnutls_rnd() if possible */ - if ((ret =3D gnutls_rnd(GNUTLS_RND_RANDOM, buf, nbytes)) < 0) { + if ((rv =3D gnutls_rnd(GNUTLS_RND_RANDOM, buf, nbytes)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to generate byte stream, ret=3D%d"), ret); + _("failed to generate byte stream, rv=3D%d"), rv); VIR_FREE(buf); return NULL; } @@ -346,8 +346,8 @@ virCryptoGenerateRandom(size_t nbytes) /* If we don't have gnutls_rnd(), we will generate a less cryptographi= cally * strong master buf from /dev/urandom. */ - if ((ret =3D virRandomBytes(buf, nbytes)) < 0) { - virReportSystemError(-ret, "%s", _("failed to generate byte stream= ")); + if ((rv =3D virRandomBytes(buf, nbytes)) < 0) { + virReportSystemError(-rv, "%s", _("failed to generate byte stream"= )); VIR_FREE(buf); return NULL; } --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list