External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 23:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

virCryptoGenerateRandom: rename ret

Browse Source 
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 <mprivozn@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Michal Privoznik 2018-05-29 07:48:02 +02:00
parent 29592788f1
commit d4e66f7639
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/vircrypto.c
View File

@ -329,16 +329,16 @@ uint8_t *
virCryptoGenerateRandom(size_t nbytes) virCryptoGenerateRandom(size_t nbytes)
{ {
uint8_t *buf; uint8_t *buf;
int ret; int rv;
if (VIR_ALLOC_N(buf, nbytes) < 0) if (VIR_ALLOC_N(buf, nbytes) < 0)
return NULL; return NULL;
#if WITH_GNUTLS #if WITH_GNUTLS
/* Generate the byte stream using gnutls_rnd() if possible */ /* Generate the byte stream using gnutls_rnd() if possible */
if ((ret = gnutls_rnd(GNUTLS_RND_RANDOM, buf, nbytes)) < 0) { if ((rv = gnutls_rnd(GNUTLS_RND_RANDOM, buf, nbytes)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to generate byte stream, ret=%d"), ret); _("failed to generate byte stream, rv=%d"), rv);
VIR_FREE(buf); VIR_FREE(buf);
return NULL; return NULL;
} }
@ -346,8 +346,8 @@ virCryptoGenerateRandom(size_t nbytes)
/* If we don't have gnutls_rnd(), we will generate a less cryptographically /* If we don't have gnutls_rnd(), we will generate a less cryptographically
* strong master buf from /dev/urandom. * strong master buf from /dev/urandom.
*/ */
if ((ret = virRandomBytes(buf, nbytes)) < 0) { if ((rv = virRandomBytes(buf, nbytes)) < 0) {
virReportSystemError(-ret, "%s", _("failed to generate byte stream")); virReportSystemError(-rv, "%s", _("failed to generate byte stream"));
VIR_FREE(buf); VIR_FREE(buf);
return NULL; return NULL;
} }