From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 29 Jan 2016 17:00:13 +0000 (+0100)
Subject: Simplify virDomainParseMemory
X-Git-Tag: v1.3.2-rc1~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1d7273f245b41578208705e395053f3be613142;p=thirdparty%2Flibvirt.git

Simplify virDomainParseMemory

Do not store the return value of virDomainParseScaledValue,
it was overwritten anyway.

Delete the cleanup label, there is nothing to clean up.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6aef3f8528..55e7ed9590 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7584,28 +7584,22 @@ virDomainParseMemory(const char *xpath,
                      bool required,
                      bool capped)
 {
-    int ret = -1;
     unsigned long long bytes, max;
 
     max = virMemoryMaxValue(capped);
 
-    ret = virDomainParseScaledValue(xpath, units_xpath, ctxt,
-                                    &bytes, 1024, max, required);
-    if (ret < 0)
-        goto cleanup;
+    if (virDomainParseScaledValue(xpath, units_xpath, ctxt,
+                                  &bytes, 1024, max, required) < 0)
+        return -1;
 
     /* Yes, we really do use kibibytes for our internal sizing.  */
     *mem = VIR_DIV_UP(bytes, 1024);
 
     if (*mem >= VIR_DIV_UP(max, 1024)) {
         virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large"));
-        ret = -1;
-        goto cleanup;
+        return -1;
     }
-
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }