[libvirt PATCH 09/14] api: virDomainMemoryStats: use 'ret' variable

Ján Tomko posted 14 patches 5 years, 4 months ago
There is a newer version of this series
[libvirt PATCH 09/14] api: virDomainMemoryStats: use 'ret' variable
Posted by Ján Tomko 5 years, 4 months ago
Instead of 'nr_stats_ret'. Also reduce its scope.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/libvirt-domain.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index cde86c77e8..415482a526 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -5741,7 +5741,6 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats,
                      unsigned int nr_stats, unsigned int flags)
 {
     virConnectPtr conn;
-    unsigned long nr_stats_ret = 0;
 
     VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=0x%x",
                      stats, nr_stats, flags);
@@ -5758,11 +5757,10 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats,
 
     conn = dom->conn;
     if (conn->driver->domainMemoryStats) {
-        nr_stats_ret = conn->driver->domainMemoryStats(dom, stats, nr_stats,
-                                                       flags);
-        if (nr_stats_ret == -1)
+        int ret = conn->driver->domainMemoryStats(dom, stats, nr_stats, flags);
+        if (ret == -1)
             goto error;
-        return nr_stats_ret;
+        return ret;
     }
 
     virReportUnsupportedError();
-- 
2.26.2

Re: [libvirt PATCH 09/14] api: virDomainMemoryStats: use 'ret' variable
Posted by Martin Kletzander 5 years, 4 months ago
On Wed, Sep 23, 2020 at 08:14:58PM +0200, Ján Tomko wrote:
>Instead of 'nr_stats_ret'. Also reduce its scope.
>
>Signed-off-by: Ján Tomko <jtomko@redhat.com>

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

>---
> src/libvirt-domain.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
>diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
>index cde86c77e8..415482a526 100644
>--- a/src/libvirt-domain.c
>+++ b/src/libvirt-domain.c
>@@ -5741,7 +5741,6 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats,
>                      unsigned int nr_stats, unsigned int flags)
> {
>     virConnectPtr conn;
>-    unsigned long nr_stats_ret = 0;
>
>     VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u, flags=0x%x",
>                      stats, nr_stats, flags);
>@@ -5758,11 +5757,10 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats,
>
>     conn = dom->conn;
>     if (conn->driver->domainMemoryStats) {
>-        nr_stats_ret = conn->driver->domainMemoryStats(dom, stats, nr_stats,
>-                                                       flags);
>-        if (nr_stats_ret == -1)
>+        int ret = conn->driver->domainMemoryStats(dom, stats, nr_stats, flags);
>+        if (ret == -1)
>             goto error;
>-        return nr_stats_ret;
>+        return ret;
>     }
>
>     virReportUnsupportedError();
>-- 
>2.26.2
>