[libvirt PATCH 1/2] qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject

Jiri Denemark posted 2 patches 3 years, 12 months ago
There is a newer version of this series
[libvirt PATCH 1/2] qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject
Posted by Jiri Denemark 3 years, 12 months ago
We use 'ret' for storing values to be returned from a function. Return
values from called functions that are not supposed to be returned
further are usually called 'rv' (or 'rc').

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_migration_cookie.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index ba05a5a07f..76a01781d6 100644
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -184,7 +184,7 @@ qemuDomainExtractTLSSubject(const char *certdir)
     g_autofree char *pemdata = NULL;
     gnutls_datum_t pemdatum;
     gnutls_x509_crt_t cert;
-    int ret;
+    int rc;
     size_t subjectlen;
 
     certfile = g_strdup_printf("%s/server-cert.pem", certdir);
@@ -195,22 +195,22 @@ qemuDomainExtractTLSSubject(const char *certdir)
         return NULL;
     }
 
-    ret = gnutls_x509_crt_init(&cert);
-    if (ret < 0) {
+    rc = gnutls_x509_crt_init(&cert);
+    if (rc < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("cannot initialize cert object: %s"),
-                       gnutls_strerror(ret));
+                       gnutls_strerror(rc));
         return NULL;
     }
 
     pemdatum.data = (unsigned char *)pemdata;
     pemdatum.size = strlen(pemdata);
 
-    ret = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM);
-    if (ret < 0) {
+    rc = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM);
+    if (rc < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("cannot load cert data from %s: %s"),
-                       certfile, gnutls_strerror(ret));
+                       certfile, gnutls_strerror(rc));
         return NULL;
     }
 
-- 
2.35.1

Re: [libvirt PATCH 1/2] qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject
Posted by Ján Tomko 3 years, 12 months ago
On a Thursday in 2022, Jiri Denemark wrote:
>We use 'ret' for storing values to be returned from a function. Return
>values from called functions that are not supposed to be returned
>further are usually called 'rv' (or 'rc').
>
>Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
>---
> src/qemu/qemu_migration_cookie.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano