aboutsummaryrefslogtreecommitdiff
path: root/qemu-io-cmds.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-21 21:14:06 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-02-23 20:35:36 +0100
commitf17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7 (patch)
tree65d92c1363f1c071214779eee670185ff31094e7 /qemu-io-cmds.c
parent4fcdf65ae2c00ae69f7625f26ed41f37d77b403c (diff)
downloadqemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.zip
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.gz
qemu-f17fd4fdf0df3d2f3444399d04c38d22b9a3e1b7.tar.bz2
util/cutils: Return qemu_strtosz*() error and value separately
This makes qemu_strtosz(), qemu_strtosz_mebi() and qemu_strtosz_metric() similar to qemu_strtoi64(), except negative values are rejected. Cc: Dr. David Alan Gilbert <dgilbert@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> (maintainer:X86) Cc: Kevin Wolf <kwolf@redhat.com> (supporter:Block layer core) Cc: Max Reitz <mreitz@redhat.com> (supporter:Block layer core) Cc: qemu-block@nongnu.org (open list:Block layer core) Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <1487708048-2131-23-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qemu-io-cmds.c')
-rw-r--r--qemu-io-cmds.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 973eb94..01a6dc6 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -137,10 +137,14 @@ static char **breakline(char *input, int *count)
static int64_t cvtnum(const char *s)
{
- int64_t ret;
+ int err;
+ int64_t value;
- ret = qemu_strtosz(s, NULL);
- return ret;
+ err = qemu_strtosz(s, NULL, &value);
+ if (err < 0) {
+ return err;
+ }
+ return value;
}
static void print_cvtnum_err(int64_t rc, const char *arg)