From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 2 Jun 2015 09:17:27 +0000 (+0200)
Subject: virsh: Make vshCommandOptScaledInt() use vshCommandOpt()
X-Git-Tag: v1.2.17-rc1~326
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5eaca29fbb103f1d3330e0982c5c18548d37d108;p=thirdparty%2Flibvirt.git

virsh: Make vshCommandOptScaledInt() use vshCommandOpt()

This aligns it to the other vshCommandOpt*() functions.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 55caa87701..cd2bfef5a7 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -1804,16 +1804,16 @@ vshCommandOptScaledInt(const vshCmd *cmd, const char *name,
                        unsigned long long *value, int scale,
                        unsigned long long max)
 {
-    const char *str;
-    int ret;
+    vshCmdOpt *arg;
     char *end;
+    int ret;
 
-    ret = vshCommandOptString(cmd, name, &str);
-    if (ret <= 0)
+    if ((ret = vshCommandOpt(cmd, name, &arg, true)) <= 0)
         return ret;
-    if (virStrToLong_ullp(str, &end, 10, value) < 0 ||
+    if (virStrToLong_ullp(arg->data, &end, 10, value) < 0 ||
         virScaleInteger(value, end, scale, max) < 0)
         return -1;
+
     return 1;
 }